clarifai 11.1.7rc4__py3-none-any.whl → 11.1.7rc6__py3-none-any.whl

clarifai/__init__.py

@@ -1 +1 @@
-__version__ = "11.1.7rc4"
+__version__ = "11.1.7rc6"

clarifai/client/model.py

@@ -802,13 +802,14 @@ class Model(Lister, BaseClient):
     elif args:
       inputs = args[0]
     if inputs and isinstance(inputs, Iterable):
-      inputs_iter = iter(inputs)
+      inputs_iter = inputs
       try:
         peek = next(inputs_iter)
       except StopIteration:
         pass
       else:
-        use_proto_call = isinstance(peek, resources_pb2.Input)
+        use_proto_call = (peek and isinstance(peek, list) and
+                          isinstance(peek[0], resources_pb2.Input))
         # put back the peeked value
         if inputs_iter is inputs:
           inputs = itertools.chain([peek], inputs_iter)

clarifai/client/model_client.py

@@ -6,6 +6,7 @@ from clarifai_grpc.grpc.api.status import status_code_pb2
 
 from clarifai.constants.model import MAX_MODEL_PREDICT_INPUTS
 from clarifai.errors import UserError
+from clarifai.runners.utils.data_utils import is_openai_chat_format
 from clarifai.runners.utils.method_signatures import (CompatibilitySerializer, deserialize,
                                                       get_stream_from_signature, serialize,
                                                       signatures_from_json)
@@ -129,7 +130,8 @@ class ModelClient:
             batch_inputs = args[0]
             # Validate each input is a dictionary
             is_batch_input_valid = all(isinstance(input, dict) for input in batch_inputs)
-            if is_batch_input_valid:
+            if is_batch_input_valid and (not is_openai_chat_format(batch_inputs)):
+              # If the batch input is valid, call the function with the batch inputs and the method name
               return call_func(batch_inputs, method_name)
 
           for name, arg in zip(method_argnames, args):  # handle positional with zip shortest
@@ -293,7 +295,8 @@ class ModelClient:
         outputs.append(deserialize(output.data, output_signature, is_output=True))
       if batch_input:
         yield outputs
-      yield outputs[0]
+      else:
+        yield outputs[0]
 
   def _generate_by_proto(
       self,
@@ -421,8 +424,9 @@ class ModelClient:
       else:
         req.inputs.append(inputs)
       # TODO: put into new proto field?
-      for inp in req.inputs:
-        inp.data.metadata['_method_name'] = method_name
+      if method_name:
+        for inp in req.inputs:
+          inp.data.metadata['_method_name'] = method_name
       yield req
 
   def _stream_by_proto(self,

clarifai/runners/models/model_builder.py

@@ -68,11 +68,11 @@ class ModelBuilder:
     self.inference_compute_info = self._get_inference_compute_info()
     self.is_v3 = True  # Do model build for v3
 
-  def create_model_instance(self, load_model=True):
+  def create_model_instance(self, load_model=True, mocking=False):
     """
     Create an instance of the model class, as specified in the config file.
     """
-    model_class = self.load_model_class()
+    model_class = self.load_model_class(mocking=mocking)
 
     # initialize the model
     model = model_class()
@@ -80,7 +80,7 @@ class ModelBuilder:
       model.load_model()
     return model
 
-  def load_model_class(self):
+  def load_model_class(self, mocking=False):
     """
     Import the model class from the model.py file, dynamically handling missing dependencies
     """
@@ -109,8 +109,9 @@ class ModelBuilder:
       # Mock all third-party imports to avoid ImportErrors or other issues
       return MagicMock()
 
-    # Replace the built-in __import__ function with our custom one
-    builtins.__import__ = custom_import
+    if mocking:
+      # Replace the built-in __import__ function with our custom one
+      builtins.__import__ = custom_import
 
     try:
       spec.loader.exec_module(module)
@@ -306,7 +307,7 @@ class ModelBuilder:
     """
     Returns the method signatures for the model class in YAML format.
     """
-    model_class = self.load_model_class()
+    model_class = self.load_model_class(mocking=True)
     method_info = model_class._get_method_info()
     signatures = {method.name: method.signature for method in method_info.values()}
     return signatures_to_yaml(signatures)
@@ -315,7 +316,7 @@ class ModelBuilder:
     """
     Returns the method signatures for the model class.
     """
-    model_class = self.load_model_class()
+    model_class = self.load_model_class(mocking=True)
     method_info = model_class._get_method_info()
     signatures = [method.signature for method in method_info.values()]
     return signatures

clarifai/runners/models/model_class.py

@@ -163,7 +163,7 @@ class ModelClass(ABC):
       request = next(request_iterator)  # get first request to determine method
       assert len(request.inputs) == 1, "Streaming requires exactly one input"
 
-      method_name = 'generate'
+      method_name = 'stream'
       inference_params = get_inference_params(request)
       if len(request.inputs) > 0 and '_method_name' in request.inputs[0].data.metadata:
         method_name = request.inputs[0].data.metadata['_method_name']
@@ -224,7 +224,15 @@ class ModelClass(ABC):
       for k, v in kwargs.items():
         if k not in python_param_types:
           continue
-        kwargs[k] = data_types.cast(v, python_param_types[k])
+
+        if hasattr(python_param_types[k], "__args__") and getattr(
+            python_param_types[k], "__origin__", None) == data_types.Stream:
+          # get the type of the items in the stream
+          stream_type = python_param_types[k].__args__[0]
+
+          kwargs[k] = data_types.cast(v, stream_type)
+        else:
+          kwargs[k] = data_types.cast(v, python_param_types[k])
       result.append(kwargs)
     return result
 

clarifai/runners/models/model_run_locally.py

@@ -7,6 +7,7 @@ import subprocess
 import sys
 import tempfile
 import time
+import traceback
 import venv
 
 from clarifai_grpc.grpc.api import resources_pb2, service_pb2
@@ -114,7 +115,12 @@ class ModelRunLocally:
     model = self.builder.create_model_instance()
     # call its test method, if it has one
     if hasattr(model, "test"):
-      model.test()
+      try:
+        model.test()
+        logger.info("Model tested successfully!")
+      except Exception as e:
+        logger.error(f"Error occurred while testing the model: {e}")
+        traceback.print_exc()
 
   def test_model(self):
     """Test the model by running it locally in the virtual environment."""

clarifai/runners/models/model_runner.py

@@ -114,6 +114,9 @@ class ModelRunner(BaseRunner, HealthProbeRequestHandler):
     ensure_urls_downloaded(request)
 
     for resp in self.model.generate_wrapper(request):
+      if resp.status.code != status_code_pb2.SUCCESS:
+        yield service_pb2.RunnerItemOutput(multi_output_response=resp)
+        continue
       successes = []
       for output in resp.outputs:
         if not output.HasField('status') or not output.status.code:
@@ -142,6 +145,9 @@ class ModelRunner(BaseRunner, HealthProbeRequestHandler):
                         ) -> Iterator[service_pb2.RunnerItemOutput]:
     # Call the generate() method the underlying model implements.
     for resp in self.model.stream_wrapper(pmo_iterator(runner_item_iterator)):
+      if resp.status.code != status_code_pb2.SUCCESS:
+        yield service_pb2.RunnerItemOutput(multi_output_response=resp)
+        continue
       successes = []
       for output in resp.outputs:
         if not output.HasField('status') or not output.status.code:

clarifai/runners/utils/data_utils.py

@@ -13,3 +13,39 @@ def image_to_bytes(img: Image.Image, format="JPEG") -> bytes:
 def bytes_to_image(bytes_img) -> Image.Image:
   img = Image.open(BytesIO(bytes_img))
   return img
+
+
+def is_openai_chat_format(messages):
+  """
+    Verify if the given argument follows the OpenAI chat messages format.
+
+    Args:
+        messages (list): A list of dictionaries representing chat messages.
+
+    Returns:
+        bool: True if valid, False otherwise.
+    """
+  if not isinstance(messages, list):
+    return False
+
+  valid_roles = {"system", "user", "assistant", "function"}
+
+  for msg in messages:
+    if not isinstance(msg, dict):
+      return False
+    if "role" not in msg or "content" not in msg:
+      return False
+    if msg["role"] not in valid_roles:
+      return False
+
+    content = msg["content"]
+
+    # Content should be either a string (text message) or a multimodal list
+    if isinstance(content, str):
+      continue  # Valid text message
+
+    elif isinstance(content, list):
+      for item in content:
+        if not isinstance(item, dict):
+          return False
+  return True

clarifai/runners/utils/method_signatures.py

@@ -1,7 +1,7 @@
 import inspect
 import json
 from collections import namedtuple
-from typing import List, Tuple, get_args, get_origin
+from typing import Dict, List, Tuple, get_args, get_origin
 
 import numpy as np
 import PIL.Image
@@ -327,13 +327,6 @@ def _normalize_type(tp):
 
 
 def _normalize_data_type(tp):
-
-  # jsonable list and dict, these can be serialized as json
-  # (tuple we want to keep as a tuple for args and returns, so don't include here)
-  if tp in (list, dict) or (get_origin(tp) in (list, dict) and _is_jsonable(tp) and
-                            get_args(tp) is None):
-    return data_types.JSON
-
   # container types that need to be serialized as parts
   if get_origin(tp) == list and get_args(tp):
     return List[_normalize_data_type(get_args(tp)[0])]
@@ -371,6 +364,11 @@ def _normalize_data_type(tp):
   if tp == PIL.Image:
     raise TypeError('Use PIL.Image.Image instead of PIL.Image module')
 
+  # jsonable list and dict, these can be serialized as json
+  # (tuple we want to keep as a tuple for args and returns, so don't include here)
+  if tp in (list, dict, Dict) or (get_origin(tp) in (list, dict, Dict) and _is_jsonable(tp)):
+    return data_types.JSON
+
   # check for known data types
   try:
     if tp in _DATA_TYPES:

{clarifai-11.1.7rc4.dist-info → clarifai-11.1.7rc6.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: clarifai
-Version: 11.1.7rc4
+Version: 11.1.7rc6
 Summary: Clarifai Python SDK
 Home-page: https://github.com/Clarifai/clarifai-python
 Author: Clarifai
@@ -20,7 +20,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: clarifai-grpc>=11.2.4
+Requires-Dist: clarifai-grpc>=11.2.6
 Requires-Dist: clarifai-protocol>=0.0.20
 Requires-Dist: numpy>=1.22.0
 Requires-Dist: tqdm>=4.65.0
@@ -35,6 +35,17 @@ Requires-Dist: requests>=2.32.3
 Requires-Dist: aiohttp>=3.10.0
 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
 
 <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.1.7rc4.dist-info → clarifai-11.1.7rc6.dist-info}/RECORD

@@ -1,4 +1,4 @@
-clarifai/__init__.py,sha256=ifkdBMaRvYCzXalTvOKcl2DNqYnmG2YMz8JBP1t1moU,26
+clarifai/__init__.py,sha256=PzbKrpCo-t2qaebsvu-symHcih514RB4J2tA_qrxQqQ,26
 clarifai/cli.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 clarifai/errors.py,sha256=RwzTajwds51wLD0MVlMC5kcpBnzRpreDLlazPSBZxrg,2605
 clarifai/versions.py,sha256=jctnczzfGk_S3EnVqb2FjRKfSREkNmvNEwAAa_VoKiQ,222
@@ -30,8 +30,8 @@ clarifai/client/dataset.py,sha256=y3zKT_VhP1gyN3OO-b3cPeW21ZXyKbQ7ZJkEG06bsTU,32
 clarifai/client/deployment.py,sha256=w7Y6pA1rYG4KRK1SwusRZc2sQRXlG8wezuVdzSWpCo0,2586
 clarifai/client/input.py,sha256=obMAHMDU1OwfXZ8KraOnGFlWzlW-3F7Ob_2lcOQMlhY,46339
 clarifai/client/lister.py,sha256=03KGMvs5RVyYqxLsSrWhNc34I8kiF1Ph0NeyEwu7nMU,2082
-clarifai/client/model.py,sha256=DFlZLIExMUvYXc9hDzVLYka6_AbfG3vqLlhZkk4GfIY,76835
-clarifai/client/model_client.py,sha256=FwI9XEDZjyrubK3ue0-gyTKwK_lShQcm8SoFc66aXiw,17537
+clarifai/client/model.py,sha256=UGBC0weDFCH7OK7vf67yiVmQ09hlRx_9ZkfKzQjLq-U,76896
+clarifai/client/model_client.py,sha256=nKEMH0Rkb1cSVpuIwmMI4Kqf1zAXT6eEPaDoAunHEb4,17796
 clarifai/client/module.py,sha256=FTkm8s9m-EaTKN7g9MnLhGJ9eETUfKG7aWZ3o1RshYs,4204
 clarifai/client/nodepool.py,sha256=la3vTFrO4LX8zm2eQ5jqf2L0-kQ63Dano8FibadoZbk,10152
 clarifai/client/search.py,sha256=GaPWN6JmTQGZaCHr6U1yv0zqR6wKFl7i9IVLg2ul1CI,14254
@@ -138,11 +138,11 @@ clarifai/runners/dockerfile_template/Dockerfile.nim,sha256=CSdUAehj3uOwminioLnT5
 clarifai/runners/dockerfile_template/Dockerfile.template,sha256=5cjv7U8PmWa3DB_5B1CqSYh_6GE0E0np52TIAa7EIDE,2312
 clarifai/runners/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 clarifai/runners/models/base_typed_model.py,sha256=0QCWxch8CcyJSKvE1D4PILd2RSnQZHTmx4DXlQQ6dpo,7856
-clarifai/runners/models/model_builder.py,sha256=GlMpJn1krpckvI0cqd8ujrCnoU62z-kqSI3nJfGJEwY,34788
-clarifai/runners/models/model_class.py,sha256=qK5qk4geoFpqrRtl4VmKK90CIJKyWmD_vjJMqLWR_CQ,11854
+clarifai/runners/models/model_builder.py,sha256=-GFmVqDr6Dw9zRyiFH2vRaJF2EAVTmj1OfaZPzhzfw8,34877
+clarifai/runners/models/model_class.py,sha256=R32Nxxe-Ols4nyMq8KWer9jqKn2rDyBHr5ZQGDAhJxk,12178
 clarifai/runners/models/model_class_refract.py,sha256=HxuozxSW7ag5yWCPxjNwgLArQ6dORhyGXlnpPaZz2-c,3211
-clarifai/runners/models/model_run_locally.py,sha256=VZetm9Mko8MBjcjwr6PCnTU9gF3glgD5qvpbj-8tW2s,17962
-clarifai/runners/models/model_runner.py,sha256=qyc73pe4xc9BsUKHwnOyC9g-RNCARiFis4GTh-yg0vg,6219
+clarifai/runners/models/model_run_locally.py,sha256=m5uLlXpWVGuQIJv-XBt-sHGx1gD8w6d77f9b85DOZqs,18170
+clarifai/runners/models/model_runner.py,sha256=T4Qn_x0vky7XdeS54bvipzEmKZMra1tQdAu_u01yyjc,6503
 clarifai/runners/models/model_servicer.py,sha256=A--b1P71PBCAMJCpy_-fpNDkfCVdvdMh1LleW15dSas,3037
 clarifai/runners/models/model_upload.py,sha256=VjJgNNBPP9O7LkNCXxOqa0lTW1M7k6XKVyI6XlLdXIc,25095
 clarifai/runners/models/temp.py,sha256=0Xy2tAqA5eu2axuTanac995t5IQrnU1y8MdNm-7we6Q,404
@@ -160,10 +160,10 @@ clarifai/runners/utils/const.py,sha256=bwj-Pcw558-pasdIFbNhnkn-9oiCdojYH1fNTTUG2
 clarifai/runners/utils/data_handler.py,sha256=b7k6MWYPXSgjrfw6wsDf82xFYa0D7UjYmjE4mw5HzHM,8499
 clarifai/runners/utils/data_handler_refract.py,sha256=3M-V4hkOoF-9Ix4hE6ocXWiTJPc9dewtu6FMtddd-jQ,6343
 clarifai/runners/utils/data_types.py,sha256=A6IYU55pdPFfoh0K6HkEgTPlgQVv2JUG5lOlqTu1w44,12258
-clarifai/runners/utils/data_utils.py,sha256=R1iQ82TuQ9JwxCJk8yEB1Lyb0BYVhVbWJI9YDi1zGOs,318
+clarifai/runners/utils/data_utils.py,sha256=g0YEb0j_F6azIKb6BqR-uhWgR0qbmpdL1-Z4KS4mvgU,1228
 clarifai/runners/utils/loader.py,sha256=SgNHMwRmCCymFQm8aDp73NmIUHhM-N60CBlTKbPzmVc,7470
 clarifai/runners/utils/logger.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-clarifai/runners/utils/method_signatures.py,sha256=hwrZnSbnt4OSGqnrN7INghtuJm8EJm0CEnTpwlsGgmw,17468
+clarifai/runners/utils/method_signatures.py,sha256=RiAbj7I8JGp0pqwqWZN9AgP1GWYAzizK8LdSeSN_hHE,17432
 clarifai/runners/utils/serializers.py,sha256=S4sRsOVvH191vAGTRTAAdwLlQwlK4T5QVRDGPptg9nQ,7191
 clarifai/runners/utils/url_fetcher.py,sha256=v_8JOWmkyFAzsBulsieKX7Nfjy1Yg7wGSZeqfEvw2cg,1640
 clarifai/runners/utils/__pycache__/__init__.cpython-310.pyc,sha256=0GGbXIecXlOZmQKMCkSRhEBY_a1zvoimv-mHG4pJuNA,167
@@ -229,9 +229,9 @@ clarifai/workflows/__pycache__/__init__.cpython-39.pyc,sha256=9nA--jULSW7OFrYOcs
 clarifai/workflows/__pycache__/export.cpython-310.pyc,sha256=phEGwi2gAojCUhRTqjZVeTDn7Gk6LCVBeSTjAj4m9iY,2418
 clarifai/workflows/__pycache__/utils.cpython-310.pyc,sha256=M9_KTM7GOOS5SPrWwAzqHDqyGvgKi3xuSGvyw6MNf-I,1925
 clarifai/workflows/__pycache__/validate.cpython-310.pyc,sha256=c18Jgp_-CAm8RD_tmUpDCPoqZeexaoWELG0yBzb9rjw,2149
-clarifai-11.1.7rc4.dist-info/LICENSE,sha256=mUqF_d12-qE2n41g7C5_sq-BMLOcj6CNN-jevr15YHU,555
-clarifai-11.1.7rc4.dist-info/METADATA,sha256=kufmH0KOUsaV0LTIz5ckGf8oF4zfCr5giQbrsAucNRo,22215
-clarifai-11.1.7rc4.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-clarifai-11.1.7rc4.dist-info/entry_points.txt,sha256=X9FZ4Z-i_r2Ud1RpZ9sNIFYuu_-9fogzCMCRUD9hyX0,51
-clarifai-11.1.7rc4.dist-info/top_level.txt,sha256=wUMdCQGjkxaynZ6nZ9FAnvBUCgp5RJUVFSy2j-KYo0s,9
-clarifai-11.1.7rc4.dist-info/RECORD,,
+clarifai-11.1.7rc6.dist-info/LICENSE,sha256=mUqF_d12-qE2n41g7C5_sq-BMLOcj6CNN-jevr15YHU,555
+clarifai-11.1.7rc6.dist-info/METADATA,sha256=9IsUiXR999olaPeOHXDj7yVzwdc5LjoNfMxNCbIGD1c,22453
+clarifai-11.1.7rc6.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+clarifai-11.1.7rc6.dist-info/entry_points.txt,sha256=X9FZ4Z-i_r2Ud1RpZ9sNIFYuu_-9fogzCMCRUD9hyX0,51
+clarifai-11.1.7rc6.dist-info/top_level.txt,sha256=wUMdCQGjkxaynZ6nZ9FAnvBUCgp5RJUVFSy2j-KYo0s,9
+clarifai-11.1.7rc6.dist-info/RECORD,,

{clarifai-11.1.7rc4.dist-info → clarifai-11.1.7rc6.dist-info}/WHEEL

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