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

clarifai/__init__.py

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

clarifai/client/model.py

@@ -84,6 +84,7 @@ class Model(Lister, BaseClient):
         compute_cluster_id=compute_cluster_id,
         nodepool_id=nodepool_id,
         deployment_id=deployment_id,
+        user_id=self.user_id,  # FIXME the deployment's user_id can be different than the model's.
     )
     BaseClient.__init__(
         self,

clarifai/client/model_client.py

@@ -203,6 +203,8 @@ class ModelClient:
       proto = resources_pb2.Input()
 
       serialize(input, input_signature, proto.data)
+      print("input:", input)
+      print("proto.data:", proto.data)
       proto_inputs.append(proto)
 
     response = self._predict_by_proto(proto_inputs, method_name)

clarifai/runners/utils/data_types.py

@@ -158,19 +158,20 @@ class Text(MessageData):
 
 class Concept(MessageData):
 
-  def __init__(self, name: str, value: float = 0):
+  def __init__(self, id: str, name: str, value: float = 1):
+    self.id = id
     self.name = name
     self.value = value
 
   def __repr__(self) -> str:
-    return f"Concept(name={self.name!r}, value={self.value})"
+    return f"Concept(id={self.id!r}, name={self.name!r}, value={self.value})"
 
   def to_proto(self):
-    return ConceptProto(name=self.name, value=self.value)
+    return ConceptProto(id=self.id, name=self.name, value=self.value)
 
   @classmethod
   def from_proto(cls, proto: ConceptProto) -> "Concept":
-    return cls(proto.name, proto.value)
+    return cls(proto.id, proto.name, proto.value)
 
 
 class Region(MessageData):

clarifai/runners/utils/data_utils.py

@@ -1,7 +1,12 @@
 from io import BytesIO
 
+from clarifai_grpc.grpc.api.resources_pb2 import ModelTypeEnumOption
+from clarifai_grpc.grpc.api.resources_pb2 import ModelTypeField as InputFieldProto
+from clarifai_grpc.grpc.api.resources_pb2 import ModelTypeRangeInfo
 from PIL import Image
 
+from clarifai.runners.utils.data_types import MessageData
+
 
 def image_to_bytes(img: Image.Image, format="JPEG") -> bytes:
   buffered = BytesIO()
@@ -49,3 +54,130 @@ def is_openai_chat_format(messages):
         if not isinstance(item, dict):
           return False
   return True
+
+
+class InputField(MessageData):
+  """A field that can be used to store input data."""
+
+  def __init__(self,
+               default=None,
+               description=None,
+               min_value=None,
+               max_value=None,
+               choices=None,
+               visibility=True,
+               is_param=False):
+    self.default = default
+    self.description = description
+    self.min_value = min_value
+    self.max_value = max_value
+    self.choices = choices
+    self.visibility = visibility
+    self.is_param = is_param
+
+  def __repr__(self) -> str:
+    attrs = []
+    if self.default is not None:
+      attrs.append(f"default={self.default!r}")
+    if self.description is not None:
+      attrs.append(f"description={self.description!r}")
+    if self.min_value is not None:
+      attrs.append(f"min_value={self.min_value!r}")
+    if self.max_value is not None:
+      attrs.append(f"max_value={self.max_value!r}")
+    if self.choices is not None:
+      attrs.append(f"choices={self.choices!r}")
+    attrs.append(f"visibility={self.visibility!r}")
+    attrs.append(f"is_param={self.is_param!r}")
+    return f"InputField({', '.join(attrs)})"
+
+  def to_proto(self, proto=None) -> InputFieldProto:
+    if proto is None:
+      proto = InputFieldProto()
+    if self.description is not None:
+      proto.description = self.description
+
+    if self.choices is not None:
+      for choice in self.choices:
+        option = ModelTypeEnumOption(id=str(choice))
+        proto.model_type_enum_options.append(option)
+
+    proto.required = self.default is None
+
+    if self.min_value is not None or self.max_value is not None:
+      range_info = ModelTypeRangeInfo()
+      if self.min_value is not None:
+        range_info.min = float(self.min_value)
+      if self.max_value is not None:
+        range_info.max = float(self.max_value)
+      proto.model_type_range_info.CopyFrom(range_info)
+
+    proto.visibility = self.visibility
+    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)
+
+    return proto
+
+  @classmethod
+  def from_proto(cls, proto):
+    default = None
+    if proto.HasField('default'):
+      pb_value = proto.default
+      if pb_value.HasField('string_value'):
+        default = pb_value.string_value
+        try:
+          import json
+          default = json.loads(default)
+        except json.JSONDecodeError:
+          pass
+      elif pb_value.HasField('number_value'):
+        default = pb_value.number_value
+        if default.is_integer():
+          default = int(default)
+        else:
+          default = float(default)
+      elif pb_value.HasField('bool_value'):
+        default = pb_value.bool_value
+
+    choices = [option.id for option in proto.model_type_enum_options
+              ] if proto.model_type_enum_options else None
+
+    min_value = None
+    max_value = None
+    if proto.HasField('model_type_range_info'):
+      min_value = proto.model_type_range_info.min
+      max_value = proto.model_type_range_info.max
+      if min_value.is_integer():
+        min_value = int(min_value)
+      if max_value.is_integer():
+        max_value = int(max_value)
+
+    return cls(
+        default=default,
+        description=proto.description if proto.description else None,
+        min_value=min_value,
+        max_value=max_value,
+        choices=choices,
+        visibility=proto.visibility,
+        is_param=proto.is_param)
+
+  @classmethod
+  def set_default(cls, proto=None, default=None):
+
+    if proto is None:
+      proto = InputFieldProto()
+    if default is not None:
+      if isinstance(default, str) or isinstance(default, bool) or isinstance(
+          default, (int, float)):
+        proto.default = str(default)
+      else:
+        import json
+        proto.default = json.dumps(default)
+    return proto

clarifai/runners/utils/method_signatures.py

@@ -10,7 +10,7 @@ from clarifai_grpc.grpc.api import resources_pb2
 from google.protobuf.json_format import MessageToDict, ParseDict
 from google.protobuf.message import Message as MessageProto
 
-from clarifai.runners.utils import data_types
+from clarifai.runners.utils import data_types, data_utils
 from clarifai.runners.utils.serializers import (
     AtomicFieldSerializer, JSONSerializer, ListSerializer, MessageSerializer,
     NamedFieldsSerializer, NDArraySerializer, Serializer, TupleSerializer)
@@ -107,7 +107,10 @@ def build_variable_signature(name, annotation, default=inspect.Parameter.empty,
   if not is_output:
     sig.required = (default is inspect.Parameter.empty)
     if not sig.required:
-      sig.default = str(default)
+      if isinstance(default, data_utils.InputField):
+        sig = default.to_proto(sig)
+      else:
+        sig = data_utils.InputField.set_default(sig, default)
 
   _fill_signature_type(sig, tp)
 
@@ -150,6 +153,7 @@ def _fill_signature_type(sig, tp):
     sig.type = resources_pb2.ModelTypeField.DataType.TUPLE
     for inner_type in args:
       inner_sig = sig.type_args.add()
+      inner_sig.name = sig.name + '_item'
       _fill_signature_type(inner_sig, inner_type)
     return
 
@@ -157,6 +161,7 @@ def _fill_signature_type(sig, tp):
   if origin == list:
     sig.type = resources_pb2.ModelTypeField.DataType.LIST
     inner_sig = sig.type_args.add()
+    inner_sig.name = sig.name + '_item'
     _fill_signature_type(inner_sig, args[0])
     return
 
@@ -237,7 +242,7 @@ def serialize(kwargs, signatures, proto=None, is_output=False):
     # if there is only one output, flatten it and return directly
     inline_first_value = True
   if signatures and signatures[0].type not in _NON_INLINABLE_TYPES:
-    inline_first_value = True
+    inline_first_value = False
   for sig_i, sig in enumerate(signatures):
     if sig.name not in kwargs:
       if sig.required:

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

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

{clarifai-11.1.7rc6.dist-info → clarifai-11.1.7rc7.dist-info}/RECORD

@@ -1,4 +1,4 @@
-clarifai/__init__.py,sha256=PzbKrpCo-t2qaebsvu-symHcih514RB4J2tA_qrxQqQ,26
+clarifai/__init__.py,sha256=UVb-Qd94W3trcR1tUhxvZWOZsQeO3zRk4WOaKuSTtK0,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=UGBC0weDFCH7OK7vf67yiVmQ09hlRx_9ZkfKzQjLq-U,76896
-clarifai/client/model_client.py,sha256=nKEMH0Rkb1cSVpuIwmMI4Kqf1zAXT6eEPaDoAunHEb4,17796
+clarifai/client/model.py,sha256=HLTzCoGhZ5Ifm5x5nSFa4YULnLLlBpZF-29nfOcwFuY,76995
+clarifai/client/model_client.py,sha256=B2M_yr-iuhgT1bJTontfN_KrJyfDRKfNW5ALM0Cufkc,17864
 clarifai/client/module.py,sha256=FTkm8s9m-EaTKN7g9MnLhGJ9eETUfKG7aWZ3o1RshYs,4204
 clarifai/client/nodepool.py,sha256=la3vTFrO4LX8zm2eQ5jqf2L0-kQ63Dano8FibadoZbk,10152
 clarifai/client/search.py,sha256=GaPWN6JmTQGZaCHr6U1yv0zqR6wKFl7i9IVLg2ul1CI,14254
@@ -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=A6IYU55pdPFfoh0K6HkEgTPlgQVv2JUG5lOlqTu1w44,12258
-clarifai/runners/utils/data_utils.py,sha256=g0YEb0j_F6azIKb6BqR-uhWgR0qbmpdL1-Z4KS4mvgU,1228
+clarifai/runners/utils/data_types.py,sha256=xW3DrBP0uyyyAw_K7xuLhEfBDhTbGu2u1L-mKK2bhTY,12322
+clarifai/runners/utils/data_utils.py,sha256=j_W_O57ciGbp2JDVLlau-V-DDrF6gsN6cjtLaL51AvA,5512
 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=RiAbj7I8JGp0pqwqWZN9AgP1GWYAzizK8LdSeSN_hHE,17432
+clarifai/runners/utils/method_signatures.py,sha256=ZFqcPsjp9Fbih2u-xTLN3utZkHeOhBxtaiHMEzJKcCw,17657
 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.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.7rc7.dist-info/LICENSE,sha256=mUqF_d12-qE2n41g7C5_sq-BMLOcj6CNN-jevr15YHU,555
+clarifai-11.1.7rc7.dist-info/METADATA,sha256=5YXRRR7I8rkzcai9pN5auQTaxd0M-X0jUKNaVk-qNmo,22453
+clarifai-11.1.7rc7.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+clarifai-11.1.7rc7.dist-info/entry_points.txt,sha256=X9FZ4Z-i_r2Ud1RpZ9sNIFYuu_-9fogzCMCRUD9hyX0,51
+clarifai-11.1.7rc7.dist-info/top_level.txt,sha256=wUMdCQGjkxaynZ6nZ9FAnvBUCgp5RJUVFSy2j-KYo0s,9
+clarifai-11.1.7rc7.dist-info/RECORD,,