Merge branch 'master' into fix/multicombo-multi-select-serialization

Amp-Thread-ID: https://ampcode.com/threads/T-019dad04-a07a-724b-af4d-fbfe98654fdd
Co-authored-by: Amp <amp@ampcode.com>

comfy/context_windows.py

@@ -63,11 +63,7 @@ class IndexListContextWindow(ContextWindowABC):
             dim = self.dim
         if dim == 0 and full.shape[dim] == 1:
             return full
-        indices = self.index_list
-        anchor_idx = getattr(self, 'causal_anchor_index', None)
-        if anchor_idx is not None and anchor_idx >= 0:
-            indices = [anchor_idx] + list(indices)
-        idx = tuple([slice(None)] * dim + [indices])
+        idx = tuple([slice(None)] * dim + [self.index_list])
         window = full[idx]
         if retain_index_list:
             idx = tuple([slice(None)] * dim + [retain_index_list])
@@ -117,14 +113,7 @@ def slice_cond(cond_value, window: IndexListContextWindow, x_in: torch.Tensor, d
 
     # skip leading latent positions that have no corresponding conditioning (e.g. reference frames)
     if temporal_offset > 0:
-        anchor_idx = getattr(window, 'causal_anchor_index', None)
-        if anchor_idx is not None and anchor_idx >= 0:
-            # anchor occupies one of the no-cond positions, so skip one fewer from window.index_list
-            skip_count = temporal_offset - 1
-        else:
-            skip_count = temporal_offset
-
-        indices = [i - temporal_offset for i in window.index_list[skip_count:]]
+        indices = [i - temporal_offset for i in window.index_list[temporal_offset:]]
         indices = [i for i in indices if 0 <= i]
     else:
         indices = list(window.index_list)
@@ -161,8 +150,7 @@ class ContextFuseMethod:
 ContextResults = collections.namedtuple("ContextResults", ['window_idx', 'sub_conds_out', 'sub_conds', 'window'])
 class IndexListContextHandler(ContextHandlerABC):
     def __init__(self, context_schedule: ContextSchedule, fuse_method: ContextFuseMethod, context_length: int=1, context_overlap: int=0, context_stride: int=1,
-                 closed_loop: bool=False, dim:int=0, freenoise: bool=False, cond_retain_index_list: list[int]=[], split_conds_to_windows: bool=False,
-                 causal_window_fix: bool=True):
+                 closed_loop: bool=False, dim:int=0, freenoise: bool=False, cond_retain_index_list: list[int]=[], split_conds_to_windows: bool=False):
         self.context_schedule = context_schedule
         self.fuse_method = fuse_method
         self.context_length = context_length
@@ -174,7 +162,6 @@ class IndexListContextHandler(ContextHandlerABC):
         self.freenoise = freenoise
         self.cond_retain_index_list = [int(x.strip()) for x in cond_retain_index_list.split(",")] if cond_retain_index_list else []
         self.split_conds_to_windows = split_conds_to_windows
-        self.causal_window_fix = causal_window_fix
 
         self.callbacks = {}
 
@@ -331,14 +318,6 @@ class IndexListContextHandler(ContextHandlerABC):
             # allow processing to end between context window executions for faster Cancel
             comfy.model_management.throw_exception_if_processing_interrupted()
 
-            # causal_window_fix: prepend a pre-window frame that will be stripped post-forward
-            anchor_applied = False
-            if self.causal_window_fix:
-                anchor_idx = window.index_list[0] - 1
-                if 0 <= anchor_idx < x_in.size(self.dim):
-                    window.causal_anchor_index = anchor_idx
-                    anchor_applied = True
-
             for callback in comfy.patcher_extension.get_all_callbacks(IndexListCallbacks.EVALUATE_CONTEXT_WINDOWS, self.callbacks):
                 callback(self, model, x_in, conds, timestep, model_options, window_idx, window, model_options, device, first_device)
 
@@ -353,12 +332,6 @@ class IndexListContextHandler(ContextHandlerABC):
             if device is not None:
                 for i in range(len(sub_conds_out)):
                     sub_conds_out[i] = sub_conds_out[i].to(x_in.device)
-
-            # strip causal_window_fix anchor if applied
-            if anchor_applied:
-                for i in range(len(sub_conds_out)):
-                    sub_conds_out[i] = sub_conds_out[i].narrow(self.dim, 1, sub_conds_out[i].shape[self.dim] - 1)
-
             results.append(ContextResults(window_idx, sub_conds_out, sub_conds, window))
         return results
 

comfy/latent_formats.py

@@ -9,7 +9,6 @@ class LatentFormat:
     latent_rgb_factors_reshape = None
     taesd_decoder_name = None
     spacial_downscale_ratio = 8
-    temporal_downscale_ratio = 1
 
     def process_in(self, latent):
         return latent * self.scale_factor
@@ -236,7 +235,6 @@ class Flux2(LatentFormat):
 class Mochi(LatentFormat):
     latent_channels = 12
     latent_dimensions = 3
-    temporal_downscale_ratio = 6
 
     def __init__(self):
         self.scale_factor = 1.0
@@ -280,7 +278,6 @@ class LTXV(LatentFormat):
     latent_channels = 128
     latent_dimensions = 3
     spacial_downscale_ratio = 32
-    temporal_downscale_ratio = 8
 
     def __init__(self):
         self.latent_rgb_factors = [
@@ -424,7 +421,6 @@ class LTXAV(LTXV):
 class HunyuanVideo(LatentFormat):
     latent_channels = 16
     latent_dimensions = 3
-    temporal_downscale_ratio = 4
     scale_factor = 0.476986
     latent_rgb_factors = [
         [-0.0395, -0.0331,  0.0445],
@@ -451,7 +447,6 @@ class HunyuanVideo(LatentFormat):
 class Cosmos1CV8x8x8(LatentFormat):
     latent_channels = 16
     latent_dimensions = 3
-    temporal_downscale_ratio = 8
 
     latent_rgb_factors = [
         [ 0.1817,  0.2284,  0.2423],
@@ -477,7 +472,6 @@ class Cosmos1CV8x8x8(LatentFormat):
 class Wan21(LatentFormat):
     latent_channels = 16
     latent_dimensions = 3
-    temporal_downscale_ratio = 4
 
     latent_rgb_factors = [
             [-0.1299, -0.1692,  0.2932],
@@ -740,7 +734,6 @@ class HunyuanVideo15(LatentFormat):
     latent_channels = 32
     latent_dimensions = 3
     spacial_downscale_ratio = 16
-    temporal_downscale_ratio = 4
     scale_factor = 1.03682
     taesd_decoder_name = "lighttaehy1_5"
 
@@ -795,7 +788,6 @@ class ZImagePixelSpace(ChromaRadiance):
 class CogVideoX(LatentFormat):
     latent_channels = 16
     latent_dimensions = 3
-    temporal_downscale_ratio = 4
 
     def __init__(self):
         self.scale_factor = 1.15258426

comfy_extras/nodes_context_windows.py

@@ -29,7 +29,6 @@ class ContextWindowsManualNode(io.ComfyNode):
                 io.Boolean.Input("freenoise", default=False, tooltip="Whether to apply FreeNoise noise shuffling, improves window blending."),
                 io.String.Input("cond_retain_index_list", default="", tooltip="List of latent indices to retain in the conditioning tensors for each window, for example setting this to '0' will use the initial start image for each window."),
                 io.Boolean.Input("split_conds_to_windows", default=False, tooltip="Whether to split multiple conditionings (created by ConditionCombine) to each window based on region index."),
-                io.Boolean.Input("causal_window_fix", default=True, tooltip="Whether to add a causal fix frame to non-0-indexed context windows."),
             ],
             outputs=[
                 io.Model.Output(tooltip="The model with context windows applied during sampling."),
@@ -39,7 +38,7 @@ class ContextWindowsManualNode(io.ComfyNode):
 
     @classmethod
     def execute(cls, model: io.Model.Type, context_length: int, context_overlap: int, context_schedule: str, context_stride: int, closed_loop: bool, fuse_method: str, dim: int, freenoise: bool,
-                cond_retain_index_list: list[int]=[], split_conds_to_windows: bool=False, causal_window_fix: bool=True) -> io.Model:
+                cond_retain_index_list: list[int]=[], split_conds_to_windows: bool=False) -> io.Model:
         model = model.clone()
         model.model_options["context_handler"] = comfy.context_windows.IndexListContextHandler(
             context_schedule=comfy.context_windows.get_matching_context_schedule(context_schedule),
@@ -51,8 +50,7 @@ class ContextWindowsManualNode(io.ComfyNode):
             dim=dim,
             freenoise=freenoise,
             cond_retain_index_list=cond_retain_index_list,
-            split_conds_to_windows=split_conds_to_windows,
-            causal_window_fix=causal_window_fix,
+            split_conds_to_windows=split_conds_to_windows
         )
         # make memory usage calculation only take into account the context window latents
         comfy.context_windows.create_prepare_sampling_wrapper(model)

folder_paths.py

@@ -432,9 +432,7 @@ def get_save_image_path(filename_prefix: str, output_dir: str, image_width=0, im
         prefix_len = len(os.path.basename(filename_prefix))
         prefix = filename[:prefix_len + 1]
         try:
-            remainder = filename[prefix_len + 1:]
-            base_remainder = remainder.split('.')[0]
-            digits = int(base_remainder.split('_')[0])
+            digits = int(filename[prefix_len + 1:].split('_')[0])
         except:
             digits = 0
         return digits, prefix

openapi.yaml

@@ -631,7 +631,7 @@ paths:
       operationId: getFeatures
       tags: [system]
       summary: Get enabled feature flags
-      description: Returns a dictionary of feature flag names to their enabled state. Cloud deployments may include additional typed fields alongside the boolean flags.
+      description: Returns a dictionary of feature flag names to their enabled state.
       responses:
         "200":
           description: Feature flags
@@ -641,43 +641,6 @@ paths:
                 type: object
                 additionalProperties:
                   type: boolean
-                properties:
-                  max_upload_size:
-                    type: integer
-                    format: int64
-                    minimum: 0
-                    description: "Maximum file upload size in bytes."
-                  free_tier_credits:
-                    type: integer
-                    format: int32
-                    minimum: 0
-                    nullable: true
-                    x-runtime: [cloud]
-                    description: "[cloud-only] Credits available to free-tier users. Local ComfyUI returns null."
-                  posthog_api_host:
-                    type: string
-                    format: uri
-                    nullable: true
-                    x-runtime: [cloud]
-                    description: "[cloud-only] PostHog analytics proxy URL for frontend telemetry. Local ComfyUI returns null."
-                  max_concurrent_jobs:
-                    type: integer
-                    format: int32
-                    minimum: 0
-                    nullable: true
-                    x-runtime: [cloud]
-                    description: "[cloud-only] Maximum concurrent jobs the authenticated user can run. Local ComfyUI returns null."
-                  workflow_templates_version:
-                    type: string
-                    nullable: true
-                    x-runtime: [cloud]
-                    description: "[cloud-only] Version identifier for the workflow templates bundle. Local ComfyUI returns null."
-                  workflow_templates_source:
-                    type: string
-                    nullable: true
-                    enum: [dynamic_config_override, workflow_templates_version_json]
-                    x-runtime: [cloud]
-                    description: "[cloud-only] How the templates version was resolved. Local ComfyUI returns null."
 
   # ---------------------------------------------------------------------------
   # Node / Object Info
@@ -1534,24 +1497,6 @@ paths:
             type: string
             enum: [asc, desc]
           description: Sort direction
-        - name: job_ids
-          in: query
-          schema:
-            type: string
-          x-runtime: [cloud]
-          description: "[cloud-only] Comma-separated UUIDs to filter assets by associated job."
-        - name: include_public
-          in: query
-          schema:
-            type: boolean
-          x-runtime: [cloud]
-          description: "[cloud-only] Include workspace-public assets in addition to the caller's own."
-        - name: asset_hash
-          in: query
-          schema:
-            type: string
-          x-runtime: [cloud]
-          description: "[cloud-only] Filter by exact content hash."
       responses:
         "200":
           description: Asset list
@@ -1597,49 +1542,6 @@ paths:
                   type: string
                   format: uuid
                   description: ID of an existing asset to use as the preview image
-                id:
-                  type: string
-                  format: uuid
-                  nullable: true
-                  x-runtime: [cloud]
-                  description: "[cloud-only] Client-supplied asset ID for idempotent creation. If an asset with this ID already exists, the existing asset is returned."
-          application/json:
-            schema:
-              type: object
-              x-runtime: [cloud]
-              description: "[cloud-only] URL-based asset upload. Caller supplies a URL instead of a file body; the server fetches the content."
-              required:
-                - url
-              properties:
-                url:
-                  type: string
-                  format: uri
-                  description: "[cloud-only] URL of the file to import as an asset"
-                name:
-                  type: string
-                  description: Display name for the asset
-                tags:
-                  type: string
-                  description: Comma-separated tags
-                user_metadata:
-                  type: string
-                  description: JSON-encoded user metadata
-                hash:
-                  type: string
-                  description: "Blake3 hash of the file content (e.g. blake3:abc123...)"
-                mime_type:
-                  type: string
-                  description: MIME type of the file (overrides auto-detected type)
-                preview_id:
-                  type: string
-                  format: uuid
-                  description: ID of an existing asset to use as the preview image
-                id:
-                  type: string
-                  format: uuid
-                  nullable: true
-                  x-runtime: [cloud]
-                  description: "[cloud-only] Client-supplied asset ID for idempotent creation. If an asset with this ID already exists, the existing asset is returned."
       responses:
         "201":
           description: Asset created
@@ -1678,11 +1580,6 @@ paths:
                 user_metadata:
                   type: object
                   additionalProperties: true
-                mime_type:
-                  type: string
-                  nullable: true
-                  x-runtime: [cloud]
-                  description: "[cloud-only] MIME type of the content, so the type is preserved without re-inspecting content. Ignored by local ComfyUI."
       responses:
         "201":
           description: Asset created from hash
@@ -1747,11 +1644,6 @@ paths:
                   type: string
                   format: uuid
                   description: ID of the asset to use as the preview
-                mime_type:
-                  type: string
-                  nullable: true
-                  x-runtime: [cloud]
-                  description: "[cloud-only] MIME type override when auto-detection was wrong. Ignored by local ComfyUI."
       responses:
         "200":
           description: Asset updated
@@ -2112,13 +2004,21 @@ components:
           format: uuid
           nullable: true
           x-runtime: [cloud]
-          description: "[cloud-only] Cloud workflow entity ID for tracking and gallery association. Ignored by local ComfyUI."
+          description: |
+            UUID identifying a hosted-cloud workflow entity to associate with this
+            job. Local ComfyUI doesn't track workflow entities and returns `null`
+            (or omits the field). The `x-runtime: [cloud]` extension marks this
+            as populated only by the hosted-cloud runtime; absence of the tag
+            means a field is populated by all runtimes.
         workflow_version_id:
           type: string
           format: uuid
           nullable: true
           x-runtime: [cloud]
-          description: "[cloud-only] Cloud workflow version ID for pinning execution to a specific version. Ignored by local ComfyUI."
+          description: |
+            UUID identifying a hosted-cloud workflow version to associate with
+            this job. Local ComfyUI returns `null` (or omits the field). See
+            `workflow_id` above for `x-runtime` semantics.
 
     PromptResponse:
       type: object

requirements.txt

@@ -1,4 +1,4 @@
-comfyui-frontend-package==1.43.17
+comfyui-frontend-package==1.42.15
 comfyui-workflow-templates==0.9.69
 comfyui-embedded-docs==0.4.4
 torch