Skip to content

Commit 32292f5

Browse files
authored
chore: remove deprecated env vars (#50)
1 parent 21e7aae commit 32292f5

File tree

1 file changed

+12
-60
lines changed

1 file changed

+12
-60
lines changed

src/gradient/_client.py

Lines changed: 12 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,6 @@ class Gradient(SyncAPIClient):
8080
def __init__(
8181
self,
8282
*,
83-
api_key: str | None = None, # deprecated, use `access_token` instead
84-
inference_key: str | None = None, # deprecated, use `model_access_key` instead
85-
agent_key: str | None = None, # deprecated, use `agent_access_key` instead
8683
access_token: str | None = None,
8784
model_access_key: str | None = None,
8885
agent_access_key: str | None = None,
@@ -120,33 +117,15 @@ def __init__(
120117
- `inference_endpoint` from `GRADIENT_INFERENCE_ENDPOINT`
121118
"""
122119
if access_token is None:
123-
if api_key is not None:
124-
access_token = api_key
125-
else:
126-
access_token = os.environ.get("DIGITALOCEAN_ACCESS_TOKEN")
127-
# support for legacy environment variable
128-
if access_token is None:
129-
access_token = os.environ.get("GRADIENT_API_KEY")
120+
access_token = os.environ.get("DIGITALOCEAN_ACCESS_TOKEN")
130121
self.access_token = access_token
131122

132123
if model_access_key is None:
133-
if inference_key is not None:
134-
model_access_key = inference_key
135-
else:
136-
model_access_key = os.environ.get("GRADIENT_INFERENCE_KEY")
137-
# support for legacy environment variable
138-
if model_access_key is None:
139-
model_access_key = os.environ.get("GRADIENT_MODEL_ACCESS_KEY")
124+
model_access_key = os.environ.get("GRADIENT_MODEL_ACCESS_KEY")
140125
self.model_access_key = model_access_key
141126

142127
if agent_access_key is None:
143-
if agent_key is not None:
144-
agent_access_key = agent_key
145-
else:
146-
agent_access_key = os.environ.get("GRADIENT_AGENT_ACCESS_KEY")
147-
# support for legacy environment variable
148-
if agent_access_key is None:
149-
agent_access_key = os.environ.get("GRADIENT_AGENT_KEY")
128+
agent_access_key = os.environ.get("GRADIENT_AGENT_ACCESS_KEY")
150129
self.agent_access_key = agent_access_key
151130

152131
if agent_endpoint is None:
@@ -283,9 +262,6 @@ def _validate_headers(self, headers: Headers, custom_headers: Headers) -> None:
283262
def copy(
284263
self,
285264
*,
286-
api_key: str | None = None, # deprecated, use `access_token` instead
287-
inference_key: str | None = None, # deprecated, use `model_access_key` instead
288-
agent_key: str | None = None, # deprecated, use `agent_access_key` instead
289265
access_token: str | None = None,
290266
model_access_key: str | None = None,
291267
agent_access_key: str | None = None,
@@ -326,9 +302,9 @@ def copy(
326302

327303
http_client = http_client or self._client
328304
client = self.__class__(
329-
access_token=access_token or api_key or self.access_token,
330-
model_access_key=model_access_key or inference_key or self.model_access_key,
331-
agent_access_key=agent_access_key or agent_key or self.agent_access_key,
305+
access_token=access_token or self.access_token,
306+
model_access_key=model_access_key or self.model_access_key,
307+
agent_access_key=agent_access_key or self.agent_access_key,
332308
agent_endpoint=agent_endpoint or self._agent_endpoint,
333309
inference_endpoint=inference_endpoint or self.inference_endpoint,
334310
base_url=base_url or self.base_url,
@@ -393,9 +369,6 @@ class AsyncGradient(AsyncAPIClient):
393369
def __init__(
394370
self,
395371
*,
396-
api_key: str | None = None, # deprecated, use `access_token` instead
397-
inference_key: str | None = None, # deprecated, use `model_access_key` instead
398-
agent_key: str | None = None, # deprecated, use `agent_access_key` instead
399372
access_token: str | None = None,
400373
model_access_key: str | None = None,
401374
agent_access_key: str | None = None,
@@ -433,33 +406,15 @@ def __init__(
433406
- `inference_endpoint` from `GRADIENT_INFERENCE_ENDPOINT`
434407
"""
435408
if access_token is None:
436-
if api_key is not None:
437-
access_token = api_key
438-
else:
439-
access_token = os.environ.get("DIGITALOCEAN_ACCESS_TOKEN")
440-
# support for legacy environment variable
441-
if access_token is None:
442-
access_token = os.environ.get("GRADIENT_API_KEY")
409+
access_token = os.environ.get("DIGITALOCEAN_ACCESS_TOKEN")
443410
self.access_token = access_token
444411

445412
if model_access_key is None:
446-
if inference_key is not None:
447-
model_access_key = inference_key
448-
else:
449-
model_access_key = os.environ.get("GRADIENT_INFERENCE_KEY")
450-
# support for legacy environment variable
451-
if model_access_key is None:
452-
model_access_key = os.environ.get("GRADIENT_MODEL_ACCESS_KEY")
413+
model_access_key = os.environ.get("GRADIENT_MODEL_ACCESS_KEY")
453414
self.model_access_key = model_access_key
454415

455416
if agent_access_key is None:
456-
if agent_key is not None:
457-
agent_access_key = agent_key
458-
else:
459-
agent_access_key = os.environ.get("GRADIENT_AGENT_ACCESS_KEY")
460-
# support for legacy environment variable
461-
if agent_access_key is None:
462-
agent_access_key = os.environ.get("GRADIENT_AGENT_KEY")
417+
agent_access_key = os.environ.get("GRADIENT_AGENT_ACCESS_KEY")
463418
self.agent_access_key = agent_access_key
464419

465420
if agent_endpoint is None:
@@ -596,9 +551,6 @@ def _validate_headers(self, headers: Headers, custom_headers: Headers) -> None:
596551
def copy(
597552
self,
598553
*,
599-
api_key: str | None = None, # deprecated, use `access_token` instead
600-
inference_key: str | None = None, # deprecated, use `model_access_key` instead
601-
agent_key: str | None = None, # deprecated, use `agent_access_key` instead
602554
agent_endpoint: str | None = None,
603555
access_token: str | None = None,
604556
model_access_key: str | None = None,
@@ -639,9 +591,9 @@ def copy(
639591

640592
http_client = http_client or self._client
641593
client = self.__class__(
642-
access_token=access_token or api_key or self.access_token,
643-
model_access_key=model_access_key or inference_key or self.model_access_key,
644-
agent_access_key=agent_access_key or agent_key or self.agent_access_key,
594+
access_token=access_token or self.access_token,
595+
model_access_key=model_access_key or self.model_access_key,
596+
agent_access_key=agent_access_key or self.agent_access_key,
645597
agent_endpoint=agent_endpoint or self._agent_endpoint,
646598
inference_endpoint=inference_endpoint or self.inference_endpoint,
647599
base_url=base_url or self.base_url,

0 commit comments

Comments
 (0)