调整对应的调用
This commit is contained in:
@@ -4,7 +4,7 @@ import hashlib
|
||||
import time
|
||||
|
||||
from src.common.logger import get_logger
|
||||
from src.config.config import global_config
|
||||
from src.config.config import global_config, model_config
|
||||
from src.llm_models.utils_model import LLMRequest
|
||||
from src.person_info.person_info import get_person_info_manager
|
||||
from rich.traceback import install
|
||||
@@ -23,10 +23,7 @@ class Individuality:
|
||||
self.meta_info_file_path = "data/personality/meta.json"
|
||||
self.personality_data_file_path = "data/personality/personality_data.json"
|
||||
|
||||
self.model = LLMRequest(
|
||||
model=global_config.model.utils,
|
||||
request_type="individuality.compress",
|
||||
)
|
||||
self.model = LLMRequest(model_set=model_config.model_task_config.utils, request_type="individuality.compress")
|
||||
|
||||
async def initialize(self) -> None:
|
||||
"""初始化个体特征"""
|
||||
@@ -35,7 +32,6 @@ class Individuality:
|
||||
personality_side = global_config.personality.personality_side
|
||||
identity = global_config.personality.identity
|
||||
|
||||
|
||||
person_info_manager = get_person_info_manager()
|
||||
self.bot_person_id = person_info_manager.get_person_id("system", "bot_id")
|
||||
self.name = bot_nickname
|
||||
@@ -85,16 +81,16 @@ class Individuality:
|
||||
bot_nickname = f",也有人叫你{','.join(global_config.bot.alias_names)}"
|
||||
else:
|
||||
bot_nickname = ""
|
||||
|
||||
|
||||
# 从文件获取 short_impression
|
||||
personality, identity = self._get_personality_from_file()
|
||||
|
||||
|
||||
# 确保short_impression是列表格式且有足够的元素
|
||||
if not personality or not identity:
|
||||
logger.warning(f"personality或identity为空: {personality}, {identity}, 使用默认值")
|
||||
personality = "友好活泼"
|
||||
identity = "人类"
|
||||
|
||||
|
||||
prompt_personality = f"{personality}\n{identity}"
|
||||
return f"你的名字是{bot_name}{bot_nickname},你{prompt_personality}"
|
||||
|
||||
@@ -215,7 +211,7 @@ class Individuality:
|
||||
|
||||
def _get_personality_from_file(self) -> tuple[str, str]:
|
||||
"""从文件获取personality数据
|
||||
|
||||
|
||||
Returns:
|
||||
tuple: (personality, identity)
|
||||
"""
|
||||
@@ -226,7 +222,7 @@ class Individuality:
|
||||
|
||||
def _save_personality_to_file(self, personality: str, identity: str):
|
||||
"""保存personality数据到文件
|
||||
|
||||
|
||||
Args:
|
||||
personality: 压缩后的人格描述
|
||||
identity: 压缩后的身份描述
|
||||
@@ -235,7 +231,7 @@ class Individuality:
|
||||
"personality": personality,
|
||||
"identity": identity,
|
||||
"bot_nickname": self.name,
|
||||
"last_updated": int(time.time())
|
||||
"last_updated": int(time.time()),
|
||||
}
|
||||
self._save_personality_data(personality_data)
|
||||
|
||||
@@ -269,7 +265,7 @@ class Individuality:
|
||||
2. 尽量简洁,不超过30字
|
||||
3. 直接输出压缩后的内容,不要解释"""
|
||||
|
||||
response, (_, _) = await self.model.generate_response_async(
|
||||
response, _ = await self.model.generate_response_async(
|
||||
prompt=prompt,
|
||||
)
|
||||
|
||||
@@ -281,7 +277,7 @@ class Individuality:
|
||||
# 压缩失败时使用原始内容
|
||||
if personality_side:
|
||||
personality_parts.append(personality_side)
|
||||
|
||||
|
||||
if personality_parts:
|
||||
personality_result = "。".join(personality_parts)
|
||||
else:
|
||||
@@ -308,7 +304,7 @@ class Individuality:
|
||||
2. 尽量简洁,不超过30字
|
||||
3. 直接输出压缩后的内容,不要解释"""
|
||||
|
||||
response, (_, _) = await self.model.generate_response_async(
|
||||
response, _ = await self.model.generate_response_async(
|
||||
prompt=prompt,
|
||||
)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user