scriptoriumadmin/litellm
1
0
Fork 0
mirror of https://github.com/BerriAI/litellm.git synced 2026-10-06 02:48:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 103

refactor: readable db search where-condition and ruff-format clean

Browse source
This commit is contained in:
thementalcoding 2026-09-29 13:22:27 +02:00
parent 66dbe79d1d
commit 27d155b1a1
1 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
litellm/proxy/proxy_server.py
View file

@ -14466,24 +14466,24 @@ async def _fetch_db_models_for_search(
filter for `team_public_model_name` instead and keep the DB cost
bounded by `search`.
"""
db_where_condition: Final[dict[str, Any]] = (
{
"AND": [
{
"OR": [
{"model_name": {"contains": search_lower, "mode": "insensitive"}},
# JSON string_contains is case-sensitive on Postgres (see
# note above); router-side matching below covers the
# case-insensitive path for rows already in the router.
{"litellm_params": {"path": ["model"], "string_contains": search_lower}},
]
},
*( [{"model_id": {"not": {"in": list(db_model_ids_in_router)}}}] if db_model_ids_in_router else [] ),
]
}
match_conditions: list[dict[str, Any]] = (
[
{
"OR": [
{"model_name": {"contains": search_lower, "mode": "insensitive"}},
# JSON string_contains is case-sensitive on Postgres (see
# note above); router-side matching below covers the
# case-insensitive path for rows already in the router.
{"litellm_params": {"path": ["model"], "string_contains": search_lower}},
]
}
]
if model_name is None
else {"model_name": model_name}
else [{"model_name": model_name}]
)
if db_model_ids_in_router:
match_conditions.append({"model_id": {"not": {"in": list(db_model_ids_in_router)}}})
db_where_condition: Final[dict[str, Any]] = {"AND": match_conditions}
# Unsorted searches only need enough DB rows to fill the current
# page after counting router-side matches. Sorted searches need
@ -15324,7 +15324,8 @@ async def model_info_v2(
# `is True` because direct-call tests bypass FastAPI, so the Query default arrives as a
# truthy sentinel object rather than False.
all_models = [
m for m in all_models
m
for m in all_models
if _matches_model_info_filters(m, exclude_auto_routers, access_group, wildcard_only, blocked)
]