clarifai 10.10.1__py3-none-any.whl → 10.11.0__py3-none-any.whl

clarifai/__init__.py

@@ -1 +1 @@
-__version__ = "10.10.1"
+__version__ = "10.11.0"

clarifai/cli/model.py

@@ -39,11 +39,16 @@ def upload(model_path, download_checkpoints, skip_dockerfile):
     type=click.Path(exists=True),
     required=True,
     help='Path to the model directory.')
-def test_locally(model_path):
+@click.option(
+    '--keep_env',
+    is_flag=True,
+    help='Flag to keep the virtual environment after testing the model\
+    locally. Defaults to False, which will delete the virtual environment after testing.')
+def test_locally(model_path, keep_env=False):
   """Test model locally."""
   try:
     from clarifai.runners.models import model_run_locally
-    model_run_locally.main(model_path)
+    model_run_locally.main(model_path, keep_env=keep_env)
     click.echo(f"Model tested locally from {model_path}.")
   except Exception as e:
     click.echo(f"Failed to test model locally: {e}", err=True)

clarifai/client/model.py

@@ -743,7 +743,7 @@ class Model(Lister, BaseClient):
       file_bytes = f.read()
 
     return self.generate_by_bytes(
-        filepath=file_bytes,
+        input_bytes=file_bytes,
         input_type=input_type,
         compute_cluster_id=compute_cluster_id,
         nodepool_id=nodepool_id,

clarifai/datasets/export/inputs_annotations.py

@@ -165,6 +165,14 @@ class InputAnnotationDownloader:
   def _save_annotation_to_archive(self, new_archive: zipfile.ZipFile, annot_data: List[Dict],
                                   file_name: str) -> None:
     """Gets the annotation response bytestring (from requests) and append to zip file."""
+    # Fill zero values for missing bounding box keys
+    for annot in annot_data:
+      if annot.get('regionInfo') and annot['regionInfo'].get('boundingBox'):
+        bbox = annot['regionInfo']['boundingBox']
+        bbox.setdefault('topRow', 0)
+        bbox.setdefault('leftCol', 0)
+        bbox.setdefault('bottomRow', 0)
+        bbox.setdefault('rightCol', 0)
     # Serialize the dictionary to a JSON string
     json_str = json.dumps(annot_data)
     # Convert the JSON string to bytes

clarifai/runners/models/base_typed_model.py

@@ -24,7 +24,8 @@ class AnyAnyModel(ModelRunner):
     list_input_dict = [
         InputDataHandler.from_proto(input).to_python() for input in input_request.inputs
     ]
-    inference_params = json_format.MessageToDict(input_request.model.output_info.params)
+    inference_params = json_format.MessageToDict(
+        input_request.model.model_version.output_info.params)
 
     return list_input_dict, inference_params
 
@@ -141,7 +142,8 @@ class VisualInputModel(AnyAnyModel):
     list_input_dict = [
         InputDataHandler.from_proto(input).image(format="np") for input in input_request.inputs
     ]
-    inference_params = json_format.MessageToDict(input_request.model.output_info.params)
+    inference_params = json_format.MessageToDict(
+        input_request.model.model_version.output_info.params)
 
     return list_input_dict, inference_params
 
@@ -181,7 +183,8 @@ class TextInputModel(AnyAnyModel):
   def parse_input_request(
       self, input_request: service_pb2.PostModelOutputsRequest) -> Tuple[List[Dict], Dict]:
     list_input_text = [InputDataHandler.from_proto(input).text for input in input_request.inputs]
-    inference_params = json_format.MessageToDict(input_request.model.output_info.params)
+    inference_params = json_format.MessageToDict(
+        input_request.model.model_version.output_info.params)
 
     return list_input_text, inference_params
 

clarifai/runners/models/model_run_locally.py

@@ -1,3 +1,4 @@
+import hashlib
 import importlib.util
 import inspect
 import os
@@ -13,6 +14,7 @@ from clarifai_grpc.grpc.api.status import status_code_pb2, status_pb2
 from clarifai_protocol import BaseRunner
 
 from clarifai.runners.models.model_upload import ModelUploader
+from clarifai.runners.utils.url_fetcher import ensure_urls_downloaded
 from clarifai.utils.logging import logger
 
 
@@ -24,17 +26,26 @@ class ModelRunLocally:
 
   def create_temp_venv(self):
     """Create a temporary virtual environment."""
-    logger.info("Creating temporary virtual environment...")
-    temp_dir = tempfile.mkdtemp()
+    with open(self.requirements_file, "r") as f:
+      requirements_hash = hashlib.md5(f.read().encode('utf-8')).hexdigest()
+
+    temp_dir = os.path.join(tempfile.gettempdir(), str(requirements_hash))
     venv_dir = os.path.join(temp_dir, "venv")
-    venv.create(venv_dir, with_pip=True)
+
+    if os.path.exists(temp_dir):
+      logger.info(f"Using previous virtual environment at {temp_dir}")
+      use_existing_venv = True
+    else:
+      logger.info("Creating temporary virtual environment...")
+      use_existing_venv = False
+      venv.create(venv_dir, with_pip=True)
+      logger.info(f"Created temporary virtual environment at {venv_dir}")
 
     self.venv_dir = venv_dir
     self.temp_dir = temp_dir
     self.python_executable = os.path.join(venv_dir, "bin", "python")
 
-    logger.info(f"Created temporary virtual environment at {venv_dir}")
-    return venv_dir, temp_dir
+    return use_existing_venv
 
   def install_requirements(self):
     """Install the dependencies from requirements.txt and Clarifai."""
@@ -102,6 +113,8 @@ class ModelRunLocally:
     """Perform inference using the runner."""
     request = self._build_request()
 
+    ensure_urls_downloaded(request)
+
     try:
       return runner.predict(request)
     except Exception as e:
@@ -175,16 +188,18 @@ class ModelRunLocally:
       shutil.rmtree(self.temp_dir)
 
 
-def main(model_path, run_model_server=False):
+def main(model_path, run_model_server=False, keep_env=False):
 
   manager = ModelRunLocally(model_path)
-  manager.create_temp_venv()
+  use_existing_env = manager.create_temp_venv()
 
   try:
-    manager.install_requirements()
+    if not use_existing_env:
+      manager.install_requirements()
     if run_model_server:
       manager.run_model_server()
     else:
       manager.test_model()
   finally:
-    manager.clean_up()
+    if not keep_env:
+      manager.clean_up()

clarifai/runners/models/model_upload.py

@@ -126,7 +126,7 @@ class ModelUploader:
       user_id = model.get('user_id')
       app_id = model.get('app_id')
 
-      base = os.environ.get('CLARIFAI_API_BASE', 'https://api-dev.clarifai.com')
+      base = os.environ.get('CLARIFAI_API_BASE', 'https://api.clarifai.com')
 
       self._client = BaseClient(user_id=user_id, app_id=app_id, base=base)
 

clarifai/runners/utils/url_fetcher.py

@@ -6,25 +6,32 @@ from clarifai.utils.logging import logger
 
 
 def download_input(input):
+  _download_input_data(input.data)
+  if input.data.parts:
+    for i in range(len(input.data.parts)):
+      _download_input_data(input.data.parts[i].data)
+
+
+def _download_input_data(input_data):
   """
   This function will download any urls that are not already bytes.
   """
-  if input.data.image.url and not input.data.image.base64:
+  if input_data.image.url and not input_data.image.base64:
     # Download the image
-    with fsspec.open(input.data.image.url, 'rb') as f:
-      input.data.image.base64 = f.read()
-  if input.data.video.url and not input.data.video.base64:
+    with fsspec.open(input_data.image.url, 'rb') as f:
+      input_data.image.base64 = f.read()
+  if input_data.video.url and not input_data.video.base64:
     # Download the video
-    with fsspec.open(input.data.video.url, 'rb') as f:
-      input.data.video.base64 = f.read()
-  if input.data.audio.url and not input.data.audio.base64:
+    with fsspec.open(input_data.video.url, 'rb') as f:
+      input_data.video.base64 = f.read()
+  if input_data.audio.url and not input_data.audio.base64:
     # Download the audio
-    with fsspec.open(input.data.audio.url, 'rb') as f:
-      input.data.audio.base64 = f.read()
-  if input.data.text.url and not input.data.text.raw:
+    with fsspec.open(input_data.audio.url, 'rb') as f:
+      input_data.audio.base64 = f.read()
+  if input_data.text.url and not input_data.text.raw:
     # Download the text
-    with fsspec.open(input.data.text.url, 'r') as f:
-      input.data.text.raw = f.read()
+    with fsspec.open(input_data.text.url, 'r') as f:
+      input_data.text.raw = f.read()
 
 
 def ensure_urls_downloaded(request, max_threads=128):

{clarifai-10.10.1.dist-info → clarifai-10.11.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: clarifai
-Version: 10.10.1
+Version: 10.11.0
 Summary: Clarifai Python SDK
 Home-page: https://github.com/Clarifai/clarifai-python
 Author: Clarifai
@@ -20,22 +20,22 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: clarifai-grpc >=10.9.11
-Requires-Dist: clarifai-protocol >=0.0.6
-Requires-Dist: numpy >=1.22.0
-Requires-Dist: tqdm >=4.65.0
-Requires-Dist: tritonclient >=2.34.0
-Requires-Dist: rich >=13.4.2
-Requires-Dist: PyYAML >=6.0.1
-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
-Requires-Dist: fsspec ==2024.6.1
-Requires-Dist: click ==8.1.7
+Requires-Dist: clarifai-grpc>=10.10.2
+Requires-Dist: clarifai-protocol>=0.0.6
+Requires-Dist: numpy>=1.22.0
+Requires-Dist: tqdm>=4.65.0
+Requires-Dist: tritonclient>=2.34.0
+Requires-Dist: rich>=13.4.2
+Requires-Dist: PyYAML>=6.0.1
+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
+Requires-Dist: fsspec==2024.6.1
+Requires-Dist: click==8.1.7
 Provides-Extra: all
-Requires-Dist: pycocotools ==2.0.6 ; extra == 'all'
+Requires-Dist: pycocotools==2.0.6; extra == "all"
 
 <h1 align="center">
   <a href="https://www.clarifai.com/"><img alt="Clarifai" title="Clarifai" src="https://github.com/user-attachments/assets/623b883b-7fe5-4b95-bbfa-8691f5779af4"></a>

{clarifai-10.10.1.dist-info → clarifai-10.11.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-clarifai/__init__.py,sha256=9zsqePD7LCjMaH7l_9eXWc_FNCxosvR1TP75yQryev4,24
+clarifai/__init__.py,sha256=QlkUWf1vZWZO1B4-0PjOW339CFFq5tlWz3teIz9l6-E,24
 clarifai/cli.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 clarifai/errors.py,sha256=RwzTajwds51wLD0MVlMC5kcpBnzRpreDLlazPSBZxrg,2605
 clarifai/versions.py,sha256=jctnczzfGk_S3EnVqb2FjRKfSREkNmvNEwAAa_VoKiQ,222
@@ -7,7 +7,7 @@ clarifai/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 clarifai/cli/base.py,sha256=okuBNlMmLEQw9-0f4yzemCtneNNRTVXUugCwD58-ZtQ,3417
 clarifai/cli/compute_cluster.py,sha256=N2dNQNJEPg9nxsb8x2igEzYuGRzjn7l4kNttjFIxmhI,1827
 clarifai/cli/deployment.py,sha256=sUEuz5-rtozMx8deVcJXLi6lHsP2jc8x3y2MpUAVfqY,2506
-clarifai/cli/model.py,sha256=lp_5FGO-lWb07c7nNHEsJ6NA0mxVyvL3wqU5N-_sbEU,1934
+clarifai/cli/model.py,sha256=0DRp3TjySvRwyUnt-v1nqhYOcTnVtEZ0jdXH4TBtuQ8,2183
 clarifai/cli/nodepool.py,sha256=yihxS_rIFoBBKzRlqBX8Ab42iPpBMJrJFsk8saph6ms,3049
 clarifai/client/__init__.py,sha256=xI1U0l5AZdRThvQAXCLsd9axxyFzXXJ22m8LHqVjQRU,662
 clarifai/client/app.py,sha256=6pckYme1urV2YJjLIYfeZ-vH0Z5YSQa51jzIMcEfwug,38342
@@ -17,7 +17,7 @@ clarifai/client/dataset.py,sha256=AIzwbYs-ExkmUqW9nuEJgpW8-D7rjA1PtopU5Iu6YZE,32
 clarifai/client/deployment.py,sha256=w7Y6pA1rYG4KRK1SwusRZc2sQRXlG8wezuVdzSWpCo0,2586
 clarifai/client/input.py,sha256=GvrPV2chThNjimekBIleuIr6AD10_wrfc-1Hm5C4NQ8,45648
 clarifai/client/lister.py,sha256=03KGMvs5RVyYqxLsSrWhNc34I8kiF1Ph0NeyEwu7nMU,2082
-clarifai/client/model.py,sha256=WmLBPm_rDzbPR_Cxo8gnntBnPiWFt3gYKiiKuJ9lH04,84652
+clarifai/client/model.py,sha256=8koRWV_-cLLtZYFHQzNxMFw2X1VXAZ6aJI-1cOp6r4U,84655
 clarifai/client/module.py,sha256=FTkm8s9m-EaTKN7g9MnLhGJ9eETUfKG7aWZ3o1RshYs,4204
 clarifai/client/nodepool.py,sha256=la3vTFrO4LX8zm2eQ5jqf2L0-kQ63Dano8FibadoZbk,10152
 clarifai/client/search.py,sha256=GaPWN6JmTQGZaCHr6U1yv0zqR6wKFl7i9IVLg2ul1CI,14254
@@ -36,7 +36,7 @@ clarifai/constants/search.py,sha256=yYEqTaFg-KdnpJE_Ytp-EPVHIIC395iNtZrpVlLIf4o,
 clarifai/constants/workflow.py,sha256=cECq1xdvf44MCdtK2AbkiuuwhyL-6OWZdQfYbsLKy_o,33
 clarifai/datasets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 clarifai/datasets/export/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-clarifai/datasets/export/inputs_annotations.py,sha256=vqe3CBlWTgeBnIoRnjwIRnOj5QmH1480efSk8tv2mCg,9796
+clarifai/datasets/export/inputs_annotations.py,sha256=3AtUBrMIjw8H3ehDsJFYcBFoAZ1QKQo1hXTMsHh8f20,10159
 clarifai/datasets/upload/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 clarifai/datasets/upload/base.py,sha256=UIc0ufyIBCrb83_sFpv21L8FshsX4nwsLYQkdlJfzD4,2357
 clarifai/datasets/upload/features.py,sha256=jv2x7jGZKS-LMt87sEZNBwwOskHbP26XTMjoiaSA5pg,2024
@@ -64,17 +64,17 @@ clarifai/runners/__init__.py,sha256=3vr4RVvN1IRy2SxJpyycAAvrUBbH-mXR7pqUmu4w36A,
 clarifai/runners/server.py,sha256=CVLrv2DjzCvKVXcJ4SWvcFWUZq0bdlBmyEpfVlfgT2A,4902
 clarifai/runners/dockerfile_template/Dockerfile.template,sha256=-T38Rscpjot8WVuUTUq1_N0xz_gg653FOHV4XQYGG-U,1453
 clarifai/runners/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-clarifai/runners/models/base_typed_model.py,sha256=OnAk08Lo2Y1fGiBc6JJ6UvJ8P435cTsikTNYDkStDpI,7790
+clarifai/runners/models/base_typed_model.py,sha256=DWEUK5ge9NVZE6LkT3BNTFYjYMPHz-nDgPA48Y0DGXU,7859
 clarifai/runners/models/model_class.py,sha256=9JSPAr4U4K7xI0kSl-q0mHB06zknm2OR-8XIgBCto94,1611
-clarifai/runners/models/model_run_locally.py,sha256=xbNcD0TMRlk52cUjJH-qenlkeiwS4YcOeb8eYy7KAEI,6583
+clarifai/runners/models/model_run_locally.py,sha256=6LgRzTTDjmGvAV6gEUhW3T3yoCMpLqkOUGa4anZUbig,7144
 clarifai/runners/models/model_runner.py,sha256=3vzoastQxkGRDK8T9aojDsLNBb9A3IiKm6YmbFrE9S0,6241
 clarifai/runners/models/model_servicer.py,sha256=X4715PVA5PBurRTYcwSEudg8fShGV6InAF4mmRlRcHg,2826
-clarifai/runners/models/model_upload.py,sha256=ocd6vnm9Pms9AMwi7j5yTjIHQY6LS9yopTTX6uocJvE,20434
+clarifai/runners/models/model_upload.py,sha256=N3KCAHibeTJdnlDx1vixYkV1vl6lI6GA8LL7TuvUax8,20430
 clarifai/runners/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 clarifai/runners/utils/data_handler.py,sha256=sxy9zlAgI6ETuxCQhUgEXAn2GCsaW1GxpK6GTaMne0g,6966
 clarifai/runners/utils/data_utils.py,sha256=R1iQ82TuQ9JwxCJk8yEB1Lyb0BYVhVbWJI9YDi1zGOs,318
 clarifai/runners/utils/loader.py,sha256=1oktDUQA1Lpv0NiCXFwoxpp0jqqbvB7sWvpymwyWY2E,4243
-clarifai/runners/utils/url_fetcher.py,sha256=-Hwjb1SURszn7zUVwi4Of0-nrksfZy-uqT4SvPGCgSU,1446
+clarifai/runners/utils/url_fetcher.py,sha256=v_8JOWmkyFAzsBulsieKX7Nfjy1Yg7wGSZeqfEvw2cg,1640
 clarifai/schema/search.py,sha256=JjTi8ammJgZZ2OGl4K6tIA4zEJ1Fr2ASZARXavI1j5c,2448
 clarifai/urls/helper.py,sha256=tjoMGGHuWX68DUB0pk4MEjrmFsClUAQj2jmVEM_Sy78,4751
 clarifai/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -91,9 +91,9 @@ clarifai/workflows/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 clarifai/workflows/export.py,sha256=vICRhIreqDSShxLKjHNM2JwzKsf1B4fdXB0ciMcA70k,1945
 clarifai/workflows/utils.py,sha256=nGeB_yjVgUO9kOeKTg4OBBaBz-AwXI3m-huSVj-9W18,1924
 clarifai/workflows/validate.py,sha256=yJq03MaJqi5AK3alKGJJBR89xmmjAQ31sVufJUiOqY8,2556
-clarifai-10.10.1.dist-info/LICENSE,sha256=mUqF_d12-qE2n41g7C5_sq-BMLOcj6CNN-jevr15YHU,555
-clarifai-10.10.1.dist-info/METADATA,sha256=01eG2EIX_sgN8tgNkHnAD782mje2gLrspqrAFUEmSic,19566
-clarifai-10.10.1.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
-clarifai-10.10.1.dist-info/entry_points.txt,sha256=X9FZ4Z-i_r2Ud1RpZ9sNIFYuu_-9fogzCMCRUD9hyX0,51
-clarifai-10.10.1.dist-info/top_level.txt,sha256=wUMdCQGjkxaynZ6nZ9FAnvBUCgp5RJUVFSy2j-KYo0s,9
-clarifai-10.10.1.dist-info/RECORD,,
+clarifai-10.11.0.dist-info/LICENSE,sha256=mUqF_d12-qE2n41g7C5_sq-BMLOcj6CNN-jevr15YHU,555
+clarifai-10.11.0.dist-info/METADATA,sha256=C1A5Myx1yQUdZRhpNDzOV-zm6a7OfBVbSireNn1e7mY,19550
+clarifai-10.11.0.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+clarifai-10.11.0.dist-info/entry_points.txt,sha256=X9FZ4Z-i_r2Ud1RpZ9sNIFYuu_-9fogzCMCRUD9hyX0,51
+clarifai-10.11.0.dist-info/top_level.txt,sha256=wUMdCQGjkxaynZ6nZ9FAnvBUCgp5RJUVFSy2j-KYo0s,9
+clarifai-10.11.0.dist-info/RECORD,,

{clarifai-10.10.1.dist-info → clarifai-10.11.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.5.0)
+Generator: setuptools (75.6.0)
 Root-Is-Purelib: true
 Tag: py3-none-any