Skip to content

Commit

Permalink
Restoring validation functionality after #383 turns out to not work f…
Browse files Browse the repository at this point in the history
…or Python 3.11
  • Loading branch information
jamesbraza committed Sep 12, 2024
1 parent 57fb356 commit 81dae50
Showing 1 changed file with 16 additions and 8 deletions.
24 changes: 16 additions & 8 deletions paperqa/llms.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
from collections.abc import AsyncIterable, Awaitable, Callable, Iterable, Sequence
from enum import StrEnum
from inspect import signature
from sys import version_info
from typing import Any

import numpy as np
Expand Down Expand Up @@ -350,9 +351,12 @@ async def _run_completion(
},
]

_DeploymentTypedDictValidator = TypeAdapter(
list[DeploymentTypedDict], config=ConfigDict(arbitrary_types_allowed=True)
)

IS_PYTHON_BELOW_312 = version_info < (3, 12)
if not IS_PYTHON_BELOW_312:
_DeploymentTypedDictValidator = TypeAdapter(
list[DeploymentTypedDict], config=ConfigDict(arbitrary_types_allowed=True)
)


class LiteLLMModel(LLMModel):
Expand Down Expand Up @@ -390,11 +394,15 @@ def maybe_set_config_attribute(cls, data: dict[str, Any]) -> dict[str, Any]:
"router_kwargs": {"num_retries": 3, "retry_after": 5},
}
# we only support one "model name" for now, here we validate
_DeploymentTypedDictValidator.validate_python(data["config"]["model_list"])
if (
"config" in data
and len({m["model_name"] for m in data["config"]["model_list"]}) > 1
):
model_list = data["config"]["model_list"]
if IS_PYTHON_BELOW_312:
if not isinstance(model_list, list):
# Work around https://github.com/BerriAI/litellm/issues/5664
raise TypeError(f"model_list must be a list, not a {type(model_list)}.")
else:
# pylint: disable-next=possibly-used-before-assignment
_DeploymentTypedDictValidator.validate_python(model_list)
if "config" in data and len({m["model_name"] for m in model_list}) > 1:
raise ValueError("Only one model name per router is supported for now.")
return data

Expand Down

0 comments on commit 81dae50

Please sign in to comment.