xinyun/ComfyUI
1
0
Fork 0
mirror of https://git.datalinker.icu/comfyanonymous/ComfyUI synced 2026-08-31 01:03:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed client bug; converted openai nodes

Browse Source
This commit is contained in:
bigcat88 2025-08-01 11:33:02 +03:00
parent 265051a930
commit 361f95b584
No known key found for this signature in database
GPG Key ID: 1F0BF0EC3CF22721
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
comfy_api_nodes/apis/client.py
View File

@ -351,6 +351,8 @@ class ApiClient:
request_headers.update(headers) request_headers.update(headers)
if files: if files:
request_headers.pop("Content-Type", None) request_headers.pop("Content-Type", None)
if params:
params = {k: v for k, v in params.items() if v is not None} # aiohttp fails to serialize None values
logging.debug(f"[DEBUG] Request Headers: {request_headers}") logging.debug(f"[DEBUG] Request Headers: {request_headers}")
logging.debug(f"[DEBUG] Files: {files}") logging.debug(f"[DEBUG] Files: {files}")

28
comfy_api_nodes/nodes_openai.py
View File

@ -163,7 +163,7 @@ class OpenAIDalle2(ComfyNodeABC):
DESCRIPTION = cleandoc(__doc__ or "") DESCRIPTION = cleandoc(__doc__ or "")
API_NODE = True API_NODE = True
def api_call( async def api_call(
self, self,
prompt, prompt,
seed=0, seed=0,
@ -233,9 +233,9 @@ class OpenAIDalle2(ComfyNodeABC):
auth_kwargs=kwargs, auth_kwargs=kwargs,
) )
response = operation.execute() response = await operation.execute()
img_tensor = validate_and_cast_response(response, node_id=unique_id) img_tensor = await validate_and_cast_response(response, node_id=unique_id)
return (img_tensor,) return (img_tensor,)
@ -311,7 +311,7 @@ class OpenAIDalle3(ComfyNodeABC):
DESCRIPTION = cleandoc(__doc__ or "") DESCRIPTION = cleandoc(__doc__ or "")
API_NODE = True API_NODE = True
def api_call( async def api_call(
self, self,
prompt, prompt,
seed=0, seed=0,
@ -343,9 +343,9 @@ class OpenAIDalle3(ComfyNodeABC):
auth_kwargs=kwargs, auth_kwargs=kwargs,
) )
response = operation.execute() response = await operation.execute()
img_tensor = validate_and_cast_response(response, node_id=unique_id) img_tensor = await validate_and_cast_response(response, node_id=unique_id)
return (img_tensor,) return (img_tensor,)
@ -446,7 +446,7 @@ class OpenAIGPTImage1(ComfyNodeABC):
DESCRIPTION = cleandoc(__doc__ or "") DESCRIPTION = cleandoc(__doc__ or "")
API_NODE = True API_NODE = True
def api_call( async def api_call(
self, self,
prompt, prompt,
seed=0, seed=0,
@ -537,9 +537,9 @@ class OpenAIGPTImage1(ComfyNodeABC):
auth_kwargs=kwargs, auth_kwargs=kwargs,
) )
response = operation.execute() response = await operation.execute()
img_tensor = validate_and_cast_response(response, node_id=unique_id) img_tensor = await validate_and_cast_response(response, node_id=unique_id)
return (img_tensor,) return (img_tensor,)
@ -623,7 +623,7 @@ class OpenAIChatNode(OpenAITextNode):
DESCRIPTION = "Generate text responses from an OpenAI model." DESCRIPTION = "Generate text responses from an OpenAI model."
def get_result_response( async def get_result_response(
self, self,
response_id: str, response_id: str,
include: Optional[list[Includable]] = None, include: Optional[list[Includable]] = None,
@ -639,7 +639,7 @@ class OpenAIChatNode(OpenAITextNode):
creation above for more information. creation above for more information.
""" """
return PollingOperation( return await PollingOperation(
poll_endpoint=ApiEndpoint( poll_endpoint=ApiEndpoint(
path=f"{RESPONSES_ENDPOINT}/{response_id}", path=f"{RESPONSES_ENDPOINT}/{response_id}",
method=HttpMethod.GET, method=HttpMethod.GET,
@ -784,7 +784,7 @@ class OpenAIChatNode(OpenAITextNode):
self.history[session_id] = new_history self.history[session_id] = new_history
def api_call( async def api_call(
self, self,
prompt: str, prompt: str,
persist_context: bool, persist_context: bool,
@ -815,7 +815,7 @@ class OpenAIChatNode(OpenAITextNode):
previous_response_id = None previous_response_id = None
# Create response # Create response
create_response = SynchronousOperation( create_response = await SynchronousOperation(
endpoint=ApiEndpoint( endpoint=ApiEndpoint(
path=RESPONSES_ENDPOINT, path=RESPONSES_ENDPOINT,
method=HttpMethod.POST, method=HttpMethod.POST,
@ -848,7 +848,7 @@ class OpenAIChatNode(OpenAITextNode):
response_id = create_response.id response_id = create_response.id
# Get result output # Get result output
result_response = self.get_result_response(response_id, auth_kwargs=kwargs) result_response = await self.get_result_response(response_id, auth_kwargs=kwargs)
output_text = self.parse_output_text_from_response(result_response) output_text = self.parse_output_text_from_response(result_response)
# Update history # Update history