phoenix/litellm
1
0
Fork 0
forked from phoenix/litellm-mirror
Code Pull requests Activity

use ProxyErrorTypes,

Browse source
This commit is contained in:
Ishaan Jaff 2024-07-08 12:47:53 -07:00
parent 25ddbbb41d
commit 5c0d4a4162
2 changed files with 60 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

12
litellm/proxy/health_endpoints/_health_endpoints.py
View file

@ -10,7 +10,13 @@ from fastapi import APIRouter, Depends, Header, HTTPException, Request, Response
import litellm import litellm
from litellm._logging import verbose_proxy_logger from litellm._logging import verbose_proxy_logger
from litellm.proxy._types import CallInfo, ProxyException, UserAPIKeyAuth, WebhookEvent from litellm.proxy._types import (
CallInfo,
ProxyErrorTypes,
ProxyException,
UserAPIKeyAuth,
WebhookEvent,
)
from litellm.proxy.auth.user_api_key_auth import user_api_key_auth from litellm.proxy.auth.user_api_key_auth import user_api_key_auth
from litellm.proxy.health_check import perform_health_check from litellm.proxy.health_check import perform_health_check
@ -239,7 +245,7 @@ async def health_services_endpoint(
if isinstance(e, HTTPException): if isinstance(e, HTTPException):
raise ProxyException( raise ProxyException(
message=getattr(e, "detail", f"Authentication Error({str(e)})"), message=getattr(e, "detail", f"Authentication Error({str(e)})"),
type="auth_error", type=ProxyErrorTypes.auth_error,
param=getattr(e, "param", "None"), param=getattr(e, "param", "None"),
code=getattr(e, "status_code", status.HTTP_500_INTERNAL_SERVER_ERROR), code=getattr(e, "status_code", status.HTTP_500_INTERNAL_SERVER_ERROR),
) )
@ -247,7 +253,7 @@ async def health_services_endpoint(
raise e raise e
raise ProxyException( raise ProxyException(
message="Authentication Error, " + str(e), message="Authentication Error, " + str(e),
type="auth_error", type=ProxyErrorTypes.auth_error,
param=getattr(e, "param", "None"), param=getattr(e, "param", "None"),
code=status.HTTP_500_INTERNAL_SERVER_ERROR, code=status.HTTP_500_INTERNAL_SERVER_ERROR,
) )

100
litellm/proxy/management_endpoints/team_endpoints.py
View file

@ -1,32 +1,34 @@
from typing import Optional, List import asyncio
import fastapi
from fastapi import Depends, Request, APIRouter, Header, status
from fastapi import HTTPException
import copy import copy
import json import json
import uuid import uuid
import litellm
import asyncio
from datetime import datetime, timedelta, timezone from datetime import datetime, timedelta, timezone
from typing import List, Optional
import fastapi
from fastapi import APIRouter, Depends, Header, HTTPException, Request, status
import litellm
from litellm._logging import verbose_proxy_logger from litellm._logging import verbose_proxy_logger
from litellm.proxy.auth.user_api_key_auth import user_api_key_auth
from litellm.proxy._types import ( from litellm.proxy._types import (
UserAPIKeyAuth,
LiteLLM_TeamTable,
LiteLLM_ModelTable,
LitellmUserRoles,
NewTeamRequest,
TeamMemberAddRequest,
UpdateTeamRequest,
BlockTeamRequest, BlockTeamRequest,
DeleteTeamRequest,
Member,
LitellmTableNames,
LiteLLM_AuditLogs,
TeamMemberDeleteRequest,
ProxyException,
CommonProxyErrors, CommonProxyErrors,
DeleteTeamRequest,
LiteLLM_AuditLogs,
LiteLLM_ModelTable,
LiteLLM_TeamTable,
LitellmTableNames,
LitellmUserRoles,
Member,
NewTeamRequest,
ProxyErrorTypes,
ProxyException,
TeamMemberAddRequest,
TeamMemberDeleteRequest,
UpdateTeamRequest,
UserAPIKeyAuth,
) )
from litellm.proxy.auth.user_api_key_auth import user_api_key_auth
from litellm.proxy.management_helpers.utils import ( from litellm.proxy.management_helpers.utils import (
add_new_member, add_new_member,
management_endpoint_wrapper, management_endpoint_wrapper,
@ -109,10 +111,10 @@ async def new_team(
``` ```
""" """
from litellm.proxy.proxy_server import ( from litellm.proxy.proxy_server import (
prisma_client,
litellm_proxy_admin_name,
create_audit_log_for_update,
_duration_in_seconds, _duration_in_seconds,
create_audit_log_for_update,
litellm_proxy_admin_name,
prisma_client,
) )
if prisma_client is None: if prisma_client is None:
@ -326,10 +328,10 @@ async def update_team(
``` ```
""" """
from litellm.proxy.proxy_server import ( from litellm.proxy.proxy_server import (
prisma_client,
litellm_proxy_admin_name,
create_audit_log_for_update,
_duration_in_seconds, _duration_in_seconds,
create_audit_log_for_update,
litellm_proxy_admin_name,
prisma_client,
) )
if prisma_client is None: if prisma_client is None:
@ -420,10 +422,10 @@ async def team_member_add(
``` ```
""" """
from litellm.proxy.proxy_server import ( from litellm.proxy.proxy_server import (
prisma_client,
litellm_proxy_admin_name,
create_audit_log_for_update,
_duration_in_seconds, _duration_in_seconds,
create_audit_log_for_update,
litellm_proxy_admin_name,
prisma_client,
) )
if prisma_client is None: if prisma_client is None:
@ -525,10 +527,10 @@ async def team_member_delete(
``` ```
""" """
from litellm.proxy.proxy_server import ( from litellm.proxy.proxy_server import (
prisma_client,
litellm_proxy_admin_name,
create_audit_log_for_update,
_duration_in_seconds, _duration_in_seconds,
create_audit_log_for_update,
litellm_proxy_admin_name,
prisma_client,
) )
if prisma_client is None: if prisma_client is None:
@ -639,10 +641,10 @@ async def delete_team(
``` ```
""" """
from litellm.proxy.proxy_server import ( from litellm.proxy.proxy_server import (
prisma_client,
litellm_proxy_admin_name,
create_audit_log_for_update,
_duration_in_seconds, _duration_in_seconds,
create_audit_log_for_update,
litellm_proxy_admin_name,
prisma_client,
) )
if prisma_client is None: if prisma_client is None:
@ -725,10 +727,10 @@ async def team_info(
``` ```
""" """
from litellm.proxy.proxy_server import ( from litellm.proxy.proxy_server import (
prisma_client,
litellm_proxy_admin_name,
create_audit_log_for_update,
_duration_in_seconds, _duration_in_seconds,
create_audit_log_for_update,
litellm_proxy_admin_name,
prisma_client,
) )
try: try:
@ -783,7 +785,7 @@ async def team_info(
if isinstance(e, HTTPException): if isinstance(e, HTTPException):
raise ProxyException( raise ProxyException(
message=getattr(e, "detail", f"Authentication Error({str(e)})"), message=getattr(e, "detail", f"Authentication Error({str(e)})"),
type="auth_error", type=ProxyErrorTypes.auth_error,
param=getattr(e, "param", "None"), param=getattr(e, "param", "None"),
code=getattr(e, "status_code", status.HTTP_400_BAD_REQUEST), code=getattr(e, "status_code", status.HTTP_400_BAD_REQUEST),
) )
@ -791,7 +793,7 @@ async def team_info(
raise e raise e
raise ProxyException( raise ProxyException(
message="Authentication Error, " + str(e), message="Authentication Error, " + str(e),
type="auth_error", type=ProxyErrorTypes.auth_error,
param=getattr(e, "param", "None"), param=getattr(e, "param", "None"),
code=status.HTTP_400_BAD_REQUEST, code=status.HTTP_400_BAD_REQUEST,
) )
@ -810,10 +812,10 @@ async def block_team(
Blocks all calls from keys with this team id. Blocks all calls from keys with this team id.
""" """
from litellm.proxy.proxy_server import ( from litellm.proxy.proxy_server import (
prisma_client,
litellm_proxy_admin_name,
create_audit_log_for_update,
_duration_in_seconds, _duration_in_seconds,
create_audit_log_for_update,
litellm_proxy_admin_name,
prisma_client,
) )
if prisma_client is None: if prisma_client is None:
@ -839,10 +841,10 @@ async def unblock_team(
Blocks all calls from keys with this team id. Blocks all calls from keys with this team id.
""" """
from litellm.proxy.proxy_server import ( from litellm.proxy.proxy_server import (
prisma_client,
litellm_proxy_admin_name,
create_audit_log_for_update,
_duration_in_seconds, _duration_in_seconds,
create_audit_log_for_update,
litellm_proxy_admin_name,
prisma_client,
) )
if prisma_client is None: if prisma_client is None:
@ -872,10 +874,10 @@ async def list_team(
``` ```
""" """
from litellm.proxy.proxy_server import ( from litellm.proxy.proxy_server import (
prisma_client,
litellm_proxy_admin_name,
create_audit_log_for_update,
_duration_in_seconds, _duration_in_seconds,
create_audit_log_for_update,
litellm_proxy_admin_name,
prisma_client,
) )
if user_api_key_dict.user_role != LitellmUserRoles.PROXY_ADMIN: if user_api_key_dict.user_role != LitellmUserRoles.PROXY_ADMIN: