Skip to content

Commit e5396a6

Browse files
committed
Clean up custom client interface
1 parent 5d899a6 commit e5396a6

File tree

1 file changed

+8
-20
lines changed

1 file changed

+8
-20
lines changed

src/pipedream/pipedream.py

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9,40 +9,27 @@
99
from .types.project_environment import ProjectEnvironment
1010

1111

12-
class OAuthCredentials:
13-
14-
def __init__(
15-
self,
16-
client_id: Optional[str] = None,
17-
client_secret: Optional[str] = None,
18-
):
19-
self.client_id = client_id or os.getenv("PIPEDREAM_CLIENT_ID")
20-
self.client_secret = client_secret or os.getenv(
21-
"PIPEDREAM_CLIENT_SECRET")
22-
23-
2412
class Pipedream(Client):
2513

2614
def __init__(
2715
self,
2816
*,
29-
credentials: OAuthCredentials = OAuthCredentials(),
17+
client_id: Optional[str] = None,
18+
client_secret: Optional[str] = None,
3019
project_id: Optional[str] = None,
3120
project_environment: ProjectEnvironment = "production",
3221
environment: PipedreamEnvironment = PipedreamEnvironment.PROD,
33-
**kwargs,
3422
):
3523
project_id = project_id or os.getenv("PIPEDREAM_PROJECT_ID")
3624
if not project_id:
3725
raise ValueError("Project ID is required")
3826

3927
super().__init__(
4028
base_url=_get_base_url(environment),
41-
client_id=credentials.client_id,
42-
client_secret=credentials.client_secret,
29+
client_id=client_id,
30+
client_secret=client_secret,
4331
project_id=project_id,
4432
project_environment=project_environment,
45-
**kwargs,
4633
)
4734

4835

@@ -51,7 +38,8 @@ class AsyncPipedream(AsyncClient):
5138
def __init__(
5239
self,
5340
*,
54-
credentials: OAuthCredentials = OAuthCredentials(),
41+
client_id: Optional[str] = None,
42+
client_secret: Optional[str] = None,
5543
project_id: Optional[str] = None,
5644
project_environment: ProjectEnvironment = "production",
5745
environment: PipedreamEnvironment = PipedreamEnvironment.PROD,
@@ -63,8 +51,8 @@ def __init__(
6351

6452
super().__init__(
6553
base_url=_get_base_url(environment),
66-
client_id=credentials.client_id,
67-
client_secret=credentials.client_secret,
54+
client_id=client_id,
55+
client_secret=client_secret,
6856
project_id=project_id,
6957
project_environment=project_environment,
7058
**kwargs,

0 commit comments

Comments
 (0)