fix: Fix an Marked takes frame issue. (#498)

Signed-off-by: Karthik Bekal Pattathana <133984042+karthikbekalp@users.noreply.github.com>

Author: karthikbekalp

src/deadline/cinema4d_submitter/cinema4d_render_submitter.py

@@ -163,7 +163,7 @@ def _get_parameter_values(
         if settings.override_frame_range:
             frame_list = settings.frame_list
         else:
-            frame_list = Animation.frame_list()
+            frame_list = submit_takes[0].frame_range
         parameter_values.append({"name": "Frames", "value": frame_list})
 
     # Check for any overlap between the job parameters we've defined and the

test/AGENTS.md

@@ -214,7 +214,7 @@ Each settings case changes only the named setting group before exporting:
 | `shared_job_settings` | Job name, priority, maximum failed tasks, maximum retries |
 | `job_specific_output_path` | Override Output Path and path value |
 | `job_specific_multi_pass_path` | Override Multi-Pass Path and path value |
-| `job_specific_take_selection` | Current, Main, and All Takes modes and their generated steps |
+| `job_specific_take_selection` | Current, Main, Marked, and All Takes modes and their generated steps |
 | `physical_multi_takes` | All Takes naming, truncation, and deduplication edge cases |
 | `job_specific_frame_range` | Override Frame Range and frame expression |
 | `job_specific_detailed_logging` | Detailed logging |
@@ -223,6 +223,11 @@ Each settings case changes only the named setting group before exporting:
 | `job_specific_task_chunking` | Frames per chunk and target chunk duration |
 | `job_specific_tile_rendering` | Tile rendering, columns, and rows |
 
+Unit tests in
+`test/unit/deadline_submitter_for_cinema4d/test_cinema4d_render_submitter.py`
+also cover take-name truncation, OpenJD parameter-name collisions, and `$take`
+path sanitization.
+
 The environment-gated **Include Adaptor Wheels** developer option is excluded
 because it is not present in the customer-facing dialog.
 

test/integ_xa11y/test_cases/job_specific_take_selection/expected/marked/job_bundle/asset_references.yaml

@@ -0,0 +1,9 @@
+assetReferences:
+  inputs:
+    directories: []
+    filenames:
+    - PATH_TO_BE_REPLACED/deadline-cloud-for-cinema-4d/test/integ_xa11y/test_cases/job_specific_take_selection/actual/job_specific_take_selection.c4d
+  outputs:
+    directories:
+    - PATH_TO_BE_REPLACED/deadline-cloud-for-cinema-4d/test/integ_xa11y/test_cases/job_specific_take_selection/actual/renders
+  referencedPaths: []

test/integ_xa11y/test_cases/job_specific_take_selection/expected/marked/job_bundle/parameter_values.yaml

@@ -0,0 +1,29 @@
+parameterValues:
+- name: Cinema4DFile
+  value: PATH_TO_BE_REPLACED/deadline-cloud-for-cinema-4d/test/integ_xa11y/test_cases/job_specific_take_selection/actual/job_specific_take_selection.c4d
+- name: SubmitterIntegrationVersion
+  value: 0.11.4.post17.g91d4fbd80.d20260720
+- name: OutputPath
+  value: PATH_TO_BE_REPLACED/deadline-cloud-for-cinema-4d/test/integ_xa11y/test_cases/job_specific_take_selection/actual/renders/job_specific_take_selection_$take
+- name: MultiPassPath
+  value: ''
+- name: ActivateErrorChecking
+  value: '1'
+- name: DetailedLogging
+  value: '0'
+- name: UseCachedText
+  value: '0'
+- name: ChunkSize
+  value: 1
+- name: TargetChunkDuration
+  value: 0
+- name: Frames
+  value: '2'
+- name: deadline:targetTaskRunStatus
+  value: READY
+- name: deadline:maxFailedTasksCount
+  value: 20
+- name: deadline:maxRetriesPerTask
+  value: 5
+- name: deadline:priority
+  value: 50

test/integ_xa11y/test_cases/job_specific_take_selection/expected/marked/job_bundle/template.yaml

@@ -0,0 +1,183 @@
+specificationVersion: jobtemplate-2023-09
+extensions:
+- TASK_CHUNKING
+name: job_specific_take_selection.c4d
+parameterDefinitions:
+- name: Cinema4DFile
+  type: PATH
+  objectType: FILE
+  dataFlow: IN
+  userInterface:
+    control: CHOOSE_INPUT_FILE
+    label: Cinema4D Document File
+    groupLabel: Cinema4D Settings
+    fileFilters:
+    - label: Cinema4D document files
+      patterns:
+      - '*.c4d'
+    - label: All Files
+      patterns:
+      - '*'
+  description: The Cinema4D document file to render.
+- name: SubmitterIntegrationVersion
+  type: STRING
+  userInterface:
+    control: HIDDEN
+    label: Submitter Integration Version
+    groupLabel: Cinema4D Settings
+  description: The Cinema 4D submitter integration version.
+- name: Frames
+  type: STRING
+  userInterface:
+    control: LINE_EDIT
+    label: Frames
+    groupLabel: Cinema4D Settings
+  description: The frames to render. E.g. 1-3,8,11-15
+  minLength: 1
+- name: ChunkSize
+  type: INT
+  default: 1
+  minValue: 1
+  description: |
+    Number of frames per chunk. Use 1 for one frame per task (default). Higher values group frames into chunks to reduce per-task overhead.
+  userInterface:
+    control: SPIN_BOX
+    label: Frames Per Chunk
+    groupLabel: Cinema4D Settings
+- name: TargetChunkDuration
+  type: INT
+  default: 0
+  minValue: 0
+  description: |
+    Target render time per chunk in seconds. Deadline Cloud will automatically adjust how many frames are grouped together to hit this target. Set to 0 to always use the fixed frames-per-chunk value.
+  userInterface:
+    control: SPIN_BOX
+    label: Target Chunk Duration (Seconds)
+    groupLabel: Cinema4D Settings
+- name: OutputPath
+  type: PATH
+  objectType: FILE
+  dataFlow: OUT
+  userInterface:
+    control: CHOOSE_OUTPUT_FILE
+    label: Default image output
+    groupLabel: Cinema4D Settings
+  description: Image output path
+- name: MultiPassPath
+  type: PATH
+  objectType: FILE
+  dataFlow: OUT
+  userInterface:
+    control: CHOOSE_OUTPUT_FILE
+    label: Multi-pass output path
+    groupLabel: Cinema4D Settings
+  description: Multi-pass image output
+- name: ActivateErrorChecking
+  type: STRING
+  userInterface:
+    control: CHECK_BOX
+    label: Activate automatic error checking
+    groupLabel: Cinema4D Settings
+  description: Fail when errors occur.
+  default: '1'
+  allowedValues:
+  - '1'
+  - '0'
+- name: DetailedLogging
+  type: STRING
+  userInterface:
+    control: CHECK_BOX
+    label: Enable Detailed Logging
+    groupLabel: Cinema4D Settings
+  description: Enable detailed Cinema 4D + Redshift renderer logging for debugging.
+  default: '0'
+  allowedValues:
+  - '1'
+  - '0'
+- name: UseCachedText
+  type: STRING
+  userInterface:
+    control: CHECK_BOX
+    label: Use cached text during render
+    groupLabel: Cinema4D Settings
+  description: Prevents incorrect or missing text by using cached fonts. If there
+    are no fonts in the scene, this is ignored. If there are fonts in the scene, this
+    will increase rendering time.
+  default: '0'
+  allowedValues:
+  - '1'
+  - '0'
+steps:
+- name: A
+  parameterSpace:
+    taskParameterDefinitions:
+    - name: Frame
+      type: CHUNK[INT]
+      range: '{{Param.Frames}}'
+      chunks:
+        defaultTaskCount: '{{Param.ChunkSize}}'
+        targetRuntimeSeconds: '{{Param.TargetChunkDuration}}'
+        rangeConstraint: CONTIGUOUS
+  stepEnvironments:
+  - name: Cinema4D
+    description: Runs Cinema4D in the background.
+    variables:
+      PYTHONUNBUFFERED: '1'
+      SUBMITTER_INTEGRATION_VERSION: '{{Param.SubmitterIntegrationVersion}}'
+    script:
+      embeddedFiles:
+      - name: initData
+        filename: init-data.yaml
+        type: TEXT
+        data: |
+          take: A
+          activate_error_checking: '{{Param.ActivateErrorChecking}}'
+          use_cached_text: '{{Param.UseCachedText}}'
+          scene_file: {{Param.Cinema4DFile}}
+          output_path: PATH_TO_BE_REPLACED/deadline-cloud-for-cinema-4d/test/integ_xa11y/test_cases/job_specific_take_selection/actual/renders/job_specific_take_selection_A
+          multi_pass_path: ''
+      actions:
+        onEnter:
+          command: cinema4d-openjd
+          args:
+          - daemon
+          - start
+          - --path-mapping-rules
+          - file://{{Session.PathMappingRulesFile}}
+          - --connection-file
+          - '{{Session.WorkingDirectory}}/connection.json'
+          - --init-data
+          - file://{{Env.File.initData}}
+          cancelation:
+            mode: NOTIFY_THEN_TERMINATE
+          timeout: 600
+        onExit:
+          command: cinema4d-openjd
+          args:
+          - daemon
+          - stop
+          - --connection-file
+          - '{{ Session.WorkingDirectory }}/connection.json'
+          cancelation:
+            mode: NOTIFY_THEN_TERMINATE
+          timeout: 300
+  script:
+    embeddedFiles:
+    - name: runData
+      filename: run-data.yaml
+      type: TEXT
+      data: |
+        frame: '{{Task.Param.Frame}}'
+    actions:
+      onRun:
+        command: cinema4d-openjd
+        args:
+        - daemon
+        - run
+        - --connection-file
+        - '{{ Session.WorkingDirectory }}/connection.json'
+        - --run-data
+        - file://{{ Task.File.runData }}
+        cancelation:
+          mode: NOTIFY_THEN_TERMINATE
+        timeout: 172800

test/integ_xa11y/test_cases/job_specific_take_selection/expected/marked/renders/job_specific_take_selection_A0002.png

@@ -39,8 +39,10 @@ def main():
     take_a.SetRenderData(take_data, render_settings_2)
 
     selection_variant = sys.argv[2]
-    if selection_variant not in ("current", "main", "all"):
+    if selection_variant not in ("current", "main", "marked", "all"):
         raise ValueError(f"Unknown take-selection variant: {selection_variant}")
+    main_take.SetChecked(False)
+    take_a.SetChecked(selection_variant == "marked")
     take_data.SetCurrentTake(take_a if selection_variant == "current" else main_take)
 
     save_dir = sys.argv[1]

test/integ_xa11y/test_cases/job_specific_take_selection/input/scene.py

@@ -662,6 +662,7 @@ def _run_integ_case(
 _TAKE_SELECTIONS = [
     pytest.param("current", "Current Take", id="current"),
     pytest.param("main", "Main Take", id="main"),
+    pytest.param("marked", "Marked Takes", id="marked"),
     pytest.param("all", "All Takes", id="all"),
 ]
 
@@ -690,7 +691,7 @@ def test_job_specific_take_selection(
     expected_variant: str,
     selection: str,
 ) -> None:
-    """Verify Current, Main, and All Takes produce the intended job steps."""
+    """Verify Current, Main, Marked, and All Takes produce the intended job steps."""
     _run_integ_case(
         cinema4d_location,
         test_cases_folder_location,

test/integ_xa11y/test_cinema4d.py

@@ -0,0 +1,33 @@
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+
+from unittest.mock import Mock, patch
+
+import xa11y
+
+from test.integ_xa11y import submitter_ui
+
+
+def test_activate_take_option_clicks_macos_press_target() -> None:
+    option_element = Mock(actions=["press"])
+    option_element.parent.return_value = None
+    option = Mock()
+    option.element.return_value = option_element
+    input_sim = Mock()
+
+    with patch.object(submitter_ui.xa11y, "input_sim", return_value=input_sim):
+        submitter_ui._activate_take_option(option, "Marked Takes")
+
+    option.press.assert_not_called()
+    input_sim.click.assert_called_once_with(option_element)
+
+
+def test_wait_for_take_selection_confirms_highlighted_row() -> None:
+    combo = Mock()
+    combo.wait_until.side_effect = [xa11y.TimeoutError(), None]
+    input_sim = Mock()
+
+    with patch.object(submitter_ui.xa11y, "input_sim", return_value=input_sim):
+        submitter_ui._wait_for_take_selection(combo, "Current Take")
+
+    assert [call.kwargs["timeout"] for call in combo.wait_until.call_args_list] == [1.0, 10.0]
+    input_sim.press.assert_called_once_with("Enter")