Modal - allow pulling docker image from GCP artifacts registry

Author: grzegorz-roboflow

inference/core/env.py

@@ -741,6 +741,9 @@
 )
 WEBRTC_MODAL_RTSP_PLACEHOLDER = os.getenv("WEBRTC_MODAL_RTSP_PLACEHOLDER")
 WEBRTC_MODAL_RTSP_PLACEHOLDER_URL = os.getenv("WEBRTC_MODAL_RTSP_PLACEHOLDER_URL")
+WEBRTC_MODAL_IMAGE_FROM_GCP = str2bool(
+    os.getenv("WEBRTC_MODAL_IMAGE_FROM_GCP", "False")
+)
 HTTP_API_SHARED_WORKFLOWS_THREAD_POOL_ENABLED = str2bool(
     os.getenv("HTTP_API_SHARED_WORKFLOWS_THREAD_POOL_ENABLED", "True")
 )

inference/core/interfaces/webrtc_worker/modal.py

@@ -27,6 +27,7 @@
     WEBRTC_MODAL_FUNCTION_MIN_CONTAINERS,
     WEBRTC_MODAL_FUNCTION_SCALEDOWN_WINDOW,
     WEBRTC_MODAL_FUNCTION_TIME_LIMIT,
+    WEBRTC_MODAL_IMAGE_FROM_GCP,
     WEBRTC_MODAL_IMAGE_NAME,
     WEBRTC_MODAL_IMAGE_TAG,
     WEBRTC_MODAL_RESPONSE_TIMEOUT,
@@ -58,12 +59,24 @@
 
 if modal is not None:
     docker_tag: str = WEBRTC_MODAL_IMAGE_TAG if WEBRTC_MODAL_IMAGE_TAG else __version__
-    # https://modal.com/docs/reference/modal.Image
-    video_processing_image = (
-        modal.Image.from_registry(f"{WEBRTC_MODAL_IMAGE_NAME}:{docker_tag}")
-        .pip_install("modal")
-        .entrypoint([])
-    )
+    if WEBRTC_MODAL_IMAGE_FROM_GCP:
+        # https://modal.com/docs/reference/modal.Secret#from_name
+        secret = modal.Secret.from_name("SERVICE_ACCOUNT_JSON")
+        # https://modal.com/docs/reference/modal.Image#from_gcp_artifact_registry
+        video_processing_image = (
+            modal.Image.from_gcp_artifact_registry(
+                f"{WEBRTC_MODAL_IMAGE_NAME}:{docker_tag}",
+                secret=secret,
+            )
+            .pip_install("modal")
+            .entrypoint([])
+        )
+    else:
+        video_processing_image = (
+            modal.Image.from_registry(f"{WEBRTC_MODAL_IMAGE_NAME}:{docker_tag}")
+            .pip_install("modal")
+            .entrypoint([])
+        )
 
     # https://modal.com/docs/reference/modal.Volume
     rfcache_volume = modal.Volume.from_name("rfcache", create_if_missing=True)