mixpeek 0.13.2__py3-none-any.whl → 0.14.0__py3-none-any.whl

mixpeek/sdk.py

@@ -7,7 +7,7 @@ from .utils.logger import Logger, get_default_logger
 from .utils.retries import RetryConfig
 import httpx
 from mixpeek import models, utils
-from mixpeek._hooks import HookContext, SDKHooks
+from mixpeek._hooks import SDKHooks
 from mixpeek.assets import Assets
 from mixpeek.collections import Collections
 from mixpeek.featureextractors import FeatureExtractors
@@ -20,7 +20,7 @@ from mixpeek.organizations import Organizations
 from mixpeek.searchinteractions import SearchInteractions
 from mixpeek.tasks import Tasks
 from mixpeek.types import OptionalNullable, UNSET
-from typing import Any, Dict, Mapping, Optional
+from typing import Any, Callable, Dict, Optional, Union
 
 
 class Mixpeek(BaseSDK):
@@ -40,6 +40,7 @@ class Mixpeek(BaseSDK):
 
     def __init__(
         self,
+        bearer_auth: Optional[Union[Optional[str], Callable[[], Optional[str]]]] = None,
         server_idx: Optional[int] = None,
         server_url: Optional[str] = None,
         url_params: Optional[Dict[str, str]] = None,
@@ -51,6 +52,7 @@ class Mixpeek(BaseSDK):
     ) -> None:
         r"""Instantiates the SDK configuring it with the provided parameters.
 
+        :param bearer_auth: The bearer_auth required for authentication
         :param server_idx: The index of the server to use for all methods
         :param server_url: The server URL to use for all methods
         :param url_params: Parameters to optionally template the server URL with
@@ -76,6 +78,12 @@ class Mixpeek(BaseSDK):
             type(async_client), AsyncHttpClient
         ), "The provided async_client must implement the AsyncHttpClient protocol."
 
+        security: Any = None
+        if callable(bearer_auth):
+            security = lambda: models.Security(bearer_auth=bearer_auth())  # pylint: disable=unnecessary-lambda-assignment
+        else:
+            security = models.Security(bearer_auth=bearer_auth)
+
         if server_url is not None:
             if url_params is not None:
                 server_url = utils.template_url(server_url, url_params)
@@ -85,6 +93,7 @@ class Mixpeek(BaseSDK):
             SDKConfiguration(
                 client=client,
                 async_client=async_client,
+                security=security,
                 server_url=server_url,
                 server_idx=server_idx,
                 retry_config=retry_config,
@@ -133,149 +142,3 @@ class Mixpeek(BaseSDK):
     async def __aexit__(self, exc_type, exc_val, exc_tb):
         if self.sdk_configuration.async_client is not None:
             await self.sdk_configuration.async_client.aclose()
-
-    def debug_openapi_debug_openapi_get(
-        self,
-        *,
-        retries: OptionalNullable[utils.RetryConfig] = UNSET,
-        server_url: Optional[str] = None,
-        timeout_ms: Optional[int] = None,
-        http_headers: Optional[Mapping[str, str]] = None,
-    ) -> Any:
-        r"""Debug Openapi
-
-        :param retries: Override the default retry configuration for this method
-        :param server_url: Override the default server URL for this method
-        :param timeout_ms: Override the default request timeout configuration for this method in milliseconds
-        :param http_headers: Additional headers to set or replace on requests.
-        """
-        base_url = None
-        url_variables = None
-        if timeout_ms is None:
-            timeout_ms = self.sdk_configuration.timeout_ms
-
-        if server_url is not None:
-            base_url = server_url
-        req = self._build_request(
-            method="GET",
-            path="/debug-openapi",
-            base_url=base_url,
-            url_variables=url_variables,
-            request=None,
-            request_body_required=False,
-            request_has_path_params=False,
-            request_has_query_params=False,
-            user_agent_header="user-agent",
-            accept_header_value="application/json",
-            http_headers=http_headers,
-            timeout_ms=timeout_ms,
-        )
-
-        if retries == UNSET:
-            if self.sdk_configuration.retry_config is not UNSET:
-                retries = self.sdk_configuration.retry_config
-
-        retry_config = None
-        if isinstance(retries, utils.RetryConfig):
-            retry_config = (retries, ["429", "500", "502", "503", "504"])
-
-        http_res = self.do_request(
-            hook_ctx=HookContext(
-                operation_id="debug_openapi_debug_openapi_get",
-                oauth2_scopes=[],
-                security_source=None,
-            ),
-            request=req,
-            error_status_codes=["4XX", "5XX"],
-            retry_config=retry_config,
-        )
-
-        if utils.match_response(http_res, "200", "application/json"):
-            return utils.unmarshal_json(http_res.text, Any)
-        if utils.match_response(http_res, ["4XX", "5XX"], "*"):
-            http_res_text = utils.stream_to_text(http_res)
-            raise models.APIError(
-                "API error occurred", http_res.status_code, http_res_text, http_res
-            )
-
-        content_type = http_res.headers.get("Content-Type")
-        http_res_text = utils.stream_to_text(http_res)
-        raise models.APIError(
-            f"Unexpected response received (code: {http_res.status_code}, type: {content_type})",
-            http_res.status_code,
-            http_res_text,
-            http_res,
-        )
-
-    async def debug_openapi_debug_openapi_get_async(
-        self,
-        *,
-        retries: OptionalNullable[utils.RetryConfig] = UNSET,
-        server_url: Optional[str] = None,
-        timeout_ms: Optional[int] = None,
-        http_headers: Optional[Mapping[str, str]] = None,
-    ) -> Any:
-        r"""Debug Openapi
-
-        :param retries: Override the default retry configuration for this method
-        :param server_url: Override the default server URL for this method
-        :param timeout_ms: Override the default request timeout configuration for this method in milliseconds
-        :param http_headers: Additional headers to set or replace on requests.
-        """
-        base_url = None
-        url_variables = None
-        if timeout_ms is None:
-            timeout_ms = self.sdk_configuration.timeout_ms
-
-        if server_url is not None:
-            base_url = server_url
-        req = self._build_request_async(
-            method="GET",
-            path="/debug-openapi",
-            base_url=base_url,
-            url_variables=url_variables,
-            request=None,
-            request_body_required=False,
-            request_has_path_params=False,
-            request_has_query_params=False,
-            user_agent_header="user-agent",
-            accept_header_value="application/json",
-            http_headers=http_headers,
-            timeout_ms=timeout_ms,
-        )
-
-        if retries == UNSET:
-            if self.sdk_configuration.retry_config is not UNSET:
-                retries = self.sdk_configuration.retry_config
-
-        retry_config = None
-        if isinstance(retries, utils.RetryConfig):
-            retry_config = (retries, ["429", "500", "502", "503", "504"])
-
-        http_res = await self.do_request_async(
-            hook_ctx=HookContext(
-                operation_id="debug_openapi_debug_openapi_get",
-                oauth2_scopes=[],
-                security_source=None,
-            ),
-            request=req,
-            error_status_codes=["4XX", "5XX"],
-            retry_config=retry_config,
-        )
-
-        if utils.match_response(http_res, "200", "application/json"):
-            return utils.unmarshal_json(http_res.text, Any)
-        if utils.match_response(http_res, ["4XX", "5XX"], "*"):
-            http_res_text = await utils.stream_to_text_async(http_res)
-            raise models.APIError(
-                "API error occurred", http_res.status_code, http_res_text, http_res
-            )
-
-        content_type = http_res.headers.get("Content-Type")
-        http_res_text = await utils.stream_to_text_async(http_res)
-        raise models.APIError(
-            f"Unexpected response received (code: {http_res.status_code}, type: {content_type})",
-            http_res.status_code,
-            http_res_text,
-            http_res,
-        )

mixpeek/sdkconfiguration.py

@@ -4,9 +4,10 @@ from ._hooks import SDKHooks
 from .httpclient import AsyncHttpClient, HttpClient
 from .utils import Logger, RetryConfig, remove_suffix
 from dataclasses import dataclass
+from mixpeek import models
 from mixpeek.types import OptionalNullable, UNSET
 from pydantic import Field
-from typing import Dict, Optional, Tuple
+from typing import Callable, Dict, Optional, Tuple, Union
 
 
 SERVERS = [
@@ -20,13 +21,14 @@ class SDKConfiguration:
     client: HttpClient
     async_client: AsyncHttpClient
     debug_logger: Logger
+    security: Optional[Union[models.Security, Callable[[], models.Security]]] = None
     server_url: Optional[str] = ""
     server_idx: Optional[int] = 0
     language: str = "python"
     openapi_doc_version: str = "0.81"
-    sdk_version: str = "0.13.2"
-    gen_version: str = "2.483.6"
-    user_agent: str = "speakeasy-sdk/python 0.13.2 2.483.6 0.81 mixpeek"
+    sdk_version: str = "0.14.0"
+    gen_version: str = "2.484.0"
+    user_agent: str = "speakeasy-sdk/python 0.14.0 2.484.0 0.81 mixpeek"
     retry_config: OptionalNullable[RetryConfig] = Field(default_factory=lambda: UNSET)
     timeout_ms: Optional[int] = None
 

mixpeek/searchinteractions.py

@@ -4,6 +4,7 @@ from .basesdk import BaseSDK
 from mixpeek import models, utils
 from mixpeek._hooks import HookContext
 from mixpeek.types import OptionalNullable, UNSET
+from mixpeek.utils import get_security_from_env
 from typing import Any, Mapping, Optional, Union
 
 
@@ -78,10 +79,11 @@ class SearchInteractions(BaseSDK):
             request=request,
             request_body_required=True,
             request_has_path_params=False,
-            request_has_query_params=False,
+            request_has_query_params=True,
             user_agent_header="user-agent",
             accept_header_value="application/json",
             http_headers=http_headers,
+            security=self.sdk_configuration.security,
             get_serialized_body=lambda: utils.serialize_request_body(
                 request.search_interaction,
                 False,
@@ -104,7 +106,9 @@ class SearchInteractions(BaseSDK):
             hook_ctx=HookContext(
                 operation_id="create_interaction_features_search_interactions_post",
                 oauth2_scopes=[],
-                security_source=None,
+                security_source=get_security_from_env(
+                    self.sdk_configuration.security, models.Security
+                ),
             ),
             request=req,
             error_status_codes=["400", "401", "403", "404", "422", "4XX", "500", "5XX"],
@@ -207,10 +211,11 @@ class SearchInteractions(BaseSDK):
             request=request,
             request_body_required=True,
             request_has_path_params=False,
-            request_has_query_params=False,
+            request_has_query_params=True,
             user_agent_header="user-agent",
             accept_header_value="application/json",
             http_headers=http_headers,
+            security=self.sdk_configuration.security,
             get_serialized_body=lambda: utils.serialize_request_body(
                 request.search_interaction,
                 False,
@@ -233,7 +238,9 @@ class SearchInteractions(BaseSDK):
             hook_ctx=HookContext(
                 operation_id="create_interaction_features_search_interactions_post",
                 oauth2_scopes=[],
-                security_source=None,
+                security_source=get_security_from_env(
+                    self.sdk_configuration.security, models.Security
+                ),
             ),
             request=req,
             error_status_codes=["400", "401", "403", "404", "422", "4XX", "500", "5XX"],
@@ -310,10 +317,11 @@ class SearchInteractions(BaseSDK):
             request=request,
             request_body_required=False,
             request_has_path_params=True,
-            request_has_query_params=False,
+            request_has_query_params=True,
             user_agent_header="user-agent",
             accept_header_value="application/json",
             http_headers=http_headers,
+            security=self.sdk_configuration.security,
             timeout_ms=timeout_ms,
         )
 
@@ -329,7 +337,9 @@ class SearchInteractions(BaseSDK):
             hook_ctx=HookContext(
                 operation_id="get_interaction_features_search_interactions__interaction_id__get",
                 oauth2_scopes=[],
-                security_source=None,
+                security_source=get_security_from_env(
+                    self.sdk_configuration.security, models.Security
+                ),
             ),
             request=req,
             error_status_codes=["400", "401", "403", "404", "422", "4XX", "500", "5XX"],
@@ -406,10 +416,11 @@ class SearchInteractions(BaseSDK):
             request=request,
             request_body_required=False,
             request_has_path_params=True,
-            request_has_query_params=False,
+            request_has_query_params=True,
             user_agent_header="user-agent",
             accept_header_value="application/json",
             http_headers=http_headers,
+            security=self.sdk_configuration.security,
             timeout_ms=timeout_ms,
         )
 
@@ -425,7 +436,9 @@ class SearchInteractions(BaseSDK):
             hook_ctx=HookContext(
                 operation_id="get_interaction_features_search_interactions__interaction_id__get",
                 oauth2_scopes=[],
-                security_source=None,
+                security_source=get_security_from_env(
+                    self.sdk_configuration.security, models.Security
+                ),
             ),
             request=req,
             error_status_codes=["400", "401", "403", "404", "422", "4XX", "500", "5XX"],
@@ -500,10 +513,11 @@ class SearchInteractions(BaseSDK):
             request=request,
             request_body_required=False,
             request_has_path_params=True,
-            request_has_query_params=False,
+            request_has_query_params=True,
             user_agent_header="user-agent",
             accept_header_value="application/json",
             http_headers=http_headers,
+            security=self.sdk_configuration.security,
             timeout_ms=timeout_ms,
         )
 
@@ -519,7 +533,9 @@ class SearchInteractions(BaseSDK):
             hook_ctx=HookContext(
                 operation_id="delete_interaction_features_search_interactions__interaction_id__delete",
                 oauth2_scopes=[],
-                security_source=None,
+                security_source=get_security_from_env(
+                    self.sdk_configuration.security, models.Security
+                ),
             ),
             request=req,
             error_status_codes=["400", "401", "403", "404", "422", "4XX", "500", "5XX"],
@@ -594,10 +610,11 @@ class SearchInteractions(BaseSDK):
             request=request,
             request_body_required=False,
             request_has_path_params=True,
-            request_has_query_params=False,
+            request_has_query_params=True,
             user_agent_header="user-agent",
             accept_header_value="application/json",
             http_headers=http_headers,
+            security=self.sdk_configuration.security,
             timeout_ms=timeout_ms,
         )
 
@@ -613,7 +630,9 @@ class SearchInteractions(BaseSDK):
             hook_ctx=HookContext(
                 operation_id="delete_interaction_features_search_interactions__interaction_id__delete",
                 oauth2_scopes=[],
-                security_source=None,
+                security_source=get_security_from_env(
+                    self.sdk_configuration.security, models.Security
+                ),
             ),
             request=req,
             error_status_codes=["400", "401", "403", "404", "422", "4XX", "500", "5XX"],

mixpeek/tasks.py

@@ -4,6 +4,7 @@ from .basesdk import BaseSDK
 from mixpeek import models, utils
 from mixpeek._hooks import HookContext
 from mixpeek.types import OptionalNullable, UNSET
+from mixpeek.utils import get_security_from_env
 from typing import Any, Mapping, Optional
 
 
@@ -48,10 +49,11 @@ class Tasks(BaseSDK):
             request=request,
             request_body_required=False,
             request_has_path_params=True,
-            request_has_query_params=False,
+            request_has_query_params=True,
             user_agent_header="user-agent",
             accept_header_value="application/json",
             http_headers=http_headers,
+            security=self.sdk_configuration.security,
             timeout_ms=timeout_ms,
         )
 
@@ -67,7 +69,9 @@ class Tasks(BaseSDK):
             hook_ctx=HookContext(
                 operation_id="kill_task_tasks__task_id__delete",
                 oauth2_scopes=[],
-                security_source=None,
+                security_source=get_security_from_env(
+                    self.sdk_configuration.security, models.Security
+                ),
             ),
             request=req,
             error_status_codes=["400", "401", "403", "404", "422", "4XX", "500", "5XX"],
@@ -140,10 +144,11 @@ class Tasks(BaseSDK):
             request=request,
             request_body_required=False,
             request_has_path_params=True,
-            request_has_query_params=False,
+            request_has_query_params=True,
             user_agent_header="user-agent",
             accept_header_value="application/json",
             http_headers=http_headers,
+            security=self.sdk_configuration.security,
             timeout_ms=timeout_ms,
         )
 
@@ -159,7 +164,9 @@ class Tasks(BaseSDK):
             hook_ctx=HookContext(
                 operation_id="kill_task_tasks__task_id__delete",
                 oauth2_scopes=[],
-                security_source=None,
+                security_source=get_security_from_env(
+                    self.sdk_configuration.security, models.Security
+                ),
             ),
             request=req,
             error_status_codes=["400", "401", "403", "404", "422", "4XX", "500", "5XX"],
@@ -237,10 +244,11 @@ class Tasks(BaseSDK):
             request=request,
             request_body_required=False,
             request_has_path_params=True,
-            request_has_query_params=False,
+            request_has_query_params=True,
             user_agent_header="user-agent",
             accept_header_value="application/json",
             http_headers=http_headers,
+            security=self.sdk_configuration.security,
             timeout_ms=timeout_ms,
         )
 
@@ -256,7 +264,9 @@ class Tasks(BaseSDK):
             hook_ctx=HookContext(
                 operation_id="get_task_tasks__task_id__get",
                 oauth2_scopes=[],
-                security_source=None,
+                security_source=get_security_from_env(
+                    self.sdk_configuration.security, models.Security
+                ),
             ),
             request=req,
             error_status_codes=["400", "401", "403", "404", "422", "4XX", "500", "5XX"],
@@ -334,10 +344,11 @@ class Tasks(BaseSDK):
             request=request,
             request_body_required=False,
             request_has_path_params=True,
-            request_has_query_params=False,
+            request_has_query_params=True,
             user_agent_header="user-agent",
             accept_header_value="application/json",
             http_headers=http_headers,
+            security=self.sdk_configuration.security,
             timeout_ms=timeout_ms,
         )
 
@@ -353,7 +364,9 @@ class Tasks(BaseSDK):
             hook_ctx=HookContext(
                 operation_id="get_task_tasks__task_id__get",
                 oauth2_scopes=[],
-                security_source=None,
+                security_source=get_security_from_env(
+                    self.sdk_configuration.security, models.Security
+                ),
             ),
             request=req,
             error_status_codes=["400", "401", "403", "404", "422", "4XX", "500", "5XX"],

mixpeek/utils/__init__.py

@@ -17,7 +17,8 @@ from .metadata import (
 from .queryparams import get_query_params
 from .retries import BackoffStrategy, Retries, retry, retry_async, RetryConfig
 from .requestbodies import serialize_request_body, SerializedRequestBody
-from .security import get_security
+from .security import get_security, get_security_from_env
+
 from .serializers import (
     get_pydantic_model,
     marshal_json,
@@ -60,6 +61,7 @@ __all__ = [
     "get_query_params",
     "get_response_headers",
     "get_security",
+    "get_security_from_env",
     "HeaderMetadata",
     "Logger",
     "marshal_json",

mixpeek/utils/security.py

@@ -1,10 +1,12 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 import base64
+
 from typing import (
     Any,
     Dict,
     List,
+    Optional,
     Tuple,
 )
 from pydantic import BaseModel
@@ -14,6 +16,7 @@ from .metadata import (
     SecurityMetadata,
     find_field_metadata,
 )
+import os
 
 
 def get_security(security: Any) -> Tuple[Dict[str, str], Dict[str, List[str]]]:
@@ -52,6 +55,21 @@ def get_security(security: Any) -> Tuple[Dict[str, str], Dict[str, List[str]]]:
     return headers, query_params
 
 
+def get_security_from_env(security: Any, security_class: Any) -> Optional[BaseModel]:
+    if security is not None:
+        return security
+
+    if not issubclass(security_class, BaseModel):
+        raise TypeError("security_class must be a pydantic model class")
+
+    security_dict: Any = {}
+
+    if os.getenv("MIXPEEK_BEARER_AUTH"):
+        security_dict["bearer_auth"] = os.getenv("MIXPEEK_BEARER_AUTH")
+
+    return security_class(**security_dict) if security_dict else None
+
+
 def _parse_security_option(
     headers: Dict[str, str], query_params: Dict[str, List[str]], option: Any
 ):