fix(aiand): retire models on their UTC date while the proxy runs, and add muse-spark-open

The wildcard listing now checks each row's deprecation_date when it expands, against the UTC date the field
documents, so a model drops on its day without a restart. deepseek-v4.1-flash now carries 2026-11-05, the
UTC day ai& retires it, and meta/muse-spark-open gets its price row from ai&'s live /v1/models
This commit is contained in:
mateo-berri 2026-10-30 00:43:13 -07:00
parent 1a6ce18e57
commit c19fcf9d5f
6 changed files with 104 additions and 15 deletions

View file

@ -7,7 +7,6 @@ _apply_process_defaults()
### INIT VARIABLES #########################
import threading
import os
import datetime
from collections.abc import Mapping, Sequence
from typing import (
@ -550,6 +549,7 @@ _key_management_system: Optional["KeyManagementSystem"] = None
output_parse_pii: bool = False
#############################################
from litellm.litellm_core_utils.get_model_cost_map import get_model_cost_map, mark_litellm_import_complete
from litellm.litellm_core_utils.model_retirement import is_past_deprecation_date as _is_past_deprecation_date
model_cost = get_model_cost_map(url=model_cost_map_url)
cost_discount_config: Dict[str, float] = {} # Provider-specific cost discounts {"vertex_ai": 0.05} = 5% discount
@ -755,16 +755,6 @@ def is_openai_finetune_model(key: str) -> bool:
return key.startswith("ft:") and not key.count(":") > 1
def _is_past_deprecation_date(value: Mapping[str, object]) -> bool:
deprecation_date: Final = value.get("deprecation_date")
if not isinstance(deprecation_date, str):
return False
try:
return datetime.date.fromisoformat(deprecation_date) <= datetime.date.today()
except ValueError:
return False
def _populate_provider_model_sets(model_cost_map: Mapping[str, Mapping[str, object]]) -> None:
for key, value in tuple(model_cost_map.items()):
if value.get("litellm_provider") == "openai" and not is_openai_finetune_model(key):

View file

@ -0,0 +1,19 @@
import datetime
from collections.abc import Mapping
from typing import Final
PROVIDERS_HIDING_RETIRED_MODELS: Final = frozenset({"aiand", "baseten"})
def is_past_deprecation_date(value: Mapping[str, object]) -> bool:
deprecation_date: Final = value.get("deprecation_date")
if not isinstance(deprecation_date, str):
return False
try:
return datetime.date.fromisoformat(deprecation_date) <= datetime.datetime.now(datetime.timezone.utc).date()
except ValueError:
return False
def is_hidden_as_retired(value: Mapping[str, object]) -> bool:
return value.get("litellm_provider") in PROVIDERS_HIDING_RETIRED_MODELS and is_past_deprecation_date(value)

View file

@ -72064,7 +72064,7 @@
},
"aiand/deepseek-ai/deepseek-v4.1-flash": {
"cache_read_input_token_cost": 2e-08,
"deprecation_date": "2026-11-06",
"deprecation_date": "2026-11-05",
"input_cost_per_token": 3e-07,
"litellm_provider": "aiand",
"max_input_tokens": 1048576,
@ -72108,6 +72108,21 @@
"supports_tool_choice": true,
"supports_vision": true
},
"aiand/meta/muse-spark-open": {
"cache_read_input_token_cost": 1.5e-07,
"input_cost_per_token": 1.25e-06,
"litellm_provider": "aiand",
"max_input_tokens": 1048576,
"max_output_tokens": 943718,
"mode": "chat",
"output_cost_per_token": 4.25e-06,
"source": "https://api.aiand.com/v1/models",
"supports_function_calling": true,
"supports_prompt_caching": true,
"supports_reasoning": true,
"supports_tool_choice": true,
"supports_vision": true
},
"aiand/moonshotai/kimi-k2.7-code": {
"cache_read_input_token_cost": 2e-07,
"deprecation_date": "2026-10-27",

View file

@ -94,6 +94,7 @@ from litellm.litellm_core_utils.fallback_generalizations import (
)
from litellm.litellm_core_utils.get_model_cost_map import AliasedCostEntry, GetModelCostMap
from litellm.litellm_core_utils.model_param_helper import peek_reasoning_summary_aliases
from litellm.litellm_core_utils.model_retirement import is_hidden_as_retired
from litellm.litellm_core_utils.offline_mode import is_offline_mode
from litellm.litellm_core_utils.sensitive_data_masker import redact_credentials_in_payload
from litellm.litellm_core_utils.tokenizer import strip_special_tokens
@ -8852,7 +8853,8 @@ def get_valid_models(
models_for_provider = copy.deepcopy(litellm.models_by_provider.get(provider, []))
valid_models.extend(models_for_provider)
return valid_models
cost_map: Final = _builtin_cost_map()
return [model for model in valid_models if not is_hidden_as_retired(cost_map.get(model, {}))]
except Exception as e:
verbose_logger.warning("Error getting valid models: %s", e)
return [] # NON-Blocking

View file

@ -72064,7 +72064,7 @@
},
"aiand/deepseek-ai/deepseek-v4.1-flash": {
"cache_read_input_token_cost": 2e-08,
"deprecation_date": "2026-11-06",
"deprecation_date": "2026-11-05",
"input_cost_per_token": 3e-07,
"litellm_provider": "aiand",
"max_input_tokens": 1048576,
@ -72108,6 +72108,21 @@
"supports_tool_choice": true,
"supports_vision": true
},
"aiand/meta/muse-spark-open": {
"cache_read_input_token_cost": 1.5e-07,
"input_cost_per_token": 1.25e-06,
"litellm_provider": "aiand",
"max_input_tokens": 1048576,
"max_output_tokens": 943718,
"mode": "chat",
"output_cost_per_token": 4.25e-06,
"source": "https://api.aiand.com/v1/models",
"supports_function_calling": true,
"supports_prompt_caching": true,
"supports_reasoning": true,
"supports_tool_choice": true,
"supports_vision": true
},
"aiand/moonshotai/kimi-k2.7-code": {
"cache_read_input_token_cost": 2e-07,
"deprecation_date": "2026-10-27",

View file

@ -1,5 +1,6 @@
import datetime
import json
import time
from typing import Final
import httpx
@ -90,19 +91,66 @@ def _aiand_catalog() -> frozenset[str]:
return frozenset(name for name, info in litellm.model_cost.items() if info.get("litellm_provider") == "aiand")
def _utc_today() -> datetime.date:
return datetime.datetime.now(datetime.timezone.utc).date()
def test_aiand_wildcard_lists_only_models_not_yet_retired():
catalog: Final = _aiand_catalog()
retired: Final = frozenset(
name
for name in catalog
if (retired_on := litellm.model_cost[name].get("deprecation_date")) is not None
and datetime.date.fromisoformat(retired_on) <= datetime.date.today()
and datetime.date.fromisoformat(retired_on) <= _utc_today()
)
assert catalog - retired
assert frozenset(get_known_models_from_wildcard("aiand/*")) == catalog - retired
def test_aiand_wildcard_drops_a_model_whose_retirement_date_passes_while_running(monkeypatch: pytest.MonkeyPatch):
model: Final = "aiand/acme/retires-while-running"
monkeypatch.setitem(litellm.model_cost, model, {"litellm_provider": "aiand", "deprecation_date": "2999-01-01"})
try:
litellm.add_known_models({model: litellm.model_cost[model]})
assert model in get_known_models_from_wildcard("aiand/*")
monkeypatch.setitem(litellm.model_cost, model, {"litellm_provider": "aiand", "deprecation_date": "2000-01-01"})
assert model not in get_known_models_from_wildcard("aiand/*")
finally:
litellm.aiand_models.discard(model)
litellm.add_known_models({})
@pytest.mark.parametrize("host_zone", ["Etc/GMT+12", "Etc/GMT-14"])
def test_aiand_models_retire_on_the_utc_date_whatever_the_host_zone(monkeypatch: pytest.MonkeyPatch, host_zone: str):
today: Final = _utc_today()
rows: Final = {
"aiand/acme/retires-today": {"litellm_provider": "aiand", "deprecation_date": today.isoformat()},
"aiand/acme/retires-tomorrow": {
"litellm_provider": "aiand",
"deprecation_date": (today + datetime.timedelta(days=1)).isoformat(),
},
}
for name, row in rows.items():
monkeypatch.setitem(litellm.model_cost, name, row)
monkeypatch.setenv("TZ", host_zone)
time.tzset()
try:
litellm.add_known_models(rows)
listed: Final = frozenset(get_known_models_from_wildcard("aiand/*"))
assert "aiand/acme/retires-today" not in listed
assert "aiand/acme/retires-tomorrow" in listed
finally:
monkeypatch.undo()
time.tzset()
for name in rows:
litellm.aiand_models.discard(name)
litellm.add_known_models({})
def test_aiand_calls_are_billed_from_their_cost_rows():
catalog: Final = _aiand_catalog()
assert catalog