监测点返回结果 bug fix

src/agent/tool_monitor.py

@@ -11,7 +11,7 @@ class MonitorPointResponse():
 
 class MonitorPointArgs(BaseModel):
     """监测点查询参数"""
-    key: str = Field(..., description="行政区划名称（省/市/区县级别均可）")
+    key: str = Field(..., description="行政区划名称（省/市/区县级别均可,只需要最后一级，如岳麓区，不需要长沙市）")
 
 class MonitorPointTool(BaseTool):
     """查询监测点信息的工具"""
@@ -48,40 +48,37 @@ class MonitorPointTool(BaseTool):
         try:
             print(f"进入 monitor_points_query 工具, 查询监测点信息: {key}")
             response = self.client.query_points_sync(key)
-            
-            # 格式化返回结果
-            if not response.resultdata:
-                return MonitorPointResponse(
-                    status="success",
-                    message=f"未在{key}找到监测点信息",
-                    points=[]
-                )
+            print(f"查询结果: {response}")
+            if response.type != 1 or len(response.resultdata) == 0:
+                return {
+                    'code': 400,
+                    'message': f"查询失败: {response.message}，请检查是否有相关数据权限"
+                }
             
             # 提取关键信息并格式化
             points_info = []
             for point in response.resultdata:
                 points_info.append({
-                    "名称": point.MONITORPOINTNAME,
-                    "位置": point.LOCATION,
-                    "经度": point.LONGITUDE,
-                    "纬度": point.LATITUDE,
-                    "海拔": point.ELEVATION,
-                    "建设单位": point.BUILDUNIT,
-                    "监测单位": point.MONITORUNIT
+                    "名称": point["MONITORPOINTNAME"] if point["MONITORPOINTNAME"] else "",
+                    "位置": point["LOCATION"] if point["LOCATION"] else "",
+                    "经度": point["LONGITUDE"] if point["LONGITUDE"] else "",
+                    "纬度": point["LATITUDE"] if point["LATITUDE"] else "",
+                    "海拔": point["ELEVATION"] if point["ELEVATION"] else "",
+                    "建设单位": point["BUILDUNIT"] if point["BUILDUNIT"] else "",
+                    "监测单位": point["MONITORUNIT"] if point["MONITORUNIT"] else ""
                 })
             
-            return MonitorPointResponse(
-                status="success",
-                message=f"在{key}找到{len(points_info)}个监测点",
-                points=points_info
-            )
+            return {
+                'code': 200,
+                'message': f"在{key}找到{len(points_info)}个监测点",
+                'points': points_info
+            }
             
         except Exception as e:
-            return MonitorPointResponse(
-                status="error",
-                message=f"查询失败: {str(e)}",
-                points=[]
-            )
+            return {
+                'code': 400,
+                'message': f"查询失败: {str(e)}"
+            }
 
     def _arun(self, key: str) -> Dict[str, Any]:
         """