clarifai 11.1.7rc3__py3-none-any.whl → 11.1.7rc5__py3-none-any.whl

clarifai/__init__.py

@@ -1 +1 @@
-__version__ = "11.1.7rc3"
+__version__ = "11.1.7rc5"

clarifai/client/model_client.py

@@ -121,6 +121,17 @@ class ModelClient:
             raise TypeError(
                 f"{method_name}() takes {len(method_argnames)} positional arguments but {len(args)} were given"
             )
+
+          if len(args) + len(kwargs) > len(method_argnames):
+            raise TypeError(
+                f"{method_name}() got an unexpected keyword argument {next(iter(kwargs))}")
+          if len(args) == 1 and (not kwargs) and isinstance(args[0], list):
+            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:
+              return call_func(batch_inputs, method_name)
+
           for name, arg in zip(method_argnames, args):  # handle positional with zip shortest
             if name in kwargs:
               raise TypeError(f"Multiple values for argument {name}")
@@ -176,6 +187,7 @@ class ModelClient:
       inputs,  # TODO set up functions according to fetched signatures?
       method_name: str = 'predict',
   ) -> Any:
+
     input_signature = self._method_signatures[method_name].input_fields
     output_signature = self._method_signatures[method_name].output_fields
 
@@ -187,11 +199,11 @@ class ModelClient:
     proto_inputs = []
     for input in inputs:
       proto = resources_pb2.Input()
+
       serialize(input, input_signature, proto.data)
       proto_inputs.append(proto)
 
     response = self._predict_by_proto(proto_inputs, method_name)
-    #print(response)
 
     outputs = []
     for output in response.outputs:
@@ -274,7 +286,6 @@ class ModelClient:
       proto_inputs.append(proto)
 
     response_stream = self._generate_by_proto(proto_inputs, method_name)
-    #print(response)
 
     for response in response_stream:
       outputs = []
@@ -386,7 +397,6 @@ class ModelClient:
         yield proto
 
     response_stream = self._stream_by_proto(_input_proto_stream(), method_name)
-    #print(response)
 
     for response in response_stream:
       assert len(response.outputs) == 1, 'streaming methods must have exactly one output'

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
     """
@@ -108,9 +108,10 @@ 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,16 +307,16 @@ 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 = {name: m.signature for name, m in method_info.values()}
+    signatures = {method.name: method.signature for method in method_info.values()}
     return signatures_to_yaml(signatures)
 
   def get_method_signatures(self):
     """
     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/utils/data_types.py

@@ -175,8 +175,20 @@ class Concept(MessageData):
 
 class Region(MessageData):
 
-  def __init__(self, proto_region: RegionProto):
+  def __init__(self,
+               proto_region: RegionProto = None,
+               box: List[float] = None,
+               concepts: List[Concept] = None):
+    if proto_region is None:
+      proto_region = RegionProto()
     self.proto = proto_region
+    # use setters for init vals
+    if box and isinstance(
+        box, list) and len(box) == 4 and all(isinstance(val, (int, float)) for val in box):
+      self.box = box
+    if concepts and isinstance(concepts,
+                               list) and all(isinstance(concept, Concept) for concept in concepts):
+      self.concepts = concepts
 
   @property
   def box(self) -> List[float]:
@@ -291,9 +303,16 @@ class Image(MessageData):
 
 class Audio(MessageData):
 
-  def __init__(self, proto_audio: AudioProto):
+  def __init__(self, proto_audio: AudioProto = None, url: str = None, bytes: bytes = None):
+    if proto_audio is None:
+      proto_audio = AudioProto()
     self.proto = proto_audio
 
+    if url:
+      self.url = url
+    if bytes:
+      self.bytes = bytes
+
   @property
   def url(self) -> str:
     return self.proto.url
@@ -333,8 +352,21 @@ class Audio(MessageData):
 
 class Frame(MessageData):
 
-  def __init__(self, proto_frame: FrameProto):
+  def __init__(self,
+               proto_frame: FrameProto = None,
+               image: Image = None,
+               regions: List[Region] = None,
+               time: float = None):
+    if proto_frame is None:
+      proto_frame = FrameProto()
     self.proto = proto_frame
+    # use setters for init vals
+    if image:
+      self.image = image
+    if regions:
+      self.regions = regions
+    if time:
+      self.time = time
 
   @property
   def time(self) -> float:
@@ -372,9 +404,16 @@ class Frame(MessageData):
 
 class Video(MessageData):
 
-  def __init__(self, proto_video: VideoProto):
+  def __init__(self, proto_video: VideoProto = None, url: str = None, bytes: bytes = None):
+    if proto_video is None:
+      proto_video = VideoProto()
     self.proto = proto_video
 
+    if url:
+      self.url = url
+    if bytes:
+      self.bytes = bytes
+
   @property
   def url(self) -> str:
     return self.proto.url

clarifai/runners/utils/method_signatures.py

@@ -330,7 +330,8 @@ 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)):
+  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

{clarifai-11.1.7rc3.dist-info → clarifai-11.1.7rc5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: clarifai
-Version: 11.1.7rc3
+Version: 11.1.7rc5
 Summary: Clarifai Python SDK
 Home-page: https://github.com/Clarifai/clarifai-python
 Author: Clarifai
@@ -32,7 +32,7 @@ Requires-Dist: tabulate>=0.9.0
 Requires-Dist: fsspec>=2024.6.1
 Requires-Dist: click>=8.1.7
 Requires-Dist: requests>=2.32.3
-Requires-Dist: aiohttp>=3.8.1
+Requires-Dist: aiohttp>=3.10.0
 Provides-Extra: all
 Requires-Dist: pycocotools==2.0.6; extra == "all"
 

{clarifai-11.1.7rc3.dist-info → clarifai-11.1.7rc5.dist-info}/RECORD

@@ -1,4 +1,4 @@
-clarifai/__init__.py,sha256=l0wL8EO4WdUNsKcblugjv356bjDqdfj1fg33DYBM7Uo,26
+clarifai/__init__.py,sha256=L7ecgzwVF1qIM4sX3JzNrp3tI1YSfegldgbqVv-b-HQ,26
 clarifai/cli.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 clarifai/errors.py,sha256=RwzTajwds51wLD0MVlMC5kcpBnzRpreDLlazPSBZxrg,2605
 clarifai/versions.py,sha256=jctnczzfGk_S3EnVqb2FjRKfSREkNmvNEwAAa_VoKiQ,222
@@ -31,7 +31,7 @@ clarifai/client/deployment.py,sha256=w7Y6pA1rYG4KRK1SwusRZc2sQRXlG8wezuVdzSWpCo0
 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=aeKx8mx5gXqkRnipHLDYRPLIy28c0iO2MWCn3dRK9eE,17068
+clarifai/client/model_client.py,sha256=FwI9XEDZjyrubK3ue0-gyTKwK_lShQcm8SoFc66aXiw,17537
 clarifai/client/module.py,sha256=FTkm8s9m-EaTKN7g9MnLhGJ9eETUfKG7aWZ3o1RshYs,4204
 clarifai/client/nodepool.py,sha256=la3vTFrO4LX8zm2eQ5jqf2L0-kQ63Dano8FibadoZbk,10152
 clarifai/client/search.py,sha256=GaPWN6JmTQGZaCHr6U1yv0zqR6wKFl7i9IVLg2ul1CI,14254
@@ -138,7 +138,7 @@ 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=p4xl3Hvol7J25Z8E--CWvrPQr1SxWuchvwZC3Dx18l0,34777
+clarifai/runners/models/model_builder.py,sha256=DDE4s1yzomsGyl4PbpjKdiofM6VhL0sgZujCP6wvF2k,34881
 clarifai/runners/models/model_class.py,sha256=qK5qk4geoFpqrRtl4VmKK90CIJKyWmD_vjJMqLWR_CQ,11854
 clarifai/runners/models/model_class_refract.py,sha256=HxuozxSW7ag5yWCPxjNwgLArQ6dORhyGXlnpPaZz2-c,3211
 clarifai/runners/models/model_run_locally.py,sha256=VZetm9Mko8MBjcjwr6PCnTU9gF3glgD5qvpbj-8tW2s,17962
@@ -159,11 +159,11 @@ clarifai/runners/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 clarifai/runners/utils/const.py,sha256=bwj-Pcw558-pasdIFbNhnkn-9oiCdojYH1fNTTUG2gU,1048
 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=nJS9n4oQHcwf2scxH8pl5TjHcY9l6ZdY401fTwpEoe4,11032
+clarifai/runners/utils/data_types.py,sha256=A6IYU55pdPFfoh0K6HkEgTPlgQVv2JUG5lOlqTu1w44,12258
 clarifai/runners/utils/data_utils.py,sha256=R1iQ82TuQ9JwxCJk8yEB1Lyb0BYVhVbWJI9YDi1zGOs,318
 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=EnVdLsyh7GzE7pY7fWqtcDN6t6gYKnGLU_yJnHxw7vI,17415
+clarifai/runners/utils/method_signatures.py,sha256=hwrZnSbnt4OSGqnrN7INghtuJm8EJm0CEnTpwlsGgmw,17468
 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.7rc3.dist-info/LICENSE,sha256=mUqF_d12-qE2n41g7C5_sq-BMLOcj6CNN-jevr15YHU,555
-clarifai-11.1.7rc3.dist-info/METADATA,sha256=-t2evkzC5WdrGOlmiBDkINx4r8Pnpg-q7ZEvqz6RgMk,22214
-clarifai-11.1.7rc3.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-clarifai-11.1.7rc3.dist-info/entry_points.txt,sha256=X9FZ4Z-i_r2Ud1RpZ9sNIFYuu_-9fogzCMCRUD9hyX0,51
-clarifai-11.1.7rc3.dist-info/top_level.txt,sha256=wUMdCQGjkxaynZ6nZ9FAnvBUCgp5RJUVFSy2j-KYo0s,9
-clarifai-11.1.7rc3.dist-info/RECORD,,
+clarifai-11.1.7rc5.dist-info/LICENSE,sha256=mUqF_d12-qE2n41g7C5_sq-BMLOcj6CNN-jevr15YHU,555
+clarifai-11.1.7rc5.dist-info/METADATA,sha256=tOQbvNsbo_DjwJRDarrhk1uAgnSjSCDfdlcaUucYhI8,22215
+clarifai-11.1.7rc5.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+clarifai-11.1.7rc5.dist-info/entry_points.txt,sha256=X9FZ4Z-i_r2Ud1RpZ9sNIFYuu_-9fogzCMCRUD9hyX0,51
+clarifai-11.1.7rc5.dist-info/top_level.txt,sha256=wUMdCQGjkxaynZ6nZ9FAnvBUCgp5RJUVFSy2j-KYo0s,9
+clarifai-11.1.7rc5.dist-info/RECORD,,