refactor: umo custom rules

packages/astrbot/commands/persona.py

@@ -1,6 +1,6 @@
 import builtins
 
-from astrbot.api import star
+from astrbot.api import sp, star
 from astrbot.api.event import AstrMessageEvent, MessageEventResult
 
 
@@ -17,6 +17,13 @@ class PersonaCommands:
         default_persona = await self.context.persona_manager.get_default_persona_v3(
             umo=umo,
         )
+
+        force_applied_persona_id = (
+            await sp.get_async(
+                scope="umo", scope_id=umo, key="session_service_config", default={}
+            )
+        ).get("persona_id")
+
         curr_cid_title = "无"
         if cid:
             conv = await self.context.conversation_manager.get_conversation(
@@ -36,6 +43,9 @@ class PersonaCommands:
             else:
                 curr_persona_name = conv.persona_id
 
+            if force_applied_persona_id:
+                curr_persona_name = f"{curr_persona_name} (自定义规则)"
+
             curr_cid_title = conv.title if conv.title else "新对话"
             curr_cid_title += f"({cid[:4]})"
 
@@ -113,9 +123,15 @@ class PersonaCommands:
                     message.unified_msg_origin,
                     ps,
                 )
+                force_warn_msg = ""
+                if force_applied_persona_id:
+                    force_warn_msg = (
+                        "提醒：由于自定义规则，您现在切换的人格将不会生效。"
+                    )
+
                 message.set_result(
                     MessageEventResult().message(
-                        "设置成功。如果您正在切换到不同的人格，请注意使用 /reset 来清空上下文，防止原人格对话影响现人格。",
+                        f"设置成功。如果您正在切换到不同的人格，请注意使用 /reset 来清空上下文，防止原人格对话影响现人格。{force_warn_msg}",
                     ),
                 )
             else:

packages/astrbot/process_llm_request.py

@@ -3,7 +3,7 @@ import copy
 import datetime
 import zoneinfo
 
-from astrbot.api import logger, star
+from astrbot.api import logger, sp, star
 from astrbot.api.event import AstrMessageEvent
 from astrbot.api.message_components import Image, Reply
 from astrbot.api.provider import Provider, ProviderRequest
@@ -21,16 +21,27 @@ class ProcessLLMRequest:
         else:
             logger.info(f"Timezone set to: {self.timezone}")
 
-    def _ensure_persona(self, req: ProviderRequest, cfg: dict):
+    async def _ensure_persona(self, req: ProviderRequest, cfg: dict, umo: str):
         """确保用户人格已加载"""
         if not req.conversation:
             return
         # persona inject
-        persona_id = req.conversation.persona_id or cfg.get("default_personality")
-        if not persona_id and persona_id != "[%None]":  # [%None] 为用户取消人格
-            default_persona = self.ctx.persona_manager.selected_default_persona_v3
-            if default_persona:
-                persona_id = default_persona["name"]
+
+        # custom rule is preferred
+        persona_id = (
+            await sp.get_async(
+                scope="umo", scope_id=umo, key="session_service_config", default={}
+            )
+        ).get("persona_id")
+
+        if not persona_id:
+            persona_id = req.conversation.persona_id or cfg.get("default_personality")
+            if not persona_id and persona_id != "[%None]":  # [%None] 为用户取消人格
+                default_persona = self.ctx.persona_manager.selected_default_persona_v3
+                if default_persona:
+                    persona_id = default_persona["name"]
+
+
         persona = next(
             builtins.filter(
                 lambda persona: persona["name"] == persona_id,
@@ -152,7 +163,7 @@ class ProcessLLMRequest:
         img_cap_prov_id: str = cfg.get("default_image_caption_provider_id") or ""
         if req.conversation:
             # inject persona for this request
-            self._ensure_persona(req, cfg)
+            await self._ensure_persona(req, cfg, event.unified_msg_origin)
 
             # image caption
             if img_cap_prov_id and req.image_urls: