The most powerful and modular diffusion model GUI, api and backend with a graph/nodes interface. The fastest local inference engine in the world.
feat(comfy_api): add basic 3D Model file types (#12129)
Alexander Piskunfb23935c1139
diff --git a/comfy_api/latest/__init__.py b/comfy_api/latest/__init__.pyindex b0fa14ff6..8542a1dbc 100644--- a/comfy_api/latest/__init__.py+++ b/comfy_api/latest/__init__.py@@ -7,7 +7,7 @@ from comfy_api.internal.singleton import ProxiedSingletonfrom comfy_api.internal.async_to_sync import create_sync_classfrom ._input import ImageInput, AudioInput, MaskInput, LatentInput, VideoInputfrom ._input_impl import VideoFromFile, VideoFromComponents-from ._util import VideoCodec, VideoContainer, VideoComponents, MESH, VOXEL+from ._util import VideoCodec, VideoContainer, VideoComponents, MESH, VOXEL, File3Dfrom . import _io_public as iofrom . import _ui_public as uifrom comfy_execution.utils import get_executing_context@@ -105,6 +105,7 @@ class Types:VideoComponents = VideoComponentsMESH = MESHVOXEL = VOXEL+ File3D = File3DComfyAPI = ComfyAPI_latestdiff --git a/comfy_api/latest/_io.py b/comfy_api/latest/_io.pyindex eeea9781a..93cf482ca 100644--- a/comfy_api/latest/_io.py+++ b/comfy_api/latest/_io.py@@ -27,7 +27,7 @@ if TYPE_CHECKING:from comfy_api.internal import (_ComfyNodeInternal, _NodeOutputInternal, classproperty, copy_class, first_real_override, is_class,prune_dict, shallow_clone_class)from comfy_execution.graph_utils import ExecutionBlocker-from ._util import MESH, VOXEL, SVG as _SVG+from ._util import MESH, VOXEL, SVG as _SVG, File3Dclass FolderType(str, Enum):@@ -667,6 +667,49 @@ class Voxel(ComfyTypeIO):class Mesh(ComfyTypeIO):Type = MESH++@comfytype(io_type="FILE_3D")+class File3DAny(ComfyTypeIO):+ """General 3D file type - accepts any supported 3D format."""+ Type = File3D+++@comfytype(io_type="FILE_3D_GLB")+class File3DGLB(ComfyTypeIO):+ """GLB format 3D file - binary glTF, best for web and cross-platform."""+ Type = File3D+++@comfytype(io_type="FILE_3D_GLTF")+class File3DGLTF(ComfyTypeIO):+ """GLTF format 3D file - JSON-based glTF with external resources."""+ Type = File3D+++@comfytype(io_type="FILE_3D_FBX")+class File3DFBX(ComfyTypeIO):+ """FBX format 3D file - best for game engines and animation."""+ Type = File3D+++@comfytype(io_type="FILE_3D_OBJ")+class File3DOBJ(ComfyTypeIO):+ """OBJ format 3D file - simple geometry format."""+ Type = File3D+++@comfytype(io_type="FILE_3D_STL")+class File3DSTL(ComfyTypeIO):+ """STL format 3D file - best for 3D printing."""+ Type = File3D+++@comfytype(io_type="FILE_3D_USDZ")+class File3DUSDZ(ComfyTypeIO):+ """USDZ format 3D file - Apple AR format."""+ Type = File3D++@comfytype(io_type="HOOKS")class Hooks(ComfyTypeIO):if TYPE_CHECKING:@@ -2037,6 +2080,13 @@ __all__ = ["LossMap","Voxel","Mesh",+ "File3DAny",+ "File3DGLB",+ "File3DGLTF",+ "File3DFBX",+ "File3DOBJ",+ "File3DSTL",+ "File3DUSDZ","Hooks","HookKeyframes","TimestepsRange",diff --git a/comfy_api/latest/_util/__init__.py b/comfy_api/latest/_util/__init__.pyindex 6313eb01b..115baf392 100644--- a/comfy_api/latest/_util/__init__.py+++ b/comfy_api/latest/_util/__init__.py@@ -1,5 +1,5 @@from .video_types import VideoContainer, VideoCodec, VideoComponents-from .geometry_types import VOXEL, MESH+from .geometry_types import VOXEL, MESH, File3Dfrom .image_types import SVG__all__ = [@@ -9,5 +9,6 @@ __all__ = ["VideoComponents","VOXEL","MESH",+ "File3D","SVG",]diff --git a/comfy_api/latest/_util/geometry_types.py b/comfy_api/latest/_util/geometry_types.pyindex 385122778..b586fceb3 100644--- a/comfy_api/latest/_util/geometry_types.py+++ b/comfy_api/latest/_util/geometry_types.py@@ -1,3 +1,8 @@+import shutil+from io import BytesIO+from pathlib import Path+from typing import IO+import torch@@ -10,3 +15,75 @@ class MESH:def __init__(self, vertices: torch.Tensor, faces: torch.Tensor):self.vertices = verticesself.faces = faces+++class File3D:+ """Class representing a 3D file from a file path or binary stream.++ Supports both disk-backed (file path) and memory-backed (BytesIO) storage.+ """++ def __init__(self, source: str | IO[bytes], file_format: str = ""):+ self._source = source+ self._format = file_format or self._infer_format()++ def _infer_format(self) -> str:+ if isinstance(self._source, str):+ return Path(self._source).suffix.lstrip(".").lower()+ return ""++ @property+ def format(self) -> str:+ return self._format++ @format.setter+ def format(self, value: str) -> None:+ self._format = value.lstrip(".").lower() if value else ""++ @property+ def is_disk_backed(self) -> bool:+ return isinstance(self._source, str)++ def get_source(self) -> str | IO[bytes]:+ if isinstance(self._source, str):+ return self._source+ if hasattr(self._source, "seek"):+ self._source.seek(0)+ return self._source++ def get_data(self) -> BytesIO:+ if isinstance(self._source, str):+ with open(self._source, "rb") as f:+ result = BytesIO(f.read())+ return result+ if hasattr(self._source, "seek"):+ self._source.seek(0)+ if isinstance(self._source, BytesIO):+ return self._source+ return BytesIO(self._source.read())++ def save_to(self, path: str) -> str:+ dest = Path(path)+ dest.parent.mkdir(parents=True, exist_ok=True)++ if isinstance(self._source, str):+ if Path(self._source).resolve() != dest.resolve():+ shutil.copy2(self._source, dest)+ else:+ if hasattr(self._source, "seek"):+ self._source.seek(0)+ with open(dest, "wb") as f:+ f.write(self._source.read())+ return str(dest)++ def get_bytes(self) -> bytes:+ if isinstance(self._source, str):+ return Path(self._source).read_bytes()+ if hasattr(self._source, "seek"):+ self._source.seek(0)+ return self._source.read()++ def __repr__(self) -> str:+ if isinstance(self._source, str):+ return f"File3D(source={self._source!r}, format={self._format!r})"+ return f"File3D(<stream>, format={self._format!r})"diff --git a/comfy_api_nodes/apis/meshy.py b/comfy_api_nodes/apis/meshy.pyindex be46d0d58..7d72e6e91 100644--- a/comfy_api_nodes/apis/meshy.py+++ b/comfy_api_nodes/apis/meshy.py@@ -109,14 +109,19 @@ class MeshyTextureRequest(BaseModel):class MeshyModelsUrls(BaseModel):glb: str = Field("")+ fbx: str = Field("")+ usdz: str = Field("")+ obj: str = Field("")class MeshyRiggedModelsUrls(BaseModel):rigged_character_glb_url: str = Field("")+ rigged_character_fbx_url: str = Field("")class MeshyAnimatedModelsUrls(BaseModel):animation_glb_url: str = Field("")+ animation_fbx_url: str = Field("")class MeshyResultTextureUrls(BaseModel):diff --git a/comfy_api_nodes/nodes_hunyuan3d.py b/comfy_api_nodes/nodes_hunyuan3d.pyindex b3a736643..813a7c809 100644--- a/comfy_api_nodes/nodes_hunyuan3d.py+++ b/comfy_api_nodes/nodes_hunyuan3d.py@@ -1,5 +1,3 @@-import os-from typing_extensions import overridefrom comfy_api.latest import IO, ComfyExtension, Input@@ -14,7 +12,7 @@ from comfy_api_nodes.apis.hunyuan3d import ()from comfy_api_nodes.util import (ApiEndpoint,- download_url_to_bytesio,+ download_url_to_file_3d,downscale_image_tensor_by_max_side,poll_op,sync_op,@@ -22,14 +20,13 @@ from comfy_api_nodes.util import (validate_image_dimensions,validate_string,)-from folder_paths import get_output_directory-def get_glb_obj_from_response(response_objs: list[ResultFile3D]) -> ResultFile3D:+def get_file_from_response(response_objs: list[ResultFile3D], file_type: str) -> ResultFile3D | None:for i in response_objs:- if i.Type.lower() == "glb":+ if i.Type.lower() == file_type.lower():return i- raise ValueError("No GLB file found in response. Please report this to the developers.")+ return Noneclass TencentTextToModelNode(IO.ComfyNode):@@ -74,7 +71,9 @@ class TencentTextToModelNode(IO.ComfyNode):),],outputs=[- IO.String.Output(display_name="model_file"),+ IO.String.Output(display_name="model_file"), # for backward compatibility only+ IO.File3DGLB.Output(display_name="GLB"),+ IO.File3DOBJ.Output(display_name="OBJ"),],hidden=[IO.Hidden.auth_token_comfy_org,@@ -124,19 +123,20 @@ class TencentTextToModelNode(IO.ComfyNode):)if response.Error:raise ValueError(f"Task creation failed with code {response.Error.Code}: {response.Error.Message}")+ task_id = response.JobIdresult = await poll_op(cls,ApiEndpoint(path="/proxy/tencent/hunyuan/3d-pro/query", method="POST"),- data=To3DProTaskQueryRequest(JobId=response.JobId),+ data=To3DProTaskQueryRequest(JobId=task_id),response_model=To3DProTaskResultResponse,status_extractor=lambda r: r.Status,)- model_file = f"hunyuan_model_{response.JobId}.glb"- await download_url_to_bytesio(- get_glb_obj_from_response(result.ResultFile3Ds).Url,- os.path.join(get_output_directory(), model_file),+ glb_result = get_file_from_response(result.ResultFile3Ds, "glb")+ obj_result = get_file_from_response(result.ResultFile3Ds, "obj")+ file_glb = await download_url_to_file_3d(glb_result.Url, "glb", task_id=task_id) if glb_result else None+ return IO.NodeOutput(+ file_glb, file_glb, await download_url_to_file_3d(obj_result.Url, "obj", task_id=task_id) if obj_result else None)- return IO.NodeOutput(model_file)class TencentImageToModelNode(IO.ComfyNode):@@ -184,7 +184,9 @@ class TencentImageToModelNode(IO.ComfyNode):),],outputs=[- IO.String.Output(display_name="model_file"),+ IO.String.Output(display_name="model_file"), # for backward compatibility only+ IO.File3DGLB.Output(display_name="GLB"),+ IO.File3DOBJ.Output(display_name="OBJ"),],hidden=[IO.Hidden.auth_token_comfy_org,@@ -269,19 +271,20 @@ class TencentImageToModelNode(IO.ComfyNode):)if response.Error:raise ValueError(f"Task creation failed with code {response.Error.Code}: {response.Error.Message}")+ task_id = response.JobIdresult = await poll_op(cls,ApiEndpoint(path="/proxy/tencent/hunyuan/3d-pro/query", method="POST"),- data=To3DProTaskQueryRequest(JobId=response.JobId),+ data=To3DProTaskQueryRequest(JobId=task_id),response_model=To3DProTaskResultResponse,status_extractor=lambda r: r.Status,)- model_file = f"hunyuan_model_{response.JobId}.glb"- await download_url_to_bytesio(- get_glb_obj_from_response(result.ResultFile3Ds).Url,- os.path.join(get_output_directory(), model_file),+ glb_result = get_file_from_response(result.ResultFile3Ds, "glb")+ obj_result = get_file_from_response(result.ResultFile3Ds, "obj")+ file_glb = await download_url_to_file_3d(glb_result.Url, "glb", task_id=task_id) if glb_result else None+ return IO.NodeOutput(+ file_glb, file_glb, await download_url_to_file_3d(obj_result.Url, "obj", task_id=task_id) if obj_result else None)- return IO.NodeOutput(model_file)class TencentHunyuan3DExtension(ComfyExtension):diff --git a/comfy_api_nodes/nodes_meshy.py b/comfy_api_nodes/nodes_meshy.pyindex 740607983..65f6f0d2d 100644--- a/comfy_api_nodes/nodes_meshy.py+++ b/comfy_api_nodes/nodes_meshy.py@@ -1,5 +1,3 @@-import os-from typing_extensions import overridefrom comfy_api.latest import IO, ComfyExtension, Input@@ -20,13 +18,12 @@ from comfy_api_nodes.apis.meshy import ()from comfy_api_nodes.util import (ApiEndpoint,- download_url_to_bytesio,+ download_url_to_file_3d,poll_op,sync_op,upload_images_to_comfyapi,validate_string,)-from folder_paths import get_output_directoryclass MeshyTextToModelNode(IO.ComfyNode):@@ -79,8 +76,10 @@ class MeshyTextToModelNode(IO.ComfyNode):),],outputs=[- IO.String.Output(display_name="model_file"),+ IO.String.Output(display_name="model_file"), # for backward compatibility onlyIO.Custom("MESHY_TASK_ID").Output(display_name="meshy_task_id"),+ IO.File3DGLB.Output(display_name="GLB"),+ IO.File3DFBX.Output(display_name="FBX"),],hidden=[IO.Hidden.auth_token_comfy_org,@@ -122,16 +121,20 @@ class MeshyTextToModelNode(IO.ComfyNode):seed=seed,),)+ task_id = response.resultresult = await poll_op(cls,- ApiEndpoint(path=f"/proxy/meshy/openapi/v2/text-to-3d/{response.result}"),+ ApiEndpoint(path=f"/proxy/meshy/openapi/v2/text-to-3d/{task_id}"),response_model=MeshyModelResult,status_extractor=lambda r: r.status,progress_extractor=lambda r: r.progress,)- model_file = f"meshy_model_{response.result}.glb"- await download_url_to_bytesio(result.model_urls.glb, os.path.join(get_output_directory(), model_file))- return IO.NodeOutput(model_file, response.result)+ return IO.NodeOutput(+ f"{task_id}.glb",+ task_id,+ await download_url_to_file_3d(result.model_urls.glb, "glb", task_id=task_id),+ await download_url_to_file_3d(result.model_urls.fbx, "fbx", task_id=task_id),+ )class MeshyRefineNode(IO.ComfyNode):@@ -167,8 +170,10 @@ class MeshyRefineNode(IO.ComfyNode):),],outputs=[- IO.String.Output(display_name="model_file"),+ IO.String.Output(display_name="model_file"), # for backward compatibility onlyIO.Custom("MESHY_TASK_ID").Output(display_name="meshy_task_id"),+ IO.File3DGLB.Output(display_name="GLB"),+ IO.File3DFBX.Output(display_name="FBX"),],hidden=[IO.Hidden.auth_token_comfy_org,@@ -210,16 +215,20 @@ class MeshyRefineNode(IO.ComfyNode):ai_model=model,),)+ task_id = response.resultresult = await poll_op(cls,- ApiEndpoint(path=f"/proxy/meshy/openapi/v2/text-to-3d/{response.result}"),+ ApiEndpoint(path=f"/proxy/meshy/openapi/v2/text-to-3d/{task_id}"),response_model=MeshyModelResult,status_extractor=lambda r: r.status,progress_extractor=lambda r: r.progress,)- model_file = f"meshy_model_{response.result}.glb"- await download_url_to_bytesio(result.model_urls.glb, os.path.join(get_output_directory(), model_file))- return IO.NodeOutput(model_file, response.result)+ return IO.NodeOutput(+ f"{task_id}.glb",+ task_id,+ await download_url_to_file_3d(result.model_urls.glb, "glb", task_id=task_id),+ await download_url_to_file_3d(result.model_urls.fbx, "fbx", task_id=task_id),+ )class MeshyImageToModelNode(IO.ComfyNode):@@ -303,8 +312,10 @@ class MeshyImageToModelNode(IO.ComfyNode):),],outputs=[- IO.String.Output(display_name="model_file"),+ IO.String.Output(display_name="model_file"), # for backward compatibility onlyIO.Custom("MESHY_TASK_ID").Output(display_name="meshy_task_id"),+ IO.File3DGLB.Output(display_name="GLB"),+ IO.File3DFBX.Output(display_name="FBX"),],hidden=[IO.Hidden.auth_token_comfy_org,@@ -368,16 +379,20 @@ class MeshyImageToModelNode(IO.ComfyNode):seed=seed,),)+ task_id = response.resultresult = await poll_op(cls,- ApiEndpoint(path=f"/proxy/meshy/openapi/v1/image-to-3d/{response.result}"),+ ApiEndpoint(path=f"/proxy/meshy/openapi/v1/image-to-3d/{task_id}"),response_model=MeshyModelResult,status_extractor=lambda r: r.status,progress_extractor=lambda r: r.progress,)- model_file = f"meshy_model_{response.result}.glb"- await download_url_to_bytesio(result.model_urls.glb, os.path.join(get_output_directory(), model_file))- return IO.NodeOutput(model_file, response.result)+ return IO.NodeOutput(+ f"{task_id}.glb",+ task_id,+ await download_url_to_file_3d(result.model_urls.glb, "glb", task_id=task_id),+ await download_url_to_file_3d(result.model_urls.fbx, "fbx", task_id=task_id),+ )class MeshyMultiImageToModelNode(IO.ComfyNode):@@ -464,8 +479,10 @@ class MeshyMultiImageToModelNode(IO.ComfyNode):),],outputs=[- IO.String.Output(display_name="model_file"),+ IO.String.Output(display_name="model_file"), # for backward compatibility onlyIO.Custom("MESHY_TASK_ID").Output(display_name="meshy_task_id"),+ IO.File3DGLB.Output(display_name="GLB"),+ IO.File3DFBX.Output(display_name="FBX"),],hidden=[IO.Hidden.auth_token_comfy_org,@@ -531,16 +548,20 @@ class MeshyMultiImageToModelNode(IO.ComfyNode):seed=seed,),)+ task_id = response.resultresult = await poll_op(cls,- ApiEndpoint(path=f"/proxy/meshy/openapi/v1/multi-image-to-3d/{response.result}"),+ ApiEndpoint(path=f"/proxy/meshy/openapi/v1/multi-image-to-3d/{task_id}"),response_model=MeshyModelResult,status_extractor=lambda r: r.status,progress_extractor=lambda r: r.progress,)- model_file = f"meshy_model_{response.result}.glb"- await download_url_to_bytesio(result.model_urls.glb, os.path.join(get_output_directory(), model_file))- return IO.NodeOutput(model_file, response.result)+ return IO.NodeOutput(+ f"{task_id}.glb",+ task_id,+ await download_url_to_file_3d(result.model_urls.glb, "glb", task_id=task_id),+ await download_url_to_file_3d(result.model_urls.fbx, "fbx", task_id=task_id),+ )class MeshyRigModelNode(IO.ComfyNode):@@ -571,8 +592,10 @@ class MeshyRigModelNode(IO.ComfyNode):),],outputs=[- IO.String.Output(display_name="model_file"),+ IO.String.Output(display_name="model_file"), # for backward compatibility onlyIO.Custom("MESHY_RIGGED_TASK_ID").Output(display_name="rig_task_id"),+ IO.File3DGLB.Output(display_name="GLB"),+ IO.File3DFBX.Output(display_name="FBX"),],hidden=[IO.Hidden.auth_token_comfy_org,@@ -606,18 +629,20 @@ class MeshyRigModelNode(IO.ComfyNode):texture_image_url=texture_image_url,),)+ task_id = response.resultresult = await poll_op(cls,- ApiEndpoint(path=f"/proxy/meshy/openapi/v1/rigging/{response.result}"),+ ApiEndpoint(path=f"/proxy/meshy/openapi/v1/rigging/{task_id}"),response_model=MeshyRiggedResult,status_extractor=lambda r: r.status,progress_extractor=lambda r: r.progress,)- model_file = f"meshy_model_{response.result}.glb"- await download_url_to_bytesio(- result.result.rigged_character_glb_url, os.path.join(get_output_directory(), model_file)+ return IO.NodeOutput(+ f"{task_id}.glb",+ task_id,+ await download_url_to_file_3d(result.result.rigged_character_glb_url, "glb", task_id=task_id),+ await download_url_to_file_3d(result.result.rigged_character_fbx_url, "fbx", task_id=task_id),)- return IO.NodeOutput(model_file, response.result)class MeshyAnimateModelNode(IO.ComfyNode):@@ -640,7 +665,9 @@ class MeshyAnimateModelNode(IO.ComfyNode):),],outputs=[- IO.String.Output(display_name="model_file"),+ IO.String.Output(display_name="model_file"), # for backward compatibility only+ IO.File3DGLB.Output(display_name="GLB"),+ IO.File3DFBX.Output(display_name="FBX"),],hidden=[IO.Hidden.auth_token_comfy_org,@@ -669,16 +696,19 @@ class MeshyAnimateModelNode(IO.ComfyNode):action_id=action_id,),)+ task_id = response.resultresult = await poll_op(cls,- ApiEndpoint(path=f"/proxy/meshy/openapi/v1/animations/{response.result}"),+ ApiEndpoint(path=f"/proxy/meshy/openapi/v1/animations/{task_id}"),response_model=MeshyAnimationResult,status_extractor=lambda r: r.status,progress_extractor=lambda r: r.progress,)- model_file = f"meshy_model_{response.result}.glb"- await download_url_to_bytesio(result.result.animation_glb_url, os.path.join(get_output_directory(), model_file))- return IO.NodeOutput(model_file, response.result)+ return IO.NodeOutput(+ f"{task_id}.glb",+ await download_url_to_file_3d(result.result.animation_glb_url, "glb", task_id=task_id),+ await download_url_to_file_3d(result.result.animation_fbx_url, "fbx", task_id=task_id),+ )class MeshyTextureNode(IO.ComfyNode):@@ -715,8 +745,10 @@ class MeshyTextureNode(IO.ComfyNode):),],outputs=[- IO.String.Output(display_name="model_file"),+ IO.String.Output(display_name="model_file"), # for backward compatibility onlyIO.Custom("MODEL_TASK_ID").Output(display_name="meshy_task_id"),+ IO.File3DGLB.Output(display_name="GLB"),+ IO.File3DFBX.Output(display_name="FBX"),],hidden=[IO.Hidden.auth_token_comfy_org,@@ -760,16 +792,20 @@ class MeshyTextureNode(IO.ComfyNode):image_style_url=image_style_url,),)+ task_id = response.resultresult = await poll_op(cls,- ApiEndpoint(path=f"/proxy/meshy/openapi/v1/retexture/{response.result}"),+ ApiEndpoint(path=f"/proxy/meshy/openapi/v1/retexture/{task_id}"),response_model=MeshyModelResult,status_extractor=lambda r: r.status,progress_extractor=lambda r: r.progress,)- model_file = f"meshy_model_{response.result}.glb"- await download_url_to_bytesio(result.model_urls.glb, os.path.join(get_output_directory(), model_file))- return IO.NodeOutput(model_file, response.result)+ return IO.NodeOutput(+ f"{task_id}.glb",+ task_id,+ await download_url_to_file_3d(result.model_urls.glb, "glb", task_id=task_id),+ await download_url_to_file_3d(result.model_urls.fbx, "fbx", task_id=task_id),+ )class MeshyExtension(ComfyExtension):diff --git a/comfy_api_nodes/nodes_rodin.py b/comfy_api_nodes/nodes_rodin.pyindex 3ffdc8b90..f9cff121f 100644--- a/comfy_api_nodes/nodes_rodin.py+++ b/comfy_api_nodes/nodes_rodin.py@@ -10,7 +10,6 @@ import folder_paths as comfy_pathsimport osimport loggingimport math-from typing import Optionalfrom io import BytesIOfrom typing_extensions import overridefrom PIL import Image@@ -28,8 +27,9 @@ from comfy_api_nodes.util import (poll_op,ApiEndpoint,download_url_to_bytesio,+ download_url_to_file_3d,)-from comfy_api.latest import ComfyExtension, IO+from comfy_api.latest import ComfyExtension, IO, TypesCOMMON_PARAMETERS = [@@ -177,7 +177,7 @@ def check_rodin_status(response: Rodin3DCheckStatusResponse) -> str:return "DONE"return "Generating"-def extract_progress(response: Rodin3DCheckStatusResponse) -> Optional[int]:+def extract_progress(response: Rodin3DCheckStatusResponse) -> int | None:if not response.jobs:return Nonecompleted_count = sum(1 for job in response.jobs if job.status == JobStatus.Done)@@ -207,17 +207,25 @@ async def get_rodin_download_list(uuid: str, cls: type[IO.ComfyNode]) -> Rodin3D)-async def download_files(url_list, task_uuid: str):+async def download_files(url_list, task_uuid: str) -> tuple[str | None, Types.File3D | None]:result_folder_name = f"Rodin3D_{task_uuid}"save_path = os.path.join(comfy_paths.get_output_directory(), result_folder_name)os.makedirs(save_path, exist_ok=True)model_file_path = None+ file_3d = None+for i in url_list.list:file_path = os.path.join(save_path, i.name)- if file_path.endswith(".glb"):+ if i.name.lower().endswith(".glb"):model_file_path = os.path.join(result_folder_name, i.name)- await download_url_to_bytesio(i.url, file_path)- return model_file_path+ file_3d = await download_url_to_file_3d(i.url, "glb")+ # Save to disk for backward compatibility+ with open(file_path, "wb") as f:+ f.write(file_3d.get_bytes())+ else:+ await download_url_to_bytesio(i.url, file_path)++ return model_file_path, file_3dclass Rodin3D_Regular(IO.ComfyNode):@@ -234,7 +242,10 @@ class Rodin3D_Regular(IO.ComfyNode):IO.Image.Input("Images"),*COMMON_PARAMETERS,],- outputs=[IO.String.Output(display_name="3D Model Path")],+ outputs=[+ IO.String.Output(display_name="3D Model Path"), # for backward compatibility only+ IO.File3DGLB.Output(display_name="GLB"),+ ],hidden=[IO.Hidden.auth_token_comfy_org,IO.Hidden.api_key_comfy_org,@@ -271,9 +282,9 @@ class Rodin3D_Regular(IO.ComfyNode):)await poll_for_task_status(subscription_key, cls)download_list = await get_rodin_download_list(task_uuid, cls)- model = await download_files(download_list, task_uuid)+ model_path, file_3d = await download_files(download_list, task_uuid)- return IO.NodeOutput(model)+ return IO.NodeOutput(model_path, file_3d)class Rodin3D_Detail(IO.ComfyNode):@@ -290,7 +301,10 @@ class Rodin3D_Detail(IO.ComfyNode):IO.Image.Input("Images"),*COMMON_PARAMETERS,],- outputs=[IO.String.Output(display_name="3D Model Path")],+ outputs=[+ IO.String.Output(display_name="3D Model Path"), # for backward compatibility only+ IO.File3DGLB.Output(display_name="GLB"),+ ],hidden=[IO.Hidden.auth_token_comfy_org,IO.Hidden.api_key_comfy_org,@@ -327,9 +341,9 @@ class Rodin3D_Detail(IO.ComfyNode):)await poll_for_task_status(subscription_key, cls)download_list = await get_rodin_download_list(task_uuid, cls)- model = await download_files(download_list, task_uuid)+ model_path, file_3d = await download_files(download_list, task_uuid)- return IO.NodeOutput(model)+ return IO.NodeOutput(model_path, file_3d)class Rodin3D_Smooth(IO.ComfyNode):@@ -346,7 +360,10 @@ class Rodin3D_Smooth(IO.ComfyNode):IO.Image.Input("Images"),*COMMON_PARAMETERS,],- outputs=[IO.String.Output(display_name="3D Model Path")],+ outputs=[+ IO.String.Output(display_name="3D Model Path"), # for backward compatibility only+ IO.File3DGLB.Output(display_name="GLB"),+ ],hidden=[IO.Hidden.auth_token_comfy_org,IO.Hidden.api_key_comfy_org,@@ -382,9 +399,9 @@ class Rodin3D_Smooth(IO.ComfyNode):)await poll_for_task_status(subscription_key, cls)download_list = await get_rodin_download_list(task_uuid, cls)- model = await download_files(download_list, task_uuid)+ model_path, file_3d = await download_files(download_list, task_uuid)- return IO.NodeOutput(model)+ return IO.NodeOutput(model_path, file_3d)class Rodin3D_Sketch(IO.ComfyNode):@@ -408,7 +425,10 @@ class Rodin3D_Sketch(IO.ComfyNode):optional=True,),],- outputs=[IO.String.Output(display_name="3D Model Path")],+ outputs=[+ IO.String.Output(display_name="3D Model Path"), # for backward compatibility only+ IO.File3DGLB.Output(display_name="GLB"),+ ],hidden=[IO.Hidden.auth_token_comfy_org,IO.Hidden.api_key_comfy_org,@@ -441,9 +461,9 @@ class Rodin3D_Sketch(IO.ComfyNode):)await poll_for_task_status(subscription_key, cls)download_list = await get_rodin_download_list(task_uuid, cls)- model = await download_files(download_list, task_uuid)+ model_path, file_3d = await download_files(download_list, task_uuid)- return IO.NodeOutput(model)+ return IO.NodeOutput(model_path, file_3d)class Rodin3D_Gen2(IO.ComfyNode):@@ -475,7 +495,10 @@ class Rodin3D_Gen2(IO.ComfyNode):),IO.Boolean.Input("TAPose", default=False),],- outputs=[IO.String.Output(display_name="3D Model Path")],+ outputs=[+ IO.String.Output(display_name="3D Model Path"), # for backward compatibility only+ IO.File3DGLB.Output(display_name="GLB"),+ ],hidden=[IO.Hidden.auth_token_comfy_org,IO.Hidden.api_key_comfy_org,@@ -511,9 +534,9 @@ class Rodin3D_Gen2(IO.ComfyNode):)await poll_for_task_status(subscription_key, cls)download_list = await get_rodin_download_list(task_uuid, cls)- model = await download_files(download_list, task_uuid)+ model_path, file_3d = await download_files(download_list, task_uuid)- return IO.NodeOutput(model)+ return IO.NodeOutput(model_path, file_3d)class Rodin3DExtension(ComfyExtension):diff --git a/comfy_api_nodes/nodes_tripo.py b/comfy_api_nodes/nodes_tripo.pyindex 5abf27b4d..67c7f59fc 100644--- a/comfy_api_nodes/nodes_tripo.py+++ b/comfy_api_nodes/nodes_tripo.py@@ -1,10 +1,6 @@-import os-from typing import Optional--import torchfrom typing_extensions import override-from comfy_api.latest import IO, ComfyExtension+from comfy_api.latest import IO, ComfyExtension, Inputfrom comfy_api_nodes.apis.tripo import (TripoAnimateRetargetRequest,TripoAnimateRigRequest,@@ -26,12 +22,11 @@ from comfy_api_nodes.apis.tripo import ()from comfy_api_nodes.util import (ApiEndpoint,- download_url_as_bytesio,+ download_url_to_file_3d,poll_op,sync_op,upload_images_to_comfyapi,)-from folder_paths import get_output_directorydef get_model_url_from_response(response: TripoTaskResponse) -> str:@@ -45,7 +40,7 @@ def get_model_url_from_response(response: TripoTaskResponse) -> str:async def poll_until_finished(node_cls: type[IO.ComfyNode],response: TripoTaskResponse,- average_duration: Optional[int] = None,+ average_duration: int | None = None,) -> IO.NodeOutput:"""Polls the Tripo API endpoint until the task reaches a terminal state, then returns the response."""if response.code != 0:@@ -69,12 +64,8 @@ async def poll_until_finished()if response_poll.data.status == TripoTaskStatus.SUCCESS:url = get_model_url_from_response(response_poll)- bytesio = await download_url_as_bytesio(url)- # Save the downloaded model file- model_file = f"tripo_model_{task_id}.glb"- with open(os.path.join(get_output_directory(), model_file), "wb") as f:- f.write(bytesio.getvalue())- return IO.NodeOutput(model_file, task_id)+ file_glb = await download_url_to_file_3d(url, "glb", task_id=task_id)+ return IO.NodeOutput(f"{task_id}.glb", task_id, file_glb)raise RuntimeError(f"Failed to generate mesh: {response_poll}")@@ -107,8 +98,9 @@ class TripoTextToModelNode(IO.ComfyNode):IO.Combo.Input("geometry_quality", default="standard", options=["standard", "detailed"], optional=True),],outputs=[- IO.String.Output(display_name="model_file"),+ IO.String.Output(display_name="model_file"), # for backward compatibility onlyIO.Custom("MODEL_TASK_ID").Output(display_name="model task_id"),+ IO.File3DGLB.Output(display_name="GLB"),],hidden=[IO.Hidden.auth_token_comfy_org,@@ -155,18 +147,18 @@ class TripoTextToModelNode(IO.ComfyNode):async def execute(cls,prompt: str,- negative_prompt: Optional[str] = None,+ negative_prompt: str | None = None,model_version=None,- style: Optional[str] = None,- texture: Optional[bool] = None,- pbr: Optional[bool] = None,- image_seed: Optional[int] = None,- model_seed: Optional[int] = None,- texture_seed: Optional[int] = None,- texture_quality: Optional[str] = None,- geometry_quality: Optional[str] = None,- face_limit: Optional[int] = None,- quad: Optional[bool] = None,+ style: str | None = None,+ texture: bool | None = None,+ pbr: bool | None = None,+ image_seed: int | None = None,+ model_seed: int | None = None,+ texture_seed: int | None = None,+ texture_quality: str | None = None,+ geometry_quality: str | None = None,+ face_limit: int | None = None,+ quad: bool | None = None,) -> IO.NodeOutput:style_enum = None if style == "None" else styleif not prompt:@@ -232,8 +224,9 @@ class TripoImageToModelNode(IO.ComfyNode):IO.Combo.Input("geometry_quality", default="standard", options=["standard", "detailed"], optional=True),],outputs=[- IO.String.Output(display_name="model_file"),+ IO.String.Output(display_name="model_file"), # for backward compatibility onlyIO.Custom("MODEL_TASK_ID").Output(display_name="model task_id"),+ IO.File3DGLB.Output(display_name="GLB"),],hidden=[IO.Hidden.auth_token_comfy_org,@@ -279,19 +272,19 @@ class TripoImageToModelNode(IO.ComfyNode):@classmethodasync def execute(cls,- image: torch.Tensor,- model_version: Optional[str] = None,- style: Optional[str] = None,- texture: Optional[bool] = None,- pbr: Optional[bool] = None,- model_seed: Optional[int] = None,+ image: Input.Image,+ model_version: str | None = None,+ style: str | None = None,+ texture: bool | None = None,+ pbr: bool | None = None,+ model_seed: int | None = None,orientation=None,- texture_seed: Optional[int] = None,- texture_quality: Optional[str] = None,- geometry_quality: Optional[str] = None,- texture_alignment: Optional[str] = None,- face_limit: Optional[int] = None,- quad: Optional[bool] = None,+ texture_seed: int | None = None,+ texture_quality: str | None = None,+ geometry_quality: str | None = None,+ texture_alignment: str | None = None,+ face_limit: int | None = None,+ quad: bool | None = None,) -> IO.NodeOutput:style_enum = None if style == "None" else styleif image is None:@@ -368,8 +361,9 @@ class TripoMultiviewToModelNode(IO.ComfyNode):IO.Combo.Input("geometry_quality", default="standard", options=["standard", "detailed"], optional=True),],outputs=[- IO.String.Output(display_name="model_file"),+ IO.String.Output(display_name="model_file"), # for backward compatibility onlyIO.Custom("MODEL_TASK_ID").Output(display_name="model task_id"),+ IO.File3DGLB.Output(display_name="GLB"),],hidden=[IO.Hidden.auth_token_comfy_org,@@ -411,21 +405,21 @@ class TripoMultiviewToModelNode(IO.ComfyNode):@classmethodasync def execute(cls,- image: torch.Tensor,- image_left: Optional[torch.Tensor] = None,- image_back: Optional[torch.Tensor] = None,- image_right: Optional[torch.Tensor] = None,- model_version: Optional[str] = None,- orientation: Optional[str] = None,- texture: Optional[bool] = None,- pbr: Optional[bool] = None,- model_seed: Optional[int] = None,- texture_seed: Optional[int] = None,- texture_quality: Optional[str] = None,- geometry_quality: Optional[str] = None,- texture_alignment: Optional[str] = None,- face_limit: Optional[int] = None,- quad: Optional[bool] = None,+ image: Input.Image,+ image_left: Input.Image | None = None,+ image_back: Input.Image | None = None,+ image_right: Input.Image | None = None,+ model_version: str | None = None,+ orientation: str | None = None,+ texture: bool | None = None,+ pbr: bool | None = None,+ model_seed: int | None = None,+ texture_seed: int | None = None,+ texture_quality: str | None = None,+ geometry_quality: str | None = None,+ texture_alignment: str | None = None,+ face_limit: int | None = None,+ quad: bool | None = None,) -> IO.NodeOutput:if image is None:raise RuntimeError("front image for multiview is required")@@ -487,8 +481,9 @@ class TripoTextureNode(IO.ComfyNode):),],outputs=[- IO.String.Output(display_name="model_file"),+ IO.String.Output(display_name="model_file"), # for backward compatibility onlyIO.Custom("MODEL_TASK_ID").Output(display_name="model task_id"),+ IO.File3DGLB.Output(display_name="GLB"),],hidden=[IO.Hidden.auth_token_comfy_org,@@ -512,11 +507,11 @@ class TripoTextureNode(IO.ComfyNode):async def execute(cls,model_task_id,- texture: Optional[bool] = None,- pbr: Optional[bool] = None,- texture_seed: Optional[int] = None,- texture_quality: Optional[str] = None,- texture_alignment: Optional[str] = None,+ texture: bool | None = None,+ pbr: bool | None = None,+ texture_seed: int | None = None,+ texture_quality: str | None = None,+ texture_alignment: str | None = None,) -> IO.NodeOutput:response = await sync_op(cls,@@ -547,8 +542,9 @@ class TripoRefineNode(IO.ComfyNode):IO.Custom("MODEL_TASK_ID").Input("model_task_id", tooltip="Must be a v1.4 Tripo model"),],outputs=[- IO.String.Output(display_name="model_file"),+ IO.String.Output(display_name="model_file"), # for backward compatibility onlyIO.Custom("MODEL_TASK_ID").Output(display_name="model task_id"),+ IO.File3DGLB.Output(display_name="GLB"),],hidden=[IO.Hidden.auth_token_comfy_org,@@ -583,8 +579,9 @@ class TripoRigNode(IO.ComfyNode):category="api node/3d/Tripo",inputs=[IO.Custom("MODEL_TASK_ID").Input("original_model_task_id")],outputs=[- IO.String.Output(display_name="model_file"),+ IO.String.Output(display_name="model_file"), # for backward compatibility onlyIO.Custom("RIG_TASK_ID").Output(display_name="rig task_id"),+ IO.File3DGLB.Output(display_name="GLB"),],hidden=[IO.Hidden.auth_token_comfy_org,@@ -642,8 +639,9 @@ class TripoRetargetNode(IO.ComfyNode):),],outputs=[- IO.String.Output(display_name="model_file"),+ IO.String.Output(display_name="model_file"), # for backward compatibility onlyIO.Custom("RETARGET_TASK_ID").Output(display_name="retarget task_id"),+ IO.File3DGLB.Output(display_name="GLB"),],hidden=[IO.Hidden.auth_token_comfy_org,diff --git a/comfy_api_nodes/util/__init__.py b/comfy_api_nodes/util/__init__.pyindex c3c9ff4bf..18b020eef 100644--- a/comfy_api_nodes/util/__init__.py+++ b/comfy_api_nodes/util/__init__.py@@ -28,6 +28,7 @@ from .conversions import (from .download_helpers import (download_url_as_bytesio,download_url_to_bytesio,+ download_url_to_file_3d,download_url_to_image_tensor,download_url_to_video_output,)@@ -69,6 +70,7 @@ __all__ = [# Download helpers"download_url_as_bytesio","download_url_to_bytesio",+ "download_url_to_file_3d","download_url_to_image_tensor","download_url_to_video_output",# Conversionsdiff --git a/comfy_api_nodes/util/download_helpers.py b/comfy_api_nodes/util/download_helpers.pyindex 4668d14a9..78bcf1fa1 100644--- a/comfy_api_nodes/util/download_helpers.py+++ b/comfy_api_nodes/util/download_helpers.py@@ -11,7 +11,8 @@ import torchfrom aiohttp.client_exceptions import ClientError, ContentTypeErrorfrom comfy_api.latest import IO as COMFY_IO-from comfy_api.latest import InputImpl+from comfy_api.latest import InputImpl, Types+from folder_paths import get_output_directoryfrom . import request_loggerfrom ._helpers import (@@ -261,3 +262,38 @@ def _generate_operation_id(method: str, url: str, attempt: int) -> str:except Exception:slug = "download"return f"{method}_{slug}_try{attempt}_{uuid.uuid4().hex[:8]}"+++async def download_url_to_file_3d(+ url: str,+ file_format: str,+ *,+ task_id: str | None = None,+ timeout: float | None = None,+ max_retries: int = 5,+ cls: type[COMFY_IO.ComfyNode] = None,+) -> Types.File3D:+ """Downloads a 3D model file from a URL into memory as BytesIO.++ If task_id is provided, also writes the file to disk in the output directory+ for backward compatibility with the old save-to-disk behavior.+ """+ file_format = file_format.lstrip(".").lower()+ data = BytesIO()+ await download_url_to_bytesio(+ url,+ data,+ timeout=timeout,+ max_retries=max_retries,+ cls=cls,+ )++ if task_id is not None:+ # This is only for backward compatability with current behavior when every 3D node is output node+ # All new API nodes should not use "task_id" and instead users should use "SaveGLB" node to save results+ output_dir = Path(get_output_directory())+ output_path = output_dir / f"{task_id}.{file_format}"+ output_path.write_bytes(data.getvalue())+ data.seek(0)++ return Types.File3D(source=data, file_format=file_format)diff --git a/comfy_extras/nodes_hunyuan3d.py b/comfy_extras/nodes_hunyuan3d.pyindex 5bb5df48e..eda1639ab 100644--- a/comfy_extras/nodes_hunyuan3d.py+++ b/comfy_extras/nodes_hunyuan3d.py@@ -622,14 +622,20 @@ class SaveGLB(IO.ComfyNode):category="3d",is_output_node=True,inputs=[- IO.Mesh.Input("mesh"),+ IO.MultiType.Input(+ IO.Mesh.Input("mesh"),+ types=[+ IO.File3DGLB,+ ],+ tooltip="Mesh or GLB file to save",+ ),IO.String.Input("filename_prefix", default="mesh/ComfyUI"),],hidden=[IO.Hidden.prompt, IO.Hidden.extra_pnginfo])@classmethod- def execute(cls, mesh, filename_prefix) -> IO.NodeOutput:+ def execute(cls, mesh: Types.MESH | Types.File3D, filename_prefix: str) -> IO.NodeOutput:full_output_folder, filename, counter, subfolder, filename_prefix = folder_paths.get_save_image_path(filename_prefix, folder_paths.get_output_directory())results = []@@ -641,15 +647,26 @@ class SaveGLB(IO.ComfyNode):for x in cls.hidden.extra_pnginfo:metadata[x] = json.dumps(cls.hidden.extra_pnginfo[x])- for i in range(mesh.vertices.shape[0]):+ if isinstance(mesh, Types.File3D):+ # Handle File3D input - save BytesIO data to output folderf = f"{filename}_{counter:05}_.glb"- save_glb(mesh.vertices[i], mesh.faces[i], os.path.join(full_output_folder, f), metadata)+ mesh.save_to(os.path.join(full_output_folder, f))results.append({"filename": f,"subfolder": subfolder,"type": "output"})- counter += 1+ else:+ # Handle Mesh input - save vertices and faces as GLB+ for i in range(mesh.vertices.shape[0]):+ f = f"{filename}_{counter:05}_.glb"+ save_glb(mesh.vertices[i], mesh.faces[i], os.path.join(full_output_folder, f), metadata)+ results.append({+ "filename": f,+ "subfolder": subfolder,+ "type": "output"+ })+ counter += 1return IO.NodeOutput(ui={"3d": results})diff --git a/comfy_extras/nodes_load_3d.py b/comfy_extras/nodes_load_3d.pyindex 4b8d950ae..f29510488 100644--- a/comfy_extras/nodes_load_3d.py+++ b/comfy_extras/nodes_load_3d.py@@ -1,9 +1,10 @@import nodesimport folder_pathsimport os+import uuidfrom typing_extensions import override-from comfy_api.latest import IO, ComfyExtension, InputImpl, UI+from comfy_api.latest import IO, UI, ComfyExtension, InputImpl, Typesfrom pathlib import Path@@ -81,7 +82,19 @@ class Preview3D(IO.ComfyNode):is_experimental=True,is_output_node=True,inputs=[- IO.String.Input("model_file", default="", multiline=False),+ IO.MultiType.Input(+ IO.String.Input("model_file", default="", multiline=False),+ types=[+ IO.File3DGLB,+ IO.File3DGLTF,+ IO.File3DFBX,+ IO.File3DOBJ,+ IO.File3DSTL,+ IO.File3DUSDZ,+ IO.File3DAny,+ ],+ tooltip="3D model file or path string",+ ),IO.Load3DCamera.Input("camera_info", optional=True),IO.Image.Input("bg_image", optional=True),],@@ -89,10 +102,15 @@ class Preview3D(IO.ComfyNode):)@classmethod- def execute(cls, model_file, **kwargs) -> IO.NodeOutput:+ def execute(cls, model_file: str | Types.File3D, **kwargs) -> IO.NodeOutput:+ if isinstance(model_file, Types.File3D):+ filename = f"preview3d_{uuid.uuid4().hex}.{model_file.format}"+ model_file.save_to(os.path.join(folder_paths.get_output_directory(), filename))+ else:+ filename = model_filecamera_info = kwargs.get("camera_info", None)bg_image = kwargs.get("bg_image", None)- return IO.NodeOutput(ui=UI.PreviewUI3D(model_file, camera_info, bg_image=bg_image))+ return IO.NodeOutput(ui=UI.PreviewUI3D(filename, camera_info, bg_image=bg_image))process = execute # TODO: remove