Merge branch 'master' of https://github.com/RC-CHN/AstrBot

Author: RC-CHN

astrbot/core/astr_main_agent.py

@@ -846,6 +846,8 @@ def _apply_sandbox_tools(
 ) -> None:
     if req.func_tool is None:
         req.func_tool = ToolSet()
+    if req.system_prompt is None:
+        req.system_prompt = ""
     booter = config.sandbox_cfg.get("booter", "shipyard_neo")
     if booter == "shipyard":
         ep = config.sandbox_cfg.get("shipyard_endpoint", "")

astrbot/core/computer/computer_client.py

@@ -1,4 +1,5 @@
 import json
+import os
 import shutil
 import uuid
 from pathlib import Path
@@ -41,8 +42,6 @@ def _discover_bay_credentials(endpoint: str) -> str:
     Returns:
         API key string, or empty string if not found.
     """
-    import os
-
     candidates: list[Path] = []
 
     # 1. BAY_DATA_DIR env var

tests/agent/test_truncator.py

@@ -52,18 +52,6 @@ def test_fix_messages_normal_messages(self):
         assert len(result) == 3
         assert result == messages
 
-    def test_fix_messages_tool_with_valid_context(self):
-        """Test fix_messages with tool message after user+assistant."""
-        truncator = ContextTruncator()
-        messages = [
-            self.create_message("user", "Run tool"),
-            self.create_message("assistant", "Running..."),
-            self.create_message("tool", "Tool result"),
-        ]
-        result = truncator.fix_messages(messages)
-        assert len(result) == 3
-        assert result == messages
-
     def test_fix_messages_tool_without_context(self):
         """Test fix_messages with tool message without enough context."""
         truncator = ContextTruncator()
@@ -74,43 +62,6 @@ def test_fix_messages_tool_without_context(self):
         # Tool message without context should be removed
         assert len(result) == 0
 
-    def test_fix_messages_tool_with_only_one_message(self):
-        """Test fix_messages with tool message after only one message."""
-        truncator = ContextTruncator()
-        messages = [
-            self.create_message("user", "Hello"),
-            self.create_message("tool", "Tool result"),
-        ]
-        result = truncator.fix_messages(messages)
-        # Tool message without enough context should be removed
-        assert len(result) == 0
-
-    def test_fix_messages_multiple_tools(self):
-        """Test fix_messages with multiple tool messages."""
-        truncator = ContextTruncator()
-        messages = [
-            self.create_message("user", "Run tool"),
-            self.create_message("assistant", "Running..."),
-            self.create_message("tool", "Tool 1 result"),
-            self.create_message("tool", "Tool 2 result"),
-        ]
-        result = truncator.fix_messages(messages)
-        assert len(result) == 4
-        assert result == messages
-
-    def test_fix_messages_mixed_system_tool(self):
-        """Test fix_messages with system message and tool messages."""
-        truncator = ContextTruncator()
-        messages = [
-            self.create_message("system", "System prompt"),
-            self.create_message("user", "Run tool"),
-            self.create_message("assistant", "Running..."),
-            self.create_message("tool", "Tool result"),
-        ]
-        result = truncator.fix_messages(messages)
-        assert len(result) == 4
-        assert result == messages
-
     # ==================== truncate_by_turns Tests ====================
 
     def test_truncate_by_turns_no_limit(self):

tests/test_kook/.gitignore

@@ -0,0 +1 @@
+!data

tests/test_kook/data/kook_card_data.json

@@ -0,0 +1,100 @@
+{
+    "type": "card",
+    "theme": "info",
+    "size": "lg",
+    "modules": [
+        {
+            "text": {
+                "content": "test1",
+                "type": "plain-text",
+                "emoji": true
+            },
+            "type": "header"
+        },
+        {
+            "text": {
+                "content": "test2",
+                "type": "kmarkdown"
+            },
+            "type": "section",
+            "mode": "left"
+        },
+        {
+            "type": "divider"
+        },
+        {
+            "text": {
+                "fields": [
+                    {
+                        "content": "test3",
+                        "type": "kmarkdown"
+                    },
+                    {
+                        "content": "**test4**",
+                        "type": "kmarkdown"
+                    }
+                ],
+                "type": "paragraph",
+                "cols": 2
+            },
+            "type": "section",
+            "mode": "left"
+        },
+        {
+            "elements": [
+                {
+                    "src": "https://img.kookapp.cn/attachments/2023-01/05/63b645851ff19.svg",
+                    "type": "image",
+                    "alt": "",
+                    "size": "lg",
+                    "circle": false
+                }
+            ],
+            "type": "image-group"
+        },
+        {
+            "src": "https://img.kookapp.cn/attachments/2023-01/05/63b645851ff19.svg",
+            "title": "test5",
+            "type": "file"
+        },
+        {
+            "endTime": 1772343427360,
+            "type": "countdown",
+            "startTime": 1772343378259,
+            "mode": "second"
+        },
+        {
+            "elements": [
+                {
+                    "text": "点我测试回调",
+                    "type": "button",
+                    "theme": "primary",
+                    "value": "btn_clicked",
+                    "click": "return-val"
+                },
+                {
+                    "text": "访问官网",
+                    "type": "button",
+                    "theme": "danger",
+                    "value": "https://www.kookapp.cn",
+                    "click": "link"
+                }
+            ],
+            "type": "action-group"
+        },
+        {
+            "elements": [
+                {
+                    "content": "test6",
+                    "type": "plain-text",
+                    "emoji": true
+                }
+            ],
+            "type": "context"
+        },
+        {
+            "code": "test7",
+            "type": "invite"
+        }
+    ]
+}

tests/unit/test_astr_main_agent.py

@@ -516,30 +516,6 @@ async def test_ensure_persona_none_explicit(self, mock_event, mock_context):
 
         assert "Persona Instructions" not in req.system_prompt
 
-    @pytest.mark.asyncio
-    async def test_ensure_skills(self, mock_event, mock_context):
-        """Test applying skills to request."""
-        module = ama
-        mock_skill = MagicMock()
-        mock_skill.name = "test_skill"
-        mock_skill.to_prompt.return_value = "Skill description"
-        mock_context.persona_manager.personas_v3 = []
-        mock_context.persona_manager.resolve_selected_persona = AsyncMock(
-            return_value=(None, None, None, False)
-        )
-
-        with patch("astrbot.core.astr_main_agent.SkillManager") as mock_skill_mgr_cls:
-            mock_skill_mgr = MagicMock()
-            mock_skill_mgr.list_skills.return_value = [mock_skill]
-            mock_skill_mgr_cls.return_value = mock_skill_mgr
-
-            req = ProviderRequest()
-            req.conversation = MagicMock(persona_id=None)
-
-            await module._ensure_persona_and_skills(req, {}, mock_context, mock_event)
-
-        assert "test_skill" in req.system_prompt
-
     @pytest.mark.asyncio
     async def test_ensure_tools_from_persona(self, mock_event, mock_context):
         """Test applying tools from persona."""