fix failing tests
This commit is contained in:
parent
775fb79260
commit
d31d5b8486
9
license_cache.json
Normal file
9
license_cache.json
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
{
|
||||||
|
"tornado:6.5.3": "Apache-2.0",
|
||||||
|
"redisvl:0.4.1": "MIT",
|
||||||
|
"google-cloud-iam:2.19.1": "Apache 2.0",
|
||||||
|
"google-genai:1.37.0": "Apache-2.0",
|
||||||
|
"azure-keyvault:4.2.0": "MIT License",
|
||||||
|
"soundfile:0.12.1": "BSD 3-Clause License",
|
||||||
|
"openapi-core:0.21.0": "BSD-3-Clause"
|
||||||
|
}
|
||||||
@ -1136,6 +1136,7 @@ def add_system_prompt_to_messages(
|
|||||||
if merge_with_first_system and messages and messages[0].get("role") == "system":
|
if merge_with_first_system and messages and messages[0].get("role") == "system":
|
||||||
first = dict(messages[0])
|
first = dict(messages[0])
|
||||||
existing_content = first.get("content", "")
|
existing_content = first.get("content", "")
|
||||||
|
merged_content: Union[str, List[Dict[str, str]]]
|
||||||
if isinstance(existing_content, str):
|
if isinstance(existing_content, str):
|
||||||
merged_content = f"{system_prompt.strip()}\n\n{existing_content}"
|
merged_content = f"{system_prompt.strip()}\n\n{existing_content}"
|
||||||
elif isinstance(existing_content, list):
|
elif isinstance(existing_content, list):
|
||||||
|
|||||||
@ -1071,6 +1071,7 @@ async def generate_key_fn(
|
|||||||
- team_id: Optional[str] - The team id of the key
|
- team_id: Optional[str] - The team id of the key
|
||||||
- user_id: Optional[str] - The user id of the key
|
- user_id: Optional[str] - The user id of the key
|
||||||
- organization_id: Optional[str] - The organization id of the key. If not set, and team_id is set, the organization id will be the same as the team id. If conflict, an error will be raised.
|
- organization_id: Optional[str] - The organization id of the key. If not set, and team_id is set, the organization id will be the same as the team id. If conflict, an error will be raised.
|
||||||
|
- project_id: Optional[str] - The project id of the key. When set, models and max_budget are validated against the project's limits.
|
||||||
- budget_id: Optional[str] - The budget id associated with the key. Created by calling `/budget/new`.
|
- budget_id: Optional[str] - The budget id associated with the key. Created by calling `/budget/new`.
|
||||||
- models: Optional[list] - Model_name's a user is allowed to call. (if empty, key is allowed to call all models)
|
- models: Optional[list] - Model_name's a user is allowed to call. (if empty, key is allowed to call all models)
|
||||||
- aliases: Optional[dict] - Any alias mappings, on top of anything in the config.yaml model list. - https://docs.litellm.ai/docs/proxy/virtual_keys#managing-auth---upgradedowngrade-models
|
- aliases: Optional[dict] - Any alias mappings, on top of anything in the config.yaml model list. - https://docs.litellm.ai/docs/proxy/virtual_keys#managing-auth---upgradedowngrade-models
|
||||||
|
|||||||
@ -35,8 +35,23 @@ EXCLUDED_TERMINAL_VARS = {
|
|||||||
"ALACRITTY_SOCKET",
|
"ALACRITTY_SOCKET",
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# Directories to skip (dependencies, venvs, caches) - only scan litellm source
|
||||||
|
SKIP_DIRS = {
|
||||||
|
".venv",
|
||||||
|
"venv",
|
||||||
|
"__pycache__",
|
||||||
|
".git",
|
||||||
|
"node_modules",
|
||||||
|
"site-packages",
|
||||||
|
".eggs",
|
||||||
|
"dist",
|
||||||
|
"build",
|
||||||
|
}
|
||||||
|
|
||||||
# Walk through all files in the litellm repo to find references of os.getenv() and litellm.get_secret()
|
# Walk through all files in the litellm repo to find references of os.getenv() and litellm.get_secret()
|
||||||
for root, dirs, files in os.walk(repo_base):
|
for root, dirs, files in os.walk(repo_base):
|
||||||
|
# Skip dependency/venv directories - prevents picking up env vars from installed packages
|
||||||
|
dirs[:] = [d for d in dirs if d not in SKIP_DIRS]
|
||||||
for file in files:
|
for file in files:
|
||||||
if file.endswith(".py"): # Only process Python files
|
if file.endswith(".py"): # Only process Python files
|
||||||
file_path = os.path.join(root, file)
|
file_path = os.path.join(root, file)
|
||||||
@ -83,12 +98,13 @@ try:
|
|||||||
)
|
)
|
||||||
print(f"general_settings_section: {general_settings_section}")
|
print(f"general_settings_section: {general_settings_section}")
|
||||||
if general_settings_section:
|
if general_settings_section:
|
||||||
# Extract the table rows, which contain the documented keys
|
# Extract the table rows - only first column (key name) from each row
|
||||||
table_content = general_settings_section.group(1)
|
table_content = general_settings_section.group(1)
|
||||||
doc_key_pattern = re.compile(
|
for line in table_content.split("\n"):
|
||||||
r"\|\s*([^\|]+?)\s*\|"
|
# Match | KEY_NAME | description | - capture first column only
|
||||||
) # Capture the key from each row of the table
|
match = re.match(r"^\|\s*([A-Z_][A-Z0-9_]*)\s*\|", line)
|
||||||
documented_keys.update(doc_key_pattern.findall(table_content))
|
if match:
|
||||||
|
documented_keys.add(match.group(1).strip())
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
raise Exception(
|
raise Exception(
|
||||||
f"Error reading documentation: {e}, \n repo base - {os.listdir(repo_base)}"
|
f"Error reading documentation: {e}, \n repo base - {os.listdir(repo_base)}"
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user