Skip to content

Commit 40c265c

Browse files
fern-api[bot]fern-api[bot]
committed
Release 0.1.3
1 parent 2f32ee7 commit 40c265c

File tree

4 files changed

+27
-71
lines changed

4 files changed

+27
-71
lines changed

‎README.md‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ from fileforge.client import Fileforge
2222

2323
client = Fileforge(
2424
api_key="YOUR_API_KEY",
25-
username="YOUR_USERNAME",
26-
password="YOUR_PASSWORD",
25+
api_key="YOUR_API_KEY",
2726
)
2827
```
2928
<!-- End Usage -->
@@ -36,8 +35,7 @@ from fileforge.client import AsyncFileforge
3635

3736
client = AsyncFileforge(
3837
api_key="YOUR_API_KEY",
39-
username="YOUR_USERNAME",
40-
password="YOUR_PASSWORD",
38+
api_key="YOUR_API_KEY",
4139
)
4240
```
4341
<!-- End Async Usage -->

‎pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "fileforge"
3-
version = "0.1.1"
3+
version = "0.1.3"
44
description = ""
55
readme = "README.md"
66
authors = []

‎src/fileforge/client.py‎

Lines changed: 16 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,7 @@ class Fileforge:
4747
4848
4949
api_key : str
50-
username : typing.Optional[typing.Union[str, typing.Callable[[], str]]]
51-
password : typing.Optional[typing.Union[str, typing.Callable[[], str]]]
50+
api_key : str
5251
timeout : typing.Optional[float]
5352
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 a default is not set.
5453
@@ -64,8 +63,7 @@ class Fileforge:
6463
6564
client = Fileforge(
6665
api_key="YOUR_API_KEY",
67-
username="YOUR_USERNAME",
68-
password="YOUR_PASSWORD",
66+
api_key="YOUR_API_KEY",
6967
)
7068
"""
7169

@@ -75,8 +73,7 @@ def __init__(
7573
base_url: typing.Optional[str] = None,
7674
environment: FileforgeEnvironment = FileforgeEnvironment.DEFAULT,
7775
api_key: str,
78-
username: typing.Optional[typing.Union[str, typing.Callable[[], str]]] = None,
79-
password: typing.Optional[typing.Union[str, typing.Callable[[], str]]] = None,
76+
api_key: str,
8077
timeout: typing.Optional[float] = None,
8178
follow_redirects: typing.Optional[bool] = True,
8279
httpx_client: typing.Optional[httpx.Client] = None,
@@ -85,8 +82,7 @@ def __init__(
8582
self._client_wrapper = SyncClientWrapper(
8683
base_url=_get_base_url(base_url=base_url, environment=environment),
8784
api_key=api_key,
88-
username=username,
89-
password=password,
85+
api_key=api_key,
9086
httpx_client=httpx_client
9187
if httpx_client is not None
9288
else httpx.Client(timeout=_defaulted_timeout, follow_redirects=follow_redirects)
@@ -112,8 +108,7 @@ def retrieve_server_status(self, *, request_options: typing.Optional[RequestOpti
112108
113109
client = Fileforge(
114110
api_key="YOUR_API_KEY",
115-
username="YOUR_USERNAME",
116-
password="YOUR_PASSWORD",
111+
api_key="YOUR_API_KEY",
117112
)
118113
client.retrieve_server_status()
119114
"""
@@ -217,8 +212,7 @@ def convert_docx(
217212
218213
client = Fileforge(
219214
api_key="YOUR_API_KEY",
220-
username="YOUR_USERNAME",
221-
password="YOUR_PASSWORD",
215+
api_key="YOUR_API_KEY",
222216
)
223217
client.convert_docx()
224218
"""
@@ -300,8 +294,7 @@ def generate(
300294
301295
client = Fileforge(
302296
api_key="YOUR_API_KEY",
303-
username="YOUR_USERNAME",
304-
password="YOUR_PASSWORD",
297+
api_key="YOUR_API_KEY",
305298
)
306299
client.generate()
307300
"""
@@ -382,8 +375,7 @@ def merge(
382375
383376
client = Fileforge(
384377
api_key="YOUR_API_KEY",
385-
username="YOUR_USERNAME",
386-
password="YOUR_PASSWORD",
378+
api_key="YOUR_API_KEY",
387379
)
388380
client.merge()
389381
"""
@@ -453,8 +445,7 @@ class AsyncFileforge:
453445
454446
455447
api_key : str
456-
username : typing.Optional[typing.Union[str, typing.Callable[[], str]]]
457-
password : typing.Optional[typing.Union[str, typing.Callable[[], str]]]
448+
api_key : str
458449
timeout : typing.Optional[float]
459450
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 a default is not set.
460451
@@ -470,8 +461,7 @@ class AsyncFileforge:
470461
471462
client = AsyncFileforge(
472463
api_key="YOUR_API_KEY",
473-
username="YOUR_USERNAME",
474-
password="YOUR_PASSWORD",
464+
api_key="YOUR_API_KEY",
475465
)
476466
"""
477467

@@ -481,8 +471,7 @@ def __init__(
481471
base_url: typing.Optional[str] = None,
482472
environment: FileforgeEnvironment = FileforgeEnvironment.DEFAULT,
483473
api_key: str,
484-
username: typing.Optional[typing.Union[str, typing.Callable[[], str]]] = None,
485-
password: typing.Optional[typing.Union[str, typing.Callable[[], str]]] = None,
474+
api_key: str,
486475
timeout: typing.Optional[float] = None,
487476
follow_redirects: typing.Optional[bool] = True,
488477
httpx_client: typing.Optional[httpx.AsyncClient] = None,
@@ -491,8 +480,7 @@ def __init__(
491480
self._client_wrapper = AsyncClientWrapper(
492481
base_url=_get_base_url(base_url=base_url, environment=environment),
493482
api_key=api_key,
494-
username=username,
495-
password=password,
483+
api_key=api_key,
496484
httpx_client=httpx_client
497485
if httpx_client is not None
498486
else httpx.AsyncClient(timeout=_defaulted_timeout, follow_redirects=follow_redirects)
@@ -518,8 +506,7 @@ async def retrieve_server_status(self, *, request_options: typing.Optional[Reque
518506
519507
client = AsyncFileforge(
520508
api_key="YOUR_API_KEY",
521-
username="YOUR_USERNAME",
522-
password="YOUR_PASSWORD",
509+
api_key="YOUR_API_KEY",
523510
)
524511
await client.retrieve_server_status()
525512
"""
@@ -623,8 +610,7 @@ async def convert_docx(
623610
624611
client = AsyncFileforge(
625612
api_key="YOUR_API_KEY",
626-
username="YOUR_USERNAME",
627-
password="YOUR_PASSWORD",
613+
api_key="YOUR_API_KEY",
628614
)
629615
await client.convert_docx()
630616
"""
@@ -706,8 +692,7 @@ async def generate(
706692
707693
client = AsyncFileforge(
708694
api_key="YOUR_API_KEY",
709-
username="YOUR_USERNAME",
710-
password="YOUR_PASSWORD",
695+
api_key="YOUR_API_KEY",
711696
)
712697
await client.generate()
713698
"""
@@ -788,8 +773,7 @@ async def merge(
788773
789774
client = AsyncFileforge(
790775
api_key="YOUR_API_KEY",
791-
username="YOUR_USERNAME",
792-
password="YOUR_PASSWORD",
776+
api_key="YOUR_API_KEY",
793777
)
794778
await client.merge()
795779
"""

‎src/fileforge/core/client_wrapper.py‎

Lines changed: 8 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -8,46 +8,22 @@
88

99

1010
class BaseClientWrapper:
11-
def __init__(
12-
self,
13-
*,
14-
api_key: str,
15-
username: typing.Optional[typing.Union[str, typing.Callable[[], str]]] = None,
16-
password: typing.Optional[typing.Union[str, typing.Callable[[], str]]] = None,
17-
base_url: str,
18-
timeout: typing.Optional[float] = None
19-
):
11+
def __init__(self, *, api_key: str, api_key: str, base_url: str, timeout: typing.Optional[float] = None):
2012
self._api_key = api_key
21-
self._username = username
22-
self._password = password
13+
self.api_key = api_key
2314
self._base_url = base_url
2415
self._timeout = timeout
2516

2617
def get_headers(self) -> typing.Dict[str, str]:
2718
headers: typing.Dict[str, str] = {
2819
"X-Fern-Language": "Python",
2920
"X-Fern-SDK-Name": "fileforge",
30-
"X-Fern-SDK-Version": "0.1.1",
21+
"X-Fern-SDK-Version": "0.1.3",
3122
}
32-
username = self._get_username()
33-
password = self._get_password()
34-
if username is not None and password is not None:
35-
headers["Authorization"] = httpx.BasicAuth(username, password)._auth_header
3623
headers["X-API-Key"] = self._api_key
24+
headers["X-API-Key"] = self.api_key
3725
return headers
3826

39-
def _get_username(self) -> typing.Optional[str]:
40-
if isinstance(self._username, str) or self._username is None:
41-
return self._username
42-
else:
43-
return self._username()
44-
45-
def _get_password(self) -> typing.Optional[str]:
46-
if isinstance(self._password, str) or self._password is None:
47-
return self._password
48-
else:
49-
return self._password()
50-
5127
def get_base_url(self) -> str:
5228
return self._base_url
5329

@@ -60,13 +36,12 @@ def __init__(
6036
self,
6137
*,
6238
api_key: str,
63-
username: typing.Optional[typing.Union[str, typing.Callable[[], str]]] = None,
64-
password: typing.Optional[typing.Union[str, typing.Callable[[], str]]] = None,
39+
api_key: str,
6540
base_url: str,
6641
timeout: typing.Optional[float] = None,
6742
httpx_client: httpx.Client
6843
):
69-
super().__init__(api_key=api_key, username=username, password=password, base_url=base_url, timeout=timeout)
44+
super().__init__(api_key=api_key, api_key=api_key, base_url=base_url, timeout=timeout)
7045
self.httpx_client = HttpClient(httpx_client=httpx_client)
7146

7247

@@ -75,11 +50,10 @@ def __init__(
7550
self,
7651
*,
7752
api_key: str,
78-
username: typing.Optional[typing.Union[str, typing.Callable[[], str]]] = None,
79-
password: typing.Optional[typing.Union[str, typing.Callable[[], str]]] = None,
53+
api_key: str,
8054
base_url: str,
8155
timeout: typing.Optional[float] = None,
8256
httpx_client: httpx.AsyncClient
8357
):
84-
super().__init__(api_key=api_key, username=username, password=password, base_url=base_url, timeout=timeout)
58+
super().__init__(api_key=api_key, api_key=api_key, base_url=base_url, timeout=timeout)
8559
self.httpx_client = AsyncHttpClient(httpx_client=httpx_client)

0 commit comments

Comments
 (0)