clarifai 10.8.4__py3-none-any.whl → 10.8.5__py3-none-any.whl

clarifai/__init__.py

@@ -1 +1 @@
-__version__ = "10.8.4"
+__version__ = "10.8.5"

clarifai/client/dataset.py

@@ -25,6 +25,7 @@ from clarifai.datasets.export.inputs_annotations import (DatasetExportReader,
 from clarifai.datasets.upload.base import ClarifaiDataLoader
 from clarifai.datasets.upload.image import (VisualClassificationDataset, VisualDetectionDataset,
                                             VisualSegmentationDataset)
+from clarifai.datasets.upload.multimodal import MultiModalDataset
 from clarifai.datasets.upload.text import TextClassificationDataset
 from clarifai.datasets.upload.utils import DisplayUploadStatus
 from clarifai.errors import UserError
@@ -352,14 +353,15 @@ class Dataset(Lister, BaseClient):
         if input_details:
           failed_input_details = [
               index, failed_id, input_details.status.details,
-              dataset_obj.data_generator[index].image_path,
+              getattr(dataset_obj.data_generator[index], 'image_path', None) or
+              getattr(dataset_obj.data_generator[index], 'text', None),
               dataset_obj.data_generator[index].labels, dataset_obj.data_generator[index].metadata
           ]
           failed_inputs_logs.append(failed_input_details)
 
       failed_table = tabulate(
           failed_inputs_logs,
-          headers=["Index", "Input ID", "Status", "Image Path", "Labels", "Metadata"],
+          headers=["Index", "Input ID", "Status", "Input", "Labels", "Metadata"],
           tablefmt="grid")
       timestamp = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
       self.logger.warning(
@@ -422,7 +424,8 @@ class Dataset(Lister, BaseClient):
     if self.task not in DATASET_UPLOAD_TASKS:
       raise UserError("Task should be one of \
                       'text_classification', 'visual_classification', \
-                      'visual_detection', 'visual_segmentation', 'visual_captioning'")
+                      'visual_detection', 'visual_segmentation', 'visual_captioning', 'multimodal_dataset'"
+                     )
 
     if self.task == "text_classification":
       dataset_obj = TextClassificationDataset(dataloader, self.id)
@@ -433,6 +436,9 @@ class Dataset(Lister, BaseClient):
     elif self.task == "visual_segmentation":
       dataset_obj = VisualSegmentationDataset(dataloader, self.id)
 
+    elif self.task == "multimodal_dataset":
+      dataset_obj = MultiModalDataset(dataloader, self.id)
+
     else:  # visual_classification & visual_captioning
       dataset_obj = VisualClassificationDataset(dataloader, self.id)
 

clarifai/constants/dataset.py

@@ -1,6 +1,6 @@
 DATASET_UPLOAD_TASKS = [
     "visual_classification", "text_classification", "visual_detection", "visual_segmentation",
-    "visual_captioning"
+    "visual_captioning", "multimodal_dataset"
 ]
 
 TASK_TO_ANNOTATION_TYPE = {

clarifai/datasets/upload/base.py

@@ -4,21 +4,24 @@ from typing import Iterator, List, Tuple, TypeVar, Union
 from clarifai_grpc.grpc.api import resources_pb2
 
 from clarifai.constants.dataset import DATASET_UPLOAD_TASKS
-from clarifai.datasets.upload.features import (TextFeatures, VisualClassificationFeatures,
+from clarifai.datasets.upload.features import (MultiModalFeatures, TextFeatures,
+                                               VisualClassificationFeatures,
                                                VisualDetectionFeatures, VisualSegmentationFeatures)
 
 OutputFeaturesType = TypeVar(
     'OutputFeaturesType',
     bound=Union[TextFeatures, VisualClassificationFeatures, VisualDetectionFeatures,
-                VisualSegmentationFeatures])
+                VisualSegmentationFeatures, MultiModalFeatures])
 
 
 class ClarifaiDataset:
   """Clarifai datasets base class."""
 
-  def __init__(self, data_generator: 'ClarifaiDataLoader', dataset_id: str) -> None:
+  def __init__(self, data_generator: 'ClarifaiDataLoader', dataset_id: str,
+               max_workers: int = 4) -> None:
     self.data_generator = data_generator
     self.dataset_id = dataset_id
+    self.max_workers = max_workers
     self.all_input_ids = {}
     self._all_input_protos = {}
     self._all_annotation_protos = defaultdict(list)

clarifai/datasets/upload/features.py

@@ -49,3 +49,13 @@ class VisualSegmentationFeatures:
   metadata: Optional[dict] = None
   image_bytes: Optional[bytes] = None
   label_ids: Optional[List[str]] = None
+
+
+@dataclass
+class MultiModalFeatures:
+  """Multi-modal datasets preprocessing output features."""
+  text: str
+  image_bytes: str
+  labels: List[Union[str, int]] = None  # List[str or int] to cater for multi-class tasks
+  id: Optional[int] = None  # image_id
+  metadata: Optional[dict] = None

clarifai/datasets/upload/image.py

@@ -1,5 +1,4 @@
 import os
-import uuid
 from concurrent.futures import ThreadPoolExecutor
 from typing import List, Tuple, Type
 
@@ -8,12 +7,16 @@ from google.protobuf.struct_pb2 import Struct
 
 from clarifai.client.input import Inputs
 from clarifai.datasets.upload.base import ClarifaiDataLoader, ClarifaiDataset
+from clarifai.utils.misc import get_uuid
 
 
 class VisualClassificationDataset(ClarifaiDataset):
 
-  def __init__(self, data_generator: Type[ClarifaiDataLoader], dataset_id: str) -> None:
-    super().__init__(data_generator, dataset_id)
+  def __init__(self,
+               data_generator: Type[ClarifaiDataLoader],
+               dataset_id: str,
+               max_workers: int = 4) -> None:
+    super().__init__(data_generator, dataset_id, max_workers)
 
   def _extract_protos(self, batch_input_ids: List[str]
                      ) -> Tuple[List[resources_pb2.Input], List[resources_pb2.Annotation]]:
@@ -33,7 +36,7 @@ class VisualClassificationDataset(ClarifaiDataset):
       labels = data_item.labels if isinstance(data_item.labels,
                                               list) else [data_item.labels]  # clarifai concept
       label_ids = data_item.label_ids
-      input_id = f"{self.dataset_id}-{uuid.uuid4().hex[:8]}" if data_item.id is None else f"{self.dataset_id}-{str(data_item.id)}"
+      input_id = f"{self.dataset_id}-{get_uuid(8)}" if data_item.id is None else f"{self.dataset_id}-{str(data_item.id)}"
       geo_info = data_item.geo_info
       if data_item.metadata is not None:
         metadata.update(data_item.metadata)
@@ -64,7 +67,7 @@ class VisualClassificationDataset(ClarifaiDataset):
                 geo_info=geo_info,
                 metadata=metadata))
 
-    with ThreadPoolExecutor(max_workers=4) as executor:
+    with ThreadPoolExecutor(max_workers=self.max_workers) as executor:
       futures = [executor.submit(process_data_item, id) for id in batch_input_ids]
       for job in futures:
         job.result()
@@ -75,8 +78,11 @@ class VisualClassificationDataset(ClarifaiDataset):
 class VisualDetectionDataset(ClarifaiDataset):
   """Visual detection dataset proto class."""
 
-  def __init__(self, data_generator: Type[ClarifaiDataLoader], dataset_id: str) -> None:
-    super().__init__(data_generator, dataset_id)
+  def __init__(self,
+               data_generator: Type[ClarifaiDataLoader],
+               dataset_id: str,
+               max_workers: int = 4) -> None:
+    super().__init__(data_generator, dataset_id, max_workers)
 
   def _extract_protos(self, batch_input_ids: List[int]
                      ) -> Tuple[List[resources_pb2.Input], List[resources_pb2.Annotation]]:
@@ -101,7 +107,7 @@ class VisualDetectionDataset(ClarifaiDataset):
       else:
         label_ids = None
       bboxes = data_item.bboxes  # [[xmin,ymin,xmax,ymax],...,[xmin,ymin,xmax,ymax]]
-      input_id = f"{self.dataset_id}-{uuid.uuid4().hex[:8]}" if data_item.id is None else f"{self.dataset_id}-{str(data_item.id)}"
+      input_id = f"{self.dataset_id}-{get_uuid(8)}" if data_item.id is None else f"{self.dataset_id}-{str(data_item.id)}"
       if data_item.metadata is not None:
         metadata.update(data_item.metadata)
       else:
@@ -135,7 +141,7 @@ class VisualDetectionDataset(ClarifaiDataset):
                 bbox=bboxes[i],
                 label_id=label_ids[i] if label_ids else None))
 
-    with ThreadPoolExecutor(max_workers=4) as executor:
+    with ThreadPoolExecutor(max_workers=self.max_workers) as executor:
       futures = [executor.submit(process_data_item, id) for id in batch_input_ids]
       for job in futures:
         job.result()
@@ -146,8 +152,11 @@ class VisualDetectionDataset(ClarifaiDataset):
 class VisualSegmentationDataset(ClarifaiDataset):
   """Visual segmentation dataset proto class."""
 
-  def __init__(self, data_generator: Type[ClarifaiDataLoader], dataset_id: str) -> None:
-    super().__init__(data_generator, dataset_id)
+  def __init__(self,
+               data_generator: Type[ClarifaiDataLoader],
+               dataset_id: str,
+               max_workers: int = 4) -> None:
+    super().__init__(data_generator, dataset_id, max_workers)
 
   def _extract_protos(self, batch_input_ids: List[str]
                      ) -> Tuple[List[resources_pb2.Input], List[resources_pb2.Annotation]]:
@@ -172,7 +181,7 @@ class VisualSegmentationDataset(ClarifaiDataset):
       else:
         label_ids = None
       _polygons = data_item.polygons  # list of polygons: [[[x,y],...,[x,y]],...]
-      input_id = f"{self.dataset_id}-{uuid.uuid4().hex[:8]}" if data_item.id is None else f"{self.dataset_id}-{str(data_item.id)}"
+      input_id = f"{self.dataset_id}-{get_uuid(8)}" if data_item.id is None else f"{self.dataset_id}-{str(data_item.id)}"
       if data_item.metadata is not None:
         metadata.update(data_item.metadata)
       else:
@@ -210,7 +219,7 @@ class VisualSegmentationDataset(ClarifaiDataset):
         except IndexError:
           continue
 
-    with ThreadPoolExecutor(max_workers=4) as executor:
+    with ThreadPoolExecutor(max_workers=self.max_workers) as executor:
       futures = [executor.submit(process_data_item, id) for id in batch_input_ids]
       for job in futures:
         job.result()

clarifai/datasets/upload/multimodal.py

@@ -0,0 +1,70 @@
+from concurrent.futures import ThreadPoolExecutor
+from typing import List, Tuple, Type
+
+from clarifai_grpc.grpc.api import resources_pb2
+from google.protobuf.struct_pb2 import Struct
+
+from clarifai.client.input import Inputs
+from clarifai.datasets.upload.base import ClarifaiDataLoader, ClarifaiDataset
+from clarifai.utils.misc import get_uuid
+
+
+class MultiModalDataset(ClarifaiDataset):
+
+  def __init__(self,
+               data_generator: Type[ClarifaiDataLoader],
+               dataset_id: str,
+               max_workers: int = 4) -> None:
+    super().__init__(data_generator, dataset_id, max_workers)
+
+  def _extract_protos(
+      self,
+      batch_input_ids: List[str],
+  ) -> Tuple[List[resources_pb2.Input]]:
+    """ Creats Multimodal (image and text) input protos for batch of input ids.
+        Args:
+            batch_input_ids: List of input IDs to retrieve the protos for.
+        Returns:
+            input_protos: List of input protos.
+
+        """
+    input_protos, annotation_protos = [], []
+
+    def process_data_item(id):
+      data_item = self.data_generator[id]
+      metadata = Struct()
+      image_bytes = data_item.image_bytes
+      text = data_item.text
+      labels = data_item.labels if isinstance(data_item.labels, list) else [data_item.labels]
+      id = get_uuid(8)
+      input_id = f"{self.dataset_id}-{id}" if data_item.id is None else f"{self.dataset_id}-{str(data_item.id)}"
+      if data_item.metadata is not None:
+        metadata.update(data_item.metadata)
+      else:
+        metadata = None
+
+      self.all_input_ids[id] = input_id
+      if data_item.image_bytes is not None:
+        input_protos.append(
+            Inputs.get_input_from_bytes(
+                input_id=input_id,
+                image_bytes=image_bytes,
+                dataset_id=self.dataset_id,
+                labels=labels,
+                metadata=metadata))
+      else:
+        input_protos.append(
+            Inputs.get_text_input(
+                input_id=input_id,
+                raw_text=text,
+                dataset_id=self.dataset_id,
+                labels=labels,
+                metadata=metadata))
+
+    with ThreadPoolExecutor(max_workers=self.max_workers) as executor:
+      futures = [executor.submit(process_data_item, id) for id in batch_input_ids]
+
+      for job in futures:
+        job.result()
+
+    return input_protos, annotation_protos

clarifai/datasets/upload/text.py

@@ -1,4 +1,3 @@
-import uuid
 from concurrent.futures import ThreadPoolExecutor
 from typing import List, Tuple, Type
 
@@ -6,6 +5,7 @@ from clarifai_grpc.grpc.api import resources_pb2
 from google.protobuf.struct_pb2 import Struct
 
 from clarifai.client.input import Inputs
+from clarifai.utils.misc import get_uuid
 
 from .base import ClarifaiDataLoader, ClarifaiDataset
 
@@ -13,8 +13,11 @@ from .base import ClarifaiDataLoader, ClarifaiDataset
 class TextClassificationDataset(ClarifaiDataset):
   """Upload text classification datasets to clarifai datasets"""
 
-  def __init__(self, data_generator: Type[ClarifaiDataLoader], dataset_id: str) -> None:
-    super().__init__(data_generator, dataset_id)
+  def __init__(self,
+               data_generator: Type[ClarifaiDataLoader],
+               dataset_id: str,
+               max_workers: int = 4) -> None:
+    super().__init__(data_generator, dataset_id, max_workers)
 
   def _extract_protos(self, batch_input_ids: List[int]
                      ) -> Tuple[List[resources_pb2.Input], List[resources_pb2.Annotation]]:
@@ -34,7 +37,7 @@ class TextClassificationDataset(ClarifaiDataset):
       labels = data_item.labels if isinstance(data_item.labels,
                                               list) else [data_item.labels]  # clarifai concept
       label_ids = data_item.label_ids
-      input_id = f"{self.dataset_id}-{uuid.uuid4().hex[:8]}" if data_item.id is None else f"{self.dataset_id}-{str(data_item.id)}"
+      input_id = f"{self.dataset_id}-{get_uuid(8)}" if data_item.id is None else f"{self.dataset_id}-{str(data_item.id)}"
       if data_item.metadata is not None:
         metadata.update(data_item.metadata)
 
@@ -48,7 +51,7 @@ class TextClassificationDataset(ClarifaiDataset):
               label_ids=label_ids,
               metadata=metadata))
 
-    with ThreadPoolExecutor(max_workers=4) as executor:
+    with ThreadPoolExecutor(max_workers=self.max_workers) as executor:
       futures = [executor.submit(process_data_item, id) for id in batch_input_ids]
       for job in futures:
         job.result()

clarifai/utils/misc.py

@@ -1,4 +1,5 @@
 import os
+import uuid
 from typing import Any, Dict, List
 
 from clarifai.errors import UserError
@@ -69,3 +70,8 @@ def concept_relations_accumulation(relations_dict: Dict[str, Any], subject_conce
     relations_dict[object_concept] = []
     relations_dict[subject_concept] = []
   return relations_dict
+
+
+def get_uuid(val: int) -> str:
+  """Generates a UUID."""
+  return uuid.uuid4().hex[:val]

{clarifai-10.8.4.dist-info → clarifai-10.8.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: clarifai
-Version: 10.8.4
+Version: 10.8.5
 Summary: Clarifai Python SDK
 Home-page: https://github.com/Clarifai/clarifai-python
 Author: Clarifai
@@ -32,6 +32,7 @@ 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
 Provides-Extra: all
 Requires-Dist: pycocotools ==2.0.6 ; extra == 'all'
 

{clarifai-10.8.4.dist-info → clarifai-10.8.5.dist-info}/RECORD

@@ -1,11 +1,11 @@
-clarifai/__init__.py,sha256=HSKp-CWoewa1bRsD-uVM7lGOdBh9yxh5X4Qc8hkw9ak,23
+clarifai/__init__.py,sha256=2-_okis9rQrTd70xh0ljzdLxGlwhIxOh6pYB-vr7Zmk,23
 clarifai/cli.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 clarifai/errors.py,sha256=RwzTajwds51wLD0MVlMC5kcpBnzRpreDLlazPSBZxrg,2605
 clarifai/versions.py,sha256=jctnczzfGk_S3EnVqb2FjRKfSREkNmvNEwAAa_VoKiQ,222
 clarifai/client/__init__.py,sha256=xI1U0l5AZdRThvQAXCLsd9axxyFzXXJ22m8LHqVjQRU,662
 clarifai/client/app.py,sha256=VC5TqeYVNUyENPxOOKNSAl0q3ivPiqg-gtRr77ACIIM,38424
 clarifai/client/base.py,sha256=JXbbjg2CXo8rOdw-XgKWWtLVAhPv3OZua5LFT5w4U2Q,7380
-clarifai/client/dataset.py,sha256=XX-J-9Ict1CQrEycq-JbdxUTuucSgLeDSvnlHE1ucQY,29903
+clarifai/client/dataset.py,sha256=AmkeYdZI7oe7ZCEh4odTuzC5r4ESCmkdHHo4v23dSeQ,30204
 clarifai/client/input.py,sha256=ZLqa1jGx4NgCbunOTpJxCq4lDQ5xAf4GQ0rsZY8AHCM,44456
 clarifai/client/lister.py,sha256=03KGMvs5RVyYqxLsSrWhNc34I8kiF1Ph0NeyEwu7nMU,2082
 clarifai/client/model.py,sha256=YqeCwk1v_Rs2L6OTZSkDZvxGaxMoFMYuxVV7s9jdd0I,74416
@@ -17,7 +17,7 @@ clarifai/client/auth/__init__.py,sha256=7EwR0NrozkAUwpUnCsqXvE_p0wqx_SelXlSpKShK
 clarifai/client/auth/helper.py,sha256=hqwI7Zlsvivc-O9aAdtxyJT3zkpuMvbxjRaiCTsWYGk,14183
 clarifai/client/auth/register.py,sha256=2CMdBsoVLoTfjyksE6j7BM2tiEc73WKYvxnwDDgNn1k,536
 clarifai/client/auth/stub.py,sha256=xy4-fV0W8keCgXld4eOVzFQEIKxOktNwtL5bLztReug,4940
-clarifai/constants/dataset.py,sha256=Puz6_FfTm30G5FVBb1GJsobMkNtbg0Y2Soy7eyHjvtI,587
+clarifai/constants/dataset.py,sha256=vjK3IlgXu31HycuvjRSzEQSqhU6xfj5TIgo6IpyUWoc,609
 clarifai/constants/input.py,sha256=WcHwToUVIK9ItAhDefaSohQHCLNeR55PSjZ0BFnoZ3U,28
 clarifai/constants/model.py,sha256=Um1hLfMFlh5R_vtP3Z6P-o6zon-tdbLcKVIl4PucrV4,438
 clarifai/constants/rag.py,sha256=WcHwToUVIK9ItAhDefaSohQHCLNeR55PSjZ0BFnoZ3U,28
@@ -27,10 +27,11 @@ clarifai/datasets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU
 clarifai/datasets/export/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 clarifai/datasets/export/inputs_annotations.py,sha256=7c6HWdATI4aPCRoCPZetUBNNEz9dBhbyYX1QqX-xYe4,9744
 clarifai/datasets/upload/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-clarifai/datasets/upload/base.py,sha256=IP4sdBRfThk2l0W1rDWciFrAJnKwVsM-gu4zEslJ2_E,2198
-clarifai/datasets/upload/features.py,sha256=oq0PGpAw8LEafiSkdMMl0yn-NJeZ7K_CKzpJ71b0H40,1731
-clarifai/datasets/upload/image.py,sha256=pNFTThEVGIK9RNIsUuSSQE59LfO-tKkhsXSR7CONAEg,8293
-clarifai/datasets/upload/text.py,sha256=KM_LupAqYYxmbl1Q5nTsr3eV1RAYDfr-2xzf4cP6rfY,2083
+clarifai/datasets/upload/base.py,sha256=UIc0ufyIBCrb83_sFpv21L8FshsX4nwsLYQkdlJfzD4,2357
+clarifai/datasets/upload/features.py,sha256=jv2x7jGZKS-LMt87sEZNBwwOskHbP26XTMjoiaSA5pg,2024
+clarifai/datasets/upload/image.py,sha256=HlCsfEMu_C4GVecGSv52RUJ6laLW8H64Pfj_FQyX6qg,8580
+clarifai/datasets/upload/multimodal.py,sha256=2_s4SCotzacVMdnqkM7upSR3Ovxh3b9oW1hSWhKyxO4,2373
+clarifai/datasets/upload/text.py,sha256=boVJenfQZKf79aXu8CEP4g_ANzX5ROdd06g07O7RnXU,2198
 clarifai/datasets/upload/utils.py,sha256=h7mtN9FZXhQQbf47EXczgb-NTY2uOE9AJlE9u4-hDwI,9627
 clarifai/datasets/upload/loaders/README.md,sha256=aNRutSCTzLp2ruIZx74ZkN5AxpzwKOxMa7OzabnKpwg,2980
 clarifai/datasets/upload/loaders/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -40,50 +41,6 @@ clarifai/datasets/upload/loaders/imagenet_classification.py,sha256=LuylazxpI5V8f
 clarifai/datasets/upload/loaders/xview_detection.py,sha256=hk8cZdYZimm4KOaZvBjYcC6ikURZMn51xmn7pXZT3HE,6052
 clarifai/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 clarifai/models/api.py,sha256=d3FQQlG0mNDLrfEvchqaVcq4Tgb_TqryNnJtwp3c7sE,10961
-clarifai/models/model_serving/README.md,sha256=zXnKybVoIF_LYHKKY2vijTCaGcb2-GJ5kef2uB1WFrs,4241
-clarifai/models/model_serving/__init__.py,sha256=78fiK9LvdGvpMxICmZWqSIyS6BFATjW2s5R6_GgtbPA,645
-clarifai/models/model_serving/constants.py,sha256=8eVT6iYGRF4s4SKoHFUmDwCX6C2EiEiCOP1MIgtcc6A,692
-clarifai/models/model_serving/utils.py,sha256=vdFLyxvcDJhgFdw2jaOsVNVmLlw87ymGTgQachVleOU,1089
-clarifai/models/model_serving/cli/__init__.py,sha256=Nls28G-fedNw2oQZIkPQSN__TgjJXbG9RDzzuHIM0VI,575
-clarifai/models/model_serving/cli/_utils.py,sha256=CZTKKiaoO1Mg5MKQS2Qhgy4JRjnkEHqy8zY5U6b6C0w,1734
-clarifai/models/model_serving/cli/base.py,sha256=k4ARNU1koNzGAi9ach6Vpk7hpISZySiYHyKjkBLuHLg,283
-clarifai/models/model_serving/cli/build.py,sha256=-C4PBt-9xO9YsyUagz3kF4J0_PsYb6YVKFY8y-VmY5I,2786
-clarifai/models/model_serving/cli/clarifai_clis.py,sha256=sGDDj7MrlU3goWLQm4H9dCf4lPD2Ojx50_jdIoxb5QM,663
-clarifai/models/model_serving/cli/create.py,sha256=wtKcVi8XSPN-Fx0RrSUxEwH1hm5TbZ_FrCEMIS9yszM,5598
-clarifai/models/model_serving/cli/example_cli.py,sha256=tCm0J4EI0kuuSRhEiPTuraSA-bUYwtEFEHcL1eOXzRI,1039
-clarifai/models/model_serving/cli/login.py,sha256=IQHL3SdERThnCTGPp5HnI41B0-BTzzGb2wx0P8-KIIA,771
-clarifai/models/model_serving/cli/upload.py,sha256=kOz8OOEobo6sLUkS1xg0672PTmMkx0aWxjKMhSRlMwM,7013
-clarifai/models/model_serving/docs/cli.md,sha256=fLgyY8sYMPjYQW_q8Q9yJYB_ryDVGbzj2VouJgvkEFw,4564
-clarifai/models/model_serving/docs/concepts.md,sha256=ppQADibKQInf9JpfcH7wIpcMndTZ3618or5yzMhGNOE,9376
-clarifai/models/model_serving/docs/dependencies.md,sha256=apwg_IxDBzovtQYXRpWMU9pUqdf0VaS10yMVOYYXhoc,728
-clarifai/models/model_serving/docs/inference_parameters.md,sha256=EFBQs3OGQNH512zoLJKMfFD6WXE_Tzt_Uvts877VvpQ,4111
-clarifai/models/model_serving/docs/model_types.md,sha256=3sALugeBTMspEnlPNWXI8xtWCxjMDQYjrAji_jgqHVo,1013
-clarifai/models/model_serving/model_config/__init__.py,sha256=MLnCl4U2UlL8hkvKbKifFX2nKRjVN63687-gxiKf8g4,734
-clarifai/models/model_serving/model_config/base.py,sha256=Jow6cFvREtWRaaXw1hobWJks0uYsOi9oL973ZPEfIkk,14636
-clarifai/models/model_serving/model_config/config.py,sha256=EWkPcui370QEYJAjlzuLupLlaZF2BgFbK0Jhx_JDHnk,10188
-clarifai/models/model_serving/model_config/inference_parameter.py,sha256=fDPRkwsntaGZWQWOiCW8x0tcyHPeSCYZwBZoZb2oBzw,3924
-clarifai/models/model_serving/model_config/output.py,sha256=uyXY-B9mmoe8lizTpYEBRYI1KDNQh3ihEiEB4Ne65uc,4634
-clarifai/models/model_serving/model_config/model_types_config/multimodal-embedder.yaml,sha256=4wFQ2R8PiJrXR_8AEgUDD-22gY9sK93y9r68mSOOVnw,541
-clarifai/models/model_serving/model_config/model_types_config/text-classifier.yaml,sha256=0hicyQM-R2Za62RaBexdNCkHBDdacwMRVAL8Yk_sVzs,421
-clarifai/models/model_serving/model_config/model_types_config/text-embedder.yaml,sha256=MEnVsO3-SAOFSW7-b0BOSxgUNxdhXfmE98hXstBt104,395
-clarifai/models/model_serving/model_config/model_types_config/text-to-image.yaml,sha256=FPO9ic0R_mcFa3nIGon9z3negy1q6LsPRNmJ-wqGhyw,383
-clarifai/models/model_serving/model_config/model_types_config/text-to-text.yaml,sha256=7u_0kdiR2iEuXTKHtErUzZZ8ghUdep-RuWmJd9i8BdY,371
-clarifai/models/model_serving/model_config/model_types_config/visual-classifier.yaml,sha256=UDq-VtnnnhuI7NCJOYM19kFvcMS0aOvDDMSblPk5iYY,468
-clarifai/models/model_serving/model_config/model_types_config/visual-detector.yaml,sha256=cJsalUTzXclXpgzH9CutpWQqseJNg9FrI7WjU3wpfuQ,852
-clarifai/models/model_serving/model_config/model_types_config/visual-embedder.yaml,sha256=OQYdrY81rD3WNooHRkOiQASvL3XfGG9GGzT61jEsrT8,406
-clarifai/models/model_serving/model_config/model_types_config/visual-segmenter.yaml,sha256=mQLwA1JnnvWZwp26lVxzwfhp1GS7hH9yHh7mtOUt9rY,474
-clarifai/models/model_serving/model_config/triton/__init__.py,sha256=uJUjpRauhVp6_9sN5DRQi7bwIKEtHPKyQqcCVj6Aj2g,719
-clarifai/models/model_serving/model_config/triton/serializer.py,sha256=eYwXfaJkeXMaiQq_EDG4vWOCc1CKfnC_U6dSp2Urak0,4278
-clarifai/models/model_serving/model_config/triton/triton_config.py,sha256=mDZafUByvEgM1vd0QZL8nM-cOCqeR-06iOC2T6x8hr4,4696
-clarifai/models/model_serving/model_config/triton/wrappers.py,sha256=-O8t2AEJXvqJlUNtKtr8CUlxLjheV2GfBtM0sB_B1v0,8660
-clarifai/models/model_serving/repo_build/__init__.py,sha256=jFb0RNG4Jh63TH35_Urv0EyNXVMW8FEC2NVHXhlbvqg,673
-clarifai/models/model_serving/repo_build/build.py,sha256=IlJTjt5YI1alAGv1Fw3kPZeh3yqi45R20rKbWN9vV1s,7195
-clarifai/models/model_serving/repo_build/static_files/_requirements.txt,sha256=lIXMfxC4BP6QA5hraObPOwUS3PK9F2mA0Gf8KvlijQE,34
-clarifai/models/model_serving/repo_build/static_files/base_test.py,sha256=Ne5H5JKTQTBuHYl_0g_d5JmUxW7gSECp9te7W1zcVIc,6785
-clarifai/models/model_serving/repo_build/static_files/inference.py,sha256=TejkXZw43mcZD-M9TkfuqMuABz_cliJgf53_Teodtf0,721
-clarifai/models/model_serving/repo_build/static_files/sample_clarifai_config.yaml,sha256=VOFSSb7D_CgRRcqi-plaCH-6hoFO8NAGDNXVSOJGylo,678
-clarifai/models/model_serving/repo_build/static_files/test.py,sha256=GunBqWgTyo0aF5W9ckKz55tGS-wkL9S9TRfytIjB7Eo,1505
-clarifai/models/model_serving/repo_build/static_files/triton/model.py,sha256=l9lkwyeXw9H_K4Om9dGcuylnj4hAlzohspUZkSnQ7Qg,2429
 clarifai/modules/README.md,sha256=mx8pVx6cPp-pP4LcFPT_nX3ngGmhygVK0WiXeD3cbIo,367
 clarifai/modules/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 clarifai/modules/css.py,sha256=kadCEunmyh5h2yf0-4aysE3ZcZ6qaQcxuAgDXS96yF8,2020
@@ -113,7 +70,7 @@ clarifai/urls/helper.py,sha256=tjoMGGHuWX68DUB0pk4MEjrmFsClUAQj2jmVEM_Sy78,4751
 clarifai/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 clarifai/utils/constants.py,sha256=MG_iHnSwNEyUZOpvsrTicNwaT4CIjmlK_Ixk_qqEX8g,142
 clarifai/utils/logging.py,sha256=_nzRyXu3fUa_5X8vXig5dV392YkNESDTc3ZoiwVOGZY,11359
-clarifai/utils/misc.py,sha256=WV3KGM5_MwHySVthjUK4O93x6F_kE1h3-xT4zE4EvnU,2150
+clarifai/utils/misc.py,sha256=ptjt1NtteDT0EhrPoyQ7mgWtvoAQ-XNncQaZvNHb0KI,2253
 clarifai/utils/model_train.py,sha256=Mndqy5GNu7kjQHjDyNVyamL0hQFLGSHcWhOuPyOvr1w,8005
 clarifai/utils/evaluation/__init__.py,sha256=PYkurUrXrGevByj7RFb6CoU1iC7fllyQSfnnlo9WnY8,69
 clarifai/utils/evaluation/helpers.py,sha256=d_dcASRI_lhsHIRukAF1S-w7XazLpK9y6E_ug3l50t4,18440
@@ -123,9 +80,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.8.4.dist-info/LICENSE,sha256=mUqF_d12-qE2n41g7C5_sq-BMLOcj6CNN-jevr15YHU,555
-clarifai-10.8.4.dist-info/METADATA,sha256=hkbzljAgU7J6ey53Lk-70304H-VlkHBD89z68FvJK4Y,19446
-clarifai-10.8.4.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-clarifai-10.8.4.dist-info/entry_points.txt,sha256=qZOr_MIPG0dBBE1zringDJS_wXNGTAA_SQ-zcbmDHOw,82
-clarifai-10.8.4.dist-info/top_level.txt,sha256=wUMdCQGjkxaynZ6nZ9FAnvBUCgp5RJUVFSy2j-KYo0s,9
-clarifai-10.8.4.dist-info/RECORD,,
+clarifai-10.8.5.dist-info/LICENSE,sha256=mUqF_d12-qE2n41g7C5_sq-BMLOcj6CNN-jevr15YHU,555
+clarifai-10.8.5.dist-info/METADATA,sha256=4qCot6nQ161_C99PPYSfhBS0OoyeffeT_g-dOvH_cIU,19479
+clarifai-10.8.5.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+clarifai-10.8.5.dist-info/entry_points.txt,sha256=qZOr_MIPG0dBBE1zringDJS_wXNGTAA_SQ-zcbmDHOw,82
+clarifai-10.8.5.dist-info/top_level.txt,sha256=wUMdCQGjkxaynZ6nZ9FAnvBUCgp5RJUVFSy2j-KYo0s,9
+clarifai-10.8.5.dist-info/RECORD,,

clarifai/models/model_serving/README.md

@@ -1,158 +0,0 @@
-# Clarifai Model Serving
-
-## Overview
-
-Model Serving is a part of user journey at Clarifai offers a user-friendly interface for deploying your local model into production with Clarifai, featuring:
-
-* A convenient command-line interface (CLI)
-* Easy implementation and testing in Python
-* No need for MLops expertise.
-
-## Quickstart Guide
-
-Quick example for deploying a `text-to-text` model
-
-### Initialize a Clarifai model repository
-
-Suppose your working directory name is `your_model_dir`. Then run
-
-```bash
-$ clarifai create model --type text-to-text --working-dir your_model_dir
-$ cd your_model_dir
-```
-
-In `your_model_dir` folder you will see essential files for deployment process
-
-```bash
-your_model_dir
-├── clarifai_config.yaml
-├── inference.py
-├── test.py
-└── requirements.txt
-```
-
-### Implementation
-
-Write your code in class `InferenceModel` which is an interface between your model and Clarifai server in `inference.py`, there are 2 functions you must implement:
-
-* `__init__`: load your model checkpoint once.
-* `predict`: make prediction, called everytime when you make request from API.
-
-For example, a complete implementation of a hf text-generation model
-
-```python
-import os
-from typing import Dict, Union
-from clarifai.models.model_serving.model_config import *
-
-import torch
-from transformers import AutoTokenizer
-import transformers
-
-class InferenceModel(TextToText):
-  """User model inference class."""
-
-  def __init__(self) -> None:
-    """
-    Load inference time artifacts that are called frequently .e.g. models, tokenizers, etc.
-    in this method so they are loaded only once for faster inference.
-    """
-    # current directory
-    self.base_path = os.path.dirname(__file__)
-    # where you save hf checkpoint in your working dir e.i. `your_model_dir`
-    model_path = os.path.join(self.base_path, "checkpoint")
-    self.tokenizer = AutoTokenizer.from_pretrained(model_path)
-    self.pipeline = transformers.pipeline(
-        "text-generation",
-        model=model_path,
-        torch_dtype=torch.float16,
-        device_map="auto",
-    )
-
-  def predict(self, input_data: list,
-              inference_parameters: Dict[str, Union[str, float, int]]) -> list:
-    """ Custom prediction function for `text-to-text` (also called as `text generation`) model.
-
-    Args:
-      input_data (List[str]): List of text
-      inference_parameters (Dict[str, Union[str, float, int]]): your inference parameters
-
-    Returns:
-      list of TextOutput
-
-    """
-    output_sequences = self.pipeline(
-        input_data,
-        eos_token_id=self.tokenizer.eos_token_id,
-        **inference_parameters)
-
-    # wrap outputs in Clarifai defined output
-    return [TextOutput(each[0]) for each in output_sequences]
-```
-
-Update dependencies in `requirements.txt`
-
-```
-clarifai
-torch=2.1.1
-transformers==4.36.2
-accelerate==0.26.1
-```
-
-### Test (optional)
-
-> NOTE: Running `test` is also involved in `build` and `upload` command.
-
-Test and play with your implementation by executing `test.py`.
-
-Install pytest
-
-```bash
-$ pip install pytest
-```
-
-Execute test
-
-```bash
-$ pytest test.py
-```
-
-### Build
-
-Prepare for deployment step. Run:
-
-```bash
-$ clarifai build model
-```
-
-You will obtain `*.clarifai` file, it's simply a zip having all nessecary files in it to get your model work on Clarifai platform.
-
-`NOTE`: you need to upload your built file to cloud storage to get direct download `url` for next step
-
-### Deployment
-
-Login to Clarifai
-
-```bash
-$ clarifai login
-Get your PAT from https://clarifai.com/settings/security and pass it here: <insert your pat here>
-```
-
-Upload
-
-```bash
-# upload built file directly
-$ clarifai upload model <your-working-dir> --user-app <your_user_id>/<your_app_id> --id <your_model_id>
-# or using direct download url of cloud storage
-$ clarifai upload model --url <url> --user-app <your_user_id>/<your_app_id> --id <your_model_id>
-```
-
-## Learn More
-
-* [Detail Instruction](./docs/concepts.md)
-* [Examples](https://github.com/Clarifai/examples/tree/main/model_upload)
-* [Initialize from example](./docs/cli.md)
-* [CLI usage](./docs/cli.md)
-* [Inference parameters](./docs/inference_parameters.md)
-* [Model Types](./docs/model_types.md)
-* [Dependencies](./docs/dependencies.md)

clarifai/models/model_serving/__init__.py

@@ -1,14 +0,0 @@
-# Copyright 2023 Clarifai, Inc.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-from .model_config import *  # noqa
-from .repo_build import *  # noqa

clarifai/models/model_serving/cli/__init__.py

@@ -1,12 +0,0 @@
-# Copyright 2023 Clarifai, Inc.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.