Skip to content

Commit e502b18

Browse files
fix(client): correctly handle arguments with env vars (#128)
1 parent 71aab4b commit e502b18

File tree

1 file changed

+22
-6
lines changed

1 file changed

+22
-6
lines changed

src/finch/_client.py

+22-6
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ def __init__(
6363
self,
6464
*,
6565
access_token: str | None = None,
66-
client_id: str | None = os.environ.get("FINCH_CLIENT_ID", None),
67-
client_secret: str | None = os.environ.get("FINCH_CLIENT_SECRET", None),
68-
webhook_secret: str | None = os.environ.get("FINCH_WEBHOOK_SECRET", None),
66+
client_id: str | None = None,
67+
client_secret: str | None = None,
68+
webhook_secret: str | None = None,
6969
base_url: Optional[str] = None,
7070
timeout: Union[float, Timeout, None, NotGiven] = NOT_GIVEN,
7171
max_retries: int = DEFAULT_MAX_RETRIES,
@@ -96,12 +96,20 @@ def __init__(
9696
- `client_secret` from `FINCH_CLIENT_SECRET`
9797
- `webhook_secret` from `FINCH_WEBHOOK_SECRET`
9898
"""
99+
if access_token is None:
100+
access_token = None
99101
self.access_token = access_token
100102

103+
if client_id is None:
104+
client_id = os.environ.get("FINCH_CLIENT_ID") or None
101105
self.client_id = client_id
102106

107+
if client_secret is None:
108+
client_secret = os.environ.get("FINCH_CLIENT_SECRET") or None
103109
self.client_secret = client_secret
104110

111+
if webhook_secret is None:
112+
webhook_secret = os.environ.get("FINCH_WEBHOOK_SECRET") or None
105113
self.webhook_secret = webhook_secret
106114

107115
if base_url is None:
@@ -352,9 +360,9 @@ def __init__(
352360
self,
353361
*,
354362
access_token: str | None = None,
355-
client_id: str | None = os.environ.get("FINCH_CLIENT_ID", None),
356-
client_secret: str | None = os.environ.get("FINCH_CLIENT_SECRET", None),
357-
webhook_secret: str | None = os.environ.get("FINCH_WEBHOOK_SECRET", None),
363+
client_id: str | None = None,
364+
client_secret: str | None = None,
365+
webhook_secret: str | None = None,
358366
base_url: Optional[str] = None,
359367
timeout: Union[float, Timeout, None, NotGiven] = NOT_GIVEN,
360368
max_retries: int = DEFAULT_MAX_RETRIES,
@@ -385,12 +393,20 @@ def __init__(
385393
- `client_secret` from `FINCH_CLIENT_SECRET`
386394
- `webhook_secret` from `FINCH_WEBHOOK_SECRET`
387395
"""
396+
if access_token is None:
397+
access_token = None
388398
self.access_token = access_token
389399

400+
if client_id is None:
401+
client_id = os.environ.get("FINCH_CLIENT_ID") or None
390402
self.client_id = client_id
391403

404+
if client_secret is None:
405+
client_secret = os.environ.get("FINCH_CLIENT_SECRET") or None
392406
self.client_secret = client_secret
393407

408+
if webhook_secret is None:
409+
webhook_secret = os.environ.get("FINCH_WEBHOOK_SECRET") or None
394410
self.webhook_secret = webhook_secret
395411

396412
if base_url is None:

0 commit comments

Comments
 (0)