phoenix/litellm-mirror
0
0
Fork 1
mirror of https://github.com/BerriAI/litellm.git synced 2025-04-26 19:24:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix typo on codebase

Browse source
This commit is contained in:
Ishaan Jaff 2025-03-27 22:36:00 -07:00
parent 3bd005f148
commit a1a038aa19
6 changed files with 82 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

78
litellm/proxy/db/db_spend_update_writer.py
View file

@ -201,7 +201,7 @@ class DBSpendUpdateWriter:
await DBSpendUpdateWriter._update_transaction_list( await DBSpendUpdateWriter._update_transaction_list(
response_cost=response_cost, response_cost=response_cost,
entity_id=hashed_token, entity_id=hashed_token,
transaction_list=prisma_client.key_list_transactons, transaction_list=prisma_client.key_list_transactions,
entity_type=Litellm_EntityType.KEY, entity_type=Litellm_EntityType.KEY,
debug_msg=f"adding spend to key db. Response cost: {response_cost}. Token: {hashed_token}.", debug_msg=f"adding spend to key db. Response cost: {response_cost}. Token: {hashed_token}.",
) )
@ -241,7 +241,7 @@ class DBSpendUpdateWriter:
await DBSpendUpdateWriter._update_transaction_list( await DBSpendUpdateWriter._update_transaction_list(
response_cost=response_cost, response_cost=response_cost,
entity_id=_id, entity_id=_id,
transaction_list=prisma_client.user_list_transactons, transaction_list=prisma_client.user_list_transactions,
entity_type=Litellm_EntityType.USER, entity_type=Litellm_EntityType.USER,
) )
@ -249,7 +249,7 @@ class DBSpendUpdateWriter:
await DBSpendUpdateWriter._update_transaction_list( await DBSpendUpdateWriter._update_transaction_list(
response_cost=response_cost, response_cost=response_cost,
entity_id=end_user_id, entity_id=end_user_id,
transaction_list=prisma_client.end_user_list_transactons, transaction_list=prisma_client.end_user_list_transactions,
entity_type=Litellm_EntityType.END_USER, entity_type=Litellm_EntityType.END_USER,
) )
except Exception as e: except Exception as e:
@ -275,7 +275,7 @@ class DBSpendUpdateWriter:
await DBSpendUpdateWriter._update_transaction_list( await DBSpendUpdateWriter._update_transaction_list(
response_cost=response_cost, response_cost=response_cost,
entity_id=team_id, entity_id=team_id,
transaction_list=prisma_client.team_list_transactons, transaction_list=prisma_client.team_list_transactions,
entity_type=Litellm_EntityType.TEAM, entity_type=Litellm_EntityType.TEAM,
) )
@ -287,7 +287,7 @@ class DBSpendUpdateWriter:
await DBSpendUpdateWriter._update_transaction_list( await DBSpendUpdateWriter._update_transaction_list(
response_cost=response_cost, response_cost=response_cost,
entity_id=team_member_key, entity_id=team_member_key,
transaction_list=prisma_client.team_member_list_transactons, transaction_list=prisma_client.team_member_list_transactions,
entity_type=Litellm_EntityType.TEAM_MEMBER, entity_type=Litellm_EntityType.TEAM_MEMBER,
) )
except Exception: except Exception:
@ -314,7 +314,7 @@ class DBSpendUpdateWriter:
await DBSpendUpdateWriter._update_transaction_list( await DBSpendUpdateWriter._update_transaction_list(
response_cost=response_cost, response_cost=response_cost,
entity_id=org_id, entity_id=org_id,
transaction_list=prisma_client.org_list_transactons, transaction_list=prisma_client.org_list_transactions,
entity_type=Litellm_EntityType.ORGANIZATION, entity_type=Litellm_EntityType.ORGANIZATION,
) )
except Exception as e: except Exception as e:
@ -424,12 +424,12 @@ class DBSpendUpdateWriter:
await self.pod_leader_manager.release_lock() await self.pod_leader_manager.release_lock()
else: else:
db_spend_update_transactions = DBSpendUpdateTransactions( db_spend_update_transactions = DBSpendUpdateTransactions(
user_list_transactons=prisma_client.user_list_transactons, user_list_transactions=prisma_client.user_list_transactions,
end_user_list_transactons=prisma_client.end_user_list_transactons, end_user_list_transactions=prisma_client.end_user_list_transactions,
key_list_transactons=prisma_client.key_list_transactons, key_list_transactions=prisma_client.key_list_transactions,
team_list_transactons=prisma_client.team_list_transactons, team_list_transactions=prisma_client.team_list_transactions,
team_member_list_transactons=prisma_client.team_member_list_transactons, team_member_list_transactions=prisma_client.team_member_list_transactions,
org_list_transactons=prisma_client.org_list_transactons, org_list_transactions=prisma_client.org_list_transactions,
) )
await DBSpendUpdateWriter._commit_spend_updates_to_db( await DBSpendUpdateWriter._commit_spend_updates_to_db(
prisma_client=prisma_client, prisma_client=prisma_client,
@ -455,8 +455,8 @@ class DBSpendUpdateWriter:
) )
### UPDATE USER TABLE ### ### UPDATE USER TABLE ###
user_list_transactons = db_spend_update_transactions["user_list_transactons"] user_list_transactions = db_spend_update_transactions["user_list_transactions"]
if len(user_list_transactons.keys()) > 0: if len(user_list_transactions.keys()) > 0:
for i in range(n_retry_times + 1): for i in range(n_retry_times + 1):
start_time = time.time() start_time = time.time()
try: try:
@ -467,12 +467,12 @@ class DBSpendUpdateWriter:
for ( for (
user_id, user_id,
response_cost, response_cost,
) in user_list_transactons.items(): ) in user_list_transactions.items():
batcher.litellm_usertable.update_many( batcher.litellm_usertable.update_many(
where={"user_id": user_id}, where={"user_id": user_id},
data={"spend": {"increment": response_cost}}, data={"spend": {"increment": response_cost}},
) )
prisma_client.user_list_transactons = ( prisma_client.user_list_transactions = (
{} {}
) # Clear the remaining transactions after processing all batches in the loop. ) # Clear the remaining transactions after processing all batches in the loop.
break break
@ -495,24 +495,24 @@ class DBSpendUpdateWriter:
### UPDATE END-USER TABLE ### ### UPDATE END-USER TABLE ###
verbose_proxy_logger.debug( verbose_proxy_logger.debug(
"End-User Spend transactions: {}".format( "End-User Spend transactions: {}".format(
len(prisma_client.end_user_list_transactons.keys()) len(prisma_client.end_user_list_transactions.keys())
) )
) )
end_user_list_transactons = db_spend_update_transactions[ end_user_list_transactions = db_spend_update_transactions[
"end_user_list_transactons" "end_user_list_transactions"
] ]
if len(end_user_list_transactons.keys()) > 0: if len(end_user_list_transactions.keys()) > 0:
await ProxyUpdateSpend.update_end_user_spend( await ProxyUpdateSpend.update_end_user_spend(
n_retry_times=n_retry_times, n_retry_times=n_retry_times,
prisma_client=prisma_client, prisma_client=prisma_client,
proxy_logging_obj=proxy_logging_obj, proxy_logging_obj=proxy_logging_obj,
) )
### UPDATE KEY TABLE ### ### UPDATE KEY TABLE ###
key_list_transactons = db_spend_update_transactions["key_list_transactons"] key_list_transactions = db_spend_update_transactions["key_list_transactions"]
verbose_proxy_logger.debug( verbose_proxy_logger.debug(
"KEY Spend transactions: {}".format(len(key_list_transactons.keys())) "KEY Spend transactions: {}".format(len(key_list_transactions.keys()))
) )
if len(key_list_transactons.keys()) > 0: if len(key_list_transactions.keys()) > 0:
for i in range(n_retry_times + 1): for i in range(n_retry_times + 1):
start_time = time.time() start_time = time.time()
try: try:
@ -523,12 +523,12 @@ class DBSpendUpdateWriter:
for ( for (
token, token,
response_cost, response_cost,
) in key_list_transactons.items(): ) in key_list_transactions.items():
batcher.litellm_verificationtoken.update_many( # 'update_many' prevents error from being raised if no row exists batcher.litellm_verificationtoken.update_many( # 'update_many' prevents error from being raised if no row exists
where={"token": token}, where={"token": token},
data={"spend": {"increment": response_cost}}, data={"spend": {"increment": response_cost}},
) )
prisma_client.key_list_transactons = ( prisma_client.key_list_transactions = (
{} {}
) # Clear the remaining transactions after processing all batches in the loop. ) # Clear the remaining transactions after processing all batches in the loop.
break break
@ -551,11 +551,11 @@ class DBSpendUpdateWriter:
### UPDATE TEAM TABLE ### ### UPDATE TEAM TABLE ###
verbose_proxy_logger.debug( verbose_proxy_logger.debug(
"Team Spend transactions: {}".format( "Team Spend transactions: {}".format(
len(prisma_client.team_list_transactons.keys()) len(prisma_client.team_list_transactions.keys())
) )
) )
team_list_transactons = db_spend_update_transactions["team_list_transactons"] team_list_transactions = db_spend_update_transactions["team_list_transactions"]
if len(team_list_transactons.keys()) > 0: if len(team_list_transactions.keys()) > 0:
for i in range(n_retry_times + 1): for i in range(n_retry_times + 1):
start_time = time.time() start_time = time.time()
try: try:
@ -566,7 +566,7 @@ class DBSpendUpdateWriter:
for ( for (
team_id, team_id,
response_cost, response_cost,
) in team_list_transactons.items(): ) in team_list_transactions.items():
verbose_proxy_logger.debug( verbose_proxy_logger.debug(
"Updating spend for team id={} by {}".format( "Updating spend for team id={} by {}".format(
team_id, response_cost team_id, response_cost
@ -576,7 +576,7 @@ class DBSpendUpdateWriter:
where={"team_id": team_id}, where={"team_id": team_id},
data={"spend": {"increment": response_cost}}, data={"spend": {"increment": response_cost}},
) )
prisma_client.team_list_transactons = ( prisma_client.team_list_transactions = (
{} {}
) # Clear the remaining transactions after processing all batches in the loop. ) # Clear the remaining transactions after processing all batches in the loop.
break break
@ -597,10 +597,10 @@ class DBSpendUpdateWriter:
) )
### UPDATE TEAM Membership TABLE with spend ### ### UPDATE TEAM Membership TABLE with spend ###
team_member_list_transactons = db_spend_update_transactions[ team_member_list_transactions = db_spend_update_transactions[
"team_member_list_transactons" "team_member_list_transactions"
] ]
if len(team_member_list_transactons.keys()) > 0: if len(team_member_list_transactions.keys()) > 0:
for i in range(n_retry_times + 1): for i in range(n_retry_times + 1):
start_time = time.time() start_time = time.time()
try: try:
@ -611,7 +611,7 @@ class DBSpendUpdateWriter:
for ( for (
key, key,
response_cost, response_cost,
) in team_member_list_transactons.items(): ) in team_member_list_transactions.items():
# key is "team_id::<value>::user_id::<value>" # key is "team_id::<value>::user_id::<value>"
team_id = key.split("::")[1] team_id = key.split("::")[1]
user_id = key.split("::")[3] user_id = key.split("::")[3]
@ -620,7 +620,7 @@ class DBSpendUpdateWriter:
where={"team_id": team_id, "user_id": user_id}, where={"team_id": team_id, "user_id": user_id},
data={"spend": {"increment": response_cost}}, data={"spend": {"increment": response_cost}},
) )
prisma_client.team_member_list_transactons = ( prisma_client.team_member_list_transactions = (
{} {}
) # Clear the remaining transactions after processing all batches in the loop. ) # Clear the remaining transactions after processing all batches in the loop.
break break
@ -641,8 +641,8 @@ class DBSpendUpdateWriter:
) )
### UPDATE ORG TABLE ### ### UPDATE ORG TABLE ###
org_list_transactons = db_spend_update_transactions["org_list_transactons"] org_list_transactions = db_spend_update_transactions["org_list_transactions"]
if len(org_list_transactons.keys()) > 0: if len(org_list_transactions.keys()) > 0:
for i in range(n_retry_times + 1): for i in range(n_retry_times + 1):
start_time = time.time() start_time = time.time()
try: try:
@ -653,12 +653,12 @@ class DBSpendUpdateWriter:
for ( for (
org_id, org_id,
response_cost, response_cost,
) in org_list_transactons.items(): ) in org_list_transactions.items():
batcher.litellm_organizationtable.update_many( # 'update_many' prevents error from being raised if no row exists batcher.litellm_organizationtable.update_many( # 'update_many' prevents error from being raised if no row exists
where={"organization_id": org_id}, where={"organization_id": org_id},
data={"spend": {"increment": response_cost}}, data={"spend": {"increment": response_cost}},
) )
prisma_client.org_list_transactons = ( prisma_client.org_list_transactions = (
{} {}
) # Clear the remaining transactions after processing all batches in the loop. ) # Clear the remaining transactions after processing all batches in the loop.
break break

50
litellm/proxy/db/redis_update_buffer.py
View file

@ -17,12 +17,12 @@ else:
class DBSpendUpdateTransactions(TypedDict): class DBSpendUpdateTransactions(TypedDict):
user_list_transactons: Dict[str, float] user_list_transactions: Dict[str, float]
end_user_list_transactons: Dict[str, float] end_user_list_transactions: Dict[str, float]
key_list_transactons: Dict[str, float] key_list_transactions: Dict[str, float]
team_list_transactons: Dict[str, float] team_list_transactions: Dict[str, float]
team_member_list_transactons: Dict[str, float] team_member_list_transactions: Dict[str, float]
org_list_transactons: Dict[str, float] org_list_transactions: Dict[str, float]
class RedisUpdateBuffer: class RedisUpdateBuffer:
@ -78,12 +78,12 @@ class RedisUpdateBuffer:
""" """
IN_MEMORY_UPDATE_TRANSACTIONS: DBSpendUpdateTransactions = ( IN_MEMORY_UPDATE_TRANSACTIONS: DBSpendUpdateTransactions = (
DBSpendUpdateTransactions( DBSpendUpdateTransactions(
user_list_transactons=prisma_client.user_list_transactons, user_list_transactions=prisma_client.user_list_transactions,
end_user_list_transactons=prisma_client.end_user_list_transactons, end_user_list_transactions=prisma_client.end_user_list_transactions,
key_list_transactons=prisma_client.key_list_transactons, key_list_transactions=prisma_client.key_list_transactions,
team_list_transactons=prisma_client.team_list_transactons, team_list_transactions=prisma_client.team_list_transactions,
team_member_list_transactons=prisma_client.team_member_list_transactons, team_member_list_transactions=prisma_client.team_member_list_transactions,
org_list_transactons=prisma_client.org_list_transactons, org_list_transactions=prisma_client.org_list_transactions,
) )
) )
for key, _transactions in IN_MEMORY_UPDATE_TRANSACTIONS.items(): for key, _transactions in IN_MEMORY_UPDATE_TRANSACTIONS.items():
@ -120,21 +120,23 @@ class RedisUpdateBuffer:
if self.redis_cache is None: if self.redis_cache is None:
return None return None
expected_keys = [ expected_keys = [
"user_list_transactons", "user_list_transactions",
"end_user_list_transactons", "end_user_list_transactions",
"key_list_transactons", "key_list_transactions",
"team_list_transactons", "team_list_transactions",
"team_member_list_transactons", "team_member_list_transactions",
"org_list_transactons", "org_list_transactions",
] ]
result = await self.redis_cache.async_batch_get_cache(expected_keys) result = await self.redis_cache.async_batch_get_cache(expected_keys)
if result is None: if result is None:
return None return None
return DBSpendUpdateTransactions( return DBSpendUpdateTransactions(
user_list_transactons=result.get("user_list_transactons", {}), user_list_transactions=result.get("user_list_transactions", {}),
end_user_list_transactons=result.get("end_user_list_transactons", {}), end_user_list_transactions=result.get("end_user_list_transactions", {}),
key_list_transactons=result.get("key_list_transactons", {}), key_list_transactions=result.get("key_list_transactions", {}),
team_list_transactons=result.get("team_list_transactons", {}), team_list_transactions=result.get("team_list_transactions", {}),
team_member_list_transactons=result.get("team_member_list_transactons", {}), team_member_list_transactions=result.get(
org_list_transactons=result.get("org_list_transactons", {}), "team_member_list_transactions", {}
),
org_list_transactions=result.get("org_list_transactions", {}),
) )

16
litellm/proxy/utils.py
View file

@ -1101,12 +1101,12 @@ def jsonify_object(data: dict) -> dict:
class PrismaClient: class PrismaClient:
user_list_transactons: dict = {} user_list_transactions: dict = {}
end_user_list_transactons: dict = {} end_user_list_transactions: dict = {}
key_list_transactons: dict = {} key_list_transactions: dict = {}
team_list_transactons: dict = {} team_list_transactions: dict = {}
team_member_list_transactons: dict = {} # key is ["team_id" + "user_id"] team_member_list_transactions: dict = {} # key is ["team_id" + "user_id"]
org_list_transactons: dict = {} org_list_transactions: dict = {}
spend_log_transactions: List = [] spend_log_transactions: List = []
daily_user_spend_transactions: Dict[str, DailyUserSpendTransaction] = {} daily_user_spend_transactions: Dict[str, DailyUserSpendTransaction] = {}
@ -2433,7 +2433,7 @@ class ProxyUpdateSpend:
for ( for (
end_user_id, end_user_id,
response_cost, response_cost,
) in prisma_client.end_user_list_transactons.items(): ) in prisma_client.end_user_list_transactions.items():
if litellm.max_end_user_budget is not None: if litellm.max_end_user_budget is not None:
pass pass
batcher.litellm_endusertable.upsert( batcher.litellm_endusertable.upsert(
@ -2461,7 +2461,7 @@ class ProxyUpdateSpend:
e=e, start_time=start_time, proxy_logging_obj=proxy_logging_obj e=e, start_time=start_time, proxy_logging_obj=proxy_logging_obj
) )
finally: finally:
prisma_client.end_user_list_transactons = ( prisma_client.end_user_list_transactions = (
{} {}
) # reset the end user list transactions - prevent bad data from causing issues ) # reset the end user list transactions - prevent bad data from causing issues

2
tests/local_testing/test_update_spend.py
View file

@ -93,7 +93,7 @@ def prisma_client():
@pytest.mark.asyncio @pytest.mark.asyncio
async def test_batch_update_spend(prisma_client): async def test_batch_update_spend(prisma_client):
prisma_client.user_list_transactons["test-litellm-user-5"] = 23 prisma_client.user_list_transactions["test-litellm-user-5"] = 23
setattr(litellm.proxy.proxy_server, "prisma_client", prisma_client) setattr(litellm.proxy.proxy_server, "prisma_client", prisma_client)
setattr(litellm.proxy.proxy_server, "master_key", "sk-1234") setattr(litellm.proxy.proxy_server, "master_key", "sk-1234")
await litellm.proxy.proxy_server.prisma_client.connect() await litellm.proxy.proxy_server.prisma_client.connect()

4
tests/proxy_unit_tests/test_proxy_utils.py
View file

@ -1509,7 +1509,7 @@ from litellm.proxy.utils import ProxyUpdateSpend
async def test_end_user_transactions_reset(): async def test_end_user_transactions_reset():
# Setup # Setup
mock_client = MagicMock() mock_client = MagicMock()
mock_client.end_user_list_transactons = {"1": 10.0} # Bad log mock_client.end_user_list_transactions = {"1": 10.0} # Bad log
mock_client.db.tx = AsyncMock(side_effect=Exception("DB Error")) mock_client.db.tx = AsyncMock(side_effect=Exception("DB Error"))
# Call function - should raise error # Call function - should raise error
@ -1520,7 +1520,7 @@ async def test_end_user_transactions_reset():
# Verify cleanup happened # Verify cleanup happened
assert ( assert (
mock_client.end_user_list_transactons == {} mock_client.end_user_list_transactions == {}
), "Transactions list should be empty after error" ), "Transactions list should be empty after error"

12
tests/proxy_unit_tests/test_update_spend.py
View file

@ -22,12 +22,12 @@ class MockPrismaClient:
def __init__(self): def __init__(self):
self.db = MagicMock() self.db = MagicMock()
self.spend_log_transactions = [] self.spend_log_transactions = []
self.user_list_transactons = {} self.user_list_transactions = {}
self.end_user_list_transactons = {} self.end_user_list_transactions = {}
self.key_list_transactons = {} self.key_list_transactions = {}
self.team_list_transactons = {} self.team_list_transactions = {}
self.team_member_list_transactons = {} self.team_member_list_transactions = {}
self.org_list_transactons = {} self.org_list_transactions = {}
def jsonify_object(self, obj): def jsonify_object(self, obj):
return obj return obj