Commit 619a7fe
src/llm/gpt.py
@@ -18,7 +18,7 @@ from messages.parser import parse_msg
from messages.progress import modify_progress
from messages.sender import send2tg
from messages.utils import count_without_entities, equal_prefix, startswith_prefix
-from utils import env_list, slim_cid
+from utils import slim_cid, strings_list
HELP = f"""🤖**GPT对话**
`{PREFIX.GPT}` 后接提示词即可与GPT对话
@@ -54,22 +54,22 @@ def is_gpt_conversation(minfo: dict) -> bool:
return True
# not starts with /prefix, but in specific chat ids
- if any(str(x) in env_list(TID.OPENAI_CHATS) for x in [minfo["cid"], slim_cid(minfo["cid"])]):
+ if any(str(x) in strings_list(TID.OPENAI_CHATS) for x in [minfo["cid"], slim_cid(minfo["cid"])]):
minfo["text"] = "/gpt " + minfo["text"]
return True
- if any(str(x) in env_list(TID.GEMINI_CHATS) for x in [minfo["cid"], slim_cid(minfo["cid"])]):
+ if any(str(x) in strings_list(TID.GEMINI_CHATS) for x in [minfo["cid"], slim_cid(minfo["cid"])]):
minfo["text"] = "/gemini " + minfo["text"]
return True
- if any(str(x) in env_list(TID.GROK_CHATS) for x in [minfo["cid"], slim_cid(minfo["cid"])]):
+ if any(str(x) in strings_list(TID.GROK_CHATS) for x in [minfo["cid"], slim_cid(minfo["cid"])]):
minfo["text"] = "/grok " + minfo["text"]
return True
- if any(str(x) in env_list(TID.DEEPSEEK_CHATS) for x in [minfo["cid"], slim_cid(minfo["cid"])]):
+ if any(str(x) in strings_list(TID.DEEPSEEK_CHATS) for x in [minfo["cid"], slim_cid(minfo["cid"])]):
minfo["text"] = "/ds " + minfo["text"]
return True
- if any(str(x) in env_list(TID.QWEN_CHATS) for x in [minfo["cid"], slim_cid(minfo["cid"])]):
+ if any(str(x) in strings_list(TID.QWEN_CHATS) for x in [minfo["cid"], slim_cid(minfo["cid"])]):
minfo["text"] = "/qwen " + minfo["text"]
return True
- if any(str(x) in env_list(TID.DOUBAO_CHATS) for x in [minfo["cid"], slim_cid(minfo["cid"])]):
+ if any(str(x) in strings_list(TID.DOUBAO_CHATS) for x in [minfo["cid"], slim_cid(minfo["cid"])]):
minfo["text"] = "/doubao " + minfo["text"]
return True
src/utils.py
@@ -294,7 +294,7 @@ def slim_cid(cid: int | str) -> str:
return str(cid).strip().removeprefix("-100")
-def env_list(value: str | None = None, *, env_key: str = "", separator: str = ",") -> list[str]:
+def strings_list(value: str | None = None, *, env_key: str = "", separator: str = ",") -> list[str]:
"""Get list from environment variable."""
if value is None:
value = os.getenv(env_key, "")