mirror of
https://github.com/BerriAI/litellm.git
synced 2026-11-15 09:12:18 +00:00
Merge b009871bd5 into 60fc121ce8
This commit is contained in:
commit
ed475a066d
4 changed files with 20 additions and 11 deletions
|
|
@ -1,11 +1,10 @@
|
|||
import importlib.metadata
|
||||
from typing import Final
|
||||
|
||||
import importlib_metadata
|
||||
|
||||
|
||||
def _installed_version(distribution: str) -> str | None:
|
||||
try:
|
||||
return importlib_metadata.version(distribution)
|
||||
return importlib.metadata.version(distribution)
|
||||
except Exception:
|
||||
return None
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ dependencies = [
|
|||
"python-dotenv>=1.0.0,<2.0",
|
||||
"pyyaml>=6.0.3,<7.0",
|
||||
"packaging>=24.0",
|
||||
"importlib-metadata>=8.0.0,<9.0",
|
||||
"importlib-metadata>=8.0.0,<9.0; python_version < '3.10'",
|
||||
"tiktoken>=0.8.0,<1.0; python_version < '3.14'",
|
||||
"tiktoken>=0.12.0,<1.0; python_version == '3.14'",
|
||||
"tiktoken>=0.14.0,<1.0; python_version >= '3.15'",
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
import importlib.metadata
|
||||
import runpy
|
||||
import sys
|
||||
from pathlib import Path
|
||||
from typing import Final
|
||||
from unittest.mock import patch
|
||||
|
||||
import importlib_metadata
|
||||
import pytest
|
||||
|
||||
|
||||
|
|
@ -18,10 +19,10 @@ import pytest
|
|||
def test_version_uses_installed_distribution(installed: dict[str, str], expected: str) -> None:
|
||||
def lookup(name: str) -> str:
|
||||
if name not in installed:
|
||||
raise importlib_metadata.PackageNotFoundError(name)
|
||||
raise importlib.metadata.PackageNotFoundError(name)
|
||||
return installed[name]
|
||||
|
||||
with patch("importlib_metadata.version", side_effect=lookup):
|
||||
with patch("importlib.metadata.version", side_effect=lookup):
|
||||
result: Final = runpy.run_path(str(Path(__file__).resolve().parents[2] / "litellm/_version.py"))
|
||||
assert result["version"] == expected
|
||||
|
||||
|
|
@ -29,12 +30,22 @@ def test_version_uses_installed_distribution(installed: dict[str, str], expected
|
|||
@pytest.mark.parametrize("core_version", ["1.2.3", "2.3.4"])
|
||||
def test_version_rejects_overlapping_distributions(core_version: str) -> None:
|
||||
installed: Final = {"litellm": "1.2.3", "litellm-core": core_version}
|
||||
with patch("importlib_metadata.version", side_effect=installed.__getitem__):
|
||||
with patch("importlib.metadata.version", side_effect=installed.__getitem__):
|
||||
with pytest.raises(RuntimeError, match=r"litellm and litellm-core.*separate environments"):
|
||||
runpy.run_path(str(Path(__file__).resolve().parents[2] / "litellm/_version.py"))
|
||||
|
||||
|
||||
def test_version_handles_unreadable_metadata() -> None:
|
||||
with patch("importlib_metadata.version", side_effect=ValueError("Invalid metadata")):
|
||||
with patch("importlib.metadata.version", side_effect=ValueError("Invalid metadata")):
|
||||
result: Final = runpy.run_path(str(Path(__file__).resolve().parents[2] / "litellm/_version.py"))
|
||||
assert result["version"] == "unknown"
|
||||
|
||||
|
||||
def test_version_loads_without_importlib_metadata_backport() -> None:
|
||||
with patch.dict(sys.modules, {"importlib_metadata": None}):
|
||||
with patch(
|
||||
"importlib.metadata.version",
|
||||
side_effect=importlib.metadata.PackageNotFoundError,
|
||||
):
|
||||
result: Final = runpy.run_path(str(Path(__file__).resolve().parents[2] / "litellm/_version.py"))
|
||||
assert result["version"] == "unknown"
|
||||
|
|
|
|||
3
uv.lock
generated
3
uv.lock
generated
|
|
@ -4967,7 +4967,6 @@ dependencies = [
|
|||
{ name = "filelock" },
|
||||
{ name = "httpx", extra = ["http2"] },
|
||||
{ name = "huggingface-hub" },
|
||||
{ name = "importlib-metadata" },
|
||||
{ name = "jinja2" },
|
||||
{ name = "jsonschema" },
|
||||
{ name = "openai" },
|
||||
|
|
@ -5263,7 +5262,7 @@ requires-dist = [
|
|||
{ name = "httpx2", marker = "extra == 'mcp'", specifier = ">=2.10.0,<3" },
|
||||
{ name = "httpx2", marker = "extra == 'proxy'", specifier = ">=2.10.0,<3" },
|
||||
{ name = "huggingface-hub", specifier = ">=0.34.0,<2.0" },
|
||||
{ name = "importlib-metadata", specifier = ">=8.0.0,<9.0" },
|
||||
{ name = "importlib-metadata", marker = "python_full_version < '3.10'", specifier = ">=8.0.0,<9.0" },
|
||||
{ name = "inquirerpy", marker = "extra == 'cli'", specifier = ">=0.3.4,<1.0" },
|
||||
{ name = "inquirerpy", marker = "extra == 'proxy'", specifier = ">=0.3.4,<1.0" },
|
||||
{ name = "jinja2", specifier = ">=3.1.6,<4.0" },
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue