Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 20 additions & 12 deletions deepgram/clients/abstract_async_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ async def get(
url: str,
options: Optional[Dict] = None,
addons: Optional[Dict] = None,
headers: Optional[Dict] = None,
timeout: Optional[httpx.Timeout] = None,
**kwargs,
) -> str:
Expand All @@ -49,8 +50,8 @@ async def get(
url,
params=options,
addons=addons,
headers=headers,
timeout=timeout,
headers=self.config.headers,
**kwargs,
)

Expand All @@ -59,6 +60,7 @@ async def post_file(
url: str,
options: Optional[Dict] = None,
addons: Optional[Dict] = None,
headers: Optional[Dict] = None,
timeout: Optional[httpx.Timeout] = None,
file_result: Optional[List] = None,
**kwargs,
Expand All @@ -69,8 +71,8 @@ async def post_file(
file_result=file_result,
params=options,
addons=addons,
headers=headers,
timeout=timeout,
headers=self.config.headers,
**kwargs,
)

Expand All @@ -79,6 +81,7 @@ async def post(
url: str,
options: Optional[Dict] = None,
addons: Optional[Dict] = None,
headers: Optional[Dict] = None,
timeout: Optional[httpx.Timeout] = None,
**kwargs,
) -> str:
Expand All @@ -87,8 +90,8 @@ async def post(
url,
params=options,
addons=addons,
headers=headers,
timeout=timeout,
headers=self.config.headers,
**kwargs,
)

Expand All @@ -97,6 +100,7 @@ async def put(
url: str,
options: Optional[Dict] = None,
addons: Optional[Dict] = None,
headers: Optional[Dict] = None,
timeout: Optional[httpx.Timeout] = None,
**kwargs,
) -> str:
Expand All @@ -105,8 +109,8 @@ async def put(
url,
params=options,
addons=addons,
headers=headers,
timeout=timeout,
headers=self.config.headers,
**kwargs,
)

Expand All @@ -115,6 +119,7 @@ async def patch(
url: str,
options: Optional[Dict] = None,
addons: Optional[Dict] = None,
headers: Optional[Dict] = None,
timeout: Optional[httpx.Timeout] = None,
**kwargs,
) -> str:
Expand All @@ -123,8 +128,8 @@ async def patch(
url,
params=options,
addons=addons,
headers=headers,
timeout=timeout,
headers=self.config.headers,
**kwargs,
)

Expand All @@ -133,6 +138,7 @@ async def delete(
url: str,
options: Optional[Dict] = None,
addons: Optional[Dict] = None,
headers: Optional[Dict] = None,
timeout: Optional[httpx.Timeout] = None,
**kwargs,
) -> str:
Expand All @@ -141,8 +147,8 @@ async def delete(
url,
params=options,
addons=addons,
headers=headers,
timeout=timeout,
headers=self.config.headers,
**kwargs,
)

Expand All @@ -152,24 +158,26 @@ async def _handle_request(
url: str,
params: Optional[Dict] = None,
addons: Optional[Dict] = None,
timeout: Optional[httpx.Timeout] = None,
headers: Optional[Dict] = None,
timeout: Optional[httpx.Timeout] = None,
file_result: Optional[List] = None,
**kwargs,
):
new_url = url
_url = url
if params is not None:
new_url = append_query_params(new_url, params)
_url = append_query_params(_url, params)
if addons is not None:
new_url = append_query_params(new_url, addons)

_url = append_query_params(_url, addons)
_headers = self.config.headers
if headers is not None:
_headers.update(headers)
if timeout is None:
timeout = httpx.Timeout(30.0, connect=10.0)

try:
async with httpx.AsyncClient(timeout=timeout) as client:
response = await client.request(
method, new_url, headers=headers, **kwargs
method, _url, headers=_headers, **kwargs
)
response.raise_for_status()

Expand Down
32 changes: 20 additions & 12 deletions deepgram/clients/abstract_sync_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ def get(
url: str,
options: Optional[Dict] = None,
addons: Optional[Dict] = None,
headers: Optional[Dict] = None,
timeout: Optional[httpx.Timeout] = None,
**kwargs,
) -> str:
Expand All @@ -48,7 +49,7 @@ def get(
url,
params=options,
addons=addons,
headers=self.config.headers,
headers=headers,
timeout=timeout,
**kwargs,
)
Expand All @@ -58,6 +59,7 @@ def post_file(
url: str,
options: Optional[Dict] = None,
addons: Optional[Dict] = None,
headers: Optional[Dict] = None,
timeout: Optional[httpx.Timeout] = None,
file_result: Optional[List] = None,
**kwargs,
Expand All @@ -68,7 +70,7 @@ def post_file(
file_result=file_result,
params=options,
addons=addons,
headers=self.config.headers,
headers=headers,
timeout=timeout,
**kwargs,
)
Expand All @@ -78,6 +80,7 @@ def post(
url: str,
options: Optional[Dict] = None,
addons: Optional[Dict] = None,
headers: Optional[Dict] = None,
timeout: Optional[httpx.Timeout] = None,
**kwargs,
) -> str:
Expand All @@ -86,7 +89,7 @@ def post(
url,
params=options,
addons=addons,
headers=self.config.headers,
headers=headers,
timeout=timeout,
**kwargs,
)
Expand All @@ -96,6 +99,7 @@ def put(
url: str,
options: Optional[Dict] = None,
addons: Optional[Dict] = None,
headers: Optional[Dict] = None,
timeout: Optional[httpx.Timeout] = None,
**kwargs,
) -> str:
Expand All @@ -104,7 +108,7 @@ def put(
url,
params=options,
addons=addons,
headers=self.config.headers,
headers=headers,
timeout=timeout,
**kwargs,
)
Expand All @@ -114,6 +118,7 @@ def patch(
url: str,
options: Optional[Dict] = None,
addons: Optional[Dict] = None,
headers: Optional[Dict] = None,
timeout: Optional[httpx.Timeout] = None,
**kwargs,
) -> str:
Expand All @@ -122,7 +127,7 @@ def patch(
url,
params=options,
addons=addons,
headers=self.config.headers,
headers=headers,
timeout=timeout,
**kwargs,
)
Expand All @@ -132,6 +137,7 @@ def delete(
url: str,
options: Optional[Dict] = None,
addons: Optional[Dict] = None,
headers: Optional[Dict] = None,
timeout: Optional[httpx.Timeout] = None,
**kwargs,
) -> str:
Expand All @@ -140,7 +146,7 @@ def delete(
url,
params=options,
addons=addons,
headers=self.config.headers,
headers=headers,
timeout=timeout,
**kwargs,
)
Expand All @@ -151,23 +157,25 @@ def _handle_request(
url: str,
params: Optional[Dict] = None,
addons: Optional[Dict] = None,
timeout: Optional[httpx.Timeout] = None,
headers: Optional[Dict] = None,
timeout: Optional[httpx.Timeout] = None,
file_result: Optional[List] = None,
**kwargs,
):
new_url = url
_url = url
if params is not None:
new_url = append_query_params(new_url, params)
_url = append_query_params(_url, params)
if addons is not None:
new_url = append_query_params(new_url, addons)

_url = append_query_params(_url, addons)
_headers = self.config.headers
if headers is not None:
_headers.update(headers)
if timeout is None:
timeout = httpx.Timeout(30.0, connect=10.0)

try:
with httpx.Client(timeout=timeout) as client:
response = client.request(method, new_url, headers=headers, **kwargs)
response = client.request(method, _url, headers=_headers, **kwargs)
response.raise_for_status()

# handle file response
Expand Down
Loading