Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use httpx async client for openai async calls #137

Merged
merged 2 commits into from
Apr 9, 2024
Merged

use httpx async client for openai async calls #137

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98c5586
use httpx async client
wenzhe-log10 Apr 8, 2024
589c28b
reuse the same httpx async client
wenzhe-log10 Apr 8, 2024
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: 28 additions & 4 deletions log10/_httpx_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
_log10_config = Log10Config()
base_url = _log10_config.url
httpx_client = httpx.Client()
httpx_async_client = httpx.AsyncClient()


def _get_time_diff(created_at):
Expand Down Expand Up @@ -83,13 +84,36 @@ def _try_post_request(url: str, payload: dict = {}) -> httpx.Response:
logger.error(f"Failed to insert in log10: {payload} with error {err}")


async def _try_post_request_async(url: str, payload: dict = {}) -> httpx.Response:
headers = {
"x-log10-token": _log10_config.token,
"x-log10-organization-id": _log10_config.org_id,
"Content-Type": "application/json",
}
payload["organization_id"] = _log10_config.org_id
try:
res = await httpx_async_client.post(url, headers=headers, json=payload)
res.raise_for_status()
return res
except httpx.HTTPStatusError as http_err:
if "401" in str(http_err):
logger.error(
"Failed authorization. Please verify that LOG10_TOKEN and LOG10_ORG_ID are set correctly and try again."
+ "\nSee https://github.com/log10-io/log10#%EF%B8%8F-setup for details"
)
else:
logger.error(f"Failed with error: {http_err}")
except Exception as err:
logger.error(f"Failed to insert in log10: {payload} with error {err}")


async def get_completion_id(request: Request):
if "v1/chat/completions" not in str(request.url):
logger.warning("Currently logging is only available for v1/chat/completions.")
return

completion_url = "/api/completions"
res = _try_post_request(url=f"{base_url}{completion_url}")
res = await _try_post_request_async(url=f"{base_url}{completion_url}")
try:
completion_id = res.json().get("completionID")
except Exception as e:
Expand Down Expand Up @@ -125,7 +149,7 @@ async def log_request(request: Request):
}
if get_log10_session_tags():
log_row["tags"] = get_log10_session_tags()
_try_post_request(url=f"{base_url}/api/completions/{completion_id}", payload=log_row)
await _try_post_request_async(url=f"{base_url}/api/completions/{completion_id}", payload=log_row)


class _LogResponse(Response):
Expand Down Expand Up @@ -205,7 +229,7 @@ async def aiter_bytes(self, *args, **kwargs):
}
if get_log10_session_tags():
log_row["tags"] = get_log10_session_tags()
_try_post_request(url=f"{base_url}/api/completions/{completion_id}", payload=log_row)
await _try_post_request_async(url=f"{base_url}/api/completions/{completion_id}", payload=log_row)


class _LogTransport(httpx.AsyncBaseTransport):
Expand Down Expand Up @@ -246,7 +270,7 @@ async def handle_async_request(self, request: httpx.Request) -> httpx.Response:
}
if get_log10_session_tags():
log_row["tags"] = get_log10_session_tags()
_try_post_request(url=f"{base_url}/api/completions/{completion_id}", payload=log_row)
await _try_post_request_async(url=f"{base_url}/api/completions/{completion_id}", payload=log_row)
return response
elif response.headers.get("content-type") == "text/event-stream":
return _LogResponse(
Expand Down
Loading