Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 9 additions & 23 deletions litellm/proxy/db/db_transaction_queue/redis_update_buffer.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ def _should_commit_spend_updates_to_redis() -> bool:
"""
from litellm.proxy.proxy_server import general_settings

_use_redis_transaction_buffer: Optional[Union[bool, str]] = (
general_settings.get("use_redis_transaction_buffer", False)
_use_redis_transaction_buffer: Optional[Union[bool, str]] = general_settings.get(
"use_redis_transaction_buffer", False
)
if isinstance(_use_redis_transaction_buffer, str):
_use_redis_transaction_buffer = str_to_bool(_use_redis_transaction_buffer)
Expand Down Expand Up @@ -151,15 +151,11 @@ async def store_in_memory_spend_updates_in_redis(
```
"""
if self.redis_cache is None:
verbose_proxy_logger.debug(
"redis_cache is None, skipping store_in_memory_spend_updates_in_redis"
)
verbose_proxy_logger.debug("redis_cache is None, skipping store_in_memory_spend_updates_in_redis")
return

# Get all transactions
db_spend_update_transactions = (
await spend_update_queue.flush_and_get_aggregated_db_spend_update_transactions()
)
db_spend_update_transactions = await spend_update_queue.flush_and_get_aggregated_db_spend_update_transactions()
daily_spend_update_transactions = (
await daily_spend_update_queue.flush_and_get_aggregated_daily_spend_update_transactions()
)
Expand All @@ -170,12 +166,8 @@ async def store_in_memory_spend_updates_in_redis(
await daily_tag_spend_update_queue.flush_and_get_aggregated_daily_spend_update_transactions()
)

verbose_proxy_logger.debug(
"ALL DB SPEND UPDATE TRANSACTIONS: %s", db_spend_update_transactions
)
verbose_proxy_logger.debug(
"ALL DAILY SPEND UPDATE TRANSACTIONS: %s", daily_spend_update_transactions
)
verbose_proxy_logger.debug("ALL DB SPEND UPDATE TRANSACTIONS: %s", db_spend_update_transactions)
verbose_proxy_logger.debug("ALL DAILY SPEND UPDATE TRANSACTIONS: %s", daily_spend_update_transactions)

await self._store_transactions_in_redis(
transactions=db_spend_update_transactions,
Expand Down Expand Up @@ -295,9 +287,7 @@ async def get_all_daily_spend_update_transactions_from_redis_buffer(
)
if list_of_transactions is None:
return None
list_of_daily_spend_update_transactions = [
json.loads(transaction) for transaction in list_of_transactions
]
list_of_daily_spend_update_transactions = [json.loads(transaction) for transaction in list_of_transactions]
return cast(
Dict[str, DailyUserSpendTransaction],
DailySpendUpdateQueue.get_aggregated_daily_spend_update_transactions(
Expand All @@ -319,9 +309,7 @@ async def get_all_daily_team_spend_update_transactions_from_redis_buffer(
)
if list_of_transactions is None:
return None
list_of_daily_spend_update_transactions = [
json.loads(transaction) for transaction in list_of_transactions
]
list_of_daily_spend_update_transactions = [json.loads(transaction) for transaction in list_of_transactions]
return cast(
Dict[str, DailyTeamSpendTransaction],
DailySpendUpdateQueue.get_aggregated_daily_spend_update_transactions(
Expand All @@ -343,9 +331,7 @@ async def get_all_daily_tag_spend_update_transactions_from_redis_buffer(
)
if list_of_transactions is None:
return None
list_of_daily_spend_update_transactions = [
json.loads(transaction) for transaction in list_of_transactions
]
list_of_daily_spend_update_transactions = [json.loads(transaction) for transaction in list_of_transactions]
return cast(
Dict[str, DailyTagSpendTransaction],
DailySpendUpdateQueue.get_aggregated_daily_spend_update_transactions(
Expand Down
7 changes: 2 additions & 5 deletions litellm/secret_managers/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,11 @@ def str_to_bool(value: Optional[str]) -> Optional[bool]:
if value is None:
return None

true_values = {"true"}
false_values = {"false"}

value_lower = value.strip().lower()

if value_lower in true_values:
if value_lower == "true":
return True
elif value_lower in false_values:
elif value_lower == "false":
return False
else:
return None
Expand Down