scalekit-sdk-python 2.12.0__tar.gz → 2.13.0__tar.gz

{scalekit_sdk_python-2.12.0 → scalekit_sdk_python-2.13.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scalekit-sdk-python
-Version: 2.12.0
+Version: 2.13.0
 Summary: Scalekit official Python SDK
 Home-page: https://github.com/scalekit-inc/scalekit-sdk-python
 Author: Team Scalekit
@@ -11,22 +11,22 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: grpcio>=1.64.1
-Requires-Dist: protobuf<7.0.0,>=5.29.5
+Requires-Dist: grpcio<2.0,>=1.81.0
+Requires-Dist: protobuf<8.0.0,>=5.29.5
 Requires-Dist: google>=3.0
-Requires-Dist: requests>=2.32.3
-Requires-Dist: PyJWT>=2.12.0
+Requires-Dist: requests>=2.34.0
+Requires-Dist: PyJWT>=2.13.0
 Requires-Dist: cffi>=1.15.1
-Requires-Dist: cryptography<47,==46.0.6
-Requires-Dist: setuptools<81.0,>=78.1.1
-Requires-Dist: grpcio-status<1.67,>=1.64
+Requires-Dist: cryptography<49,>=46.0.6
+Requires-Dist: setuptools<83.0,>=82.0.1
+Requires-Dist: grpcio-status<2.0,>=1.81.0
 Requires-Dist: protoc-gen-openapiv2>=0.0.1
-Requires-Dist: googleapis-common-protos>=1.72.0
+Requires-Dist: googleapis-common-protos>=1.75.0
 Requires-Dist: deprecation>=2.1.0
-Requires-Dist: python-dotenv~=1.1.1
-Requires-Dist: Faker~=25.8.0
-Requires-Dist: pydantic>=2.10.6
-Requires-Dist: mcp>=1.23.0
+Requires-Dist: python-dotenv<2.0,>=1.2.2
+Requires-Dist: Faker<41.0,>=33.0.0
+Requires-Dist: pydantic>=2.13.4
+Requires-Dist: mcp>=1.27.2
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{scalekit_sdk_python-2.12.0 → scalekit_sdk_python-2.13.0}/scalekit/_version.py

@@ -1,3 +1,3 @@
 # Single source of truth for the SDK version.
 # Import this in setup.py and scalekit/core.py — never hardcode the version elsewhere.
-__version__ = "2.12.0"
+__version__ = "2.13.0"

{scalekit_sdk_python-2.12.0 → scalekit_sdk_python-2.13.0}/scalekit/actions/actions.py

@@ -791,10 +791,22 @@ class ActionClient:
                 organization_id=organization_id,
                 user_id=user_id
             )
-            
-            # If we found it, convert the GetConnectedAccountAuthResponse to CreateConnectedAccountResponse format
+
+            # True upsert: if credentials were supplied, apply them regardless of
+            # the account's current status (PENDING_AUTH, ACTIVE, EXPIRED, DISCONNECTED).
+            if authorization_details:
+                update_response = self.update_connected_account(
+                    connection_name=connection_name,
+                    identifier=identifier,
+                    authorization_details=authorization_details,
+                    organization_id=organization_id,
+                    user_id=user_id,
+                    api_config=api_config
+                )
+                return CreateConnectedAccountResponse(connected_account=update_response.connected_account)
+
             return CreateConnectedAccountResponse(connected_account=existing_response.connected_account)
-            
+
         except ScalekitNotFoundException:
             # Connected account doesn't exist, create a new one
             return self.create_connected_account(
@@ -806,6 +818,9 @@ class ActionClient:
                 api_config=api_config
             )
 
+    #: Alias for :meth:`get_or_create_connected_account` — preferred name for upsert semantics.
+    upsert_connected_account = get_or_create_connected_account
+
     def update_connected_account(
         self,
         connection_name: str,

{scalekit_sdk_python-2.12.0 → scalekit_sdk_python-2.13.0}/scalekit/common/exceptions.py

@@ -103,11 +103,41 @@ class ScalekitServerException(ScalekitException):
                 if not self._error_code:
                     self._error_code = info.error_code
 
+    @staticmethod
+    def _extract_error_code(error: grpc.RpcError) -> str | None:
+        """ Extract error_code from gRPC trailing metadata without constructing a full exception """
+        from grpc_status import rpc_status
+        try:
+            status = rpc_status.from_call(error)
+            if status is None:
+                return None
+            for detail in status.details:
+                info = ErrorInfo()
+                detail.Unpack(info)
+                if info.error_code:
+                    return info.error_code
+        except Exception:
+            pass
+        return None
+
     @staticmethod
     def promote(error: Response | grpc.RpcError):
         """ Promote a ScalekitServerException (Response or RpcError) to a specific error type """
         grpc_status = HTTP_TO_GRPC.get(error.status_code) if isinstance(error, Response) else error.code()
 
+        # Check for upstream provider errors signaled by error_code == "TOOL_ERROR"
+        if isinstance(error, grpc.RpcError):
+            error_code = ScalekitServerException._extract_error_code(error)
+            if error_code == "TOOL_ERROR":
+                if grpc_status == StatusCode.RESOURCE_EXHAUSTED:
+                    return ScalekitToolRateLimitException(error)
+                elif grpc_status == StatusCode.UNAUTHENTICATED:
+                    return ScalekitToolUnauthorizedException(error)
+                elif grpc_status == StatusCode.PERMISSION_DENIED:
+                    return ScalekitToolForbiddenException(error)
+                else:
+                    return ScalekitToolException(error)
+
         if grpc_status == StatusCode.INVALID_ARGUMENT:
             return ScalekitBadRequestException(error)
         elif grpc_status == StatusCode.FAILED_PRECONDITION:
@@ -258,3 +288,52 @@ class ScalekitCancelledException(ScalekitServerException):
 class ScalekitUnknownException(ScalekitServerException):
     def __init__(self, error: Response | grpc.RpcError):
         super().__init__(error)
+
+
+class ScalekitToolException(ScalekitServerException):
+    """ Base class for upstream provider tool errors (error_code == 'TOOL_ERROR') """
+    def __init__(self, error: Response | grpc.RpcError):
+        super().__init__(error)
+        # Extract ToolErrorInfo from the unpacked ErrorInfo details
+        self._tool_error_code = None
+        self._tool_error_message = None
+        self._execution_id = None
+        for info in self._unpacked_details:
+            if info.HasField("tool_error_info"):
+                self._tool_error_code = info.tool_error_info.tool_error_code or None
+                self._tool_error_message = info.tool_error_info.tool_error_message or None
+                self._execution_id = info.tool_error_info.execution_id or None
+                break
+
+    @property
+    def tool_error_code(self):
+        """ Provider-specific error code from tool execution """
+        return self._tool_error_code
+
+    @property
+    def tool_error_message(self):
+        """ Provider-specific error message from tool execution """
+        return self._tool_error_message
+
+    @property
+    def execution_id(self):
+        """ Execution ID for the tool call that failed """
+        return self._execution_id
+
+
+class ScalekitToolRateLimitException(ScalekitToolException, ScalekitTooManyRequestsException):
+    """ Provider returned 429/rate-limit during tool execution """
+    def __init__(self, error: Response | grpc.RpcError):
+        ScalekitToolException.__init__(self, error)
+
+
+class ScalekitToolUnauthorizedException(ScalekitToolException, ScalekitUnauthorizedException):
+    """ Provider returned 401/unauthorized during tool execution """
+    def __init__(self, error: Response | grpc.RpcError):
+        ScalekitToolException.__init__(self, error)
+
+
+class ScalekitToolForbiddenException(ScalekitToolException, ScalekitForbiddenException):
+    """ Provider returned 403/forbidden during tool execution """
+    def __init__(self, error: Response | grpc.RpcError):
+        ScalekitToolException.__init__(self, error)

{scalekit_sdk_python-2.12.0 → scalekit_sdk_python-2.13.0}/scalekit/core.py

@@ -10,7 +10,7 @@ from urllib.parse import urlparse
 from cryptography.hazmat.primitives import serialization
 from scalekit._version import __version__ as _sdk_version
 from scalekit.common.scalekit import GrantType
-from scalekit.common.exceptions import ScalekitServerException, ScalekitException
+from scalekit.common.exceptions import ScalekitServerException, ScalekitException, ScalekitTooManyRequestsException
 
 TRequest = TypeVar("TRequest")
 TResponse = TypeVar("TResponse")
@@ -163,6 +163,11 @@ class CoreClient:
             )
             return resp
         except grpc.RpcError as exp:
+            # Check for upstream provider errors first — never retry, never refresh M2M
+            error_code = ScalekitServerException._extract_error_code(exp)
+            if error_code == "TOOL_ERROR":
+                raise ScalekitServerException.promote(exp)
+
             if exp.code() == grpc.StatusCode.UNAUTHENTICATED:
                 if retry <= 0:
                     raise ScalekitServerException.promote(exp)
@@ -171,6 +176,9 @@ class CoreClient:
                     return self.grpc_exec(func, data, retry=retry-1)
                 except Exception as refresh_exp:
                     raise ScalekitServerException.promote(exp)
+            elif exp.code() == grpc.StatusCode.RESOURCE_EXHAUSTED:
+                # Surface Scalekit rate-limits immediately — retrying triples the damage
+                raise ScalekitServerException.promote(exp)
             elif retry > 0:
                 return self.grpc_exec(func, data, retry=retry - 1)
             else:

{scalekit_sdk_python-2.12.0 → scalekit_sdk_python-2.13.0}/scalekit_sdk_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scalekit-sdk-python
-Version: 2.12.0
+Version: 2.13.0
 Summary: Scalekit official Python SDK
 Home-page: https://github.com/scalekit-inc/scalekit-sdk-python
 Author: Team Scalekit
@@ -11,22 +11,22 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: grpcio>=1.64.1
-Requires-Dist: protobuf<7.0.0,>=5.29.5
+Requires-Dist: grpcio<2.0,>=1.81.0
+Requires-Dist: protobuf<8.0.0,>=5.29.5
 Requires-Dist: google>=3.0
-Requires-Dist: requests>=2.32.3
-Requires-Dist: PyJWT>=2.12.0
+Requires-Dist: requests>=2.34.0
+Requires-Dist: PyJWT>=2.13.0
 Requires-Dist: cffi>=1.15.1
-Requires-Dist: cryptography<47,==46.0.6
-Requires-Dist: setuptools<81.0,>=78.1.1
-Requires-Dist: grpcio-status<1.67,>=1.64
+Requires-Dist: cryptography<49,>=46.0.6
+Requires-Dist: setuptools<83.0,>=82.0.1
+Requires-Dist: grpcio-status<2.0,>=1.81.0
 Requires-Dist: protoc-gen-openapiv2>=0.0.1
-Requires-Dist: googleapis-common-protos>=1.72.0
+Requires-Dist: googleapis-common-protos>=1.75.0
 Requires-Dist: deprecation>=2.1.0
-Requires-Dist: python-dotenv~=1.1.1
-Requires-Dist: Faker~=25.8.0
-Requires-Dist: pydantic>=2.10.6
-Requires-Dist: mcp>=1.23.0
+Requires-Dist: python-dotenv<2.0,>=1.2.2
+Requires-Dist: Faker<41.0,>=33.0.0
+Requires-Dist: pydantic>=2.13.4
+Requires-Dist: mcp>=1.27.2
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{scalekit_sdk_python-2.12.0 → scalekit_sdk_python-2.13.0}/scalekit_sdk_python.egg-info/SOURCES.txt

@@ -251,6 +251,7 @@ tests/test_providers.py
 tests/test_role_defaults_dependent.py
 tests/test_roles.py
 tests/test_sessions.py
+tests/test_sk819_retry_behavior.py
 tests/test_tokens.py
 tests/test_tools.py
 tests/test_user_roles_permissions.py

scalekit_sdk_python-2.13.0/scalekit_sdk_python.egg-info/requires.txt

@@ -0,0 +1,16 @@
+grpcio<2.0,>=1.81.0
+protobuf<8.0.0,>=5.29.5
+google>=3.0
+requests>=2.34.0
+PyJWT>=2.13.0
+cffi>=1.15.1
+cryptography<49,>=46.0.6
+setuptools<83.0,>=82.0.1
+grpcio-status<2.0,>=1.81.0
+protoc-gen-openapiv2>=0.0.1
+googleapis-common-protos>=1.75.0
+deprecation>=2.1.0
+python-dotenv<2.0,>=1.2.2
+Faker<41.0,>=33.0.0
+pydantic>=2.13.4
+mcp>=1.27.2

{scalekit_sdk_python-2.12.0 → scalekit_sdk_python-2.13.0}/setup.py

@@ -10,22 +10,22 @@ setup(
     version=__version__,
     packages=find_packages(),
     install_requires=[
-        "grpcio>=1.64.1",
-        "protobuf>=5.29.5,<7.0.0",
+        "grpcio>=1.81.0,<2.0",
+        "protobuf>=5.29.5,<8.0.0",
         "google>=3.0",
-        "requests>=2.32.3",
-        "PyJWT>=2.12.0",
+        "requests>=2.34.0",
+        "PyJWT>=2.13.0",
         "cffi>=1.15.1",
-        "cryptography==46.0.6,<47",
-        "setuptools>=78.1.1,<81.0",
-        "grpcio-status>=1.64,<1.67",
+        "cryptography>=46.0.6,<49",
+        "setuptools>=82.0.1,<83.0",
+        "grpcio-status>=1.81.0,<2.0",
         "protoc-gen-openapiv2>=0.0.1",
-        "googleapis-common-protos>=1.72.0",
+        "googleapis-common-protos>=1.75.0",
         "deprecation>=2.1.0",
-        "python-dotenv~=1.1.1",
-        "Faker~=25.8.0",
-        "pydantic>=2.10.6",
-        "mcp>= 1.23.0",
+        "python-dotenv>=1.2.2,<2.0",
+        "Faker>=33.0.0,<41.0",
+        "pydantic>=2.13.4",
+        "mcp>=1.27.2",
     ],
     url="https://github.com/scalekit-inc/scalekit-sdk-python",
     license="MIT",

{scalekit_sdk_python-2.12.0 → scalekit_sdk_python-2.13.0}/tests/test_actions.py

@@ -348,7 +348,7 @@ class TestConnect(BaseTest):
         """Method to test execute_tool with connection_name parameter"""
         try:
             result = self.scalekit_client.actions.execute_tool(
-                tool_input={"url": "https://docs.apify.com/platform/storage/usage"},
+                tool_input={"url": "https://docs.apify.com/platform/storage"},
                 tool_name="c-myapifymcp_fetch-apify-docs",
                 identifier="akshay.parihar",
                 connection_name="myapifymcp",