clarifai 10.11.2rc2__tar.gz → 10.11.2rc3__tar.gz

{clarifai-10.11.2rc2/clarifai.egg-info → clarifai-10.11.2rc3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: clarifai
-Version: 10.11.2rc2
+Version: 10.11.2rc3
 Summary: Clarifai Python SDK
 Home-page: https://github.com/Clarifai/clarifai-python
 Author: Clarifai

clarifai-10.11.2rc3/clarifai/__init__.py

@@ -0,0 +1 @@
+__version__ = "10.11.2rc3"

{clarifai-10.11.2rc2 → clarifai-10.11.2rc3}/clarifai/runners/models/model_upload.py

@@ -29,16 +29,19 @@ def _clear_line(n: int = 1) -> None:
 
 class ModelUploader:
 
-  def __init__(self, folder: str, validate_api_ids: bool = True):
+  def __init__(self, folder: str, validate_api_ids: bool = True, download_validation_only=False):
     """
     :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.
+    :param validate_api_ids: Whether to validate the user_id and app_id in the config file. TODO:
+    deprecate in favor of download_validation_only.
+    :param download_validation_only: Whether to skip the API config validation. Set to True if
+    just downloading a checkpoint.
     """
     self._client = None
+    self.download_validation_only = download_validation_only
     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
@@ -46,19 +49,21 @@ class ModelUploader:
     self.inference_compute_info = self._get_inference_compute_info()
     self.is_v3 = True  # Do model build for v3
 
-  @staticmethod
-  def _validate_folder(folder):
+  def _validate_folder(self, folder):
     if not folder.startswith("/"):
       folder = os.path.join(os.getcwd(), folder)
     logger.info(f"Validating folder: {folder}")
     if not os.path.exists(folder):
       raise FileNotFoundError(f"Folder {folder} not found, please provide a valid folder path")
     files = os.listdir(folder)
-    assert "requirements.txt" in files, "requirements.txt not found in the folder"
     assert "config.yaml" in files, "config.yaml not found in the folder"
+    # If just downloading we don't need requirements.txt or the python code, we do need the
+    # 1/ folder to put 1/checkpoints into.
     assert "1" in files, "Subfolder '1' not found in the folder"
-    subfolder_files = os.listdir(os.path.join(folder, '1'))
-    assert 'model.py' in subfolder_files, "model.py not found in the folder"
+    if not self.download_validation_only:
+      assert "requirements.txt" in files, "requirements.txt not found in the folder"
+      subfolder_files = os.listdir(os.path.join(folder, '1'))
+      assert 'model.py' in subfolder_files, "model.py not found in the folder"
     return folder
 
   @staticmethod
@@ -83,8 +88,6 @@ 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
@@ -114,16 +117,14 @@ class ModelUploader:
       sys.exit(1)
 
   def _validate_config(self):
-    self._validate_config_model()
-
-    if self.config.get("checkpoints"):
-      self._validate_config_checkpoints()
+    if not self.download_validation_only:
+      self._validate_config_model()
 
-    assert "inference_compute_info" in self.config, "inference_compute_info not found in the config file"
+      assert "inference_compute_info" in self.config, "inference_compute_info not found in the config file"
 
-    if self.config.get("concepts"):
-      model_type_id = self.config.get('model').get('model_type_id')
-      assert model_type_id in CONCEPTS_REQUIRED_MODEL_TYPE, f"Model type {model_type_id} not supported for concepts"
+      if self.config.get("concepts"):
+        model_type_id = self.config.get('model').get('model_type_id')
+        assert model_type_id in CONCEPTS_REQUIRED_MODEL_TYPE, f"Model type {model_type_id} not supported for concepts"
 
     if self.config.get("checkpoints"):
       _, hf_token = self._validate_config_checkpoints()

{clarifai-10.11.2rc2 → clarifai-10.11.2rc3/clarifai.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: clarifai
-Version: 10.11.2rc2
+Version: 10.11.2rc3
 Summary: Clarifai Python SDK
 Home-page: https://github.com/Clarifai/clarifai-python
 Author: Clarifai

clarifai-10.11.2rc2/clarifai/__init__.py

@@ -1 +0,0 @@
-__version__ = "10.11.2rc2"