phoenix/litellm
1
0
Fork 0
forked from phoenix/litellm-mirror
Code Pull requests Activity

(temp) test build without using argon2

Browse source
This commit is contained in:
ishaan-jaff 2024-03-14 18:53:16 -07:00
parent 517e453adf
commit 1b63748831
2 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
litellm/proxy/proxy_server.py
View file

@ -35,7 +35,6 @@ try:
import orjson import orjson
import logging import logging
from apscheduler.schedulers.asyncio import AsyncIOScheduler from apscheduler.schedulers.asyncio import AsyncIOScheduler
from argon2 import PasswordHasher
except ImportError as e: except ImportError as e:
raise ImportError(f"Missing dependency {e}. Run `pip install 'litellm[proxy]'`") raise ImportError(f"Missing dependency {e}. Run `pip install 'litellm[proxy]'`")
@ -252,7 +251,6 @@ user_headers = None
user_config_file_path = f"config_{int(time.time())}.yaml" user_config_file_path = f"config_{int(time.time())}.yaml"
local_logging = True # writes logs to a local api_log.json file for debugging local_logging = True # writes logs to a local api_log.json file for debugging
experimental = False experimental = False
ph = PasswordHasher()
#### GLOBAL VARIABLES #### #### GLOBAL VARIABLES ####
llm_router: Optional[litellm.Router] = None llm_router: Optional[litellm.Router] = None
llm_model_list: Optional[list] = None llm_model_list: Optional[list] = None
@ -382,7 +380,7 @@ async def user_api_key_auth(
return valid_token return valid_token
try: try:
is_master_key_valid = ph.verify(litellm_master_key_hash, api_key) is_master_key_valid = secrets.compare_digest(api_key, master_key)
except Exception as e: except Exception as e:
is_master_key_valid = False is_master_key_valid = False
@ -1913,7 +1911,7 @@ class ProxyConfig:
master_key = litellm.get_secret(master_key) master_key = litellm.get_secret(master_key)
if master_key is not None and isinstance(master_key, str): if master_key is not None and isinstance(master_key, str):
litellm_master_key_hash = ph.hash(master_key) litellm_master_key_hash = master_key
### CUSTOM API KEY AUTH ### ### CUSTOM API KEY AUTH ###
## pass filepath ## pass filepath
custom_auth = general_settings.get("custom_auth", None) custom_auth = general_settings.get("custom_auth", None)

1
requirements.txt
View file

@ -34,5 +34,4 @@ jinja2==3.1.3 # for prompt templates
certifi>=2023.7.22 # [TODO] clean up certifi>=2023.7.22 # [TODO] clean up
aiohttp==3.9.0 # for network calls aiohttp==3.9.0 # for network calls
aioboto3==12.3.0 # for async sagemaker calls aioboto3==12.3.0 # for async sagemaker calls
argon2-cffi==23.1.0 # for checking secrets
#### ####