clarifai 11.0.5__tar.gz → 11.0.6rc2__tar.gz

{clarifai-11.0.5/clarifai.egg-info → clarifai-11.0.6rc2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.1
 Name: clarifai
-Version: 11.0.5
+Version: 11.0.6rc2
 Summary: Clarifai Python SDK
 Home-page: https://github.com/Clarifai/clarifai-python
 Author: Clarifai
@@ -19,33 +19,8 @@ Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: clarifai-grpc>=11.0.0
-Requires-Dist: clarifai-protocol>=0.0.14
-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: fsspec==2024.6.1
-Requires-Dist: click==8.1.7
 Provides-Extra: all
-Requires-Dist: pycocotools==2.0.6; extra == "all"
-Dynamic: author
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
-Dynamic: license
-Dynamic: provides-extra
-Dynamic: requires-dist
-Dynamic: requires-python
-Dynamic: summary
+License-File: LICENSE
 
 <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-11.0.6rc2/clarifai/__init__.py

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

{clarifai-11.0.5 → clarifai-11.0.6rc2}/clarifai/cli/model.py

@@ -5,8 +5,7 @@ from clarifai.cli.base import cli
 
 @cli.group(['model'])
 def model():
-  """Manage models: upload, test locally, run_locally, predict"""
-  pass
+  """Manage models: upload, test locally, run locally, predict, and more"""
 
 
 @model.command()
@@ -34,6 +33,20 @@ def upload(model_path, download_checkpoints, skip_dockerfile):
   model_upload.main(model_path, download_checkpoints, skip_dockerfile)
 
 
+@model.command()
+@click.option(
+    '--model_path',
+    type=click.Path(exists=True),
+    required=True,
+    help='Path to the model directory.')
+def download_checkpoints(model_path):
+  """Download checkpoints from external source to local model_path"""
+
+  from clarifai.runners.models.model_upload import ModelUploader
+  uploader = ModelUploader(model_path, download_validation_only=True)
+  uploader.download_checkpoints()
+
+
 @model.command()
 @click.option(
     '--model_path',

clarifai-11.0.6rc2/clarifai/runners/dockerfile_template/Dockerfile.template

@@ -0,0 +1,67 @@
+# syntax=docker/dockerfile:1
+#############################
+# User specific requirements installed in the pip_packages
+#############################
+FROM --platform=$TARGETPLATFORM ${DOWNLOAD_IMAGE} as pip_packages
+
+COPY --link requirements.txt /home/nonroot/requirements.txt
+
+# Update clarifai package so we always have latest protocol to the API. Everything should land in /venv
+RUN pip install --no-cache-dir -r /home/nonroot/requirements.txt && \
+    (pip install --upgrade --upgrade-strategy only-if-needed --no-deps --no-cache-dir clarifai clarifai-grpc clarifai-protocol || true)
+#############################
+
+#############################
+# Final image
+#############################
+FROM --platform=$TARGETPLATFORM ${BASE_IMAGE} as final
+
+# Set the NUMBA cache dir to /tmp
+# Set the TORCHINDUCTOR cache dir to /tmp
+# The CLARIFAI* will be set by the templaing system.
+ENV CLARIFAI_PAT=${CLARIFAI_PAT} \
+    CLARIFAI_USER_ID=${CLARIFAI_USER_ID} \
+    CLARIFAI_RUNNER_ID=${CLARIFAI_RUNNER_ID} \
+    CLARIFAI_NODEPOOL_ID=${CLARIFAI_NODEPOOL_ID} \
+    CLARIFAI_COMPUTE_CLUSTER_ID=${CLARIFAI_COMPUTE_CLUSTER_ID} \
+    CLARIFAI_API_BASE=${CLARIFAI_API_BASE} \
+    NUMBA_CACHE_DIR=/tmp/numba_cache \
+    TORCHINDUCTOR_CACHE_DIR=/tmp/torchinductor_cache \
+    HOME=/tmp \
+    DEBIAN_FRONTEND=noninteractive
+
+# make sure we have the latest clarifai package.
+RUN (pip install --upgrade --upgrade-strategy only-if-needed --no-cache-dir clarifai clarifai-grpc clarifai-protocol huggingface_hub[hf_transfer] || true)
+
+#####
+# Download any checkpoints now into the final image so we don't copy large checkpoints across stages.
+#####
+# This creates the directory that HF downloader will populate and with nonroot:nonroot permissions up.
+COPY --chown=nonroot:nonroot downloader/requirements.txt /home/nonroot/model_dir/main/1/checkpoints/.cache/not_used.yaml
+
+# Mount the folder with the download_checkpoints.py, config.yaml that's been parsed then download
+# the checkpoints. This invalidates the cache if we have a different repo_id to download, but the
+# HF_TOKEN changing does not invalidate. It's validated before running the dockerfile
+RUN --mount=type=secret,id=HF_TOKEN,env=HF_TOKEN --mount=type=bind,rw,source=downloader,target=/home/nonroot/model_dir/main [ -s /home/nonroot/model_dir/main/config.yaml ] && clarifai models download-checkpoints --model_path /home/nonroot/model_dir/main
+#####
+
+#####
+# Copy the python packages from the previous stage.
+#####
+COPY --link=true --from=pip_packages /venv /venv
+#####
+# Copy in the actual files like config.yaml, requirements.txt, and most importantly 1/model.py
+# for the actual model.
+# If checkpoints aren't downloaded since a checkpoints: block is not provided, then they will
+# be in the build context and copied here as well.
+COPY --link=true 1/model.py /home/nonroot/main/1/model.py
+# At this point we only need these for validation in the SDK.
+COPY --link=true requirements.txt config.yaml /home/nonroot/main/
+
+# Add the model directory to the python path.
+ENV PYTHONPATH=${PYTHONPATH}:/home/nonroot/main
+# Finally run the clarifai entrypoint to start the runner loop and local dev server.
+# Note(zeiler): we may want to make this a clarifai CLI call.
+ENTRYPOINT ["python", "-m", "clarifai.runners.server"]
+CMD ["--model_path", "/home/nonroot/main"]
+#############################

{clarifai-11.0.5 → clarifai-11.0.6rc2}/clarifai/runners/models/model_upload.py

@@ -278,14 +278,15 @@ class ModelUploader:
       )
       python_version = DEFAULT_PYTHON_VERSION
 
-    base_image = PYTHON_BASE_IMAGE.format(python_version=python_version)
+    download_image = PYTHON_BASE_IMAGE.format(python_version=python_version)
 
     # Parse the requirements.txt file to determine the base image
     dependencies = self._parse_requirements()
     if 'torch' in dependencies and dependencies['torch']:
       torch_version = dependencies['torch']
 
-      for image in AVAILABLE_TORCH_IMAGES:
+      # Sort in reverse so that newer cuda versions come first and are preferred.
+      for image in sorted(AVAILABLE_TORCH_IMAGES, reverse=True):
         if torch_version in image and f'py{python_version}' in image:
           cuda_version = image.split('-')[-1].replace('cuda', '')
           base_image = TORCH_BASE_IMAGE.format(
@@ -295,11 +296,13 @@ class ModelUploader:
           )
           logger.info(f"Using Torch version {torch_version} base image to build the Docker image")
           break
-
+    else:  # if not torch then use the download image for the base image too
+      base_image = download_image
     # Replace placeholders with actual values
     dockerfile_content = dockerfile_template.safe_substitute(
         name='main',
-        BASE_IMAGE=base_image,
+        DOWNLOAD_IMAGE=download_image,  # for downloading
+        BASE_IMAGE=base_image,  # for runtime
     )
 
     # Write Dockerfile

{clarifai-11.0.5 → clarifai-11.0.6rc2}/clarifai/runners/utils/const.py

@@ -11,23 +11,24 @@ AVAILABLE_PYTHON_IMAGES = ['3.11', '3.12', '3.13']
 DEFAULT_PYTHON_VERSION = 3.12
 
 # List of available torch images
+# Keep sorted by most recent cuda version.
 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.0-py3.11-cuda121',
     '2.4.1-py3.11-cuda124',
-    '2.5.1-py3.11-cuda121',
+    '2.4.1-py3.11-cuda121',
     '2.5.1-py3.11-cuda124',
+    '2.5.1-py3.11-cuda121',
     '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.0-py3.12-cuda121',
     '2.4.1-py3.12-cuda124',
-    '2.5.1-py3.12-cuda121',
+    '2.4.1-py3.12-cuda121',
     '2.5.1-py3.12-cuda124',
+    '2.5.1-py3.12-cuda121',
     # '2.2.2-py3.13-cuda121',
     # '2.3.1-py3.13-cuda121',
     # '2.4.0-py3.13-cuda121',

{clarifai-11.0.5 → clarifai-11.0.6rc2}/clarifai/runners/utils/loader.py

@@ -44,6 +44,7 @@ class HuggingFaceLoader:
       from huggingface_hub import snapshot_download
     except ImportError:
       raise ImportError(self.HF_DOWNLOAD_TEXT)
+    os.environ['HF_HUB_ENABLE_HF_TRANSFER'] = '1'
     if os.path.exists(checkpoint_path) and self.validate_download(checkpoint_path):
       logger.info("Checkpoints already exist")
       return True

{clarifai-11.0.5 → clarifai-11.0.6rc2}/clarifai/utils/logging.py

@@ -143,7 +143,7 @@ def _configure_logger(name: str, logger_level: Union[int, str] = logging.NOTSET)
   else:
     # Add the new rich handler and formatter
     handler = RichHandler(
-        rich_tracebacks=True, log_time_format="%Y-%m-%d %H:%M:%S", console=Console(width=255))
+        rich_tracebacks=True, log_time_format="%Y-%m-%d %H:%M:%S.%f", console=Console(width=255))
     formatter = logging.Formatter('%(name)s:  %(message)s')
     handler.setFormatter(formatter)
     logger.addHandler(handler)

{clarifai-11.0.5 → clarifai-11.0.6rc2/clarifai.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.1
 Name: clarifai
-Version: 11.0.5
+Version: 11.0.6rc2
 Summary: Clarifai Python SDK
 Home-page: https://github.com/Clarifai/clarifai-python
 Author: Clarifai
@@ -19,33 +19,8 @@ Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: clarifai-grpc>=11.0.0
-Requires-Dist: clarifai-protocol>=0.0.14
-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: fsspec==2024.6.1
-Requires-Dist: click==8.1.7
 Provides-Extra: all
-Requires-Dist: pycocotools==2.0.6; extra == "all"
-Dynamic: author
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
-Dynamic: license
-Dynamic: provides-extra
-Dynamic: requires-dist
-Dynamic: requires-python
-Dynamic: summary
+License-File: LICENSE
 
 <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>