typing fix
This commit is contained in:
@@ -173,12 +173,10 @@ class Individuality:
|
|||||||
personality = short_impression[0]
|
personality = short_impression[0]
|
||||||
identity = short_impression[1]
|
identity = short_impression[1]
|
||||||
prompt_personality = f"{personality},{identity}"
|
prompt_personality = f"{personality},{identity}"
|
||||||
identity_block = f"你的名字是{bot_name}{bot_nickname},你{prompt_personality}:"
|
return f"你的名字是{bot_name}{bot_nickname},你{prompt_personality}:"
|
||||||
|
|
||||||
return identity_block
|
|
||||||
|
|
||||||
def _get_config_hash(
|
def _get_config_hash(
|
||||||
self, bot_nickname: str, personality_core: str, personality_side: str, identity: list
|
self, bot_nickname: str, personality_core: str, personality_side: str, identity: str
|
||||||
) -> tuple[str, str]:
|
) -> tuple[str, str]:
|
||||||
"""获取personality和identity配置的哈希值
|
"""获取personality和identity配置的哈希值
|
||||||
|
|
||||||
@@ -197,7 +195,7 @@ class Individuality:
|
|||||||
|
|
||||||
# 身份配置哈希
|
# 身份配置哈希
|
||||||
identity_config = {
|
identity_config = {
|
||||||
"identity": sorted(identity),
|
"identity": identity,
|
||||||
"compress_identity": self.personality.compress_identity if self.personality else True,
|
"compress_identity": self.personality.compress_identity if self.personality else True,
|
||||||
}
|
}
|
||||||
identity_str = json.dumps(identity_config, sort_keys=True)
|
identity_str = json.dumps(identity_config, sort_keys=True)
|
||||||
@@ -206,7 +204,7 @@ class Individuality:
|
|||||||
return personality_hash, identity_hash
|
return personality_hash, identity_hash
|
||||||
|
|
||||||
async def _check_config_and_clear_if_changed(
|
async def _check_config_and_clear_if_changed(
|
||||||
self, bot_nickname: str, personality_core: str, personality_side: str, identity: list
|
self, bot_nickname: str, personality_core: str, personality_side: str, identity: str
|
||||||
) -> tuple[bool, bool]:
|
) -> tuple[bool, bool]:
|
||||||
"""检查配置是否发生变化,如果变化则清空相应缓存
|
"""检查配置是否发生变化,如果变化则清空相应缓存
|
||||||
|
|
||||||
@@ -321,7 +319,7 @@ class Individuality:
|
|||||||
|
|
||||||
return personality_result
|
return personality_result
|
||||||
|
|
||||||
async def _create_identity(self, identity: list) -> str:
|
async def _create_identity(self, identity: str) -> str:
|
||||||
"""使用LLM创建压缩版本的impression"""
|
"""使用LLM创建压缩版本的impression"""
|
||||||
logger.info("正在构建身份.........")
|
logger.info("正在构建身份.........")
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
|
|
||||||
from dataclasses import dataclass
|
from dataclasses import dataclass
|
||||||
from typing import Dict, List
|
from typing import Dict, Optional
|
||||||
|
|
||||||
|
|
||||||
@dataclass
|
@dataclass
|
||||||
@@ -10,7 +9,7 @@ class Personality:
|
|||||||
bot_nickname: str # 机器人昵称
|
bot_nickname: str # 机器人昵称
|
||||||
personality_core: str # 人格核心特点
|
personality_core: str # 人格核心特点
|
||||||
personality_side: str # 人格侧面描述
|
personality_side: str # 人格侧面描述
|
||||||
identity: List[str] # 身份细节描述
|
identity: Optional[str] # 身份细节描述
|
||||||
compress_personality: bool # 是否压缩人格
|
compress_personality: bool # 是否压缩人格
|
||||||
compress_identity: bool # 是否压缩身份
|
compress_identity: bool # 是否压缩身份
|
||||||
|
|
||||||
@@ -21,7 +20,7 @@ class Personality:
|
|||||||
cls._instance = super().__new__(cls)
|
cls._instance = super().__new__(cls)
|
||||||
return cls._instance
|
return cls._instance
|
||||||
|
|
||||||
def __init__(self, personality_core: str = "", personality_side: str = "", identity: List[str] = None):
|
def __init__(self, personality_core: str = "", personality_side: str = "", identity: Optional[str] = None):
|
||||||
self.personality_core = personality_core
|
self.personality_core = personality_core
|
||||||
self.personality_side = personality_side
|
self.personality_side = personality_side
|
||||||
self.identity = identity
|
self.identity = identity
|
||||||
@@ -45,7 +44,7 @@ class Personality:
|
|||||||
bot_nickname: str,
|
bot_nickname: str,
|
||||||
personality_core: str,
|
personality_core: str,
|
||||||
personality_side: str,
|
personality_side: str,
|
||||||
identity: List[str] = None,
|
identity: Optional[str] = None,
|
||||||
compress_personality: bool = True,
|
compress_personality: bool = True,
|
||||||
compress_identity: bool = True,
|
compress_identity: bool = True,
|
||||||
) -> "Personality":
|
) -> "Personality":
|
||||||
|
|||||||
Reference in New Issue
Block a user