fix(proxy/utils.py): fix isoformat to string logic

This commit is contained in:
Krrish Dholakia 2024-01-18 09:32:14 -08:00
parent 39c699d084
commit c2813594ea
2 changed files with 13 additions and 10 deletions

View file

@ -331,9 +331,10 @@ async def user_api_key_auth(
f"LLM Model List pre access group check: {llm_model_list}" f"LLM Model List pre access group check: {llm_model_list}"
) )
access_groups = [] access_groups = []
for m in llm_model_list: if llm_model_list is not None:
for group in m.get("model_info", {}).get("access_groups", []): for m in llm_model_list:
access_groups.append((m["model_name"], group)) for group in m.get("model_info", {}).get("access_groups", []):
access_groups.append((m["model_name"], group))
allowed_models = valid_token.models allowed_models = valid_token.models
if ( if (

View file

@ -370,19 +370,21 @@ class PrismaClient:
response = await self.db.litellm_verificationtoken.find_unique( response = await self.db.litellm_verificationtoken.find_unique(
where={"token": hashed_token} where={"token": hashed_token}
) )
if response is not None:
# for prisma we need to cast the expires time to str
if isinstance(response.expires, datetime):
response.expires = response.expires.isoformat()
elif query_type == "find_all" and user_id is not None: elif query_type == "find_all" and user_id is not None:
response = await self.db.litellm_verificationtoken.find_many( response = await self.db.litellm_verificationtoken.find_many(
where={"user_id": user_id} where={"user_id": user_id}
) )
if response is not None and len(response) > 0:
for r in response:
if isinstance(r.expires, datetime):
r.expires = r.expires.isoformat()
print_verbose(f"PrismaClient: response={response}") print_verbose(f"PrismaClient: response={response}")
if response is not None: if response is not None:
if isinstance(response, LiteLLM_VerificationToken): return response
# for prisma we need to cast the expires time to str
if isinstance(response.expires, datetime):
response.expires = response.expires.isoformat()
return response
else:
return response
else: else:
# Token does not exist. # Token does not exist.
raise HTTPException( raise HTTPException(