clarifai 11.2.3rc2__tar.gz → 11.2.3rc4__tar.gz

{clarifai-11.2.3rc2/clarifai.egg-info → clarifai-11.2.3rc4}/PKG-INFO

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

clarifai-11.2.3rc4/clarifai/__init__.py

@@ -0,0 +1 @@
+__version__ = "11.2.3rc4"

{clarifai-11.2.3rc2 → clarifai-11.2.3rc4}/clarifai/runners/models/model_class.py

@@ -195,6 +195,17 @@ class ModelClass(ABC):
 
     return False
 
+  def _convert_output_data_to_old_format(self, data: resources_pb2.Data) -> resources_pb2.Data:
+    """Convert output data to old format."""
+    old_data = resources_pb2.Data()
+    part_data = data.parts[0].data
+    # Handle text.raw specially (common case for text outputs)
+    old_data = part_data
+    if old_data.string_value:
+      old_data.text.raw = old_data.string_value
+
+    return old_data
+
   def _batch_predict(self, method, inputs: List[Dict[str, Any]]) -> List[Any]:
     """Batch predict method for multiple inputs."""
     outputs = []
@@ -228,7 +239,8 @@ class ModelClass(ABC):
       python_param_types = method_info.python_param_types
       for input in request.inputs:
         # check if input is in old format
-        if self.is_old_format(input.data):
+        is_convert = self.is_old_format(input.data)
+        if is_convert:
           # convert to new format
           new_data = self._convert_input_data_to_new_format(input.data, signature.input_fields)
           input.data.CopyFrom(new_data)
@@ -238,11 +250,15 @@ class ModelClass(ABC):
       if len(inputs) == 1:
         inputs = inputs[0]
         output = method(**inputs)
-        outputs.append(self._convert_output_to_proto(output, signature.output_fields))
+        outputs.append(
+            self._convert_output_to_proto(
+                output, signature.output_fields, convert_old_format=is_convert))
       else:
         outputs = self._batch_predict(method, inputs)
         outputs = [
-            self._convert_output_to_proto(output, signature.output_fields) for output in outputs
+            self._convert_output_to_proto(
+                output, signature.output_fields, convert_old_format=is_convert)
+            for output in outputs
         ]
 
       return service_pb2.MultiOutputResponse(
@@ -269,7 +285,8 @@ class ModelClass(ABC):
       python_param_types = method_info.python_param_types
       for input in request.inputs:
         # check if input is in old format
-        if self.is_old_format(input.data):
+        is_convert = self.is_old_format(input.data)
+        if is_convert:
           # convert to new format
           new_data = self._convert_input_data_to_new_format(input.data, signature.input_fields)
           input.data.CopyFrom(new_data)
@@ -279,7 +296,11 @@ class ModelClass(ABC):
         inputs = inputs[0]
         for output in method(**inputs):
           resp = service_pb2.MultiOutputResponse()
-          self._convert_output_to_proto(output, signature.output_fields, proto=resp.outputs.add())
+          self._convert_output_to_proto(
+              output,
+              signature.output_fields,
+              proto=resp.outputs.add(),
+              convert_old_format=is_convert)
           resp.status.code = status_code_pb2.SUCCESS
           yield resp
       else:
@@ -287,7 +308,10 @@ class ModelClass(ABC):
           resp = service_pb2.MultiOutputResponse()
           for output in outputs:
             self._convert_output_to_proto(
-                output, signature.output_fields, proto=resp.outputs.add())
+                output,
+                signature.output_fields,
+                proto=resp.outputs.add(),
+                convert_old_format=is_convert)
           resp.status.code = status_code_pb2.SUCCESS
           yield resp
     except Exception as e:
@@ -322,7 +346,8 @@ class ModelClass(ABC):
 
       for input in request.inputs:
         # check if input is in old format
-        if self.is_old_format(input.data):
+        is_convert = self.is_old_format(input.data)
+        if is_convert:
           # convert to new format
           new_data = self._convert_input_data_to_new_format(input.data, signature.input_fields)
           input.data.CopyFrom(new_data)
@@ -349,7 +374,11 @@ class ModelClass(ABC):
 
       for output in method(**kwargs):
         resp = service_pb2.MultiOutputResponse()
-        self._convert_output_to_proto(output, signature.output_fields, proto=resp.outputs.add())
+        self._convert_output_to_proto(
+            output,
+            signature.output_fields,
+            proto=resp.outputs.add(),
+            convert_old_format=is_convert)
         resp.status.code = status_code_pb2.SUCCESS
         yield resp
     except Exception as e:
@@ -387,14 +416,19 @@ class ModelClass(ABC):
   def _convert_output_to_proto(self,
                                output: Any,
                                variables_signature: List[resources_pb2.ModelTypeField],
-                               proto=None) -> resources_pb2.Output:
+                               proto=None,
+                               convert_old_format=False) -> resources_pb2.Output:
     if proto is None:
       proto = resources_pb2.Output()
     serialize({'return': output}, variables_signature, proto.data, is_output=True)
+    if convert_old_format:
+      # convert to old format
+      data = self._convert_output_data_to_old_format(proto.data)
+      proto.data.CopyFrom(data)
     proto.status.code = status_code_pb2.SUCCESS
-    if self._prompt_tokens is not None:
+    if hasattr(self, "_prompt_tokens") and self._prompt_tokens is not None:
       proto.prompt_tokens = self._prompt_tokens
-    if self._completion_tokens is not None:
+    if hasattr(self, "_completion_tokens") and self._completion_tokens is not None:
       proto.completion_tokens = self._completion_tokens
     self._prompt_tokens = None
     self._completion_tokens = None

{clarifai-11.2.3rc2 → clarifai-11.2.3rc4}/clarifai/runners/utils/method_signatures.py

@@ -279,11 +279,6 @@ def serialize(kwargs, signatures, proto=None, is_output=False):
       raise TypeError('Got a single return value, but expected multiple outputs {%s}' %
                       ', '.join(sig.name for sig in signatures))
     raise TypeError('Got unexpected key: %s' % ', '.join(unknown))
-  inline_first_value = False
-  if (is_output and len(signatures) == 1 and signatures[0].name == 'return' and
-      len(kwargs) == 1 and 'return' in kwargs):
-    # if there is only one output, flatten it and return directly
-    inline_first_value = True
   for sig_i, sig in enumerate(signatures):
     if sig.name not in kwargs:
       if sig.required:
@@ -293,16 +288,10 @@ def serialize(kwargs, signatures, proto=None, is_output=False):
     serializer = serializer_from_signature(sig)
     # TODO determine if any (esp the first) var can go in the proto without parts
     # and whether to put this in the signature or dynamically determine it
-    if inline_first_value and sig_i == 0 and id(data) not in _ZERO_VALUE_IDS:
-      # inlined first value; note data must not be empty or 0 to inline, since that
-      # will correspond to the missing value case (which uses function defaults).
-      # empty values are put explicitly in parts.
-      serializer.serialize(proto, data)
-    else:
-      # add the part to the proto
-      part = proto.parts.add()
-      part.id = sig.name
-      serializer.serialize(part.data, data)
+    # add the part to the proto
+    part = proto.parts.add()
+    part.id = sig.name
+    serializer.serialize(part.data, data)
   return proto
 
 

{clarifai-11.2.3rc2 → clarifai-11.2.3rc4/clarifai.egg-info}/PKG-INFO

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

clarifai-11.2.3rc2/clarifai/__init__.py

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