Merge pull request aliyun#25 from junliang-xjl/feature/edit_monitor_metrics

Modify the code describe_monitor_metrics

Author: cnwenf

src/alibabacloud_rds_openapi_mcp_server/server.py

@@ -39,6 +39,7 @@
  transform_perf_key,
  transform_das_key,
  json_array_to_csv,
+ json_array_to_markdown,
  get_rds_client,
  get_vpc_client,
  get_bill_client, get_das_client, convert_datetime_to_timestamp, current_request_headers)
@@ -1449,18 +1450,26 @@ async def describe_monitor_metrics(
  response = client.call_api(params, req, util_models.RuntimeOptions())
  response_data = response['body']['Data']
  timestamp_map = {}
+ resp_metrics_list = set()
  for metric in response_data:
  name = metric["Name"]
  values = metric["Value"]
  timestamps = metric["Timestamp"]
+ resp_metrics_list.add(name)
  for timestamp, value in zip(timestamps, values):
  dt = transform_timestamp_to_datetime(timestamp)
  if dt not in timestamp_map:
  timestamp_map[dt] = {}
  timestamp_map[dt][name] = value
 
- timestamp_list = [{"datetime": dt, **values} for dt, values in timestamp_map.items()]
- return json_array_to_csv(timestamp_list)
+ headers = sorted(list(resp_metrics_list))
+ datas = []
+ for dt in sorted(timestamp_map.keys()):
+ value_map = timestamp_map[dt]
+ value_map["datetime"] = dt
+ datas.append(value_map)
+ headers.insert(0, "datetime")
+ return json_array_to_markdown(headers, datas)
  except Exception as e:
  logger.error(f"Error occurred: {str(e)}")
  raise e

src/alibabacloud_rds_openapi_mcp_server/utils.py

@@ -120,6 +120,8 @@ def transform_das_key(db_type: str, das_keys: list[str]):
  for key in das_keys:
  if key in DAS_KEYS[db_type.lower()]:
  das_key_after_transform.extend(DAS_KEYS[db_type.lower()][key])
+ else:
+ das_key_after_transform.append(key)
  return das_key_after_transform
 
 
@@ -150,6 +152,21 @@ def json_array_to_csv(data):
  return output.getvalue()
 
 
+def json_array_to_markdown(headers, datas):
+ if not headers or not isinstance(headers, list):
+ return ""
+ if not datas or not isinstance(datas, list):
+ return ""
+ 
+ markdown_table = "| " + " | ".join(headers) + " |\n"
+ markdown_table += "| " + " | ".join(["---"] * len(headers)) + " |\n"
+ for row in datas:
+ if isinstance(row, dict):
+ markdown_table += "| " + " | ".join(str(row.get(header, '-')) for header in headers) + " |\n"
+ else:
+ markdown_table += "| " + " | ".join(map(str, row)) + " |\n"
+ return markdown_table
+
 def convert_datetime_to_timestamp(date_str):
  dt = datetime.strptime(date_str, "%Y-%m-%d %H:%M:%S")
  timestamp_seconds = time.mktime(dt.timetuple())