panda/bettafish-company
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Standardize LLM clients and expose configurable base URLs.

Browse Source
This commit is contained in:
666ghj
2025-10-09 02:23:08 +08:00
parent 960608cee9
commit 49d4893780
22 changed files with 189 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
InsightEngine/agent.py
+4 -2
View File
@@ -72,7 +72,8 @@ class DeepSearchAgent:
if self.config.default_llm_provider == "deepseek":
return DeepSeekLLM(
api_key=self.config.deepseek_api_key,
model_name=self.config.deepseek_model
model_name=self.config.deepseek_model,
base_url=self.config.deepseek_base_url
)
elif self.config.default_llm_provider == "openai":
return OpenAILLM(
@@ -82,7 +83,8 @@ class DeepSearchAgent:
elif self.config.default_llm_provider == "kimi":
return KimiLLM(
api_key=self.config.kimi_api_key,
model_name=self.config.kimi_model
model_name=self.config.kimi_model,
base_url=self.config.kimi_base_url
)
else:
raise ValueError(f"不支持的LLM提供商: {self.config.default_llm_provider}")
InsightEngine/llms/deepseek.py
+8 -3
View File
@@ -9,6 +9,8 @@ from openai import OpenAI
from .base import BaseLLM
import sys
DEFAULT_DEEPSEEK_BASE_URL = "https://api.deepseek.com"
# 添加utils目录到Python路径
current_dir = os.path.dirname(os.path.abspath(__file__))
root_dir = os.path.dirname(os.path.dirname(current_dir))
@@ -30,13 +32,14 @@ except ImportError:
class DeepSeekLLM(BaseLLM):
"""DeepSeek LLM实现类"""
def __init__(self, api_key: Optional[str] = None, model_name: Optional[str] = None):
def __init__(self, api_key: Optional[str] = None, model_name: Optional[str] = None, base_url: Optional[str] = None):
"""
初始化DeepSeek客户端
Args:
api_key: DeepSeek API密钥，如果不提供则从环境变量读取
model_name: 模型名称，默认使用deepseek-chat
base_url: DeepSeek API基础地址
"""
if api_key is None:
api_key = os.getenv("DEEPSEEK_API_KEY")
@@ -45,10 +48,12 @@ class DeepSeekLLM(BaseLLM):
super().__init__(api_key, model_name)
self.base_url = base_url or os.getenv("DEEPSEEK_BASE_URL") or DEFAULT_DEEPSEEK_BASE_URL
# 初始化OpenAI客户端，使用DeepSeek的endpoint
self.client = OpenAI(
api_key=self.api_key,
base_url="https://api.deepseek.com"
base_url=self.base_url
)
self.default_model = model_name or self.get_default_model()
@@ -110,5 +115,5 @@ class DeepSeekLLM(BaseLLM):
return {
"provider": "DeepSeek",
"model": self.default_model,
"api_base": "https://api.deepseek.com"
"api_base": self.base_url
}
InsightEngine/llms/kimi.py
+10 -5
View File
@@ -10,6 +10,8 @@ from openai import OpenAI
# 假设 .base 模块和 BaseLLM 类已存在
from .base import BaseLLM
DEFAULT_KIMI_BASE_URL = "https://api.moonshot.cn/v1"
# 添加utils目录到Python路径并导入重试模块
try:
current_dir = os.path.dirname(os.path.abspath(__file__))
@@ -30,13 +32,14 @@ except ImportError:
class KimiLLM(BaseLLM):
"""Kimi LLM实现类"""
def __init__(self, api_key: Optional[str] = None, model_name: Optional[str] = None):
def __init__(self, api_key: Optional[str] = None, model_name: Optional[str] = None, base_url: Optional[str] = None):
"""
初始化Kimi客户端
Args:
api_key: Kimi API密钥，如果不提供则从环境变量读取
model_name: 模型名称，默认使用kimi-k2-0711-preview
base_url: Kimi API基础地址
"""
if api_key is None:
api_key = os.getenv("KIMI_API_KEY")
@@ -44,11 +47,13 @@ class KimiLLM(BaseLLM):
raise ValueError("Kimi API Key未找到！请设置KIMI_API_KEY环境变量或在初始化时提供")
super().__init__(api_key, model_name)
self.base_url = base_url or os.getenv("KIMI_BASE_URL") or DEFAULT_KIMI_BASE_URL
# 初始化OpenAI客户端，使用Kimi的endpoint
self.client = OpenAI(
api_key=self.api_key,
base_url="https://api.moonshot.cn/v1"
base_url=self.base_url
)
self.default_model = model_name or self.get_default_model()
@@ -136,7 +141,7 @@ class KimiLLM(BaseLLM):
return {
"provider": "Kimi",
"model": self.default_model,
"api_base": "https://api.moonshot.cn/v1",
"api_base": self.base_url,
"max_context_length": "长文本支持（200K+ tokens）"
}
@@ -159,4 +164,4 @@ class KimiLLM(BaseLLM):
kwargs.setdefault("max_tokens", 16384)
# 直接调用核心的invoke方法，将所有参数（包括预设的默认值）传递给它。
return self.invoke(system_prompt, user_prompt, **kwargs)
return self.invoke(system_prompt, user_prompt, **kwargs)
InsightEngine/tools/keyword_optimizer.py
+6 -3
View File
@@ -12,7 +12,7 @@ from dataclasses import dataclass
# 添加项目根目录到Python路径以导入config
sys.path.append(os.path.dirname(os.path.dirname(os.path.dirname(__file__))))
from config import GUIJI_QWEN3_API_KEY
from config import GUIJI_QWEN3_API_KEY, GUIJI_QWEN3_BASE_URL
# 添加utils目录到Python路径
current_dir = os.path.dirname(os.path.abspath(__file__))
@@ -38,21 +38,24 @@ class KeywordOptimizer:
使用硅基流动的Qwen3模型将Agent生成的搜索词优化为更贴近真实舆情的关键词
"""
def __init__(self, api_key: str = None):
def __init__(self, api_key: str = None, base_url: str = None):
"""
初始化关键词优化器
Args:
api_key: 硅基流动API密钥，如果不提供则从配置文件读取
base_url: 接口基础地址，默认使用配置文件提供的SiliconFlow地址
"""
self.api_key = api_key or GUIJI_QWEN3_API_KEY
if not self.api_key:
raise ValueError("未找到硅基流动API密钥，请在config.py中设置GUIJI_QWEN3_API_KEY")
self.base_url = base_url or GUIJI_QWEN3_BASE_URL
self.client = OpenAI(
api_key=self.api_key,
base_url="https://api.siliconflow.cn/v1"
base_url=self.base_url
)
self.model = "Qwen/Qwen3-30B-A3B-Instruct-2507"
InsightEngine/utils/config.py
+10
View File
@@ -15,6 +15,9 @@ class Config:
deepseek_api_key: Optional[str] = None
openai_api_key: Optional[str] = None
kimi_api_key: Optional[str] = None
deepseek_base_url: str = "https://api.deepseek.com"
openai_base_url: Optional[str] = None
kimi_base_url: str = "https://api.moonshot.cn/v1"
# 数据库配置
db_host: Optional[str] = None
@@ -85,6 +88,10 @@ class Config:
return cls(
deepseek_api_key=getattr(config_module, "DEEPSEEK_API_KEY", None),
openai_api_key=getattr(config_module, "OPENAI_API_KEY", None),
kimi_api_key=getattr(config_module, "KIMI_API_KEY", None),
deepseek_base_url=getattr(config_module, "DEEPSEEK_BASE_URL", "https://api.deepseek.com"),
openai_base_url=getattr(config_module, "OPENAI_BASE_URL", None),
kimi_base_url=getattr(config_module, "KIMI_BASE_URL", "https://api.moonshot.cn/v1"),
db_host=getattr(config_module, "DB_HOST", None),
db_user=getattr(config_module, "DB_USER", None),
@@ -131,6 +138,9 @@ class Config:
deepseek_api_key=config_dict.get("DEEPSEEK_API_KEY"),
openai_api_key=config_dict.get("OPENAI_API_KEY"),
kimi_api_key=config_dict.get("KIMI_API_KEY"),
deepseek_base_url=config_dict.get("DEEPSEEK_BASE_URL", "https://api.deepseek.com"),
openai_base_url=config_dict.get("OPENAI_BASE_URL"),
kimi_base_url=config_dict.get("KIMI_BASE_URL", "https://api.moonshot.cn/v1"),
db_host=config_dict.get("DB_HOST"),
db_user=config_dict.get("DB_USER"),