mirror of
https://github.com/tiennm99/litellm.git
synced 2026-06-18 07:33:58 +00:00
Yuneng Jiang
8cac6c5bff
- Move _user_has_admin_view to litellm.proxy._types as
user_api_key_has_admin_view (single source of truth). common_utils.py
and isolation.py both import from there now, removing the duplicated
role-check that could silently diverge if new admin roles are added.
- Add pytest.importorskip("litellm_enterprise") to the two regression
tests that assert managed_files / managed_vector_stores are registered;
those keys come from ENTERPRISE_PROXY_HOOKS so the tests would fail
unconditionally in a checkout without the enterprise extra installed.
52 lines
1.9 KiB
Python
52 lines
1.9 KiB
Python
"""Regression guard for the enterprise hook registration / import cycle.
|
|
|
|
Python 3.13 is stricter about partially-initialized modules and surfaces
|
|
cycles that Python 3.12 silently tolerated. The previous bug:
|
|
|
|
litellm.proxy.hooks.__init__
|
|
-> enterprise.enterprise_hooks
|
|
-> litellm_enterprise.proxy.hooks.managed_files
|
|
-> litellm.llms.base_llm.managed_resources.isolation
|
|
-> litellm.proxy.management_endpoints.common_utils
|
|
-> litellm.proxy.utils (re-enters litellm.proxy.hooks mid-init)
|
|
|
|
silently swallowed the ImportError in `hooks/__init__.py`, leaving
|
|
``managed_files`` unregistered and the /files endpoint returning 500.
|
|
"""
|
|
|
|
import pytest
|
|
|
|
from litellm.proxy.hooks import PROXY_HOOKS, get_proxy_hook
|
|
|
|
|
|
def test_managed_files_hook_registered():
|
|
pytest.importorskip("litellm_enterprise")
|
|
assert "managed_files" in PROXY_HOOKS
|
|
hook_cls = get_proxy_hook("managed_files")
|
|
assert hook_cls.__name__ == "_PROXY_LiteLLMManagedFiles"
|
|
|
|
|
|
def test_managed_vector_stores_hook_registered():
|
|
pytest.importorskip("litellm_enterprise")
|
|
assert "managed_vector_stores" in PROXY_HOOKS
|
|
hook_cls = get_proxy_hook("managed_vector_stores")
|
|
assert hook_cls.__name__ == "_PROXY_LiteLLMManagedVectorStores"
|
|
|
|
|
|
def test_isolation_module_does_not_pull_in_proxy_utils():
|
|
"""Layering guard: litellm.llms.* must not transitively import
|
|
litellm.proxy.utils, which would reintroduce the import cycle."""
|
|
import importlib
|
|
import sys
|
|
|
|
for mod in [
|
|
"litellm.proxy.utils",
|
|
"litellm.proxy.management_endpoints.common_utils",
|
|
"litellm.llms.base_llm.managed_resources.isolation",
|
|
]:
|
|
sys.modules.pop(mod, None)
|
|
|
|
importlib.import_module("litellm.llms.base_llm.managed_resources.isolation")
|
|
assert "litellm.proxy.utils" not in sys.modules
|
|
assert "litellm.proxy.management_endpoints.common_utils" not in sys.modules
|