clarifai 11.0.4__tar.gz → 11.0.6__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: clarifai
-Version: 11.0.4
+Version: 11.0.6
 Summary: Clarifai Python SDK
 Home-page: https://github.com/Clarifai/clarifai-python
 Author: Clarifai
@@ -20,16 +20,14 @@ 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-grpc>=11.0.4
 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

clarifai-11.0.6/clarifai/__init__.py

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

{clarifai-11.0.4 → clarifai-11.0.6}/clarifai/runners/models/model_run_locally.py

@@ -2,6 +2,7 @@ import hashlib
 import importlib.util
 import inspect
 import os
+import platform
 import shutil
 import signal
 import subprocess
@@ -27,7 +28,7 @@ class ModelRunLocally:
     self.requirements_file = os.path.join(self.model_path, "requirements.txt")
 
     # ModelUploader contains multiple useful methods to interact with the model
-    self.uploader = ModelUploader(self.model_path)
+    self.uploader = ModelUploader(self.model_path, download_validation_only=True)
     self.config = self.uploader.config
 
   def _requirements_hash(self):
@@ -35,6 +36,23 @@ class ModelRunLocally:
     with open(self.requirements_file, "r") as f:
       return hashlib.md5(f.read().encode('utf-8')).hexdigest()
 
+  def _get_env_executable(self):
+    """Get the python executable from the virtual environment."""
+    # Depending on the platform, venv scripts are placed in either "Scripts" (Windows) or "bin" (Linux/Mac)
+    if platform.system().lower().startswith("win"):
+      scripts_folder = "Scripts"
+      python_exe = "python.exe"
+      pip_exe = "pip.exe"
+    else:
+      scripts_folder = "bin"
+      python_exe = "python"
+      pip_exe = "pip"
+
+    self.python_executable = os.path.join(self.venv_dir, scripts_folder, python_exe)
+    self.pip_executable = os.path.join(self.venv_dir, scripts_folder, pip_exe)
+
+    return self.python_executable, self.pip_executable
+
   def create_temp_venv(self):
     """Create a temporary virtual environment."""
     requirements_hash = self._requirements_hash()
@@ -53,13 +71,13 @@ class ModelRunLocally:
 
     self.venv_dir = venv_dir
     self.temp_dir = temp_dir
-    self.python_executable = os.path.join(venv_dir, "bin", "python")
+    self.python_executable, self.pip_executable = self._get_env_executable()
 
     return use_existing_venv
 
   def install_requirements(self):
     """Install the dependencies from requirements.txt and Clarifai."""
-    pip_executable = os.path.join(self.venv_dir, "bin", "pip")
+    _, pip_executable = self._get_env_executable()
     try:
       logger.info(
           f"Installing requirements from {self.requirements_file}... in the virtual environment {self.venv_dir}"
@@ -104,8 +122,7 @@ class ModelRunLocally:
   def _build_request(self):
     """Create a mock inference request for testing the model."""
 
-    uploader = ModelUploader(self.model_path)
-    model_version_proto = uploader.get_model_version_proto()
+    model_version_proto = self.uploader.get_model_version_proto()
     model_version_proto.id = "model_version"
 
     return service_pb2.PostModelOutputsRequest(
@@ -213,12 +230,16 @@ class ModelRunLocally:
 
   def test_model(self):
     """Test the model by running it locally in the virtual environment."""
-    command = [
-        self.python_executable,
-        "-c",
-        f"import sys; sys.path.append('{os.path.dirname(os.path.abspath(__file__))}'); "
-        f"from model_run_locally import ModelRunLocally; ModelRunLocally('{self.model_path}')._run_test()",
-    ]
+
+    import_path = repr(os.path.dirname(os.path.abspath(__file__)))
+    model_path = repr(self.model_path)
+
+    command_string = (f"import sys; "
+                      f"sys.path.append({import_path}); "
+                      f"from model_run_locally import ModelRunLocally; "
+                      f"ModelRunLocally({model_path})._run_test()")
+
+    command = [self.python_executable, "-c", command_string]
     process = None
     try:
       logger.info("Testing the model locally...")
@@ -335,6 +356,12 @@ class ModelRunLocally:
       logger.info(f"Docker image '{image_name}' does not exist!")
       return False
 
+  def _gpu_is_available(self):
+    """
+    Checks if nvidia-smi is available, indicating a GPU is likely accessible.
+    """
+    return shutil.which("nvidia-smi") is not None
+
   def run_docker_container(self,
                            image_name,
                            container_name="clarifai-model-container",
@@ -344,9 +371,9 @@ class ModelRunLocally:
     try:
       logger.info(f"Running Docker container '{container_name}' from image '{image_name}'...")
       # Base docker run command
-      cmd = [
-          "docker", "run", "--name", container_name, '--rm', "--gpus", "all", "--network", "host"
-      ]
+      cmd = ["docker", "run", "--name", container_name, '--rm', "--network", "host"]
+      if self._gpu_is_available():
+        cmd.extend(["--gpus", "all"])
       # Add volume mappings
       cmd.extend(["-v", f"{self.model_path}:/app/model_dir/main"])
       # Add environment variables
@@ -393,9 +420,9 @@ class ModelRunLocally:
     try:
       logger.info("Testing the model inside the Docker container...")
       # Base docker run command
-      cmd = [
-          "docker", "run", "--name", container_name, '--rm', "--gpus", "all", "--network", "host"
-      ]
+      cmd = ["docker", "run", "--name", container_name, '--rm', "--network", "host"]
+      if self._gpu_is_available():
+        cmd.extend(["--gpus", "all"])
       # update the entrypoint for testing the model
       cmd.extend(["--entrypoint", "python"])
       # Add volume mappings
@@ -502,7 +529,10 @@ def main(model_path,
     if not manager.docker_image_exists(image_name):
       manager.build_docker_image(image_name=image_name)
     try:
-      envs = {'CLARIFAI_PAT': os.environ['CLARIFAI_PAT'], 'CLARIFAI_USER_ID': 'n/a'}
+      envs = {
+          'CLARIFAI_PAT': os.environ['CLARIFAI_PAT'],
+          'CLARIFAI_API_BASE': os.environ.get('CLARIFAI_API_BASE', 'https://api.clarifai.com')
+      }
       if run_model_server:
         manager.run_docker_container(
             image_name=image_name, container_name=container_name, port=port, env_vars=envs)

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

@@ -1,6 +1,7 @@
 import os
 import re
 import sys
+import tarfile
 import time
 from string import Template
 
@@ -39,6 +40,8 @@ class ModelUploader:
     just downloading a checkpoint.
     """
     self._client = None
+    if not validate_api_ids:  # for backwards compatibility
+      download_validation_only = True
     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'))
@@ -52,7 +55,7 @@ class ModelUploader:
   def _validate_folder(self, folder):
     if folder == ".":
       folder = ""  # will getcwd() next which ends with /
-    if not folder.startswith("/"):
+    if not os.path.isabs(folder):
       folder = os.path.join(os.getcwd(), folder)
     logger.info(f"Validating folder: {folder}")
     if not os.path.exists(folder):
@@ -426,14 +429,15 @@ class ModelUploader:
 
     model_version_proto = self.get_model_version_proto()
 
-    if download_checkpoints:
-      tar_cmd = f"tar --exclude=*~ --exclude={self.tar_file} -czvf {self.tar_file} -C {self.folder} ."
-    else:  # we don't want to send the checkpoints up even if they are in the folder.
-      logger.info(f"Skipping {self.checkpoint_path} in the tar file that is uploaded.")
-      tar_cmd = f"tar --exclude={self.checkpoint_suffix} --exclude=*~ --exclude={self.tar_file} -czvf {self.tar_file} -C {self.folder} ."
-    # Tar the folder
-    logger.debug(tar_cmd)
-    os.system(tar_cmd)
+    def filter_func(tarinfo):
+      name = tarinfo.name
+      exclude = [self.tar_file, "*~"]
+      if not download_checkpoints:
+        exclude.append(self.checkpoint_suffix)
+      return None if any(name.endswith(ex) for ex in exclude) else tarinfo
+
+    with tarfile.open(self.tar_file, "w:gz") as tar:
+      tar.add(self.folder, arcname=".", filter=filter_func)
     logger.info("Tarring complete, about to start upload.")
 
     file_size = os.path.getsize(self.tar_file)
@@ -465,9 +469,9 @@ class ModelUploader:
     self.model_version_id = response.model_version_id
     logger.info(f"Created Model Version ID: {self.model_version_id}")
     logger.info(f"Full url to that version is: {self.model_url}")
-
-    success = self.monitor_model_build()
-    if success:  # cleanup the tar_file if it exists
+    try:
+      self.monitor_model_build()
+    finally:
       if os.path.exists(self.tar_file):
         logger.info(f"Cleaning up upload file: {self.tar_file}")
         os.remove(self.tar_file)

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

@@ -6,27 +6,17 @@ 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']
+AVAILABLE_PYTHON_IMAGES = ['3.11', '3.12']
 
 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',

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: clarifai
-Version: 11.0.4
+Version: 11.0.6
 Summary: Clarifai Python SDK
 Home-page: https://github.com/Clarifai/clarifai-python
 Author: Clarifai
@@ -20,16 +20,14 @@ 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-grpc>=11.0.4
 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

{clarifai-11.0.4 → clarifai-11.0.6}/clarifai.egg-info/requires.txt

@@ -1,13 +1,11 @@
-clarifai-grpc>=11.0.0
+clarifai-grpc>=11.0.4
 clarifai-protocol>=0.0.14
 numpy>=1.22.0
 tqdm>=4.65.0
-tritonclient>=2.34.0
 rich>=13.4.2
 PyYAML>=6.0.1
 schema==0.7.5
 Pillow>=9.5.0
-inquirerpy==0.3.4
 tabulate>=0.9.0
 fsspec==2024.6.1
 click==8.1.7

{clarifai-11.0.4 → clarifai-11.0.6}/requirements.txt

@@ -1,13 +1,11 @@
-clarifai-grpc>=11.0.0
+clarifai-grpc>=11.0.4
 clarifai-protocol>=0.0.14
 numpy>=1.22.0
 tqdm>=4.65.0
-tritonclient>=2.34.0
 rich>=13.4.2
 PyYAML>=6.0.1
 schema==0.7.5
 Pillow>=9.5.0
-inquirerpy==0.3.4
 tabulate>=0.9.0
 fsspec==2024.6.1
 click==8.1.7

clarifai-11.0.4/clarifai/__init__.py

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