clarifai-grpc 10.9.5__tar.gz → 12.0.4__tar.gz

{clarifai_grpc-10.9.5 → clarifai_grpc-12.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: clarifai-grpc
-Version: 10.9.5
+Version: 12.0.4
 Summary: Clarifai gRPC API Client
 Home-page: https://github.com/Clarifai/clarifai-python-grpc
 Author: Clarifai
@@ -13,10 +13,21 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: grpcio<1.65.0,>=1.44.0
-Requires-Dist: protobuf>=3.20.3
-Requires-Dist: googleapis-common-protos>=1.53.0
-Requires-Dist: requests>=2.25.1
+Requires-Dist: grpcio>=1.53.2; python_version < "3.13"
+Requires-Dist: grpcio>=1.68.0; python_version >= "3.13"
+Requires-Dist: protobuf>=5.29.5
+Requires-Dist: googleapis-common-protos>=1.57.0
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 ![image](https://github.com/user-attachments/assets/e52874e7-9246-4d55-ad9d-18b1f44aee1a)
 

clarifai_grpc-12.0.4/clarifai_grpc/__init__.py

@@ -0,0 +1,33 @@
+__version__ = "12.0.4"
+
+import os
+
+# pop off env var set to the old python implementation
+unset = False
+if os.environ.get('PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION', None) == 'python':
+    unset = True
+    os.environ.pop('PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION')
+# Don't use the clarifai logger since it is in the SDK package and depends on protobuf.
+import logging
+
+logger = logging.getLogger(__name__)
+
+if unset:
+    logger.warning(
+        "Unsetting PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python env var while importing clarifai package. It's best to unset this env var in your environemnt for faster performance."
+    )
+
+try:
+    from google.protobuf.internal import api_implementation
+
+    if api_implementation.Type() == 'python':
+        logger.warning(
+            "The python version of google protobuf is being used. We recommend that you upgrade the protobuf package >=4.21.0 to use the upd version which is much faster."
+        )
+    #     and not os.environ.get('CLARIFAI_SKIP_PROTOBUF_CHECK', 'false') == 'true'
+    # ):
+    #     raise Exception(
+    #         "We do not recommend running this library with the Python implementation of Protocol Buffers. Please check your installation to use the cpp or upb implementation. We recommend setting the environment variable PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=upb. You can skip this check by setting CLARIFAI_SKIP_PROTOBUF_CHECK=true"
+    #     )
+except ImportError:
+    pass

{clarifai_grpc-10.9.5 → clarifai_grpc-12.0.4}/clarifai_grpc/channel/clarifai_channel.py

@@ -1,14 +1,15 @@
 import json
 import os
 
-import requests
+import grpc
 
 from clarifai_grpc.channel.grpc_json_channel import GRPCJSONChannel
-from clarifai_grpc.grpc.api import service_pb2_grpc
 
 RETRIES = 2  # if connections fail retry a couple times.
-CONNECTIONS = 20  # number of connections to maintain in pool.
-MAX_MESSAGE_LENGTH = 128 * 1024 * 1024  # 128MB
+CONNECTIONS = (
+    20  # number of connections to maintain in pool, only usd for json channel, not direct GRPC.
+)
+MAX_MESSAGE_LENGTH = 1024 * 1024 * 1024  # 1GB
 
 wrap_response_deserializer = None
 
@@ -19,9 +20,9 @@ grpc_json_config = json.dumps(
                 "name": [{"service": "clarifai.api.V2"}],
                 "retryPolicy": {
                     "maxAttempts": 5,
-                    "initialBackoff": "1s",
+                    "initialBackoff": "0.01s",
                     "maxBackoff": "5s",
-                    "backoffMultiplier": 1.5,
+                    "backoffMultiplier": 2,
                     "retryableStatusCodes": ["UNAVAILABLE"],
                 },
             }
@@ -52,6 +53,8 @@ class ClarifaiChannel:
 
     @staticmethod
     def _make_requests_session():
+        import requests  # noqa
+
         http_adapter = requests.adapters.HTTPAdapter(
             max_retries=RETRIES, pool_connections=CONNECTIONS, pool_maxsize=CONNECTIONS
         )
@@ -76,16 +79,17 @@ class ClarifaiChannel:
         if root_certificates_path:
             with open(root_certificates_path, "rb") as f:
                 root_certificates = f.read()
-            credentials = service_pb2_grpc.grpc.ssl_channel_credentials(root_certificates)
+            credentials = grpc.ssl_channel_credentials(root_certificates)
         else:
-            credentials = service_pb2_grpc.grpc.ssl_channel_credentials()
+            credentials = grpc.ssl_channel_credentials()
 
-        return service_pb2_grpc.grpc.secure_channel(
+        return grpc.secure_channel(
             base,
             credentials,
             options=[
                 ("grpc.service_config", grpc_json_config),
                 ("grpc.max_receive_message_length", MAX_MESSAGE_LENGTH),
+                ("grpc.max_send_message_length", MAX_MESSAGE_LENGTH),
             ],
         )
 
@@ -102,10 +106,62 @@ class ClarifaiChannel:
 
         channel_address = "{}:{}".format(base, port)
 
-        return service_pb2_grpc.grpc.insecure_channel(
+        return grpc.insecure_channel(
+            channel_address,
+            options=[
+                ("grpc.service_config", grpc_json_config),
+                ("grpc.max_receive_message_length", MAX_MESSAGE_LENGTH),
+                ("grpc.max_send_message_length", MAX_MESSAGE_LENGTH),
+            ],
+        )
+
+    @staticmethod
+    def get_aio_grpc_channel(base=None, root_certificates_path=None):
+        global wrap_response_deserializer
+        wrap_response_deserializer = _response_deserializer_for_grpc
+
+        if not base:
+            base = os.environ.get("CLARIFAI_GRPC_BASE", "api.clarifai.com")
+        if base.startswith("http:") or base.startswith("https:"):
+            raise ValueError(
+                "For secure channels the 'base' passed via arguments or env variable CLARIFAI_GRPC_BASE should not start with http:// or https:// but be a direct api endpoint like 'api.clarifai.com'"
+            )
+
+        if root_certificates_path:
+            with open(root_certificates_path, "rb") as f:
+                root_certificates = f.read()
+            credentials = grpc.ssl_channel_credentials(root_certificates)
+        else:
+            credentials = grpc.ssl_channel_credentials()
+
+        return grpc.aio.secure_channel(
+            base,
+            credentials,
+            options=[
+                ("grpc.service_config", grpc_json_config),
+                ("grpc.max_receive_message_length", MAX_MESSAGE_LENGTH),
+                ("grpc.max_send_message_length", MAX_MESSAGE_LENGTH),
+            ],
+        )
+
+    @staticmethod
+    def get_aio_insecure_grpc_channel(base=None, port=18080):
+        global wrap_response_deserializer
+        wrap_response_deserializer = _response_deserializer_for_grpc
+
+        if not base:
+            base = os.environ.get("CLARIFAI_GRPC_BASE", None)
+
+        if not base:
+            raise ValueError("Please set 'base' via arguments or env variable CLARIFAI_GRPC_BASE")
+
+        channel_address = "{}:{}".format(base, port)
+
+        return grpc.aio.insecure_channel(
             channel_address,
             options=[
                 ("grpc.service_config", grpc_json_config),
                 ("grpc.max_receive_message_length", MAX_MESSAGE_LENGTH),
+                ("grpc.max_send_message_length", MAX_MESSAGE_LENGTH),
             ],
         )

{clarifai_grpc-10.9.5 → clarifai_grpc-12.0.4}/clarifai_grpc/channel/custom_converters/custom_message_to_dict.py

@@ -24,15 +24,16 @@ def protobuf_to_dict(object_protobuf, use_integers_for_enums=True, ignore_show_e
 class _CustomPrinter(_Printer):
     def __init__(
         self,
+        *,
         including_default_value_fields,
         preserving_proto_field_name,
         use_integers_for_enums,
         ignore_show_empty,
     ):
         super(_CustomPrinter, self).__init__(
-            including_default_value_fields,
-            preserving_proto_field_name,
-            use_integers_for_enums,
+            always_print_fields_with_no_presence=including_default_value_fields,
+            preserving_proto_field_name=preserving_proto_field_name,
+            use_integers_for_enums=use_integers_for_enums,
         )
         self._ignore_show_empty = ignore_show_empty
 

{clarifai_grpc-10.9.5 → clarifai_grpc-12.0.4}/clarifai_grpc/channel/grpc_json_channel.py

@@ -3,14 +3,13 @@ import logging
 import re
 import typing  # noqa
 
-import requests  # noqa
 from google.protobuf.descriptor import Descriptor  # noqa
 from google.protobuf.message import Message  # noqa
 
 from clarifai_grpc.channel import http_client
 from clarifai_grpc.channel.custom_converters.custom_dict_to_message import dict_to_protobuf
 from clarifai_grpc.channel.custom_converters.custom_message_to_dict import protobuf_to_dict
-from clarifai_grpc.channel.errors import UsageError, NotImplementedCaller
+from clarifai_grpc.channel.errors import NotImplementedCaller, UsageError
 from clarifai_grpc.channel.exceptions import ClarifaiException
 from clarifai_grpc.grpc.api.service_pb2 import _V2
 
@@ -43,7 +42,7 @@ class GRPCJSONChannel(object):
 
     def __init__(
         self,
-        session: requests.Session,
+        session,  # type: requests.Session,
         base_url: str = BASE_URL,
         service_descriptor: typing.Any = _V2,
     ) -> None:
@@ -417,8 +416,7 @@ def _pick_proper_endpoint(
 
     if not best_match_url:
         raise Exception(
-            "You must set one case of the following fields in your request proto: "
-            "%s" % all_fields
+            "You must set one case of the following fields in your request proto: %s" % all_fields
         )
 
     return best_match_url, best_match_method, best_match_url_fields

{clarifai_grpc-10.9.5 → clarifai_grpc-12.0.4}/clarifai_grpc/channel/http_client.py

@@ -4,11 +4,10 @@ import logging
 import os
 import typing  # noqa
 
-import requests
-
+from clarifai_grpc import __version__
 from clarifai_grpc.channel.errors import ApiError
 
-CLIENT_VERSION = "10.9.5"
+CLIENT_VERSION = __version__
 OS_VER = os.sys.platform
 PYTHON_VERSION = ".".join(
     map(
@@ -39,6 +38,7 @@ class HttpClient:
             "Content-Type": "application/json",
             "X-Clarifai-gRPC-Client": "python:%s" % CLIENT_VERSION,
             "Python-Client": "%s:%s" % (OS_VER, PYTHON_VERSION),
+            "X-Clarifai-Request-ID-Prefix": f"python-json-{CLIENT_VERSION}",
             "Authorization": "Key %s" % self._auth_string,
         }
         logger.debug("=" * 100)
@@ -50,6 +50,9 @@ class HttpClient:
             json.dumps(headers, indent=2),
             json.dumps(succinct_payload, indent=2),
         )
+        # Avoid import at the top so we don't depend on requests in requirements.txt
+        import requests  # noqa
+
         try:
             if method == "GET":
                 res = self._session.get(