more changes

This commit is contained in:
Adil Hafeez 2025-09-30 15:01:06 -07:00
parent 027f54a43f
commit 3b672e798c
No known key found for this signature in database
GPG key ID: 9B18EF7691369645
9 changed files with 59 additions and 23 deletions

View file

@ -92,7 +92,7 @@ def validate_and_render_schema():
agents = config_yaml.get("agents", [])
for agent in agents:
agent_name = agent.get("name")
agent_endpoint = agent.get("endpoint")
agent_endpoint = agent.get("url")
if agent_name and agent_endpoint:
urlparse_result = urlparse(agent_endpoint)
@ -145,6 +145,8 @@ def validate_and_render_schema():
model_name_keys = set()
model_usage_name_keys = set()
print("listeners: ", listeners)
for listener in listeners:
if (
listener.get("model_providers") is None
@ -163,6 +165,7 @@ def validate_and_render_schema():
)
model_name = model_provider.get("model")
print("Processing model_provider: ", model_provider)
if model_name in model_name_keys:
raise Exception(
f"Duplicate model name {model_name}, please provide unique model name for each model_provider"
@ -306,7 +309,7 @@ def validate_and_render_schema():
target = alias_config.get("target")
if target not in model_name_keys:
raise Exception(
f"Model alias '{alias_name}' targets '{target}' which is not defined as a model. Available models: {', '.join(sorted(model_name_keys))}"
f"Model alias 2 - '{alias_name}' targets '{target}' which is not defined as a model. Available models: {', '.join(sorted(model_name_keys))}"
)
arch_config_string = yaml.dump(config_yaml)

View file

@ -106,6 +106,8 @@ def convert_legacy_listeners(
listener["model_providers"] = model_providers or []
model_provider_set = True
llm_gateway_listener = listener
if not model_provider_set:
listeners.append(llm_gateway_listener)
return listeners, llm_gateway_listener, prompt_gateway_listener
@ -116,8 +118,18 @@ def get_llm_provider_access_keys(arch_config_file):
arch_config_yaml = yaml.safe_load(arch_config)
access_key_list = []
# Convert legacy llm_providers to model_providers
if "llm_providers" in arch_config_yaml:
if "model_providers" in arch_config_yaml:
raise Exception(
"Please provide either llm_providers or model_providers, not both. llm_providers is deprecated, please use model_providers instead"
)
arch_config_yaml["model_providers"] = arch_config_yaml["llm_providers"]
del arch_config_yaml["llm_providers"]
listeners, _, _ = convert_legacy_listeners(
arch_config_yaml.get("listeners"), arch_config_yaml.get("llm_providers")
arch_config_yaml.get("listeners"), arch_config_yaml.get("model_providers")
)
for prompt_target in arch_config_yaml.get("prompt_targets", []):
@ -133,7 +145,7 @@ def get_llm_provider_access_keys(arch_config_file):
access_key_list.append(v)
for listener in listeners:
for llm_provider in listener.get("llm_providers", []):
for llm_provider in listener.get("model_providers", []):
access_key = llm_provider.get("access_key")
if access_key is not None:
access_key_list.append(access_key)