SDK regeneration

Author: fern-api[bot]

src/pipedream/client.py

@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import os
 import typing
 
 import httpx
@@ -9,7 +8,6 @@
 from .app_categories.client import AppCategoriesClient, AsyncAppCategoriesClient
 from .apps.client import AppsClient, AsyncAppsClient
 from .components.client import AsyncComponentsClient, ComponentsClient
-from .core.api_error import ApiError
 from .core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
 from .core.oauth_token_provider import OAuthTokenProvider
 from .deployed_triggers.client import AsyncDeployedTriggersClient, DeployedTriggersClient
@@ -42,8 +40,8 @@ class Client:
 
     project_id : str
     x_pd_environment : typing.Optional[str]
-    client_id : typing.Optional[str]
-    client_secret : typing.Optional[str]
+    client_id : str
+    client_secret : str
     _token_getter_override : typing.Optional[typing.Callable[[], str]]
     timeout : typing.Optional[float]
         The timeout to be used, in seconds, for requests. By default the timeout is 60 seconds, unless a custom httpx client is used, in which case this default is not enforced.
@@ -73,8 +71,8 @@ def __init__(
         environment: PipedreamEnvironment = PipedreamEnvironment.PROD,
         project_id: str,
         x_pd_environment: typing.Optional[str] = None,
-        client_id: typing.Optional[str] = os.getenv("PIPEDREAM_CLIENT_ID"),
-        client_secret: typing.Optional[str] = os.getenv("PIPEDREAM_CLIENT_SECRET"),
+        client_id: str,
+        client_secret: str,
         _token_getter_override: typing.Optional[typing.Callable[[], str]] = None,
         timeout: typing.Optional[float] = None,
         follow_redirects: typing.Optional[bool] = True,
@@ -83,14 +81,6 @@ def __init__(
         _defaulted_timeout = (
             timeout if timeout is not None else 60 if httpx_client is None else httpx_client.timeout.read
         )
-        if client_id is None:
-            raise ApiError(
-                body="The client must be instantiated be either passing in client_id or setting PIPEDREAM_CLIENT_ID"
-            )
-        if client_secret is None:
-            raise ApiError(
-                body="The client must be instantiated be either passing in client_secret or setting PIPEDREAM_CLIENT_SECRET"
-            )
         oauth_token_provider = OAuthTokenProvider(
             client_id=client_id,
             client_secret=client_secret,
@@ -150,8 +140,8 @@ class AsyncClient:
 
     project_id : str
     x_pd_environment : typing.Optional[str]
-    client_id : typing.Optional[str]
-    client_secret : typing.Optional[str]
+    client_id : str
+    client_secret : str
     _token_getter_override : typing.Optional[typing.Callable[[], str]]
     timeout : typing.Optional[float]
         The timeout to be used, in seconds, for requests. By default the timeout is 60 seconds, unless a custom httpx client is used, in which case this default is not enforced.
@@ -181,8 +171,8 @@ def __init__(
         environment: PipedreamEnvironment = PipedreamEnvironment.PROD,
         project_id: str,
         x_pd_environment: typing.Optional[str] = None,
-        client_id: typing.Optional[str] = os.getenv("PIPEDREAM_CLIENT_ID"),
-        client_secret: typing.Optional[str] = os.getenv("PIPEDREAM_CLIENT_SECRET"),
+        client_id: str,
+        client_secret: str,
         _token_getter_override: typing.Optional[typing.Callable[[], str]] = None,
         timeout: typing.Optional[float] = None,
         follow_redirects: typing.Optional[bool] = True,
@@ -191,14 +181,6 @@ def __init__(
         _defaulted_timeout = (
             timeout if timeout is not None else 60 if httpx_client is None else httpx_client.timeout.read
         )
-        if client_id is None:
-            raise ApiError(
-                body="The client must be instantiated be either passing in client_id or setting PIPEDREAM_CLIENT_ID"
-            )
-        if client_secret is None:
-            raise ApiError(
-                body="The client must be instantiated be either passing in client_secret or setting PIPEDREAM_CLIENT_SECRET"
-            )
         oauth_token_provider = OAuthTokenProvider(
             client_id=client_id,
             client_secret=client_secret,

src/pipedream/core/client_wrapper.py

@@ -12,14 +12,14 @@ def __init__(
         *,
         project_id: str,
         x_pd_environment: typing.Optional[str] = None,
-        token: typing.Optional[typing.Union[str, typing.Callable[[], str]]] = None,
+        access_token: typing.Optional[typing.Union[str, typing.Callable[[], str]]] = None,
         headers: typing.Optional[typing.Dict[str, str]] = None,
         base_url: str,
         timeout: typing.Optional[float] = None,
     ):
         self._project_id = project_id
         self._x_pd_environment = x_pd_environment
-        self._token = token
+        self._access_token = access_token
         self._headers = headers
         self._base_url = base_url
         self._timeout = timeout
@@ -34,16 +34,16 @@ def get_headers(self) -> typing.Dict[str, str]:
         }
         if self._x_pd_environment is not None:
             headers["x-pd-environment"] = self._x_pd_environment
-        token = self._get_token()
-        if token is not None:
-            headers["Authorization"] = f"Bearer {token}"
+        access_token = self._get_access_token()
+        if access_token is not None:
+            headers["Authorization"] = f"Bearer {access_token}"
         return headers
 
-    def _get_token(self) -> typing.Optional[str]:
-        if isinstance(self._token, str) or self._token is None:
-            return self._token
+    def _get_access_token(self) -> typing.Optional[str]:
+        if isinstance(self._access_token, str) or self._access_token is None:
+            return self._access_token
         else:
-            return self._token()
+            return self._access_token()
 
     def get_custom_headers(self) -> typing.Optional[typing.Dict[str, str]]:
         return self._headers
@@ -61,7 +61,7 @@ def __init__(
         *,
         project_id: str,
         x_pd_environment: typing.Optional[str] = None,
-        token: typing.Optional[typing.Union[str, typing.Callable[[], str]]] = None,
+        access_token: typing.Optional[typing.Union[str, typing.Callable[[], str]]] = None,
         headers: typing.Optional[typing.Dict[str, str]] = None,
         base_url: str,
         timeout: typing.Optional[float] = None,
@@ -70,7 +70,7 @@ def __init__(
         super().__init__(
             project_id=project_id,
             x_pd_environment=x_pd_environment,
-            token=token,
+            access_token=access_token,
             headers=headers,
             base_url=base_url,
             timeout=timeout,
@@ -89,7 +89,7 @@ def __init__(
         *,
         project_id: str,
         x_pd_environment: typing.Optional[str] = None,
-        token: typing.Optional[typing.Union[str, typing.Callable[[], str]]] = None,
+        access_token: typing.Optional[typing.Union[str, typing.Callable[[], str]]] = None,
         headers: typing.Optional[typing.Dict[str, str]] = None,
         base_url: str,
         timeout: typing.Optional[float] = None,
@@ -98,7 +98,7 @@ def __init__(
         super().__init__(
             project_id=project_id,
             x_pd_environment=x_pd_environment,
-            token=token,
+            access_token=access_token,
             headers=headers,
             base_url=base_url,
             timeout=timeout,