Simplify sandbox container image options

Use a single full container image reference for on-demand sandbox declarations and remove split registry/repository/tag/digest configuration.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: YunchuWang

durabletask-azuremanaged/durabletask/azuremanaged/preview/on_demand_sandbox/client.py

@@ -29,11 +29,10 @@ class OnDemandSandboxWorkerProfileOptions:
     """Options for a decorated on-demand sandbox worker profile."""
 
     worker_profile_id: str
+    # Full OCI image reference for the sandbox worker container, for example
+    # "myregistry.azurecr.io/workers/hello:1.0" or
+    # "myregistry.azurecr.io/workers/hello@sha256:0123456789abcdef...".
     container_image: Optional[str] = None
-    registry_server: Optional[str] = None
-    repository: Optional[str] = None
-    tag: Optional[str] = None
-    image_digest: Optional[str] = None
     image_pull_managed_identity_client_id: Optional[str] = None
     scheduler_managed_identity_client_id: Optional[str] = None
     cpu: str = DEFAULT_CPU
@@ -97,49 +96,26 @@ def resolve_activity_names(activity_names: str | Iterable[str]) -> list[str]:
     return resolved
 
 
-def build_image_ref(
-        *,
-        container_image: Optional[str] = None,
-        registry_server: Optional[str] = None,
-        repository: Optional[str] = None,
-        tag: Optional[str] = None,
-        image_digest: Optional[str] = None) -> Optional[str]:
-    if container_image and container_image.strip():
-        return container_image.strip()
-
-    if not repository or not repository.strip():
-        return None
-
-    image = repository.strip()
-    if registry_server and registry_server.strip():
-        image = f"{registry_server.strip()}/{image}"
-
-    if image_digest and image_digest.strip():
-        return f"{image}@{image_digest.strip()}"
-
-    if tag and tag.strip():
-        return f"{image}:{tag.strip()}"
-
-    return image
-
-
 def build_on_demand_sandbox_activity_declaration(
         *,
         activity_names: str | Iterable[str],
         scheduler_managed_identity_client_id: str,
         worker_profile_id: str = DEFAULT_WORKER_PROFILE_ID,
         container_image: Optional[str] = None,
-        registry_server: Optional[str] = None,
-        repository: Optional[str] = None,
-        tag: Optional[str] = None,
-        image_digest: Optional[str] = None,
         image_pull_managed_identity_client_id: Optional[str] = None,
         cpu: str = DEFAULT_CPU,
         memory: str = DEFAULT_MEMORY,
         environment_variables: Optional[dict[str, str]] = None,
         max_concurrent_activities: int = DEFAULT_MAX_CONCURRENT_ACTIVITIES,
         entrypoint: Optional[Iterable[str]] = None,
         cmd: Optional[Iterable[str]] = None) -> pb.OnDemandSandboxActivityDeclaration:
+    """Build a sandbox activity declaration.
+
+    Args:
+        container_image: Full OCI image reference for the sandbox worker container,
+            such as "myregistry.azurecr.io/workers/hello:1.0" or
+            "myregistry.azurecr.io/workers/hello@sha256:0123456789abcdef...".
+    """
     resolved_activity_names = resolve_activity_names(activity_names)
     if not resolved_activity_names:
         raise ValueError("On-demand sandbox activity declaration requires at least one activity name.")
@@ -150,14 +126,11 @@ def build_on_demand_sandbox_activity_declaration(
     if max_concurrent_activities <= 0:
         raise ValueError("On-demand sandbox activity max concurrent activities must be greater than zero.")
 
-    image_ref = build_image_ref(
-        container_image=container_image,
-        registry_server=registry_server,
-        repository=repository,
-        tag=tag,
-        image_digest=image_digest)
-    if not image_ref:
-        raise ValueError("On-demand sandbox activity image metadata requires a container image reference.")
+    image_ref = _normalize_required(
+        container_image,
+        "On-demand sandbox activity image metadata requires a container image reference like "
+        "'myregistry.azurecr.io/workers/hello:1.0' or "
+        "'myregistry.azurecr.io/workers/hello@sha256:...'.")
 
     resolved_scheduler_managed_identity_client_id = _normalize_required(
         scheduler_managed_identity_client_id,
@@ -207,10 +180,6 @@ def build_profile_on_demand_sandbox_activity_declarations() -> list[pb.OnDemandS
             activity_names=activity_names,
             worker_profile_id=profile.worker_profile_id,
             container_image=profile.container_image,
-            registry_server=profile.registry_server,
-            repository=profile.repository,
-            tag=profile.tag,
-            image_digest=profile.image_digest,
             image_pull_managed_identity_client_id=profile.image_pull_managed_identity_client_id,
             scheduler_managed_identity_client_id=profile.scheduler_managed_identity_client_id,
             cpu=profile.cpu,

tests/durabletask-azuremanaged/test_on_demand_sandbox_extension.py

@@ -13,7 +13,6 @@
 from durabletask.azuremanaged.preview.on_demand_sandbox import OnDemandSandboxWorkerProfileOptions
 from durabletask.azuremanaged.preview.on_demand_sandbox import on_demand_sandbox_worker_profile
 from durabletask.azuremanaged.preview.on_demand_sandbox.client import (
-    build_image_ref,
     build_on_demand_sandbox_activity_declaration,
     build_on_demand_sandbox_worker_heartbeat,
     build_on_demand_sandbox_worker_start,
@@ -136,18 +135,6 @@ def configure(self, options: OnDemandSandboxWorkerProfileOptions) -> None:
         sandbox_client._worker_profiles.pop("pytest-callable-profile", None)
 
 
-def test_build_image_ref_matches_dotnet_options() -> None:
-    assert build_image_ref(container_image=" repo/image:tag ") == "repo/image:tag"
-    assert build_image_ref(
-        registry_server="example.azurecr.io",
-        repository="worker",
-        tag="v1") == "example.azurecr.io/worker:v1"
-    assert build_image_ref(
-        registry_server="example.azurecr.io",
-        repository="worker",
-        image_digest="sha256:abc") == "example.azurecr.io/worker@sha256:abc"
-
-
 def test_build_on_demand_sandbox_activity_declaration() -> None:
     declaration = build_on_demand_sandbox_activity_declaration(
         worker_profile_id="preview",