fix: reject duplicate adaptor wheels before submission

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

Author: karthikbekalp

src/deadline/cinema4d_submitter/cinema4d_render_submitter.py

@@ -42,6 +42,7 @@
 from .font_utils import FONTS_DIR, get_font_manager_environment, scene_has_fonts
 from .platform_utils import is_macos, is_windows
 from .scene import Animation, Scene, get_renderer_warning
+from .setup_adaptor_wheels import _find_wheels
 from .style import C4D_STYLE
 from .takes import TakeSelection
 from .template_timeout_patcher import add_timeouts_to_job_template
@@ -263,19 +264,13 @@ def _get_adaptor_override_environment(wheels_path: Path) -> dict[str, Any]:
             f"directory does not exist:\n{wheels_path}"
         )
 
-    wheels_path_package_names = {path.name.split("-", 1)[0] for path in wheels_path.glob("*.whl")}
-    expected_package_names = {
-        "openjd_adaptor_runtime",
-        "deadline",
-        "deadline_cloud_for_cinema_4d",
-    }
-    if wheels_path_package_names != expected_package_names:
+    try:
+        _find_wheels(wheels_path)
+    except RuntimeError as exc:
         raise RuntimeError(
             "The Developer Option 'Include Adaptor Wheels' is enabled, but the wheels "
-            "directory contains the wrong wheels:\n"
-            f"Expected: {expected_package_names}\n"
-            f"Actual: {wheels_path_package_names}"
-        )
+            f"directory contains the wrong wheels:\n{exc}"
+        ) from exc
 
     with open(Path(__file__).parent / "adaptor_override_environment.yaml") as file:
         override_environment = yaml.safe_load(file)

test/unit/deadline_submitter_for_cinema4d/test_adaptor_override.py

@@ -66,6 +66,15 @@ def test_get_adaptor_override_environment_rejects_missing_directory(tmp_path):
         _get_adaptor_override_environment(wheels_dir)
 
 
+def test_get_adaptor_override_environment_rejects_duplicate_package_wheels(tmp_path):
+    wheels_dir = tmp_path / "wheels"
+    _create_wheels(wheels_dir)
+    (wheels_dir / "deadline_cloud_for_cinema_4d-0.12.2-py3-none-any.whl").touch()
+
+    with pytest.raises(RuntimeError, match="Expected exactly one wheel"):
+        _get_adaptor_override_environment(wheels_dir)
+
+
 def test_find_wheels_requires_exact_expected_set(tmp_path):
     wheels_dir = tmp_path / "wheels"
     _create_wheels(wheels_dir)