ai建议修改

src/tools/tool_can_use/compare_numbers_tool.py

@@ -1,4 +1,4 @@
-from src.tools.tool_can_use.base_tool import BaseTool
+from src.tools.tool_can_use.base_tool import BaseTool,run_lua_code
 from src.common.logger import get_module_logger
 from typing import Any
 
@@ -31,15 +31,17 @@ class CompareNumbersTool(BaseTool):
         try:
             num1 = function_args.get("num1")
             num2 = function_args.get("num2")
-
-            if num1 > num2:
-                result = f"{num1} 大于 {num2}"
-            elif num1 < num2:
-                result = f"{num1} 小于 {num2}"
-            else:
-                result = f"{num1} 等于 {num2}"
-
-            return {"type": "comparison_result", "id": f"{num1}_vs_{num2}", "content": result}
+            if not (isinstance(num1, (int, float)) and isinstance(num2, (int, float))):
+                raise ValueError("参数'num1'和'num2'必须为数字")
+            lua_code = """
+                function CompareNumbers(a, b)
+                    return a .. (a > b and " 大于 " or a < b and " 小于 " or " 等于 ") .. b
+                end
+            """
+            CompareNumbers = run_lua_code(lua_code).CompareNumbers
+            result = CompareNumbers(num1, num2)
+            
+            return {"name": self.name, "content": result}
         except Exception as e:
             logger.error(f"比较数字失败: {str(e)}")
             return {"type": "info", "id": f"{num1}_vs_{num2}", "content": f"比较数字失败，炸了: {str(e)}"}

src/tools/tool_can_use/letter_count_tool.py

@@ -0,0 +1,54 @@
+import re
+from src.tools.tool_can_use.base_tool import BaseTool, run_lua_code
+from src.common.logger import get_module_logger
+from typing import Dict, Any
+
+logger = get_module_logger("letter_count_tool")
+
+
+class LetterCountTool(BaseTool):
+    """数单词内某字母个数的工具"""
+
+    name = "word_letter_count"
+    description = "当有人询问你或者提到某个英文单词内有多少个某字母时，可以使用这个工具来数字母（如果传入的是中文，传入之前要将中文转为英文）"
+    parameters = {
+        "type": "object",
+        "properties": {
+            "word": {"type": "string", "description": "英文单词"},
+            "letter": {"type": "string", "description": "英文字母"},
+        },
+        "required": ["word", "letter"],
+    }
+
+    async def execute(self, function_args: Dict[str, Any], message_txt: str = "") -> Dict[str, Any]:
+        """
+        执行数数该单词的某字母个数的函数
+
+        Args:
+            function_args: 工具参数
+            message_txt: 原始消息文本
+
+        Returns:
+            Dict: 工具执行结果
+        """
+        try:
+            word = function_args.get("word")
+            letter = function_args.get("letter")
+            if re.match(r"^[a-zA-Z]$", letter) is None:
+                raise ValueError("请输入单个英文字母")
+            lua_code = """
+                function LetterCount(inputStr, targetLetter)
+                    local lower = (inputStr:gsub("[^"..targetLetter:lower().."]", "")):len()
+                    local upper = (inputStr:gsub("[^"..targetLetter:upper().."]", "")):len()
+                    return string.format("字母 %s 在字符串 %s 中出现的次数：%d个（小写）, %d个（大写）", targetLetter, inputStr, lower, upper)
+                end
+            """
+            LetterCount = run_lua_code(lua_code).LetterCount
+            return {"name": self.name, "content": LetterCount(word, letter)}
+        except Exception as e:
+            logger.error(f"数字母失败: {str(e)}")
+            return {"name": self.name, "content": f"数字母失败: {str(e)}"}
+
+
+# 注册工具
+# register_tool(LetterCountTool)