diff --git a/litellm/proxy/_types.py b/litellm/proxy/_types.py index 48307fc6a2e..81c5a2e920e 100644 --- a/litellm/proxy/_types.py +++ b/litellm/proxy/_types.py @@ -2600,6 +2600,7 @@ class SpendLogsPayload(TypedDict): cache_key: str request_tags: str # json str team_id: Optional[str] + organization_id: Optional[str] end_user: Optional[str] requester_ip_address: Optional[str] custom_llm_provider: Optional[str] diff --git a/litellm/proxy/db/db_spend_update_writer.py b/litellm/proxy/db/db_spend_update_writer.py index 8b276c583dd..647a815071e 100644 --- a/litellm/proxy/db/db_spend_update_writer.py +++ b/litellm/proxy/db/db_spend_update_writer.py @@ -972,6 +972,20 @@ class DBSpendUpdateWriter: ) -> None: ... + @overload + @staticmethod + async def _update_daily_spend( + n_retry_times: int, + prisma_client: PrismaClient, + proxy_logging_obj: ProxyLogging, + daily_spend_transactions: Dict[str, DailyOrganizationSpendTransaction], + entity_type: Literal["org"], + entity_id_field: str, + table_name: str, + unique_constraint_name: str, + ) -> None: + ... + @overload @staticmethod async def _update_daily_spend( @@ -1430,9 +1444,16 @@ class DBSpendUpdateWriter: ) return - # Inject org_id for daily aggregation check - payload_with_org: SpendLogsPayload = dict(payload) - payload_with_org["organization_id"] = org_id + print("org_id", org_id) + print("payload", payload) + + payload_with_org = cast( + SpendLogsPayload, + { + **payload, + "organization_id": org_id, + }, + ) base_daily_transaction = ( await self._common_add_spend_log_transaction_to_daily_transaction( diff --git a/litellm/proxy/management_endpoints/organization_endpoints.py b/litellm/proxy/management_endpoints/organization_endpoints.py index 65764b3b957..99b37c765a8 100644 --- a/litellm/proxy/management_endpoints/organization_endpoints.py +++ b/litellm/proxy/management_endpoints/organization_endpoints.py @@ -281,10 +281,8 @@ async def get_organization_daily_activity( """ from litellm.proxy.proxy_server import ( prisma_client, - proxy_logging_obj, - user_api_key_cache, ) - + if prisma_client is None: raise HTTPException( status_code=500,