craft-ai-sdk 0.64.0__tar.gz → 0.64.1__tar.gz

{craft_ai_sdk-0.64.0 → craft_ai_sdk-0.64.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: craft-ai-sdk
-Version: 0.64.0
+Version: 0.64.1
 Summary: Craft AI MLOps platform SDK
 License: Apache-2.0
 Author: Craft AI

{craft_ai_sdk-0.64.0 → craft_ai_sdk-0.64.1}/craft_ai_sdk/__init__.py

@@ -13,4 +13,4 @@ from .io import (  # noqa: F401
 )
 from .sdk import CraftAiSdk  # noqa: F401
 
-__version__ = "0.64.0"
+__version__ = "0.64.1"

{craft_ai_sdk-0.64.0 → craft_ai_sdk-0.64.1}/craft_ai_sdk/core/endpoints.py

@@ -8,6 +8,7 @@ from ..sdk import BaseCraftAiSdk
 from ..shared.logger import log_func_result
 from ..shared.request_response_handler import handle_http_response
 from .deployments import get_deployment
+from ..shared.authentication import use_authentication
 
 
 def _get_endpoint_url_path(sdk: BaseCraftAiSdk, endpoint_name: str):
@@ -55,7 +56,7 @@ def trigger_endpoint(
 def trigger_endpoint(
     sdk: BaseCraftAiSdk,
     endpoint_name: str,
-    endpoint_token: str,
+    endpoint_token: Union[str, None] = None,
     inputs: Union[dict[str, Any], None] = None,
     wait_for_completion=True,
 ) -> Union[EndpointTriggerWithOutputs, EndpointTriggerBase]:
@@ -63,7 +64,8 @@ def trigger_endpoint(
 
     Args:
         endpoint_name (:obj:`str`): Name of the endpoint.
-        endpoint_token (:obj:`str`): Token to access endpoint.
+        endpoint_token (:obj:`str`, optional): Token to access endpoint. If not set,
+            the SDK token will be used.
         inputs (:obj:`dict`, optional): Dictionary of inputs to pass to the endpoint
             with input names as keys and corresponding values as values.
             For files, the value should be an instance of io.IOBase.
@@ -85,7 +87,6 @@ def trigger_endpoint(
     """
     if inputs is None:
         inputs = {}
-    endpoint_url_path = _get_endpoint_url_path(sdk, endpoint_name)
 
     body = {}
     files = {}
@@ -95,19 +96,36 @@ def trigger_endpoint(
         else:
             body[input_name] = input_value
 
-    url = f"{sdk.base_environment_url}/endpoints/{endpoint_url_path}"
-    post_result = requests.post(
-        url,
-        headers={
-            "Authorization": f"EndpointToken {endpoint_token}",
-            "craft-ai-client": f"craft-ai-sdk@{sdk._version}",
-        },
-        allow_redirects=False,
-        json=body,
-        files=files,
-    )
-    handle_http_response(post_result)
-    execution_id = post_result.headers.get("Craft-Ai-Execution-Id", "")
+    if endpoint_token is None:
+        url = (
+            f"{sdk.base_environment_api_url}" f"/deployments/{endpoint_name}/executions"
+        )
+        do_post = use_authentication(
+            lambda sdk, *args, **kwargs: sdk._session.post(*args, **kwargs)
+        )
+        post_result = do_post(
+            sdk,
+            url,
+            allow_redirects=False,
+            json=body,
+            files=files,
+        )
+
+    else:
+        endpoint_url_path = _get_endpoint_url_path(sdk, endpoint_name)
+        url = f"{sdk.base_environment_url}/endpoints/{endpoint_url_path}"
+        post_result = requests.post(
+            url,
+            headers={
+                "Authorization": f"EndpointToken {endpoint_token}",
+                "craft-ai-client": f"craft-ai-sdk@{sdk._version}",
+            },
+            allow_redirects=False,
+            json=body,
+            files=files,
+        )
+    response = handle_http_response(post_result)
+    execution_id = response.get("execution_id", "")
     if wait_for_completion and 200 <= post_result.status_code < 400:
         return retrieve_endpoint_results(
             sdk,
@@ -123,7 +141,7 @@ def retrieve_endpoint_results(
     sdk: BaseCraftAiSdk,
     endpoint_name: str,
     execution_id: str,
-    endpoint_token: str,
+    endpoint_token: Union[str, None] = None,
 ) -> EndpointTriggerWithOutputs:
     """Get the results of an endpoint execution.
 
@@ -131,7 +149,8 @@ def retrieve_endpoint_results(
         endpoint_name (:obj:`str`): Name of the endpoint.
         execution_id (:obj:`str`): ID of the execution returned by
             `trigger_endpoint`.
-        endpoint_token (:obj:`str`): Token to access endpoint.
+        endpoint_token (:obj:`str`, optional): Token to access endpoint. If not set,
+            the SDK token will be used.
 
     Returns:
         :obj:`dict`: Created pipeline execution represented as :obj:`dict` with the
@@ -140,6 +159,10 @@ def retrieve_endpoint_results(
         * ``"outputs"`` (:obj:`dict`): Dictionary of outputs of the pipeline with
           output names as keys and corresponding values as values.
     """
+
+    if endpoint_token is None:
+        return sdk.retrieve_pipeline_execution_outputs(execution_id)
+
     endpoint_url_path = _get_endpoint_url_path(sdk, endpoint_name)
 
     url = (
@@ -149,11 +172,13 @@ def retrieve_endpoint_results(
     query = urlencode({"token": endpoint_token})
     response = requests.get(f"{url}?{query}")
 
+    handled_response = handle_http_response(response)
+
     # 500 is returned if the pipeline failed too. In that case, it is not a
     # standard API error
     if response.status_code == 500:
         try:
-            return handle_http_response(response)
+            return handled_response
         except KeyError:
             return response.json()
 
@@ -161,11 +186,15 @@ def retrieve_endpoint_results(
         content_disposition = response.headers.get("Content-Disposition", "")
         output_name = content_disposition.split(f"_{execution_id}_")[1]
         return {
-            "outputs": {output_name: handle_http_response(response)},
+            "outputs": {output_name: handled_response},
             "execution_id": execution_id,
         }
     else:
-        return {**handle_http_response(response), "execution_id": execution_id}
+        response_data = handle_http_response(response)
+        return {
+            "outputs": response_data.get("outputs", []),
+            "execution_id": execution_id,
+        }
 
 
 def generate_new_endpoint_token(

{craft_ai_sdk-0.64.0 → craft_ai_sdk-0.64.1}/craft_ai_sdk/core/pipeline_executions.py

@@ -106,12 +106,26 @@ Its execution ID is "{execution_id}".',
 
     # Wait for pipeline execution to finish
     if wait_for_completion:
-        return _retrieve_pipeline_execution_outputs(sdk, execution_id)
+        return retrieve_pipeline_execution_outputs(sdk, execution_id)
     return {"execution_id": execution_id}
 
 
 @log_func_result("Pipeline execution results retrieval")
-def _retrieve_pipeline_execution_outputs(sdk: BaseCraftAiSdk, execution_id):
+def retrieve_pipeline_execution_outputs(sdk: BaseCraftAiSdk, execution_id):
+    """Get the results of a pipeline execution.
+
+    Args:
+        execution_id (:obj:`str`): Name of the pipeline execution.
+
+    Returns:
+        :obj:`dict`: Created pipeline execution represented as :obj:`dict` with the
+        following keys:
+
+        * ``execution_id`` (str): Name of the pipeline execution.
+        * ``"outputs"`` (:obj:`dict`): Dictionary of outputs of the pipeline with
+          output names as keys and corresponding values as values.
+    """
+
     url = (
         f"{sdk.base_environment_api_url}"
         f"/executions/{execution_id}/outputs?wait_for_completion=true"

{craft_ai_sdk-0.64.0 → craft_ai_sdk-0.64.1}/craft_ai_sdk/sdk.py

@@ -93,6 +93,7 @@ class CraftAiSdk(BaseCraftAiSdk):
         get_pipeline_execution_output,
         list_pipeline_executions,
         run_pipeline,
+        retrieve_pipeline_execution_outputs,
     )
     from .core.pipeline_metrics import (
         get_list_metrics,
@@ -138,7 +139,7 @@ class CraftAiSdk(BaseCraftAiSdk):
         os.environ.get("CRAFT_AI__MULTIPART_PART_SIZE__B", str(38 * 256 * 1024))
     )
     _access_token_margin = timedelta(seconds=30)
-    _version = "0.64.0"  # Would be better to share it somewhere
+    _version = "0.64.1"  # Would be better to share it somewhere
 
     def __init__(
         self,

{craft_ai_sdk-0.64.0 → craft_ai_sdk-0.64.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "craft-ai-sdk"
-version = "0.64.0"
+version = "0.64.1"
 description = "Craft AI MLOps platform SDK"
 license = "Apache-2.0"
 authors = ["Craft AI <contact@craft.ai>"]