clarifai 11.0.1__tar.gz → 11.0.3__tar.gz

{clarifai-11.0.1/clarifai.egg-info → clarifai-11.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: clarifai
-Version: 11.0.1
+Version: 11.0.3
 Summary: Clarifai Python SDK
 Home-page: https://github.com/Clarifai/clarifai-python
 Author: Clarifai

clarifai-11.0.3/clarifai/__init__.py

@@ -0,0 +1 @@
+__version__ = "11.0.3"

{clarifai-11.0.1 → clarifai-11.0.3}/clarifai/runners/models/model_upload.py

@@ -29,10 +29,16 @@ def _clear_line(n: int = 1) -> None:
 
 class ModelUploader:
 
-  def __init__(self, folder: str):
+  def __init__(self, folder: str, validate_api_ids: bool = True):
+    """
+    :param folder: The folder containing the model.py, config.yaml, requirements.txt and
+    checkpoints.
+    :param validate_api_ids: Whether to validate the user_id and app_id in the config file.
+    """
     self._client = None
     self.folder = self._validate_folder(folder)
     self.config = self._load_config(os.path.join(self.folder, 'config.yaml'))
+    self.validate_api_ids = validate_api_ids
     self._validate_config()
     self.model_proto = self._get_model_proto()
     self.model_id = self.model_proto.id
@@ -76,6 +82,8 @@ class ModelUploader:
       return repo_id, hf_token
 
   def _check_app_exists(self):
+    if not self.validate_api_ids:
+      return True
     resp = self.client.STUB.GetApp(service_pb2.GetAppRequest(user_app_id=self.client.user_app_id))
     if resp.status.code == status_code_pb2.SUCCESS:
       return True

clarifai-11.0.3/clarifai/runners/utils/const.py

@@ -0,0 +1,42 @@
+import os
+
+registry = os.environ.get('CLARIFAI_BASE_IMAGE_REGISTRY', 'public.ecr.aws/clarifai-models')
+
+PYTHON_BASE_IMAGE = registry + '/python-base:{python_version}'
+TORCH_BASE_IMAGE = registry + '/torch:{torch_version}-py{python_version}-cuda{cuda_version}'
+
+# List of available python base images
+AVAILABLE_PYTHON_IMAGES = ['3.11', '3.12', '3.13']
+
+DEFAULT_PYTHON_VERSION = 3.12
+
+# List of available torch images
+AVAILABLE_TORCH_IMAGES = [
+    '2.2.2-py3.11-cuda121',
+    '2.3.1-py3.11-cuda121',
+    '2.4.0-py3.11-cuda121',
+    '2.4.0-py3.11-cuda124',
+    '2.4.1-py3.11-cuda121',
+    '2.4.1-py3.11-cuda124',
+    '2.5.1-py3.11-cuda121',
+    '2.5.1-py3.11-cuda124',
+    '2.2.2-py3.12-cuda121',
+    '2.3.1-py3.12-cuda121',
+    '2.4.0-py3.12-cuda121',
+    '2.4.0-py3.12-cuda124',
+    '2.4.1-py3.12-cuda121',
+    '2.4.1-py3.12-cuda124',
+    '2.5.1-py3.12-cuda121',
+    '2.5.1-py3.12-cuda124',
+    # '2.2.2-py3.13-cuda121',
+    # '2.3.1-py3.13-cuda121',
+    # '2.4.0-py3.13-cuda121',
+    # '2.4.0-py3.13-cuda124',
+    # '2.4.1-py3.13-cuda121',
+    # '2.4.1-py3.13-cuda124',
+    # '2.5.1-py3.13-cuda121',
+    # '2.5.1-py3.13-cuda124',
+]
+CONCEPTS_REQUIRED_MODEL_TYPE = [
+    'visual-classifier', 'visual-detector', 'visual-segmenter', 'text-classifier'
+]

{clarifai-11.0.1 → clarifai-11.0.3}/clarifai/runners/utils/loader.py

@@ -39,7 +39,7 @@ class HuggingFaceLoader:
   def download_checkpoints(self, checkpoint_path: str):
     # throw error if huggingface_hub wasn't installed
     try:
-      from huggingface_hub import snapshot_download
+      from huggingface_hub import list_repo_files, snapshot_download
     except ImportError:
       raise ImportError(self.HF_DOWNLOAD_TEXT)
     if os.path.exists(checkpoint_path) and self.validate_download(checkpoint_path):
@@ -52,8 +52,17 @@ class HuggingFaceLoader:
         if not is_hf_model_exists:
           logger.error("Model %s not found on Hugging Face" % (self.repo_id))
           return False
+
+        ignore_patterns = None  # Download everything.
+        repo_files = list_repo_files(repo_id=self.repo_id, token=self.token)
+        if any(f.endswith(".safetensors") for f in repo_files):
+          logger.info(f"SafeTensors found in {self.repo_id}, downloading only .safetensors files.")
+          ignore_patterns = ["original/*", "*.pth", "*.bin"]
         snapshot_download(
-            repo_id=self.repo_id, local_dir=checkpoint_path, local_dir_use_symlinks=False)
+            repo_id=self.repo_id,
+            local_dir=checkpoint_path,
+            local_dir_use_symlinks=False,
+            ignore_patterns=ignore_patterns)
       except Exception as e:
         logger.error(f"Error downloading model checkpoints {e}")
         return False

{clarifai-11.0.1 → clarifai-11.0.3/clarifai.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: clarifai
-Version: 11.0.1
+Version: 11.0.3
 Summary: Clarifai Python SDK
 Home-page: https://github.com/Clarifai/clarifai-python
 Author: Clarifai

clarifai-11.0.1/clarifai/__init__.py

@@ -1 +0,0 @@
-__version__ = "11.0.1"

clarifai-11.0.1/clarifai/runners/utils/const.py

@@ -1,40 +0,0 @@
-PYTHON_BASE_IMAGE = 'public.ecr.aws/clarifai-models/python-base:{python_version}'
-TORCH_BASE_IMAGE = 'public.ecr.aws/clarifai-models/torch:{torch_version}-py{python_version}-cuda{cuda_version}'
-
-# List of available python base images
-AVAILABLE_PYTHON_IMAGES = ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
-
-DEFAULT_PYTHON_VERSION = 3.11
-
-# List of available torch images
-AVAILABLE_TORCH_IMAGES = [
-    '1.13.1-py3.8-cuda117',
-    '1.13.1-py3.9-cuda117',
-    '1.13.1-py3.10-cuda117',
-    '2.1.2-py3.8-cuda121',
-    '2.1.2-py3.9-cuda121',
-    '2.1.2-py3.10-cuda121',
-    '2.1.2-py3.11-cuda121',
-    '2.2.2-py3.8-cuda121',
-    '2.2.2-py3.9-cuda121',
-    '2.2.2-py3.10-cuda121',
-    '2.2.2-py3.11-cuda121',
-    '2.2.2-py3.12-cuda121',
-    '2.3.1-py3.8-cuda121',
-    '2.3.1-py3.9-cuda121',
-    '2.3.1-py3.10-cuda121',
-    '2.3.1-py3.11-cuda121',
-    '2.3.1-py3.12-cuda121',
-    '2.4.1-py3.8-cuda124',
-    '2.4.1-py3.9-cuda124',
-    '2.4.1-py3.10-cuda124',
-    '2.4.1-py3.11-cuda124',
-    '2.4.1-py3.12-cuda124',
-    '2.5.1-py3.9-cuda124',
-    '2.5.1-py3.10-cuda124',
-    '2.5.1-py3.11-cuda124',
-    '2.5.1-py3.12-cuda124',
-]
-CONCEPTS_REQUIRED_MODEL_TYPE = [
-    'visual-classifier', 'visual-detector', 'visual-segmenter', 'text-classifier'
-]