Merge pull request #1735 from roboflow/feat/add-modal-preload-models-api-key

Add WEBRTC_MODAL_MODELS_PRELOAD_API_KEY

Author: hansent

inference/core/env.py

@@ -742,6 +742,7 @@
 WEBRTC_MODAL_RTSP_PLACEHOLDER = os.getenv("WEBRTC_MODAL_RTSP_PLACEHOLDER")
 WEBRTC_MODAL_RTSP_PLACEHOLDER_URL = os.getenv("WEBRTC_MODAL_RTSP_PLACEHOLDER_URL")
 WEBRTC_MODAL_GCP_SECRET_NAME = os.getenv("WEBRTC_MODAL_GCP_SECRET_NAME")
+WEBRTC_MODAL_MODELS_PRELOAD_API_KEY = os.getenv("WEBRTC_MODAL_MODELS_PRELOAD_API_KEY")
 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

@@ -31,6 +31,7 @@
     WEBRTC_MODAL_GCP_SECRET_NAME,
     WEBRTC_MODAL_IMAGE_NAME,
     WEBRTC_MODAL_IMAGE_TAG,
+    WEBRTC_MODAL_MODELS_PRELOAD_API_KEY,
     WEBRTC_MODAL_RESPONSE_TIMEOUT,
     WEBRTC_MODAL_ROBOFLOW_INTERNAL_SERVICE_NAME,
     WEBRTC_MODAL_RTSP_PLACEHOLDER,
@@ -134,6 +135,11 @@
             "WEBRTC_MODAL_FUNCTION_TIME_LIMIT": str(WEBRTC_MODAL_FUNCTION_TIME_LIMIT),
             "WEBRTC_MODAL_IMAGE_NAME": WEBRTC_MODAL_IMAGE_NAME,
             "WEBRTC_MODAL_IMAGE_TAG": WEBRTC_MODAL_IMAGE_TAG,
+            "WEBRTC_MODAL_MODELS_PRELOAD_API_KEY": (
+                str(WEBRTC_MODAL_MODELS_PRELOAD_API_KEY)
+                if WEBRTC_MODAL_MODELS_PRELOAD_API_KEY
+                else ""
+            ),
             "WEBRTC_MODAL_RTSP_PLACEHOLDER": WEBRTC_MODAL_RTSP_PLACEHOLDER,
             "WEBRTC_MODAL_RTSP_PLACEHOLDER_URL": WEBRTC_MODAL_RTSP_PLACEHOLDER_URL,
         },
@@ -283,7 +289,7 @@ def start(self):
                         logger.info(f"Preloading model: {de_aliased_model_id}")
                         model_manager.add_model(
                             model_id=de_aliased_model_id,
-                            api_key=None,
+                            api_key=WEBRTC_MODAL_MODELS_PRELOAD_API_KEY,
                             countinference=False,
                             service_secret=ROBOFLOW_INTERNAL_SERVICE_SECRET,
                         )