scriptoriumadmin/litellm
1
0
Fork 0
mirror of https://github.com/BerriAI/litellm.git synced 2026-09-10 22:41:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 129

fixing merge artifacts

Browse source
This commit is contained in:
yuneng-jiang 2026-02-24 12:58:50 -08:00
parent 5cc055ffce
commit 6c3d0a3d9f
1 changed files with 0 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
litellm/proxy/utils.py
View file

@ -4332,23 +4332,6 @@ async def update_spend_logs_job(
db_writer_client=db_writer_client,
)
<<<<<<< HEAD
=======
# Guardrail/policy usage tracking (same batch, outside spend-logs update)
try:
from litellm.proxy.guardrails.usage_tracking import \
process_spend_logs_guardrail_usage
await process_spend_logs_guardrail_usage(
prisma_client=prisma_client,
logs_to_process=logs_to_process,
)
except Exception as guardrail_tracking_err:
verbose_proxy_logger.warning(
"Spend tracking - guardrail usage tracking failed (non-fatal): %s",
guardrail_tracking_err,
)
>>>>>>> 80ebe722d9 (Merge pull request #22029 from BerriAI/litellm_spend_tracking_logging)
async def _monitor_spend_logs_queue(
prisma_client: PrismaClient,