clarifai 11.7.5__py3-none-any.whl → 11.8.0__py3-none-any.whl

clarifai/runners/utils/loader.py

@@ -72,6 +72,17 @@ class HuggingFaceLoader:
                     else:
                         self.ignore_patterns = ignore_file_patterns
 
+                repo_files_to_download = self.get_repo_files_list(
+                    allowed_file_patterns=allowed_file_patterns,
+                    ignore_file_patterns=self.ignore_patterns,
+                )
+                total_size = self.get_huggingface_checkpoint_total_size(
+                    self.repo_id, checkpoint_files_list=repo_files_to_download
+                )
+                total_size = total_size / (1024**2)
+                logger.info(f"Total download size: {total_size:.2f} MB")
+
+                logger.info("Downloading model checkpoints...")
                 snapshot_download(
                     repo_id=self.repo_id,
                     local_dir=checkpoint_path,
@@ -134,9 +145,7 @@ class HuggingFaceLoader:
         else:
             return repo_exists(self.repo_id)
 
-    def validate_download(
-        self, checkpoint_path: str, allowed_file_patterns: list, ignore_file_patterns: list
-    ):
+    def get_repo_files_list(self, allowed_file_patterns: list, ignore_file_patterns: list):
         # check if model exists on HF
         try:
             from huggingface_hub import list_repo_files
@@ -169,6 +178,14 @@ class HuggingFaceLoader:
                 return any(fnmatch.fnmatch(file_path, pattern) for pattern in patterns)
 
             repo_files = [f for f in repo_files if not should_ignore(f)]
+        return repo_files
+
+    def validate_download(
+        self, checkpoint_path: str, allowed_file_patterns: list, ignore_file_patterns: list
+    ):
+        repo_files = self.get_repo_files_list(
+            allowed_file_patterns=allowed_file_patterns, ignore_file_patterns=ignore_file_patterns
+        )
 
         # Check if downloaded files match the files we expect (ignoring ignored patterns)
         checkpoint_dir_files = []
@@ -258,13 +275,14 @@ class HuggingFaceLoader:
         return labels
 
     @staticmethod
-    def get_huggingface_checkpoint_total_size(repo_name):
+    def get_huggingface_checkpoint_total_size(repo_name, checkpoint_files_list=None):
         """
         Fetches the JSON data for a Hugging Face model using the API with `?blobs=true`.
         Calculates the total size from the JSON output.
 
         Args:
             repo_name (str): The name of the model on Hugging Face Hub. e.g. "casperhansen/llama-3-8b-instruct-awq"
+            checkpoint_files_list (list, optional): A list of specific files to include in the size calculation. If None, all files are included.
 
         Returns:
             int: The total size in bytes.
@@ -282,6 +300,8 @@ class HuggingFaceLoader:
 
             total_size = 0
             for file in data['siblings']:
+                if checkpoint_files_list and (file['rfilename'] not in checkpoint_files_list):
+                    continue
                 total_size += file['size']
             return total_size
         except Exception as e:

clarifai/utils/misc.py

@@ -221,6 +221,26 @@ def clone_github_repo(repo_url, target_dir, github_pat=None, branch=None):
         return False
 
 
+def get_list_of_files_to_download(
+    downloader, owner, repo, folder_path, branch, files_to_download, depth=1
+):
+    data = downloader.get_folder_contents(owner, repo, folder_path, branch=branch)
+    for point in data:
+        if (point['type'] == 'dir') and (depth > 0):
+            files_to_download = get_list_of_files_to_download(
+                downloader,
+                owner,
+                repo,
+                point['path'],
+                branch,
+                files_to_download,
+                depth=(depth - 1),
+            )
+        else:
+            files_to_download.append(point['path'])
+    return files_to_download
+
+
 class GitHubDownloader:
     def __init__(
         self, max_retries: int = 3, backoff_factor: float = 0.3, github_token: str = None

clarifai/utils/secrets.py

@@ -1,8 +1,9 @@
 import os
 import time
+from contextlib import contextmanager
 from pathlib import Path
 from threading import Thread
-from typing import Any, Callable, Optional
+from typing import Any, Callable, Dict, List, Optional
 
 from clarifai_grpc.grpc.api import resources_pb2, service_pb2
 from google.protobuf import struct_pb2
@@ -165,6 +166,100 @@ def inject_secrets(request: Optional[service_pb2.PostModelOutputsRequest]) -> No
     return
 
 
+def extract_req_secrets(
+    request: Optional[service_pb2.PostModelOutputsRequest],
+) -> List[Dict[str, Any]]:
+    """Extract request-type secrets from the model parameters.
+
+    Args:
+        request: The PostModelOutputsRequest containing the model parameters
+
+    Returns:
+        list: request-type secrets with env_var and value fields
+    """
+    if not request or not request.HasField("model"):
+        return []
+
+    if not (
+        request.model.HasField("model_version")
+        and request.model.model_version.HasField("output_info")
+        and request.model.model_version.output_info.HasField("params")
+    ):
+        return []
+
+    try:
+        params_dict = MessageToDict(request.model.model_version.output_info.params)
+        secrets_array = params_dict.get("secrets", [])
+
+        req_secrets = []
+        for secret in secrets_array:
+            if isinstance(secret, dict) and secret.get("secret_type") == "req":
+                secret_id = secret.get("id")
+                env_var = secret.get("env_var")
+                value = secret.get("value")
+                if env_var and value:
+                    req_secrets.append({"env_var": env_var, "value": str(value)})
+                else:
+                    logger.warning(
+                        f"Invalid req-type secret missing env_var or value: {secret_id}"
+                    )
+        return req_secrets
+    except Exception as e:
+        logger.error(f"Error extracting req secrets: {e}")
+        return []
+
+
+@contextmanager
+def temporary_env_vars(env_vars: Dict[str, str]):
+    """Context manager to temporarily set environment variables and restore them after.
+
+    Args:
+        env_vars: Dictionary of environment variable names and values to set
+    """
+    if not env_vars:
+        yield
+        return
+
+    original_values = {}
+    for key in env_vars.keys():
+        original_values[key] = os.environ.get(key)
+
+    try:
+        for key, value in env_vars.items():
+            os.environ[key] = value
+            logger.debug(f"Temporarily set environment variable: {key}")
+        yield
+    finally:
+        # Restore original environment state
+        for key, original_value in original_values.items():
+            if original_value is None:
+                if key in os.environ:
+                    del os.environ[key]
+                    logger.debug(f"Removed temporary environment variable: {key}")
+            else:
+                os.environ[key] = original_value
+                logger.debug(f"Restored environment variable: {key}")
+
+
+@contextmanager
+def req_secrets_context(request: Optional[service_pb2.PostModelOutputsRequest]):
+    """Context manager to handle request-type secrets during model prediction.
+
+    Args:
+        request: The PostModelOutputsRequest to extract secrets from
+    """
+    req_secrets = extract_req_secrets(request)
+
+    if not req_secrets:
+        yield
+        return
+
+    env_vars = {secret["env_var"]: secret["value"] for secret in req_secrets}
+    logger.debug(f"Setting {len(env_vars)} request-type secrets as environment variables")
+    with temporary_env_vars(env_vars):
+        yield
+
+
 def get_secrets(
     request: Optional[service_pb2.PostModelOutputsRequest],
 ) -> dict[str, Any]:

{clarifai-11.7.5.dist-info → clarifai-11.8.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clarifai
-Version: 11.7.5
+Version: 11.8.0
 Home-page: https://github.com/Clarifai/clarifai-python
 Author: Clarifai
 Author-email: support@clarifai.com

{clarifai-11.7.5.dist-info → clarifai-11.8.0.dist-info}/RECORD

@@ -1,21 +1,21 @@
-clarifai/__init__.py,sha256=erhK1A34wNw9UWhmdvXBUqJEX6p8t92dFVsXt-teneQ,23
+clarifai/__init__.py,sha256=i-ilTWt69mdcN4GqSDKAmTIOlguLxG2mm9Xhzz2U_aw,23
 clarifai/cli.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 clarifai/errors.py,sha256=GXa6D4v_L404J83jnRNFPH7s-1V9lk7w6Ws99f1g-AY,2772
 clarifai/versions.py,sha256=ecSuEB_nOL2XSoYHDw2n23XUbm_KPOGjudMXmQrGdS8,224
 clarifai/cli/README.md,sha256=Rm0Sk61u7PrWQBgA6idv0R6ldJGhnVHSlIF2rVzRk8g,3428
 clarifai/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 clarifai/cli/__main__.py,sha256=7nPbLW7Jr2shkgMPvnxpn4xYGMvIcnqluJ69t9w4H_k,74
-clarifai/cli/base.py,sha256=l1WpCM9URk7mkYmHNpnZYtihbTTmMpBB5oBo9IwgeEo,10677
+clarifai/cli/base.py,sha256=FQEEmi3a9_LBOmM_-X4EYdpAmDK1UljTxrHOIIsOZbM,10696
 clarifai/cli/compute_cluster.py,sha256=8Xss0Obrp6l1XuxJe0luOqU_pf8vXGDRi6jyIe8qR6k,2282
 clarifai/cli/deployment.py,sha256=9C4I6_kyMxRkWl6h681wc79-3mAtDHtTUaxRv05OZMs,4262
-clarifai/cli/model.py,sha256=Hyp68_RTLkH-Ja_XtExu-vTPwXUSIHYXq7nyMW6RA-U,43030
+clarifai/cli/model.py,sha256=afThcvpEy7ni8zezel-UjvoJkALbVLQEI4WDZIdyDL0,47948
 clarifai/cli/nodepool.py,sha256=H6OIdUW_EiyDUwZogzEDoYmVwEjLMsgoDlPyE7gjIuU,4245
-clarifai/cli/pipeline.py,sha256=9ZWVLokXHxqXy0g1_1ACuRX20ckrzyKwnsFfuJZm6Nw,13130
+clarifai/cli/pipeline.py,sha256=MmyPaVX1XsIZlrYTrT7Ctd71ao_d3ZWkuF_fv_NJS8s,13944
 clarifai/cli/pipeline_step.py,sha256=dvoC2vAsDcxOCy88VV0X42PG22_7JSu9sfBVsk-Cix4,6133
 clarifai/cli/templates/__init__.py,sha256=HbMlZuYOMyVJde73ijNAevmSRUpIttGlHdwyO4W-JOs,44
 clarifai/cli/templates/model_templates.py,sha256=f3fvXTwHLBExjSOpdcEgp7X1CH28jjzpLFKljWi5arQ,9793
 clarifai/cli/templates/pipeline_step_templates.py,sha256=w1IJghF_4wWyEmHR1925N0hpGKocy3G7ezhxTH-0XCc,1716
-clarifai/cli/templates/pipeline_templates.py,sha256=l7-0yj1aw4jVZb0xjuhc9sW9LJfG3qaGqgwt7bLURCc,4462
+clarifai/cli/templates/pipeline_templates.py,sha256=iLVxkmd0usc7jervTZTFzLwRVVF_623RszGW-oIuPDw,4234
 clarifai/client/__init__.py,sha256=MWEG_jTGn6UWbGCznsZxObJ5h65k2igD1462qID2pgI,840
 clarifai/client/app.py,sha256=8_Y5esptlFSGW2WS0uly9IBop37hJVpxnhs-vBIZrtc,47205
 clarifai/client/base.py,sha256=aduMVVSPUSQ-MsDpj4yuHmCTUNbCTPt76dhRZ14euVg,10284
@@ -28,7 +28,7 @@ clarifai/client/model.py,sha256=CQP5UiHaLR2hHcG1nU-ac_utN9ZXalOzbOqaICa0VyQ,9201
 clarifai/client/model_client.py,sha256=pyPg1C3gb5Q3_DXmMmOB5AeORR1IDaaM7n0LGc3ciLk,38217
 clarifai/client/module.py,sha256=jLViQYvVV3FmRN_ivvbk83uwsx7CgYGeEx4dYAr6yD4,4537
 clarifai/client/nodepool.py,sha256=0E8-VgNMpdx2sAGotS3ZwfeUc9k3DBa3QJEJ1wKroVA,16700
-clarifai/client/pipeline.py,sha256=Kawnp16iWwty4TZGDbZvU_G5PJzCXQqf50Dc-AYLaAI,14880
+clarifai/client/pipeline.py,sha256=R2DAaph-vlVJO_49PMfGXZ_1Prnd0vdkcgksnqK1jJA,15731
 clarifai/client/pipeline_step.py,sha256=_R0PhVCspAQatCss-0O0O9p9CpvU_y9cSSEeUp_7cV0,2765
 clarifai/client/runner.py,sha256=5xCiqByGGscfNm0IjHelhDTx8-9l8G0C3HL-3YZogK8,2253
 clarifai/client/search.py,sha256=3LLfATrdU43a0mRNITmJV-E53bhfafZkYsbwkTtlnyU,15661
@@ -72,28 +72,28 @@ clarifai/rag/__init__.py,sha256=wu3PzAzo7uqgrEzuaC9lY_3gj1HFiR3GU3elZIKTT5g,40
 clarifai/rag/rag.py,sha256=EG3GoFrHFCmA70Tz49_0Jo1-3WIaHSgWGHecPeErcdc,14170
 clarifai/rag/utils.py,sha256=_gVZdABuMnraCKViLruV75x0F3IpgFXN6amYSGE5_xc,4462
 clarifai/runners/__init__.py,sha256=wXLaSljH7qLeJCrZdKEnlQh2tNqTQAIZKWOu2rZ6wGs,279
-clarifai/runners/server.py,sha256=ZsPx9xInP6b_-KnH6M__PyVnU7Jlj1Iec6ycS6hPnGI,12453
+clarifai/runners/server.py,sha256=qTWpFw01UqdVHSUSKojnnC7P-jKx6dQvPs0C4vJCOw4,12442
 clarifai/runners/dockerfile_template/Dockerfile.template,sha256=nEnIMqzhAXDbd0Ht7QQm0U7AVPIHWQD6kYnFZ0TKJUM,2428
 clarifai/runners/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 clarifai/runners/models/dummy_openai_model.py,sha256=LfAJu173uTEYsN6xpaJ6TyimohyTooX16H6YYk9qVLs,8636
 clarifai/runners/models/mcp_class.py,sha256=RdKn7rW4vYol0VRDZiLTSMfkqjLhO1ijXAQ0Rq0Jfnw,6647
-clarifai/runners/models/model_builder.py,sha256=sG28Skk1FmHk6OY50T2n3aGVlFvWYJ4MtObozgz8kL0,70957
+clarifai/runners/models/model_builder.py,sha256=uHEbUs-madANZIjroCbdWFrD6ss9jtLQNIrLgrqEaJA,75881
 clarifai/runners/models/model_class.py,sha256=Ndh437BNMkpFBo6B108GuKL8sGYaGnSplZ6FxOgd_v8,20010
 clarifai/runners/models/model_run_locally.py,sha256=6-6WjEKc0ba3gAv4wOLdMs2XOzS3b-2bZHJS0wdVqJY,20088
-clarifai/runners/models/model_runner.py,sha256=91Phib3REIkrf9hRVjEfUJq2DR4yl_HA9SdUAEmg_3o,12238
+clarifai/runners/models/model_runner.py,sha256=bZeqIGvoR6t9kzI7ko5Wh2sB8DiT-HcCgFwTqgeu_JY,14573
 clarifai/runners/models/model_servicer.py,sha256=ZNF5rFI76YCmXXQIrz4wacPMtlFfl2KRsmPw29luGKI,4729
-clarifai/runners/models/openai_class.py,sha256=v3R1CoUIeS9dh9jhGH7G7Jih9DLXkHvieQLjMtC4Gas,8892
+clarifai/runners/models/openai_class.py,sha256=MYnL7_U4_m5FX3CoVaTd6B9Qminh-q4pYizZQsV3zSk,9557
 clarifai/runners/models/visual_classifier_class.py,sha256=1ZoLfCT2crrgRbejjTMAIwpTRgQMiH9N9yflOVpFxSg,2721
 clarifai/runners/models/visual_detector_class.py,sha256=ky4oFAkGCKPpGPdgaOso-n6D3HcmnbKee_8hBsNiV8U,2883
 clarifai/runners/pipeline_steps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-clarifai/runners/pipeline_steps/pipeline_step_builder.py,sha256=X2xWg4QM4kX3cr8JkG1RmAiVE8-XH8XbomjmXa16zmY,21333
+clarifai/runners/pipeline_steps/pipeline_step_builder.py,sha256=jcbs3ntbeyUiAaPh00Pscni4uJopbqVNVJblUX1pYVc,21808
 clarifai/runners/pipelines/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 clarifai/runners/pipelines/pipeline_builder.py,sha256=0FBjb8l7mWlCwBsBLkHM3znNQB9HPLEOYrrE53ntjCE,13810
 clarifai/runners/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 clarifai/runners/utils/code_script.py,sha256=zZ5xjd13z2oV4CUWgMU0w6J6dRr01Kl2K-8pPyw0MiY,14346
 clarifai/runners/utils/const.py,sha256=MK7lTzzJKbOiyiUtG_jlJXfz_xNKMn5LjkQ9vjbttXE,1538
 clarifai/runners/utils/data_utils.py,sha256=HRpMYR2O0OiDpXXhOManLHTeomC4bFnXMHVAiT_12yE,20856
-clarifai/runners/utils/loader.py,sha256=C6mI-9SgmdFM18Rcra7UuisE8ErHa5WlSxsM-SKucnA,10931
+clarifai/runners/utils/loader.py,sha256=hQwdRKRLgrunDzLTiqjz2qVdxiL8WQ04PUSwrh-JWZ0,12077
 clarifai/runners/utils/method_signatures.py,sha256=qdHaO8ZIgP6BBXXMhMPhcQ46dse-XMP2t4VJCNG7O3Q,18335
 clarifai/runners/utils/model_utils.py,sha256=MCYhV_00anptIO1Qtxgzn3DlGI2UHV0ESFT3wLNcAMM,6413
 clarifai/runners/utils/openai_convertor.py,sha256=ZlIrvvfHttD_DavLvmKZdL8gNq_TQvQtZVnYamwdWz4,8248
@@ -109,10 +109,10 @@ clarifai/utils/cli.py,sha256=xTenEXjhWV-lpTqlfeRO4WNakT5QszNi8GO4yH4qcMs,13184
 clarifai/utils/config.py,sha256=dENYtcWW7Il5MInvIaYe0MZn0hW1fbIb0Lzk8rQ_geQ,7671
 clarifai/utils/constants.py,sha256=klcdSiVccrdJVRXL9qq08p2lWL3KerXcQOTIG6y9298,2414
 clarifai/utils/logging.py,sha256=0we53uTqUvzrulC86whu-oeWNxn1JjJL0OQ98Bwf9vo,15198
-clarifai/utils/misc.py,sha256=ld7_lls4CrjHzKchsSgJs4T-rVpUVEzRy4MDWBEQlyA,22812
+clarifai/utils/misc.py,sha256=ATj4RR6S06GeLE0X4tMU4bmTz4Sz4j2WemTddsnSfMI,23458
 clarifai/utils/model_train.py,sha256=0XSAoTkSsrwf4f-W9yw2mkXZtkal7LBLJSoi86CFCn4,9250
 clarifai/utils/protobuf.py,sha256=VMhnNsPuWQ16VarKm8BOr5zccXMe26UlrxdJxIzEZNM,6220
-clarifai/utils/secrets.py,sha256=HAnkEXp16lPGpm19D6Aw0i-_aOWsGgQF8Vvej45_rVA,8076
+clarifai/utils/secrets.py,sha256=nmdgHpjVvx93eSXvk8NbOikj7JsFu5tnqXNMj-0qDBA,11253
 clarifai/utils/evaluation/__init__.py,sha256=PYkurUrXrGevByj7RFb6CoU1iC7fllyQSfnnlo9WnY8,69
 clarifai/utils/evaluation/helpers.py,sha256=0t6eIDXeZEoiVvnmHTnsIF_-v4BzrQW1hFaqc_psifU,21079
 clarifai/utils/evaluation/main.py,sha256=N_sfRuMjHrUeuWN0Pzms65M1PbkQkgYg3WoQVaDR1Jw,17764
@@ -121,9 +121,9 @@ clarifai/workflows/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 clarifai/workflows/export.py,sha256=HvUYG9N_-UZoRR0-_tdGbZ950_AeBqawSppgUxQebR0,1913
 clarifai/workflows/utils.py,sha256=ESL3INcouNcLKCh-nMpfXX-YbtCzX7tz7hT57_RGQ3M,2079
 clarifai/workflows/validate.py,sha256=UhmukyHkfxiMFrPPeBdUTiCOHQT5-shqivlBYEyKTlU,2931
-clarifai-11.7.5.dist-info/licenses/LICENSE,sha256=mUqF_d12-qE2n41g7C5_sq-BMLOcj6CNN-jevr15YHU,555
-clarifai-11.7.5.dist-info/METADATA,sha256=Qjd46_GmGcDLY3tSkVUHPFq_i8rMcH6m946D-ElGqYE,23161
-clarifai-11.7.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-clarifai-11.7.5.dist-info/entry_points.txt,sha256=X9FZ4Z-i_r2Ud1RpZ9sNIFYuu_-9fogzCMCRUD9hyX0,51
-clarifai-11.7.5.dist-info/top_level.txt,sha256=wUMdCQGjkxaynZ6nZ9FAnvBUCgp5RJUVFSy2j-KYo0s,9
-clarifai-11.7.5.dist-info/RECORD,,
+clarifai-11.8.0.dist-info/licenses/LICENSE,sha256=mUqF_d12-qE2n41g7C5_sq-BMLOcj6CNN-jevr15YHU,555
+clarifai-11.8.0.dist-info/METADATA,sha256=7bi487EKBn-zOSchR-9uC-l7j5-1KsWWNfbXQpjHaZk,23161
+clarifai-11.8.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+clarifai-11.8.0.dist-info/entry_points.txt,sha256=X9FZ4Z-i_r2Ud1RpZ9sNIFYuu_-9fogzCMCRUD9hyX0,51
+clarifai-11.8.0.dist-info/top_level.txt,sha256=wUMdCQGjkxaynZ6nZ9FAnvBUCgp5RJUVFSy2j-KYo0s,9
+clarifai-11.8.0.dist-info/RECORD,,