The most powerful and modular diffusion model GUI, api and backend with a graph/nodes interface. The fastest local inference engine in the world.
chore(api-nodes): remove chat widgets from OpenAI/Gemini nodes (#10861)
Alexander Piskund8433c63fdac
diff --git a/comfy_api_nodes/nodes_gemini.py b/comfy_api_nodes/nodes_gemini.pyindex 976d9c225..08f7b0f64 100644--- a/comfy_api_nodes/nodes_gemini.py+++ b/comfy_api_nodes/nodes_gemini.py@@ -4,10 +4,7 @@ See: https://cloud.google.com/vertex-ai/generative-ai/docs/model-reference/infer"""import base64-import jsonimport os-import time-import uuidfrom enum import Enumfrom io import BytesIOfrom typing import Literal@@ -43,7 +40,6 @@ from comfy_api_nodes.util import (validate_string,video_to_base64_string,)-from server import PromptServerGEMINI_BASE_ENDPOINT = "/proxy/vertexai/gemini"GEMINI_MAX_INPUT_FILE_SIZE = 20 * 1024 * 1024 # 20 MB@@ -384,29 +380,6 @@ class GeminiNode(IO.ComfyNode):)output_text = get_text_from_response(response)- if output_text:- # Not a true chat history like the OpenAI Chat node. It is emulated so the frontend can show a copy button.- render_spec = {- "node_id": cls.hidden.unique_id,- "component": "ChatHistoryWidget",- "props": {- "history": json.dumps(- [- {- "prompt": prompt,- "response": output_text,- "response_id": str(uuid.uuid4()),- "timestamp": time.time(),- }- ]- ),- },- }- PromptServer.instance.send_sync(- "display_component",- render_spec,- )-return IO.NodeOutput(output_text or "Empty response from Gemini model...")@@ -601,30 +574,7 @@ class GeminiImage(IO.ComfyNode):response_model=GeminiGenerateContentResponse,price_extractor=calculate_tokens_price,)-- output_text = get_text_from_response(response)- if output_text:- render_spec = {- "node_id": cls.hidden.unique_id,- "component": "ChatHistoryWidget",- "props": {- "history": json.dumps(- [- {- "prompt": prompt,- "response": output_text,- "response_id": str(uuid.uuid4()),- "timestamp": time.time(),- }- ]- ),- },- }- PromptServer.instance.send_sync(- "display_component",- render_spec,- )- return IO.NodeOutput(get_image_from_response(response), output_text)+ return IO.NodeOutput(get_image_from_response(response), get_text_from_response(response))class GeminiImage2(IO.ComfyNode):@@ -744,30 +694,7 @@ class GeminiImage2(IO.ComfyNode):response_model=GeminiGenerateContentResponse,price_extractor=calculate_tokens_price,)-- output_text = get_text_from_response(response)- if output_text:- render_spec = {- "node_id": cls.hidden.unique_id,- "component": "ChatHistoryWidget",- "props": {- "history": json.dumps(- [- {- "prompt": prompt,- "response": output_text,- "response_id": str(uuid.uuid4()),- "timestamp": time.time(),- }- ]- ),- },- }- PromptServer.instance.send_sync(- "display_component",- render_spec,- )- return IO.NodeOutput(get_image_from_response(response), output_text)+ return IO.NodeOutput(get_image_from_response(response), get_text_from_response(response))class GeminiExtension(ComfyExtension):diff --git a/comfy_api_nodes/nodes_openai.py b/comfy_api_nodes/nodes_openai.pyindex acf35d276..c8da5464b 100644--- a/comfy_api_nodes/nodes_openai.py+++ b/comfy_api_nodes/nodes_openai.py@@ -1,15 +1,10 @@from io import BytesIO-from typing import Optional, Union-import jsonimport os-import time-import uuidfrom enum import Enumfrom inspect import cleandocimport numpy as npimport torchfrom PIL import Image-from server import PromptServerimport folder_pathsimport base64from comfy_api.latest import IO, ComfyExtension@@ -587,11 +582,11 @@ class OpenAIChatNode(IO.ComfyNode):def create_input_message_contents(cls,prompt: str,- image: Optional[torch.Tensor] = None,- files: Optional[list[InputFileContent]] = None,+ image: torch.Tensor | None = None,+ files: list[InputFileContent] | None = None,) -> InputMessageContentList:"""Create a list of input message contents from prompt and optional image."""- content_list: list[Union[InputContent, InputTextContent, InputImageContent, InputFileContent]] = [+ content_list: list[InputContent | InputTextContent | InputImageContent | InputFileContent] = [InputTextContent(text=prompt, type="input_text"),]if image is not None:@@ -617,9 +612,9 @@ class OpenAIChatNode(IO.ComfyNode):prompt: str,persist_context: bool = False,model: SupportedOpenAIModel = SupportedOpenAIModel.gpt_5.value,- images: Optional[torch.Tensor] = None,- files: Optional[list[InputFileContent]] = None,- advanced_options: Optional[CreateModelResponseProperties] = None,+ images: torch.Tensor | None = None,+ files: list[InputFileContent] | None = None,+ advanced_options: CreateModelResponseProperties | None = None,) -> IO.NodeOutput:validate_string(prompt, strip_whitespace=False)@@ -660,30 +655,7 @@ class OpenAIChatNode(IO.ComfyNode):status_extractor=lambda response: response.status,completed_statuses=["incomplete", "completed"])- output_text = cls.get_text_from_message_content(cls.get_message_content_from_response(result_response))-- # Update history- render_spec = {- "node_id": cls.hidden.unique_id,- "component": "ChatHistoryWidget",- "props": {- "history": json.dumps(- [- {- "prompt": prompt,- "response": output_text,- "response_id": str(uuid.uuid4()),- "timestamp": time.time(),- }- ]- ),- },- }- PromptServer.instance.send_sync(- "display_component",- render_spec,- )- return IO.NodeOutput(output_text)+ return IO.NodeOutput(cls.get_text_from_message_content(cls.get_message_content_from_response(result_response)))class OpenAIInputFiles(IO.ComfyNode):@@ -790,8 +762,8 @@ class OpenAIChatConfig(IO.ComfyNode):def execute(cls,truncation: bool,- instructions: Optional[str] = None,- max_output_tokens: Optional[int] = None,+ instructions: str | None = None,+ max_output_tokens: int | None = None,) -> IO.NodeOutput:"""Configure advanced options for the OpenAI Chat Node.