clarifai 9.8.2__py3-none-any.whl → 9.9.0__py3-none-any.whl

clarifai_utils/schema/search.py

@@ -0,0 +1,60 @@
+from schema import And, Optional, Regex, Schema
+
+
+def get_schema() -> Schema:
+  """Initialize the schema for rank and filter.
+
+        This schema validates:
+
+        - Rank and filter must be a list
+        - Each item in the list must be a dict
+        - The dict can contain these optional keys:
+            - 'image_url': Valid URL string
+            - 'text_raw': Non-empty string
+            - 'metadata': Dict
+            - 'image_bytes': Bytes
+            - 'geo_point': Dict with 'longitude', 'latitude' and 'geo_limit' as float, float and int respectively
+            - 'concepts': List where each item is a concept dict
+        - Concept dict requires at least one of:
+            - 'name': Non-empty string with dashes/underscores
+            - 'id': Non-empty string
+            - 'language': Non-empty string
+            - 'value': 0 or 1 integer
+
+        Returns:
+            Schema: The schema for rank and filter.
+        """
+  # Schema for a single concept
+  concept_schema = Schema({
+      Optional('value'):
+          And(int, lambda x: x in [0, 1]),
+      Optional('id'):
+          And(str, len),
+      Optional('language'):
+          And(str, len),
+      # Non-empty strings with internal dashes and underscores.
+      Optional('name'):
+          And(str, len, Regex(r'^[0-9A-Za-z]+([-_][0-9A-Za-z]+)*$'))
+  })
+
+  # Schema for a rank or filter item
+  rank_filter_item_schema = Schema({
+      Optional('image_url'):
+          And(str, Regex(r'^https?://')),
+      Optional('text_raw'):
+          And(str, len),
+      Optional('metadata'):
+          dict,
+      Optional('image_bytes'):
+          bytes,
+      Optional('geo_point'): {
+          'longitude': float,
+          'latitude': float,
+          'geo_limit': int
+      },
+      Optional("concepts"):
+          And(list, lambda x: all(concept_schema.is_valid(item) and len(item) > 0 for item in x)),
+  })
+
+  # Schema for rank and filter args
+  return Schema([rank_filter_item_schema])

clarifai_utils/versions.py

@@ -1,6 +1,6 @@
 import os
 
-CLIENT_VERSION = '9.8.2'
+CLIENT_VERSION = '9.9.0'
 OS_VER = os.sys.platform
 PYTHON_VERSION = '.'.join(
     map(str, [os.sys.version_info.major, os.sys.version_info.minor, os.sys.version_info.micro]))

clarifai_utils/workflows/export.py

@@ -1,14 +1,13 @@
-import yaml
+from typing import Any, Dict
 
+import yaml
 from google.protobuf.json_format import MessageToDict
 
 VALID_YAML_KEYS = ["workflow", "id", "nodes", "node_inputs", "node_id", "model"]
 
 
 def clean_up_unused_keys(wf: dict):
-  """Removes unused keys from dict before exporting to yaml.
-    Supports nested dicts.
-    """
+  """Removes unused keys from dict before exporting to yaml. Supports nested dicts."""
   new_wf = dict()
   for key, val in wf.items():
     if key not in VALID_YAML_KEYS:
@@ -44,10 +43,12 @@ class Exporter:
   def __enter__(self):
     return self
 
-  def parse(self):
+  def parse(self) -> Dict[str, Any]:
     """Reads a resources_pb2.Workflow object (e.g. from a GetWorkflow response)
-        Returns a cleaned workflow dict.
-        """
+
+    Returns:
+        dict: A dict representation of the workflow.
+    """
     if isinstance(self.wf, list):
       self.wf = self.wf[0]
     wf = {"workflow": MessageToDict(self.wf, preserving_proto_field_name=True)}
@@ -57,7 +58,7 @@ class Exporter:
 
   def export(self, out_path):
     with open(out_path, 'w') as out_file:
-      yaml.dump(self.wf_dict["workflow"], out_file, default_flow_style=True)
+      yaml.dump(self.wf_dict["workflow"], out_file, default_flow_style=False)
 
   def __exit__(self, *args):
     self.close()

clarifai_utils/workflows/utils.py

@@ -31,7 +31,7 @@ def is_same_yaml_model(api_model: resources_pb2.Model, yaml_model: Dict) -> bool
 
   yaml_model_from_api = dict()
   for k, _ in yaml_model.items():
-    if k == "output_info":
+    if k == "output_info" and api_model["model_version"].get("output_info", "") != "":
       yaml_model_from_api[k] = dict(params=api_model["model_version"]["output_info"].get("params"))
     else:
       yaml_model_from_api[k] = api_model.get(k)

clarifai_utils/workflows/validate.py

@@ -1,7 +1,7 @@
 from schema import And, Optional, Regex, Schema, SchemaError, Use
 
 # Non-empty, up to 32-character ASCII strings with internal dashes and underscores.
-_id_validator = And(str, lambda s: 0 < len(s) <= 32, Regex(r'^[0-9A-Za-z]+([-_][0-9A-Za-z]+)*$'))
+_id_validator = And(str, lambda s: 0 < len(s) <= 48, Regex(r'^[0-9A-Za-z]+([-_][0-9A-Za-z]+)*$'))
 
 # 32-character hex string, converted to lower-case.
 _hex_id_validator = And(str, Use(str.lower), Regex(r'^[0-9a-f]{32}'))

clarifai/models/model_serving/envs/triton_conda-cp3.8-torch1.13.1-19f97078.yaml

@@ -1,35 +0,0 @@
-name: triton_conda-cp3.8-torch1.13.1-19f97078
-channels:
-  - conda-forge
-dependencies:
-  - _libgcc_mutex=0.1=conda_forge
-  - _openmp_mutex=4.5=2_gnu
-  - bzip2=1.0.8=h7f98852_4
-  - ca-certificates=2022.12.7=ha878542_0
-  - ld_impl_linux-64=2.40=h41732ed_0
-  - libffi=3.4.2=h7f98852_5
-  - libgcc-ng=12.2.0=h65d4601_19
-  - libgomp=12.2.0=h65d4601_19
-  - libnsl=2.0.0=h7f98852_0
-  - libsqlite=3.40.0=h753d276_0
-  - libuuid=2.32.1=h7f98852_1000
-  - libzlib=1.2.13=h166bdaf_4
-  - ncurses=6.3=h27087fc_1
-  - openssl=3.0.8=h0b41bf4_0
-  - pip=23.0.1=pyhd8ed1ab_0
-  - python=3.8.16=he550d4f_1_cpython
-  - readline=8.1.2=h0f457ee_0
-  - setuptools=67.4.0=pyhd8ed1ab_0
-  - tk=8.6.12=h27826a3_0
-  - wheel=0.38.4=pyhd8ed1ab_0
-  - xz=5.2.6=h166bdaf_0
-  - pip:
-      - numpy==1.24.2
-      - nvidia-cublas-cu11==11.10.3.66
-      - nvidia-cuda-nvrtc-cu11==11.7.99
-      - nvidia-cuda-runtime-cu11==11.7.99
-      - nvidia-cudnn-cu11==8.5.0.96
-      - opencv-python==4.7.0.72
-      - pillow==9.4.0
-      - torch==1.13.1
-      - typing-extensions==4.5.0

clarifai/models/model_serving/envs/triton_conda-cp3.8-torch2.0.0-ce980f28.yaml

@@ -1,51 +0,0 @@
-name: triton_conda-cp3.8-torch2.0.0-ce980f28
-channels:
-  - conda-forge
-dependencies:
-  - _libgcc_mutex=0.1=conda_forge
-  - _openmp_mutex=4.5=2_gnu
-  - bzip2=1.0.8=h7f98852_4
-  - ca-certificates=2023.5.7=hbcca054_0
-  - ld_impl_linux-64=2.40=h41732ed_0
-  - libffi=3.4.2=h7f98852_5
-  - libgcc-ng=13.1.0=he5830b7_0
-  - libgomp=13.1.0=he5830b7_0
-  - libnsl=2.0.0=h7f98852_0
-  - libsqlite=3.42.0=h2797004_0
-  - libuuid=2.38.1=h0b41bf4_0
-  - libzlib=1.2.13=hd590300_5
-  - ncurses=6.4=hcb278e6_0
-  - openssl=3.1.1=hd590300_1
-  - pip=23.1.2=pyhd8ed1ab_0
-  - python=3.8.17=he550d4f_0_cpython
-  - readline=8.2=h8228510_1
-  - setuptools=68.0.0=pyhd8ed1ab_0
-  - tk=8.6.12=h27826a3_0
-  - wheel=0.40.0=pyhd8ed1ab_0
-  - xz=5.2.6=h166bdaf_0
-  - pip:
-      - cmake==3.26.4
-      - filelock==3.12.2
-      - jinja2==3.1.2
-      - lit==16.0.6
-      - markupsafe==2.1.3
-      - mpmath==1.3.0
-      - networkx==3.1
-      - numpy==1.24.2
-      - nvidia-cublas-cu11==11.10.3.66
-      - nvidia-cuda-cupti-cu11==11.7.101
-      - nvidia-cuda-nvrtc-cu11==11.7.99
-      - nvidia-cuda-runtime-cu11==11.7.99
-      - nvidia-cudnn-cu11==8.5.0.96
-      - nvidia-cufft-cu11==10.9.0.58
-      - nvidia-curand-cu11==10.2.10.91
-      - nvidia-cusolver-cu11==11.4.0.1
-      - nvidia-cusparse-cu11==11.7.4.91
-      - nvidia-nccl-cu11==2.14.3
-      - nvidia-nvtx-cu11==11.7.91
-      - opencv-python==4.7.0.72
-      - pillow==9.4.0
-      - sympy==1.12
-      - torch==2.0.0
-      - triton==2.0.0
-      - typing-extensions==4.5.0

clarifai/models/model_serving/examples/image_classification/age_vit/triton_conda.yaml

@@ -1 +0,0 @@
-name: triton_conda-cp3.8-torch1.13.1-19f97078

clarifai/models/model_serving/examples/text_classification/xlm-roberta/triton_conda.yaml

@@ -1 +0,0 @@
-name: triton_conda-cp3.8-torch1.13.1-19f97078

clarifai/models/model_serving/examples/text_to_image/sd-v1.5/triton_conda.yaml

@@ -1 +0,0 @@
-name: triton_conda-cp3.8-torch1.13.1-19f97078

clarifai/models/model_serving/examples/text_to_text/bart-summarize/triton_conda.yaml

@@ -1 +0,0 @@
-name: triton_conda-cp3.8-torch1.13.1-19f97078

clarifai/models/model_serving/examples/visual_detection/yolov5x/triton_conda.yaml

@@ -1 +0,0 @@
-name: triton_conda-cp3.8-torch1.13.1-19f97078

clarifai/models/model_serving/examples/visual_embedding/vit-base/triton_conda.yaml

@@ -1 +0,0 @@
-name: triton_conda-cp3.8-torch1.13.1-19f97078

clarifai/models/model_serving/examples/visual_segmentation/segformer-b2/triton_conda.yaml

@@ -1 +0,0 @@
-name: triton_conda-cp3.8-torch1.13.1-19f97078

clarifai_utils/models/model_serving/envs/triton_conda-cp3.8-torch1.13.1-19f97078.yaml

@@ -1,35 +0,0 @@
-name: triton_conda-cp3.8-torch1.13.1-19f97078
-channels:
-  - conda-forge
-dependencies:
-  - _libgcc_mutex=0.1=conda_forge
-  - _openmp_mutex=4.5=2_gnu
-  - bzip2=1.0.8=h7f98852_4
-  - ca-certificates=2022.12.7=ha878542_0
-  - ld_impl_linux-64=2.40=h41732ed_0
-  - libffi=3.4.2=h7f98852_5
-  - libgcc-ng=12.2.0=h65d4601_19
-  - libgomp=12.2.0=h65d4601_19
-  - libnsl=2.0.0=h7f98852_0
-  - libsqlite=3.40.0=h753d276_0
-  - libuuid=2.32.1=h7f98852_1000
-  - libzlib=1.2.13=h166bdaf_4
-  - ncurses=6.3=h27087fc_1
-  - openssl=3.0.8=h0b41bf4_0
-  - pip=23.0.1=pyhd8ed1ab_0
-  - python=3.8.16=he550d4f_1_cpython
-  - readline=8.1.2=h0f457ee_0
-  - setuptools=67.4.0=pyhd8ed1ab_0
-  - tk=8.6.12=h27826a3_0
-  - wheel=0.38.4=pyhd8ed1ab_0
-  - xz=5.2.6=h166bdaf_0
-  - pip:
-      - numpy==1.24.2
-      - nvidia-cublas-cu11==11.10.3.66
-      - nvidia-cuda-nvrtc-cu11==11.7.99
-      - nvidia-cuda-runtime-cu11==11.7.99
-      - nvidia-cudnn-cu11==8.5.0.96
-      - opencv-python==4.7.0.72
-      - pillow==9.4.0
-      - torch==1.13.1
-      - typing-extensions==4.5.0

clarifai_utils/models/model_serving/envs/triton_conda-cp3.8-torch2.0.0-ce980f28.yaml

@@ -1,51 +0,0 @@
-name: triton_conda-cp3.8-torch2.0.0-ce980f28
-channels:
-  - conda-forge
-dependencies:
-  - _libgcc_mutex=0.1=conda_forge
-  - _openmp_mutex=4.5=2_gnu
-  - bzip2=1.0.8=h7f98852_4
-  - ca-certificates=2023.5.7=hbcca054_0
-  - ld_impl_linux-64=2.40=h41732ed_0
-  - libffi=3.4.2=h7f98852_5
-  - libgcc-ng=13.1.0=he5830b7_0
-  - libgomp=13.1.0=he5830b7_0
-  - libnsl=2.0.0=h7f98852_0
-  - libsqlite=3.42.0=h2797004_0
-  - libuuid=2.38.1=h0b41bf4_0
-  - libzlib=1.2.13=hd590300_5
-  - ncurses=6.4=hcb278e6_0
-  - openssl=3.1.1=hd590300_1
-  - pip=23.1.2=pyhd8ed1ab_0
-  - python=3.8.17=he550d4f_0_cpython
-  - readline=8.2=h8228510_1
-  - setuptools=68.0.0=pyhd8ed1ab_0
-  - tk=8.6.12=h27826a3_0
-  - wheel=0.40.0=pyhd8ed1ab_0
-  - xz=5.2.6=h166bdaf_0
-  - pip:
-      - cmake==3.26.4
-      - filelock==3.12.2
-      - jinja2==3.1.2
-      - lit==16.0.6
-      - markupsafe==2.1.3
-      - mpmath==1.3.0
-      - networkx==3.1
-      - numpy==1.24.2
-      - nvidia-cublas-cu11==11.10.3.66
-      - nvidia-cuda-cupti-cu11==11.7.101
-      - nvidia-cuda-nvrtc-cu11==11.7.99
-      - nvidia-cuda-runtime-cu11==11.7.99
-      - nvidia-cudnn-cu11==8.5.0.96
-      - nvidia-cufft-cu11==10.9.0.58
-      - nvidia-curand-cu11==10.2.10.91
-      - nvidia-cusolver-cu11==11.4.0.1
-      - nvidia-cusparse-cu11==11.7.4.91
-      - nvidia-nccl-cu11==2.14.3
-      - nvidia-nvtx-cu11==11.7.91
-      - opencv-python==4.7.0.72
-      - pillow==9.4.0
-      - sympy==1.12
-      - torch==2.0.0
-      - triton==2.0.0
-      - typing-extensions==4.5.0

clarifai_utils/models/model_serving/examples/image_classification/age_vit/triton_conda.yaml

@@ -1 +0,0 @@
-name: triton_conda-cp3.8-torch1.13.1-19f97078

clarifai_utils/models/model_serving/examples/text_classification/xlm-roberta/triton_conda.yaml

@@ -1 +0,0 @@
-name: triton_conda-cp3.8-torch1.13.1-19f97078

clarifai_utils/models/model_serving/examples/text_to_image/sd-v1.5/triton_conda.yaml

@@ -1 +0,0 @@
-name: triton_conda-cp3.8-torch1.13.1-19f97078

clarifai_utils/models/model_serving/examples/text_to_text/bart-summarize/triton_conda.yaml

@@ -1 +0,0 @@
-name: triton_conda-cp3.8-torch1.13.1-19f97078

clarifai_utils/models/model_serving/examples/visual_detection/yolov5x/triton_conda.yaml

@@ -1 +0,0 @@
-name: triton_conda-cp3.8-torch1.13.1-19f97078

clarifai_utils/models/model_serving/examples/visual_embedding/vit-base/triton_conda.yaml

@@ -1 +0,0 @@
-name: triton_conda-cp3.8-torch1.13.1-19f97078

clarifai_utils/models/model_serving/examples/visual_segmentation/segformer-b2/triton_conda.yaml

@@ -1 +0,0 @@
-name: triton_conda-cp3.8-torch1.13.1-19f97078