Merge branch 'v3-definition' into v3-definition-wip

comfy_api/v3/_io.py

@@ -656,9 +656,34 @@ class Accumulation(ComfyTypeIO):
         accum: list[Any]
     Type = AccumulationDict
 
+
 @comfytype(io_type="LOAD3D_CAMERA")
 class Load3DCamera(ComfyTypeIO):
-    Type = Any # TODO: figure out type for this; in code, only described as image['camera_info'], gotten from a LOAD_3D or LOAD_3D_ANIMATION type
+    class CameraInfo(TypedDict):
+        position: dict[str, float | int]
+        target: dict[str, float | int]
+        zoom: int
+        cameraType: str
+
+    Type = CameraInfo
+
+
+@comfytype(io_type="LOAD_3D")
+class Load3D(ComfyTypeIO):
+    """3D models are stored as a dictionary."""
+    class Model3DDict(TypedDict):
+        image: str
+        mask: str
+        normal: str
+        camera_info: Load3DCamera.CameraInfo
+        recording: NotRequired[str]
+
+    Type = Model3DDict
+
+
+@comfytype(io_type="LOAD_3D_ANIMATION")
+class Load3DAnimation(Load3D):
+    ...
 
 
 @comfytype(io_type="PHOTOMAKER")

comfy_api/v3/_ui.py

@@ -475,11 +475,12 @@ class PreviewVideo(_UIOutput):
 
 
 class PreviewUI3D(_UIOutput):
-    def __init__(self, values: list[SavedResult | dict], **kwargs):
-        self.values = values
+    def __init__(self, model_file, camera_info, **kwargs):
+        self.model_file = model_file
+        self.camera_info = camera_info
 
     def as_dict(self):
-        return {"3d": self.values}
+        return {"result": [self.model_file, self.camera_info]}
 
 
 class PreviewText(_UIOutput):