clarifai 11.2.4rc1__tar.gz → 11.2.4rc2__tar.gz

{clarifai-11.2.4rc1/clarifai.egg-info → clarifai-11.2.4rc2}/PKG-INFO

@@ -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.4rc2/clarifai/__init__.py

@@ -0,0 +1 @@
+__version__ = "11.2.4rc2"

{clarifai-11.2.4rc1 → clarifai-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-11.2.4rc1 → clarifai-11.2.4rc2}/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-11.2.4rc1 → clarifai-11.2.4rc2}/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 → clarifai-11.2.4rc2/clarifai.egg-info}/PKG-INFO

@@ -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/clarifai/__init__.py

@@ -1 +0,0 @@
-__version__ = "11.2.4rc1"