Skip to content

Commit 6e54199

Browse files
plutolessplutoless
committed
refactor: tidy LLM standalone copies (Groq url, dead branches, error messages)
1 parent 8d10148 commit 6e54199

2 files changed

Lines changed: 23 additions & 40 deletions

File tree

‎src/agora_agent/agentkit/vendors/cn.py‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -529,15 +529,15 @@ class AliyunLLM(BaseLLM):
529529
@model_validator(mode="after")
530530
def _validate_byok_params(self) -> "AliyunLLM":
531531
if not self.model:
532-
raise ValueError("OpenAI requires model")
532+
raise ValueError("AliyunLLM requires model")
533533
if self.api_key is not None and self.base_url is None:
534-
raise ValueError("OpenAI requires base_url when api_key is set")
534+
raise ValueError("AliyunLLM requires base_url when api_key is set")
535535
if self.api_key is None and self.base_url is not None:
536-
raise ValueError("OpenAI base_url is only valid when api_key is set")
536+
raise ValueError("AliyunLLM base_url is only valid when api_key is set")
537537
if self.api_key is None and self.model.strip().lower() not in _OPENAI_MANAGED_MODELS:
538-
raise ValueError("OpenAI requires api_key unless using a supported Agora-managed model")
538+
raise ValueError("AliyunLLM requires api_key unless using a supported Agora-managed model")
539539
if self.api_key is None and self.vendor is not None:
540-
raise ValueError("OpenAI Agora-managed mode does not allow vendor")
540+
raise ValueError("AliyunLLM Agora-managed mode does not allow vendor")
541541
return self
542542

543543
def to_config(self) -> Dict[str, Any]:
@@ -611,15 +611,15 @@ class BytedanceLLM(BaseLLM):
611611
@model_validator(mode="after")
612612
def _validate_byok_params(self) -> "BytedanceLLM":
613613
if not self.model:
614-
raise ValueError("OpenAI requires model")
614+
raise ValueError("BytedanceLLM requires model")
615615
if self.api_key is not None and self.base_url is None:
616-
raise ValueError("OpenAI requires base_url when api_key is set")
616+
raise ValueError("BytedanceLLM requires base_url when api_key is set")
617617
if self.api_key is None and self.base_url is not None:
618-
raise ValueError("OpenAI base_url is only valid when api_key is set")
618+
raise ValueError("BytedanceLLM base_url is only valid when api_key is set")
619619
if self.api_key is None and self.model.strip().lower() not in _OPENAI_MANAGED_MODELS:
620-
raise ValueError("OpenAI requires api_key unless using a supported Agora-managed model")
620+
raise ValueError("BytedanceLLM requires api_key unless using a supported Agora-managed model")
621621
if self.api_key is None and self.vendor is not None:
622-
raise ValueError("OpenAI Agora-managed mode does not allow vendor")
622+
raise ValueError("BytedanceLLM Agora-managed mode does not allow vendor")
623623
return self
624624

625625
def to_config(self) -> Dict[str, Any]:
@@ -693,15 +693,15 @@ class DeepSeekLLM(BaseLLM):
693693
@model_validator(mode="after")
694694
def _validate_byok_params(self) -> "DeepSeekLLM":
695695
if not self.model:
696-
raise ValueError("OpenAI requires model")
696+
raise ValueError("DeepSeekLLM requires model")
697697
if self.api_key is not None and self.base_url is None:
698-
raise ValueError("OpenAI requires base_url when api_key is set")
698+
raise ValueError("DeepSeekLLM requires base_url when api_key is set")
699699
if self.api_key is None and self.base_url is not None:
700-
raise ValueError("OpenAI base_url is only valid when api_key is set")
700+
raise ValueError("DeepSeekLLM base_url is only valid when api_key is set")
701701
if self.api_key is None and self.model.strip().lower() not in _OPENAI_MANAGED_MODELS:
702-
raise ValueError("OpenAI requires api_key unless using a supported Agora-managed model")
702+
raise ValueError("DeepSeekLLM requires api_key unless using a supported Agora-managed model")
703703
if self.api_key is None and self.vendor is not None:
704-
raise ValueError("OpenAI Agora-managed mode does not allow vendor")
704+
raise ValueError("DeepSeekLLM Agora-managed mode does not allow vendor")
705705
return self
706706

707707
def to_config(self) -> Dict[str, Any]:
@@ -775,15 +775,15 @@ class TencentLLM(BaseLLM):
775775
@model_validator(mode="after")
776776
def _validate_byok_params(self) -> "TencentLLM":
777777
if not self.model:
778-
raise ValueError("OpenAI requires model")
778+
raise ValueError("TencentLLM requires model")
779779
if self.api_key is not None and self.base_url is None:
780-
raise ValueError("OpenAI requires base_url when api_key is set")
780+
raise ValueError("TencentLLM requires base_url when api_key is set")
781781
if self.api_key is None and self.base_url is not None:
782-
raise ValueError("OpenAI base_url is only valid when api_key is set")
782+
raise ValueError("TencentLLM base_url is only valid when api_key is set")
783783
if self.api_key is None and self.model.strip().lower() not in _OPENAI_MANAGED_MODELS:
784-
raise ValueError("OpenAI requires api_key unless using a supported Agora-managed model")
784+
raise ValueError("TencentLLM requires api_key unless using a supported Agora-managed model")
785785
if self.api_key is None and self.vendor is not None:
786-
raise ValueError("OpenAI Agora-managed mode does not allow vendor")
786+
raise ValueError("TencentLLM Agora-managed mode does not allow vendor")
787787
return self
788788

789789
def to_config(self) -> Dict[str, Any]:

‎src/agora_agent/agentkit/vendors/llm.py‎

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -350,15 +350,7 @@ class Groq(BaseLLM):
350350
@model_validator(mode="after")
351351
def _validate_byok_params(self) -> "Groq":
352352
if not self.model:
353-
raise ValueError("OpenAI requires model")
354-
if self.api_key is not None and self.base_url is None:
355-
raise ValueError("OpenAI requires base_url when api_key is set")
356-
if self.api_key is None and self.base_url is not None:
357-
raise ValueError("OpenAI base_url is only valid when api_key is set")
358-
if self.api_key is None and self.model.strip().lower() not in _OPENAI_MANAGED_MODELS:
359-
raise ValueError("OpenAI requires api_key unless using a supported Agora-managed model")
360-
if self.api_key is None and self.vendor is not None:
361-
raise ValueError("OpenAI Agora-managed mode does not allow vendor")
353+
raise ValueError("Groq requires model")
362354
return self
363355

364356
def to_config(self) -> Dict[str, Any]:
@@ -372,7 +364,7 @@ def to_config(self) -> Dict[str, Any]:
372364
params["top_p"] = self.top_p
373365

374366
config: Dict[str, Any] = {
375-
"url": self.base_url or "https://api.openai.com/v1/chat/completions",
367+
"url": self.base_url,
376368
"params": params,
377369
"style": "openai",
378370
"input_modalities": self.input_modalities or ["text"],
@@ -403,7 +395,6 @@ def to_config(self) -> Dict[str, Any]:
403395
if self.max_history is not None:
404396
config["max_history"] = self.max_history
405397

406-
config["url"] = self.base_url
407398
return config
408399

409400

@@ -433,15 +424,7 @@ class CustomLLM(BaseLLM):
433424
@model_validator(mode="after")
434425
def _validate_byok_params(self) -> "CustomLLM":
435426
if not self.model:
436-
raise ValueError("OpenAI requires model")
437-
if self.api_key is not None and self.base_url is None:
438-
raise ValueError("OpenAI requires base_url when api_key is set")
439-
if self.api_key is None and self.base_url is not None:
440-
raise ValueError("OpenAI base_url is only valid when api_key is set")
441-
if self.api_key is None and self.model.strip().lower() not in _OPENAI_MANAGED_MODELS:
442-
raise ValueError("OpenAI requires api_key unless using a supported Agora-managed model")
443-
if self.api_key is None and self.vendor is not None:
444-
raise ValueError("OpenAI Agora-managed mode does not allow vendor")
427+
raise ValueError("CustomLLM requires model")
445428
return self
446429

447430
def to_config(self) -> Dict[str, Any]:

0 commit comments

Comments
 (0)