The most powerful and modular diffusion model GUI, api and backend with a graph/nodes interface. The fastest local inference engine in the world.
fix(ReCraft-API-node): allow custom multipart parser to return FormData (#10244)
Alexander Piskunfc34c3d1125e
diff --git a/comfy_api_nodes/apis/client.py b/comfy_api_nodes/apis/client.pyindex 79de3c262..36560c9e3 100644--- a/comfy_api_nodes/apis/client.py+++ b/comfy_api_nodes/apis/client.py@@ -220,13 +220,16 @@ class ApiClient:if multipart_parser and data:data = multipart_parser(data)- form = aiohttp.FormData(default_to_multipart=True)- if data: # regular text fields- for k, v in data.items():- if v is None:- continue # aiohttp fails to serialize "None" values- # aiohttp expects strings or bytes; convert enums etc.- form.add_field(k, str(v) if not isinstance(v, (bytes, bytearray)) else v)+ if isinstance(data, aiohttp.FormData):+ form = data # If the parser already returned a FormData, pass it through+ else:+ form = aiohttp.FormData(default_to_multipart=True)+ if data: # regular text fields+ for k, v in data.items():+ if v is None:+ continue # aiohttp fails to serialize "None" values+ # aiohttp expects strings or bytes; convert enums etc.+ form.add_field(k, str(v) if not isinstance(v, (bytes, bytearray)) else v)if files:file_iter = files if isinstance(files, list) else files.items()diff --git a/comfy_api_nodes/nodes_recraft.py b/comfy_api_nodes/nodes_recraft.pyindex 0bbb551b8..8beed5675 100644--- a/comfy_api_nodes/nodes_recraft.py+++ b/comfy_api_nodes/nodes_recraft.py@@ -35,6 +35,7 @@ from server import PromptServerimport torchfrom io import BytesIOfrom PIL import UnidentifiedImageError+import aiohttpasync def handle_recraft_file_request(@@ -82,10 +83,16 @@ async def handle_recraft_file_request(return all_bytesio-def recraft_multipart_parser(data, parent_key=None, formatter: callable=None, converted_to_check: list[list]=None, is_list=False) -> dict:+def recraft_multipart_parser(+ data,+ parent_key=None,+ formatter: callable = None,+ converted_to_check: list[list] = None,+ is_list: bool = False,+ return_mode: str = "formdata" # "dict" | "formdata"+) -> dict | aiohttp.FormData:"""- Formats data such that multipart/form-data will work with requests library- when both files and data are present.+ Formats data such that multipart/form-data will work with aiohttp library when both files and data are present.The OpenAI client that Recraft uses has a bizarre way of serializing lists:@@ -103,19 +110,19 @@ def recraft_multipart_parser(data, parent_key=None, formatter: callable=None, co# Modification of a function that handled a different type of multipart parsing, big ups:# https://gist.github.com/kazqvaizer/4cebebe5db654a414132809f9f88067b- def handle_converted_lists(data, parent_key, lists_to_check=tuple[list]):+ def handle_converted_lists(item, parent_key, lists_to_check=tuple[list]):# if list already exists exists, just extend list with datafor check_list in lists_to_check:for conv_tuple in check_list:if conv_tuple[0] == parent_key and isinstance(conv_tuple[1], list):- conv_tuple[1].append(formatter(data))+ conv_tuple[1].append(formatter(item))return Truereturn Falseif converted_to_check is None:converted_to_check = []-+ effective_mode = return_mode if parent_key is None else "dict"if formatter is None:formatter = lambda v: v # Multipart representation of value@@ -145,6 +152,15 @@ def recraft_multipart_parser(data, parent_key=None, formatter: callable=None, coelse:converted.append((current_key, formatter(value)))+ if effective_mode == "formdata":+ fd = aiohttp.FormData()+ for k, v in dict(converted).items():+ if isinstance(v, list):+ for item in v:+ fd.add_field(k, str(item))+ else:+ fd.add_field(k, str(v))+ return fdreturn dict(converted)