clarifai 11.2.4rc1__py3-none-any.whl → 11.2.4rc2__py3-none-any.whl

clarifai/__init__.py

@@ -1 +1 @@
-__version__ = "11.2.4rc1"
+__version__ = "11.2.4rc2"

clarifai/runners/models/model_builder.py

@@ -633,55 +633,55 @@ class ModelBuilder:
     concepts = config.get('concepts')
     logger.info(f"Updated config.yaml with {len(concepts)} concepts.")
 
-  # def filled_params_specs_with_inference_params(self, method_signatures: list[resources_pb2.MethodSignature], methods_defaults) -> list[resources_pb2.ModelTypeField]:
-  #   """
-  #   Fills the params_specs with the inference params.
-  #   """
-  #   inference_params = set()
-  #   for i, method_defaults in enumerate(methods_defaults):
-  #     for name, default in method_defaults.items():
-  #       if isinstance(default, data_utils.InputField):
-  #         if i==0:
-  #           inference_params.add(name)
-  #         else:
-  #           # if field.name not in inference_params then remove from inference_params
-  #           if name not in inference_params:
-  #             inference_params.remove(field.name)
-  #   output=[]
-  #   for signature in method_signatures:
-  #     for field in signature.input_fields:
-  #       if field.name in inference_params:
-  #         field.path = field.name
-  #         if field.type == resources_pb2.ModelTypeField.DataType.STR:
-  #           field.default_value= str(field.default)
-  #           field.field_type = resources_pb2.ModelTypeField.ModelTypeFieldType.STRING
-  #         elif field.type == resources_pb2.ModelTypeField.DataType.INT:
-  #           field.default_value= int(field.default)
-  #           field.field_type = resources_pb2.ModelTypeField.ModelTypeFieldType.NUMBER
-  #         elif field.type == resources_pb2.ModelTypeField.DataType.FLOAT:
-  #           field.default_value= float(field.default)
-  #           field.field_type = resources_pb2.ModelTypeField.ModelTypeFieldType.NUMBER
-  #         elif field.type == resources_pb2.ModelTypeField.DataType.BOOL:
-  #           field.default_value= bool(field.default)
-  #           field.field_type = resources_pb2.ModelTypeField.ModelTypeFieldType.BOOLEAN
-  #         else:
-  #           field.default_value= field.default
-  #           field.field_type = resources_pb2.ModelTypeField.ModelTypeFieldType.STRING
-  #         output.append(field)
-  #   return output
+  def filled_params_specs_with_inference_params(self, method_signatures: list[resources_pb2.MethodSignature], methods_defaults) -> list[resources_pb2.ModelTypeField]:
+    """
+    Fills the params_specs with the inference params.
+    """
+    inference_params = set()
+    for i, method_defaults in enumerate(methods_defaults):
+      for name, default in method_defaults.items():
+        if isinstance(default, data_utils.InputField):
+          if i==0:
+            inference_params.add(name)
+          else:
+            # if field.name not in inference_params then remove from inference_params
+            if name not in inference_params:
+              inference_params.remove(field.name)
+    output=[]
+    for signature in method_signatures:
+      for field in signature.input_fields:
+        if field.name in inference_params:
+          field.path = field.name
+          if field.type == resources_pb2.ModelTypeField.DataType.STR:
+            field.default_value= str(field.default)
+            field.field_type = resources_pb2.ModelTypeField.ModelTypeFieldType.STRING
+          elif field.type == resources_pb2.ModelTypeField.DataType.INT:
+            field.default_value= int(field.default)
+            field.field_type = resources_pb2.ModelTypeField.ModelTypeFieldType.NUMBER
+          elif field.type == resources_pb2.ModelTypeField.DataType.FLOAT:
+            field.default_value= float(field.default)
+            field.field_type = resources_pb2.ModelTypeField.ModelTypeFieldType.NUMBER
+          elif field.type == resources_pb2.ModelTypeField.DataType.BOOL:
+            field.default_value= bool(field.default)
+            field.field_type = resources_pb2.ModelTypeField.ModelTypeFieldType.BOOLEAN
+          else:
+            field.default_value= field.default
+            field.field_type = resources_pb2.ModelTypeField.ModelTypeFieldType.STRING
+          output.append(field)
+    return output
 
 
   def get_model_version_proto(self):
     signatures = self.get_method_signatures()
-    # methods_defaults = self.get_methods_defaults()
+    methods_defaults = self.get_methods_defaults()
 
     model_version_proto = resources_pb2.ModelVersion(
         pretrained_model_config=resources_pb2.PretrainedModelConfig(),
         inference_compute_info=self.inference_compute_info,
         method_signatures=signatures,
-        # output_info= resources_pb2.OutputInfo(
-        #   params_specs=self.filled_params_specs_with_inference_params(signatures, methods_defaults),
-        # )
+        output_info= resources_pb2.OutputInfo(
+          params_specs=self.filled_params_specs_with_inference_params(signatures, methods_defaults),
+        )
     )
 
 

clarifai/runners/utils/data_utils.py

@@ -115,12 +115,7 @@ class InputField(MessageData):
     # proto.is_param = self.is_param
 
     if self.default is not None:
-      if isinstance(self.default, str) or isinstance(self.default, bool) or isinstance(
-          self.default, (int, float)):
-        proto.default = str(self.default)
-      else:
-        import json
-        proto.default = json.dumps(self.default)
+      proto = self.set_default(proto, self.default)
 
     return proto
 
@@ -169,12 +164,19 @@ class InputField(MessageData):
 
   @classmethod
   def set_default(cls, proto=None, default=None):
-    import json
-    if proto is None:
-      proto = InputFieldProto()
-    if default is not None:
-      proto.default = json.dumps(default)
-    return proto
+    try:
+      import json
+      if proto is None:
+        proto = InputFieldProto()
+      if default is not None:
+        proto.default = json.dumps(default)
+      return proto
+    except json.JSONDecodeError:
+      if default is not None:
+        proto.default = str(default)
+      return proto
+    except Exception as e:
+      raise ValueError(f"Error setting default value: {e}")
 
   @classmethod
   def get_default(cls, proto):

clarifai/runners/utils/method_signatures.py

@@ -1,5 +1,6 @@
 import collections.abc as abc
 import inspect
+import logging
 import json
 from collections import namedtuple
 from typing import Dict, List, Tuple, get_args, get_origin
@@ -312,8 +313,13 @@ def deserialize(proto, signatures, inference_params={}, is_output=False):
       kwargs[sig.name] = serializer.deserialize(part.data)
     elif inference_params_value is not None:
       kwargs[sig.name] = inference_params_value
-    # elif sig.default and (sig.required is False) and (not is_output):
-    #   kwargs[sig.name] = data_utils.InputField.get_default(sig)
+    elif sig.default and (sig.required is False) and (not is_output):
+      try:
+        kwargs[sig.name] = data_utils.InputField.get_default(sig)
+      except Exception as e:
+        # default is not set, so ignore
+        logging.exception('Default value not set for %s: %s', sig.name, e)
+        pass
     else:
       if sig_i == 0:
         # possible inlined first value

{clarifai-11.2.4rc1.dist-info → clarifai-11.2.4rc2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: clarifai
-Version: 11.2.4rc1
+Version: 11.2.4rc2
 Summary: Clarifai Python SDK
 Home-page: https://github.com/Clarifai/clarifai-python
 Author: Clarifai

{clarifai-11.2.4rc1.dist-info → clarifai-11.2.4rc2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-clarifai/__init__.py,sha256=1tWubqQL15wfRZmXoJhZpjYGCNoJRv-6O4MUhDY-j3Q,26
+clarifai/__init__.py,sha256=MifEmQdTShs6F9sPHBKRleuDIhSTAInWoN8okWqMJPs,26
 clarifai/cli.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 clarifai/errors.py,sha256=RwzTajwds51wLD0MVlMC5kcpBnzRpreDLlazPSBZxrg,2605
 clarifai/versions.py,sha256=jctnczzfGk_S3EnVqb2FjRKfSREkNmvNEwAAa_VoKiQ,222
@@ -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=xk0PB0CnCROv1K1rs71C8mJb0CwJpPTNznxPPOd9sQI,38929
+clarifai/runners/models/model_builder.py,sha256=6ezRfKxXYI7jwWUiXdsy2L72Q3dvarqikvQuE5ZraVQ,38849
 clarifai/runners/models/model_class.py,sha256=j3oyOCmh-XfFg3UhdquMZ-DxrNSlOGnFlQMNT3fNQSI,14920
 clarifai/runners/models/model_class_refract.py,sha256=HxuozxSW7ag5yWCPxjNwgLArQ6dORhyGXlnpPaZz2-c,3211
 clarifai/runners/models/model_run_locally.py,sha256=H7FKUBzZ_EPPj1b6P59qbOYr3mUJjJTlD5gavH5e80o,17746
@@ -161,10 +161,10 @@ clarifai/runners/utils/const.py,sha256=9qnOC1Bt6SGLQ9XCQEQ6519XhW4gzcztsV1Rgej67
 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=CtcYoW4EFE1EG6JkcP2rcRast9Eac8hFoYRHHCuwl2w,12432
-clarifai/runners/utils/data_utils.py,sha256=seA-3wMenf7VwyOBmqBiZ-domarw9deOk7Ua87bbpGE,12882
+clarifai/runners/utils/data_utils.py,sha256=BuIxcQOudFEle8V6ZvycrYd-6X0i__EQbXxKKF1n7mA,12911
 clarifai/runners/utils/loader.py,sha256=Sl0m29RDtMPx2cIiSbbDFtKHQj2ktXQ5CnkvaHi-zDc,8804
 clarifai/runners/utils/logger.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-clarifai/runners/utils/method_signatures.py,sha256=uEPylPTMPAU50I2li3a1qhOQwjxivIHh9Jl4qaW8_GY,18328
+clarifai/runners/utils/method_signatures.py,sha256=HypEj1EN7pzRPzn-KUu1oOZcKlwfarvYTZXUZ-DEEYQ,18509
 clarifai/runners/utils/openai_convertor.py,sha256=tFFNkjcdsNi73DfT_JOqdZZAu8fDYQwpbToWcr62OOw,7650
 clarifai/runners/utils/openai_format.py,sha256=vOrpgqVWmQZGGFANZf0hmR_ksZXsr2-S9WUxvkG5lZs,1980
 clarifai/runners/utils/serializers.py,sha256=S4sRsOVvH191vAGTRTAAdwLlQwlK4T5QVRDGPptg9nQ,7191
@@ -233,9 +233,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.2.4rc1.dist-info/LICENSE,sha256=mUqF_d12-qE2n41g7C5_sq-BMLOcj6CNN-jevr15YHU,555
-clarifai-11.2.4rc1.dist-info/METADATA,sha256=oYyxfijRSs87J_aDNP8jzEe2Kr7IxvhOE_Tjk20fEJI,22453
-clarifai-11.2.4rc1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-clarifai-11.2.4rc1.dist-info/entry_points.txt,sha256=X9FZ4Z-i_r2Ud1RpZ9sNIFYuu_-9fogzCMCRUD9hyX0,51
-clarifai-11.2.4rc1.dist-info/top_level.txt,sha256=wUMdCQGjkxaynZ6nZ9FAnvBUCgp5RJUVFSy2j-KYo0s,9
-clarifai-11.2.4rc1.dist-info/RECORD,,
+clarifai-11.2.4rc2.dist-info/LICENSE,sha256=mUqF_d12-qE2n41g7C5_sq-BMLOcj6CNN-jevr15YHU,555
+clarifai-11.2.4rc2.dist-info/METADATA,sha256=2NQ4ajyyei0MMGHMBZimPeO7qxqoxMfMvlq1TaNzLRI,22453
+clarifai-11.2.4rc2.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+clarifai-11.2.4rc2.dist-info/entry_points.txt,sha256=X9FZ4Z-i_r2Ud1RpZ9sNIFYuu_-9fogzCMCRUD9hyX0,51
+clarifai-11.2.4rc2.dist-info/top_level.txt,sha256=wUMdCQGjkxaynZ6nZ9FAnvBUCgp5RJUVFSy2j-KYo0s,9
+clarifai-11.2.4rc2.dist-info/RECORD,,