在线率工具兼容新接口；增加月度统计数据

test/run_tool_picker_monitor.py

@@ -75,7 +75,15 @@ def run_examples():
                     "disaster_type": "滑坡",
                 }
             }
+        },{
+            "query": "甘肃省监控点的状态如何？",
+            "expected": {
+                "tool": "monitor_points_query",
+                "params": {
+                    "key": "甘肃省陇南市"
+                }
             }
+        },
     ]
     
     # 为每个测试案例创建一个表格

test/run_tool_picker_rate.py

@@ -21,14 +21,15 @@ def run_examples():
         model_name="Qwen2-7B",
         verbose=True
     )
-    
+    base_url = "http://172.30.0.37:30007"
     # 初始化工具
     tools = [
-        RegionRateTool(),
-        RankingRateTool(),
-        MonitorPointTool(),
+        RegionRateTool(base_url=base_url),
+        RankingRateTool(base_url=base_url),
+        MonitorPointTool(base_url=base_url),
     ]
     
+    tool_dict = {tool.name: tool for tool in tools}
     # 初始化 ToolPicker
     picker = ToolPicker(llm, tools)
     
@@ -42,7 +43,7 @@ def run_examples():
                     "start_time": "2024-11-19",
                     "end_time": "2024-11-19",
                     "region_name": "",
-                    "month_required": False
+                    "month_statistics": False
                 }
             }
         },
@@ -54,7 +55,7 @@ def run_examples():
                     "start_time": "2024-11-19",
                     "end_time": "2024-11-19",
                     "region_name": "甘肃省",
-                    "month_required": False
+                    "month_statistics": False
                 }
             }
         },
@@ -77,15 +78,6 @@ def run_examples():
             }
         },
         {
-            "query": "甘肃省监控点的状态如何？",
-            "expected": {
-                "tool": "monitor_points_query",
-                "params": {
-                    "key": "甘肃省"
-                }
-            }
-        },
-        {
             "query": "2023年甘肃省每月的设备在线率分别是多少？",
             "expected": {
                 "tool": "region_online_rate",
@@ -93,7 +85,7 @@ def run_examples():
                     "start_time": "2023-01-01",
                     "end_time": "2023-12-31",
                     "region_name": "甘肃省",
-                    "month_required": True
+                    "month_statistics": True
                 }
             }
         },
@@ -105,28 +97,28 @@ def run_examples():
                     "start_time": "2024-01-01",
                     "end_time": "2024-12-31",
                     "region_name": "甘肃省",
-                    "month_required": True
+                    "month_statistics": True
                 }
             }
         },
         {
-            "query": "2024年10月15日，成都市武侯区的设备在线率是多少？",
+            "query": "2024年10月15日，兰州市的设备在线率是多少？",
             "expected": {
                 "tool": "region_online_rate",
                 "params": {
                     "start_time": "2024-10-15",
                     "end_time": "2024-10-15",
-                    "region_name": "成都市武侯区",
-                    "month_required": False
+                    "region_name": "兰州市",
+                    "month_statistics": False
                 }
             }
         },
         {
-            "query": "2024年，成都市武侯区的设备在线率是多少？",
+            "query": "2024年，兰州市榆中县的设备在线率是多少？",
             "expected": {
                 "tool": "region_online_rate",
                 "params": {
-                    "start_time": "2024-01-01",  "region_name": "成都市武侯区", "month_required": False
+                    "start_time": "2024-11-26",  "region_name": "兰州市榆中县", "month_statistics": False
                 }
             }
         },
@@ -135,7 +127,7 @@ def run_examples():
             "expected": {
                 "tool": "region_online_rate",
                 "params": {
-                    "start_time": "2023-01-01", "end_time": "2023-12-31", "region_name": "甘肃省", "month_required": True
+                    "start_time": "2023-01-01", "end_time": "2023-12-31", "region_name": "甘肃省", "month_statistics": True
                 }
             }
         },
@@ -144,7 +136,7 @@ def run_examples():
             "expected": {
                 "tool": "region_online_rate",
                 "params": {
-                    "start_time": "2023-01-01", "region_name": "甘肃省", "month_required": True
+                    "start_time": "2023-01-01", "region_name": "甘肃省", "month_statistics": True
                 }
             }
         },
@@ -153,25 +145,25 @@ def run_examples():
             "expected": {
                 "tool": "region_online_rate",
                 "params": {
-                    "start_time": "2023-01-01", "region_name": "", "month_required": True
+                    "start_time": "2023-01-01", "region_name": "", "month_statistics": True
                 }
             }
         },
         {
-            "query": "2023年1月-2023年12月期间西藏实验点在线率是多少？",
+            "query": "2023年1月-2023年12月期间青海实验点在线率是多少？",
             "expected": {
                 "tool": "region_online_rate",
                 "params": {
-                    "start_time": "2023-01-01", "end_time": "2023-12-31", "region_name": "西藏", "month_required": False
+                    "start_time": "2023-01-01", "end_time": "2023-12-31", "region_name": "青海", "month_statistics": False
                 }
             }
         },
         {
-            "query": "2023年1月-2023年12月期间西藏实验点各月在线率是多少？",
+            "query": "2023年1月-2023年12月期间青海实验点各月在线率是多少？",
             "expected": {
                 "tool": "region_online_rate",
                 "params": {
-                    "start_time": "2023-01-01", "end_time": "2023-12-31", "region_name": "西藏", "month_required": True
+                    "start_time": "2023-01-01", "end_time": "2023-12-31", "region_name": "青海", "month_statistics": True
                 }
             }
         },
@@ -180,7 +172,7 @@ def run_examples():
             "expected": {
                 "tool": "region_online_rate",
                 "params": {
-                    "start_time": "2022-01-01", "end_time": "2022-12-31", "region_name": "", "month_required": True
+                    "start_time": "2022-01-01", "end_time": "2022-12-31", "region_name": "", "month_statistics": True
                 }
             }
         },
@@ -189,7 +181,7 @@ def run_examples():
             "expected": {
                 "tool": "region_online_rate",
                 "params": {
-                    "start_time": "2023-01-01", "end_time": "2023-12-31", "region_name": "西藏", "month_required": True
+                    "start_time": "2023-01-01", "end_time": "2023-12-31", "region_name": "西藏", "month_statistics": True
                 }
             }
         },
@@ -198,7 +190,7 @@ def run_examples():
             "expected": {
                 "tool": "region_online_rate",
                 "params": {
-                    "start_time": "2023-01-01", "end_time": "2023-12-31", "region_name": "西藏", "month_required": True
+                    "start_time": "2023-01-01", "end_time": "2023-12-31", "region_name": "西藏", "month_statistics": True
                 }
             }
         }
@@ -238,6 +230,12 @@ def run_examples():
                     "✓" if expected_value == actual_value else "✗"
                 )
 
+            tool = tool_dict[result["tool"]]
+            params = result["params"]
+
+            result =   tool.invoke(params)
+            print(result)
+
         except Exception as e:
             table.add_row("错误", "", str(e), "✗")