clarifai 10.8.0__tar.gz → 10.8.2__tar.gz

{clarifai-10.8.0/clarifai.egg-info → clarifai-10.8.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: clarifai
-Version: 10.8.0
+Version: 10.8.2
 Summary: Clarifai Python SDK
 Home-page: https://github.com/Clarifai/clarifai-python
 Author: Clarifai
@@ -20,7 +20,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: clarifai-grpc>=10.8.0
+Requires-Dist: clarifai-grpc>=10.8.6
 Requires-Dist: numpy>=1.22.0
 Requires-Dist: tqdm>=4.65.0
 Requires-Dist: tritonclient>=2.34.0
@@ -30,6 +30,7 @@ Requires-Dist: schema==0.7.5
 Requires-Dist: Pillow>=9.5.0
 Requires-Dist: inquirerpy==0.3.4
 Requires-Dist: tabulate>=0.9.0
+Requires-Dist: protobuf==5.27.3
 Provides-Extra: all
 Requires-Dist: pycocotools==2.0.6; extra == "all"
 
@@ -162,7 +163,7 @@ app = client.create_app(app_id="demo_app", base_workflow="Universal")
 dataset = app.create_dataset(dataset_id="demo_dataset")
 
 # execute data upload to Clarifai app dataset
-from clarifai.datasets.upload.laoders.coco_detection import COCODetectionDataLoader
+from clarifai.datasets.upload.loaders.coco_detection import COCODetectionDataLoader
 coco_dataloader = COCODetectionDataLoader("images_dir", "coco_annotation_filepath")
 dataset.upload_dataset(dataloader=coco_dataloader, get_upload_status=True)
 

{clarifai-10.8.0 → clarifai-10.8.2}/README.md

@@ -127,7 +127,7 @@ app = client.create_app(app_id="demo_app", base_workflow="Universal")
 dataset = app.create_dataset(dataset_id="demo_dataset")
 
 # execute data upload to Clarifai app dataset
-from clarifai.datasets.upload.laoders.coco_detection import COCODetectionDataLoader
+from clarifai.datasets.upload.loaders.coco_detection import COCODetectionDataLoader
 coco_dataloader = COCODetectionDataLoader("images_dir", "coco_annotation_filepath")
 dataset.upload_dataset(dataloader=coco_dataloader, get_upload_status=True)
 

clarifai-10.8.2/clarifai/__init__.py

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

{clarifai-10.8.0 → clarifai-10.8.2}/clarifai/client/model.py

@@ -18,8 +18,9 @@ from clarifai.client.base import BaseClient
 from clarifai.client.dataset import Dataset
 from clarifai.client.input import Inputs
 from clarifai.client.lister import Lister
-from clarifai.constants.model import (MAX_MODEL_PREDICT_INPUTS, MODEL_EXPORT_TIMEOUT,
-                                      TRAINABLE_MODEL_TYPES)
+from clarifai.constants.model import (CHUNK_SIZE, MAX_CHUNK_SIZE, MAX_MODEL_PREDICT_INPUTS,
+                                      MAX_RANGE_SIZE, MIN_CHUNK_SIZE, MIN_RANGE_SIZE,
+                                      MODEL_EXPORT_TIMEOUT, RANGE_SIZE, TRAINABLE_MODEL_TYPES)
 from clarifai.errors import UserError
 from clarifai.urls.helper import ClarifaiUrlHelper
 from clarifai.utils.logging import get_logger
@@ -1296,20 +1297,52 @@ class Model(Lister, BaseClient):
       model_export_url = get_model_export_response.export.url
       model_export_file_size = get_model_export_response.export.size
 
-      session = requests.Session()
-      retries = Retry(total=10, backoff_factor=1, status_forcelist=[500, 502, 503, 504])
-      session.mount('https://', HTTPAdapter(max_retries=retries))
-      session.headers.update({'Authorization': self.metadata[0][1]})
-      response = session.get(model_export_url, stream=True)
-      response.raise_for_status()
-
       with open(local_filepath, 'wb') as f:
         progress = tqdm(
             total=model_export_file_size, unit='B', unit_scale=True, desc="Exporting model")
-        for chunk in response.iter_content(chunk_size=8192):
-          f.write(chunk)
-          progress.update(len(chunk))
-        progress.close()
+        downloaded_size = 0
+        range_size = RANGE_SIZE
+        chunk_size = CHUNK_SIZE
+        retry = False
+        retry_count = 0
+        while downloaded_size < model_export_file_size:
+          if downloaded_size + range_size >= model_export_file_size:
+            range_header = f"bytes={downloaded_size}-"
+          else:
+            range_header = f"bytes={downloaded_size}-{(downloaded_size+range_size-1)}"
+          try:
+            session = requests.Session()
+            retries = Retry(total=5, backoff_factor=0.1, status_forcelist=[500, 502, 503, 504])
+            session.mount('https://', HTTPAdapter(max_retries=retries))
+            session.headers.update({'Authorization': self.metadata[0][1], 'Range': range_header})
+            response = session.get(model_export_url, stream=True)
+            response.raise_for_status()
+
+            for chunk in response.iter_content(chunk_size=chunk_size):
+              f.write(chunk)
+              progress.update(len(chunk))
+            f.flush()
+            os.fsync(f.fileno())
+            downloaded_size += range_size
+            if not retry:
+              range_size = (
+                  range_size * 2) if (range_size * 2) < MAX_RANGE_SIZE else MAX_RANGE_SIZE
+              chunk_size = (
+                  chunk_size * 2) if (chunk_size * 2) < MAX_CHUNK_SIZE else MAX_CHUNK_SIZE
+          except Exception as e:
+            self.logger.error(f"Error downloading model: {e}")
+            range_size = (
+                range_size // 2) if (range_size // 2) > MIN_RANGE_SIZE else MIN_RANGE_SIZE
+            chunk_size = (
+                chunk_size // 2) if (chunk_size // 2) > MIN_CHUNK_SIZE else MIN_CHUNK_SIZE
+            retry = True
+            retry_count += 1
+            f.seek(downloaded_size)
+            progress.reset(total=model_export_file_size)
+            progress.update(downloaded_size)
+            if retry_count > 5:
+              break
+      progress.close()
 
       self.logger.info(
           f"Model ID {self.id} with version {self.model_info.model_version.id} exported successfully to {export_dir}/model.tar"

{clarifai-10.8.0 → clarifai-10.8.2}/clarifai/constants/model.py

@@ -4,3 +4,9 @@ TRAINABLE_MODEL_TYPES = [
 ]
 MAX_MODEL_PREDICT_INPUTS = 128
 MODEL_EXPORT_TIMEOUT = 1800
+MIN_RANGE_SIZE = 4194304  # 4MB
+MAX_RANGE_SIZE = 314572800  # 300MB
+MIN_CHUNK_SIZE = 131072  # 128KB
+MAX_CHUNK_SIZE = 10485760  # 10MB
+RANGE_SIZE = 31457280  # 30MB
+CHUNK_SIZE = 1048576  # 1MB

{clarifai-10.8.0 → clarifai-10.8.2}/clarifai/datasets/export/inputs_annotations.py

@@ -196,7 +196,7 @@ class InputAnnotationDownloader:
 
     if data_dict.get("concepts") or data_dict.get("regions"):
       file_name = os.path.join(split, "annotations", input_.id + ".json")
-      annot_data = data_dict.get("regions", []) + data_dict.get("concepts")
+      annot_data = data_dict.get("regions", []) + data_dict.get("concepts", [])
 
       self._save_annotation_to_archive(new_archive, annot_data, file_name)
       self.num_annotations += 1

{clarifai-10.8.0 → clarifai-10.8.2/clarifai.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: clarifai
-Version: 10.8.0
+Version: 10.8.2
 Summary: Clarifai Python SDK
 Home-page: https://github.com/Clarifai/clarifai-python
 Author: Clarifai
@@ -20,7 +20,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: clarifai-grpc>=10.8.0
+Requires-Dist: clarifai-grpc>=10.8.6
 Requires-Dist: numpy>=1.22.0
 Requires-Dist: tqdm>=4.65.0
 Requires-Dist: tritonclient>=2.34.0
@@ -30,6 +30,7 @@ Requires-Dist: schema==0.7.5
 Requires-Dist: Pillow>=9.5.0
 Requires-Dist: inquirerpy==0.3.4
 Requires-Dist: tabulate>=0.9.0
+Requires-Dist: protobuf==5.27.3
 Provides-Extra: all
 Requires-Dist: pycocotools==2.0.6; extra == "all"
 
@@ -162,7 +163,7 @@ app = client.create_app(app_id="demo_app", base_workflow="Universal")
 dataset = app.create_dataset(dataset_id="demo_dataset")
 
 # execute data upload to Clarifai app dataset
-from clarifai.datasets.upload.laoders.coco_detection import COCODetectionDataLoader
+from clarifai.datasets.upload.loaders.coco_detection import COCODetectionDataLoader
 coco_dataloader = COCODetectionDataLoader("images_dir", "coco_annotation_filepath")
 dataset.upload_dataset(dataloader=coco_dataloader, get_upload_status=True)
 

{clarifai-10.8.0 → clarifai-10.8.2}/clarifai.egg-info/requires.txt

@@ -1,4 +1,4 @@
-clarifai-grpc>=10.8.0
+clarifai-grpc>=10.8.6
 numpy>=1.22.0
 tqdm>=4.65.0
 tritonclient>=2.34.0
@@ -8,6 +8,7 @@ schema==0.7.5
 Pillow>=9.5.0
 inquirerpy==0.3.4
 tabulate>=0.9.0
+protobuf==5.27.3
 
 [all]
 pycocotools==2.0.6

{clarifai-10.8.0 → clarifai-10.8.2}/requirements.txt

@@ -1,4 +1,4 @@
-clarifai-grpc>=10.8.0
+clarifai-grpc>=10.8.6
 numpy>=1.22.0
 tqdm>=4.65.0
 tritonclient>=2.34.0
@@ -8,3 +8,4 @@ schema==0.7.5
 Pillow>=9.5.0
 inquirerpy==0.3.4
 tabulate>=0.9.0
+protobuf==5.27.3

clarifai-10.8.0/clarifai/__init__.py

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