clarifai 11.3.0rc3__py3-none-any.whl → 11.4.1__py3-none-any.whl

clarifai/__init__.py

@@ -1 +1 @@
-__version__ = "11.3.0rc3"
+__version__ = "11.4.1"

clarifai/client/auth/helper.py

@@ -151,13 +151,8 @@ class ClarifaiAuthHelper:
         try:
             if st.query_params:
                 auth.add_streamlit_query_params(st.query_params)
-            elif "query_params" in st.session_state:
-                auth.add_streamlit_query_params(st.session_state.query_params)
             else:
-                st.error(
-                    "Either initialize the 'ClarifaiAuthHelper' in the main app.py file or add 'query_params' to the session state in the main app.py file."
-                )
-                st.stop()
+                auth.add_streamlit_query_params(st.session_state)
         except Exception as e:
             st.error(e)
             st.stop()
@@ -209,8 +204,7 @@ class ClarifaiAuthHelper:
                 base: as 'base' in query_params.
 
         Args:
-          query_params: the streamlit.experimental_get_query_params() response or an empty dict to fall
-        back to using env vars.
+          query_params: the streamlit.query_params response or streamlit.session_state.
         """
 
         if query_params == "":  # empty response from streamlit

clarifai/runners/utils/data_utils.py

@@ -1,9 +1,11 @@
+import math
+import operator
 from io import BytesIO
 from typing import List
 
 from clarifai_grpc.grpc.api import resources_pb2
 from clarifai_grpc.grpc.api.resources_pb2 import ModelTypeEnumOption, ModelTypeRangeInfo
-from clarifai_grpc.grpc.api.resources_pb2 import ModelTypeField as InputFieldProto
+from clarifai_grpc.grpc.api.resources_pb2 import ModelTypeField as ParamProto
 from PIL import Image
 
 from clarifai.runners.utils.data_types import MessageData
@@ -57,7 +59,7 @@ def is_openai_chat_format(messages):
     return True
 
 
-class InputField(MessageData):
+class Param(MessageData):
     """A field that can be used to store input data."""
 
     def __init__(
@@ -67,14 +69,14 @@ class InputField(MessageData):
         min_value=None,
         max_value=None,
         choices=None,
-        #  is_param=True
+        is_param=True,
     ):
         self.default = default
         self.description = description
         self.min_value = min_value
         self.max_value = max_value
         self.choices = choices
-        # self.is_param = is_param
+        self.is_param = is_param
 
     def __repr__(self) -> str:
         attrs = []
@@ -88,12 +90,162 @@ class InputField(MessageData):
             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"is_param={self.is_param!r}")
-        return f"InputField({', '.join(attrs)})"
+        attrs.append(f"is_param={self.is_param!r}")
+        return f"Param({', '.join(attrs)})"
 
-    def to_proto(self, proto=None) -> InputFieldProto:
+    # All *explicit* conversions
+    def __int__(self):
+        return int(self.default)
+
+    def __float__(self):
+        return float(self.default)
+
+    def __str__(self):
+        return str(self.default)
+
+    def __bool__(self):
+        return bool(self.default)
+
+    def __index__(self):
+        return int(self.default)  # for slicing
+
+    # sequence / mapping protocol delegation
+    def __len__(self):
+        return len(self.default)
+
+    def __iter__(self):
+        return iter(self.default)
+
+    def __reversed__(self):
+        return reversed(self.default)
+
+    def __contains__(self, item):
+        return item in self.default
+
+    def __getitem__(self, key):
+        return self.default[key]
+
+    def __setitem__(self, k, v):
+        self.default[k] = v
+
+    def __delitem__(self, k):
+        del self.default[k]
+
+    def __hash__(self):
+        return hash(self.default)
+
+    def __call__(self, *args, **kwargs):
+        return self.default(*args, **kwargs)
+
+    # Comparison operators
+    def __eq__(self, other):
+        return self.default == other
+
+    def __lt__(self, other):
+        return self.default < other
+
+    def __le__(self, other):
+        return self.default <= other
+
+    def __gt__(self, other):
+        return self.default > other
+
+    def __ge__(self, other):
+        return self.default >= other
+
+    # Arithmetic operators – # arithmetic & bitwise operators – auto-generated
+    _arith_ops = {
+        "__add__": operator.add,
+        "__sub__": operator.sub,
+        "__mul__": operator.mul,
+        "__truediv__": operator.truediv,
+        "__floordiv__": operator.floordiv,
+        "__mod__": operator.mod,
+        "__pow__": operator.pow,
+        "__and__": operator.and_,
+        "__or__": operator.or_,
+        "__xor__": operator.xor,
+        "__lshift__": operator.lshift,
+        "__rshift__": operator.rshift,
+    }
+
+    # Create both left- and right-hand versions of each operator
+    for _name, _op in _arith_ops.items():
+
+        def _make(op):
+            def _f(self, other, *, _op=op):  # default arg binds op
+                return _op(self.default, other)
+
+            return _f
+
+        locals()[_name] = _make(_op)
+        locals()["__r" + _name[2:]] = _make(lambda x, y, _op=_op: _op(y, x))
+    del _name, _op, _make
+
+    # In-place operators
+    _inplace_ops = {
+        "__iadd__": operator.iadd,
+        "__isub__": operator.isub,
+        "__imul__": operator.imul,
+        "__itruediv__": operator.itruediv,
+        "__ifloordiv__": operator.ifloordiv,
+        "__imod__": operator.imod,
+        "__ipow__": operator.ipow,
+        "__ilshift__": operator.ilshift,
+        "__irshift__": operator.irshift,
+        "__iand__": operator.iand,
+        "__ixor__": operator.ixor,
+        "__ior__": operator.ior,
+    }
+
+    for _name, _op in _inplace_ops.items():
+
+        def _make_inplace(op):
+            def _f(self, other, *, _op=op):
+                self.default = _op(self.default, other)
+                return self
+
+            return _f
+
+        locals()[_name] = _make_inplace(_op)
+    del _name, _op, _make_inplace
+
+    # Formatting and other conversions
+    def __format__(self, format_spec):
+        return format(self.default, format_spec)
+
+    def __bytes__(self):
+        return bytes(self.default)
+
+    def __complex__(self):
+        return complex(self.default)
+
+    def __round__(self, ndigits=None):
+        return round(self.default, ndigits)
+
+    def __trunc__(self):
+        return math.trunc(self.default)
+
+    def __floor__(self):
+        return math.floor(self.default)
+
+    def __ceil__(self):
+        return math.ceil(self.default)
+
+    # Attribute access delegation – anything we did *not* define above
+    # will automatically be looked up on the wrapped default value.
+    # Attribute access delegation
+    def __getattr__(self, item):
+        return getattr(self.default, item)
+
+    def __get__(self, instance, owner):
+        if instance is None:
+            return self
+        return self.default
+
+    def to_proto(self, proto=None) -> ParamProto:
         if proto is None:
-            proto = InputFieldProto()
+            proto = ParamProto()
         if self.description is not None:
             proto.description = self.description
 
@@ -111,7 +263,7 @@ class InputField(MessageData):
             if self.max_value is not None:
                 range_info.max = float(self.max_value)
             proto.model_type_range_info.CopyFrom(range_info)
-        # proto.is_param = self.is_param
+        proto.is_param = self.is_param
 
         if self.default is not None:
             proto = self.set_default(proto, self.default)
@@ -162,7 +314,7 @@ class InputField(MessageData):
             min_value=min_value,
             max_value=max_value,
             choices=choices,
-            # is_param=proto.is_param
+            is_param=proto.is_param,
         )
 
     @classmethod
@@ -171,7 +323,7 @@ class InputField(MessageData):
             import json
 
             if proto is None:
-                proto = InputFieldProto()
+                proto = ParamProto()
             if default is not None:
                 proto.default = json.dumps(default)
             return proto

clarifai/runners/utils/method_signatures.py

@@ -161,10 +161,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:
-            if isinstance(default, data_utils.InputField):
+            if isinstance(default, data_utils.Param):
                 sig = default.to_proto(sig)
             else:
-                sig = data_utils.InputField.set_default(sig, default)
+                sig = data_utils.Param.set_default(sig, default)
 
     _fill_signature_type(sig, tp)
 

{clarifai-11.3.0rc3.dist-info → clarifai-11.4.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clarifai
-Version: 11.3.0rc3
+Version: 11.4.1
 Home-page: https://github.com/Clarifai/clarifai-python
 Author: Clarifai
 Author-email: support@clarifai.com
@@ -19,8 +19,8 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: clarifai-grpc>=11.3.2
-Requires-Dist: clarifai-protocol>=0.0.22
+Requires-Dist: clarifai-grpc>=11.3.4
+Requires-Dist: clarifai-protocol>=0.0.23
 Requires-Dist: numpy>=1.22.0
 Requires-Dist: tqdm>=4.65.0
 Requires-Dist: rich>=13.4.2

{clarifai-11.3.0rc3.dist-info → clarifai-11.4.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-clarifai/__init__.py,sha256=MR8mFjyd96wlh85Uis731GEE-f7NJzQnu7qo3Jnapek,26
+clarifai/__init__.py,sha256=2En8s3vAF6UtYOsy9zZZ7y0N_jqRJPbqJoD5cTWTleo,23
 clarifai/cli.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 clarifai/errors.py,sha256=GXa6D4v_L404J83jnRNFPH7s-1V9lk7w6Ws99f1g-AY,2772
 clarifai/versions.py,sha256=ecSuEB_nOL2XSoYHDw2n23XUbm_KPOGjudMXmQrGdS8,224
@@ -27,7 +27,7 @@ clarifai/client/search.py,sha256=Z-8PJJYAw5IlF0ac1M0GCz6TRQhouI8fwZryOJZkP1Q,156
 clarifai/client/user.py,sha256=Ey-sqW5dFE_3HLC-E4mHncKth-nQ1j_q6Tp80TMOfwI,18358
 clarifai/client/workflow.py,sha256=55fO5IYhER-kHL1FwP3IiWjWEZYNG3jpe7vBRIi_PJQ,13381
 clarifai/client/auth/__init__.py,sha256=7EwR0NrozkAUwpUnCsqXvE_p0wqx_SelXlSpKShKJK0,136
-clarifai/client/auth/helper.py,sha256=YGohIM0yWCqnEGX0jAEqKodvocqc8LRIqGcvv3ZUdlM,15540
+clarifai/client/auth/helper.py,sha256=10Ow_eCgWMKURYW2aT46GLEax-GYoEUHwbcdt7tX6jg,15199
 clarifai/client/auth/register.py,sha256=pyY-Kg_64WpN6rXz1SyEzfqL14BS4yADtuYMxLJ4jx4,554
 clarifai/client/auth/stub.py,sha256=pU4FYeghooCBZmCRyNTdDfJaVe4WyeRBqE3xVwfmMTY,5388
 clarifai/constants/base.py,sha256=ogmFSZYoF0YhGjHg5aiOc3MLqPr_poKAls6xaD0_C3U,89
@@ -75,9 +75,9 @@ clarifai/runners/models/model_servicer.py,sha256=rRd_fNEXwqiBSzTUtPI2r07EBdcCPd8
 clarifai/runners/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 clarifai/runners/utils/code_script.py,sha256=CeIhBYX-vB17ThQy5x4ObQoehYo3w4Nms5Qh1p5pTDk,10382
 clarifai/runners/utils/const.py,sha256=czPVidLCb2S1HbA8YbNkoDYphqr0-W7oeqrkf8LsTc4,1068
-clarifai/runners/utils/data_utils.py,sha256=NBmIdHliue4w9MFsf36QEwmerRCVRNbArpv3ekDkYxU,14850
+clarifai/runners/utils/data_utils.py,sha256=e6aJdQf0NlOynoMUuJD8F5lHnmKMfO9JNRFClBVrovM,18836
 clarifai/runners/utils/loader.py,sha256=KliTvPgi_7SkN3PhOeDFDATRaKFbqRU4CxOq6Gkh9T0,10070
-clarifai/runners/utils/method_signatures.py,sha256=AJjjiG4V8CmoMarCZGY8Dsh7P7th5eqIvBnTINCpOmw,19232
+clarifai/runners/utils/method_signatures.py,sha256=sZdHr1F9MmJSLCOR64PzVU1yZO4EqXNm5aCbh8KbBcY,19222
 clarifai/runners/utils/openai_convertor.py,sha256=QhbytqGU856gEFggaamZy01hhCwjiWz8ju48iubvbeI,5074
 clarifai/runners/utils/serializers.py,sha256=pI7GqMTC0T3Lu_X8v8TO4RiplO-gC_49Ns37jYwsPtg,7908
 clarifai/runners/utils/url_fetcher.py,sha256=Segkvi-ktPa3-koOpUu8DNZeWOaK6G82Ya9b7_oIKwo,1778
@@ -101,9 +101,9 @@ clarifai/workflows/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 clarifai/workflows/export.py,sha256=Oq3RVNKvv1iH46U6oIjXa-MXWJ4sTlXr_NSfwoxr3H4,2149
 clarifai/workflows/utils.py,sha256=ESL3INcouNcLKCh-nMpfXX-YbtCzX7tz7hT57_RGQ3M,2079
 clarifai/workflows/validate.py,sha256=UhmukyHkfxiMFrPPeBdUTiCOHQT5-shqivlBYEyKTlU,2931
-clarifai-11.3.0rc3.dist-info/licenses/LICENSE,sha256=mUqF_d12-qE2n41g7C5_sq-BMLOcj6CNN-jevr15YHU,555
-clarifai-11.3.0rc3.dist-info/METADATA,sha256=0OhSl0J0UHavpTL7maC2Fn0E__g5CywI28oA2d1IY68,22429
-clarifai-11.3.0rc3.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-clarifai-11.3.0rc3.dist-info/entry_points.txt,sha256=X9FZ4Z-i_r2Ud1RpZ9sNIFYuu_-9fogzCMCRUD9hyX0,51
-clarifai-11.3.0rc3.dist-info/top_level.txt,sha256=wUMdCQGjkxaynZ6nZ9FAnvBUCgp5RJUVFSy2j-KYo0s,9
-clarifai-11.3.0rc3.dist-info/RECORD,,
+clarifai-11.4.1.dist-info/licenses/LICENSE,sha256=mUqF_d12-qE2n41g7C5_sq-BMLOcj6CNN-jevr15YHU,555
+clarifai-11.4.1.dist-info/METADATA,sha256=0lxRlfleSaiJMEgPr4Brf-H9UNWbdVz9b1stmpRPuwo,22426
+clarifai-11.4.1.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+clarifai-11.4.1.dist-info/entry_points.txt,sha256=X9FZ4Z-i_r2Ud1RpZ9sNIFYuu_-9fogzCMCRUD9hyX0,51
+clarifai-11.4.1.dist-info/top_level.txt,sha256=wUMdCQGjkxaynZ6nZ9FAnvBUCgp5RJUVFSy2j-KYo0s,9
+clarifai-11.4.1.dist-info/RECORD,,