phoenix/litellm-mirror
0
0
Fork 1
mirror of https://github.com/BerriAI/litellm.git synced 2025-04-26 11:14:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3602 from msabramo/msabramo/fix_pkg_resources_warning

Browse source 
Fix `pkg_resources` warning
This commit is contained in:
Krish Dholakia 2024-05-13 21:59:52 -07:00 • committed by GitHub
commit 5b390b6512
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

21
litellm/utils.py
View file

@ -40,21 +40,18 @@ from litellm.caching import DualCache
oidc_cache = DualCache() oidc_cache = DualCache()
try: try:
# this works in python 3.8 # New and recommended way to access resources
import pkg_resources # type: ignore
filename = pkg_resources.resource_filename(__name__, "llms/tokenizers")
# try:
# filename = str(
# resources.files().joinpath("llms/tokenizers") # type: ignore
# ) # for python 3.8 and 3.12
except:
# this works in python 3.9+
from importlib import resources from importlib import resources
filename = str( filename = str(
resources.files(litellm).joinpath("llms/tokenizers") # for python 3.10 resources.files(litellm).joinpath("llms/tokenizers")
) # for python 3.10+ )
except ImportError:
# Old way to access resources, which setuptools deprecated some time ago
import pkg_resources # type: ignore
filename = pkg_resources.resource_filename(__name__, "llms/tokenizers")
os.environ["TIKTOKEN_CACHE_DIR"] = ( os.environ["TIKTOKEN_CACHE_DIR"] = (
filename # use local copy of tiktoken b/c of - https://github.com/BerriAI/litellm/issues/1071 filename # use local copy of tiktoken b/c of - https://github.com/BerriAI/litellm/issues/1071
) )