Hass/xiaozhi-esp32-server
1
0
Fork 0
mirror of https://github.com/xinnan-tech/xiaozhi-esp32-server.git synced 2026-07-26 09:03:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 优化配置读取

Browse Source
This commit is contained in:
Sakura-RanChen
2026-03-31 18:00:51 +08:00
parent 24a8839753
commit 7b2bfc087d
1 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main/xiaozhi-server/core/providers/memory/powermem/powermem.py
+22 -23
View File
@@ -75,22 +75,22 @@ class MemoryProvider(MemoryProviderBase):
powermem_config["llm"] = config["llm"] powermem_config["llm"] = config["llm"]
else: else:
llm_config = {} llm_config = {}
if "llm_api_key" in config: if config.get("llm_api_key"):
llm_config["api_key"] = config["llm_api_key"] llm_config["api_key"] = config["llm_api_key"]
if "llm_model" in config: if config.get("llm_model"):
llm_config["model"] = config["llm_model"] llm_config["model"] = config["llm_model"]
# Handle base_url based on provider type # Handle base_url based on provider type
# - qwen provider uses dashscope_base_url # - qwen provider uses dashscope_base_url
# - openai provider uses openai_base_url # - openai provider uses openai_base_url
if "llm_base_url" in config: if llm_provider == "qwen":
if llm_provider == "qwen": base_url = config.get("dashscope_base_url") or config.get("llm_base_url")
llm_config["dashscope_base_url"] = config["llm_base_url"] if base_url:
else: llm_config["dashscope_base_url"] = base_url
llm_config["openai_base_url"] = config["llm_base_url"] else:
if "openai_base_url" in config: base_url = config.get("openai_base_url") or config.get("llm_base_url")
llm_config["openai_base_url"] = config["openai_base_url"] if base_url:
if "dashscope_base_url" in config: llm_config["openai_base_url"] = base_url
llm_config["dashscope_base_url"] = config["dashscope_base_url"]
powermem_config["llm"] = { powermem_config["llm"] = {
"provider": llm_provider, "provider": llm_provider,
"config": llm_config "config": llm_config
@@ -101,24 +101,23 @@ class MemoryProvider(MemoryProviderBase):
powermem_config["embedder"] = config["embedder"] powermem_config["embedder"] = config["embedder"]
else: else:
embedder_config = {} embedder_config = {}
if "embedding_api_key" in config: if config.get("embedding_api_key"):
embedder_config["api_key"] = config["embedding_api_key"] embedder_config["api_key"] = config["embedding_api_key"]
if "embedding_model" in config: if config.get("embedding_model"):
embedder_config["model"] = config["embedding_model"] embedder_config["model"] = config["embedding_model"]
# Handle base_url based on provider type # Handle base_url based on provider type
# - qwen provider uses dashscope_base_url # - qwen provider uses dashscope_base_url
# - openai provider uses openai_base_url # - openai provider uses openai_base_url
# Priority: embedding_xxx_base_url > embedding_base_url > xxx_base_url # Priority: embedding_xxx_base_url > embedding_base_url > xxx_base_url
if "embedding_base_url" in config: if embedding_provider == "qwen":
if embedding_provider == "qwen": base_url = config.get("embedding_dashscope_base_url") or config.get("embedding_base_url")
embedder_config["dashscope_base_url"] = config["embedding_base_url"] if base_url:
else: embedder_config["dashscope_base_url"] = base_url
embedder_config["openai_base_url"] = config["embedding_base_url"] else:
# Embedding-specific base_url (higher priority) base_url = config.get("embedding_openai_base_url") or config.get("embedding_base_url")
if "embedding_openai_base_url" in config: if base_url:
embedder_config["openai_base_url"] = config["embedding_openai_base_url"] embedder_config["openai_base_url"] = base_url
if "embedding_dashscope_base_url" in config:
embedder_config["dashscope_base_url"] = config["embedding_dashscope_base_url"]
powermem_config["embedder"] = { powermem_config["embedder"] = {
"provider": embedding_provider, "provider": embedding_provider,
"config": embedder_config "config": embedder_config