mcp-proxy-adapter 6.0.0__py3-none-any.whl → 6.1.1__py3-none-any.whl

mcp_proxy_adapter/commands/help_command.py

@@ -46,13 +46,15 @@ class HelpResult(CommandResult):
             if self.command_info is not None:
                 logger.debug(f"HelpResult.to_dict: returning command_info for {self.command_info.get('name', 'unknown')}")
                 # Делаем безопасное получение всех полей с дефолтными значениями
+                metadata = self.command_info.get("metadata", {})
+                schema = self.command_info.get("schema", {})
                 return {
                     "cmdname": self.command_info.get("name", "unknown"),
                     "info": {
-                        "description": self.command_info.get("description", ""),
-                        "summary": self.command_info.get("summary", ""),
-                        "params": self.command_info.get("params", {}),
-                        "examples": self.command_info.get("examples", [])
+                        "description": metadata.get("description", ""),
+                        "summary": metadata.get("summary", ""),
+                        "params": schema.get("properties", {}),
+                        "examples": metadata.get("examples", [])
                     }
                 }
 
@@ -190,14 +192,16 @@ class HelpCommand(Command):
             if cmdname is not None and cmdname != "":
                 logger.debug(f"Обработка запроса для конкретной команды: {cmdname}")
                 try:
-                    # Get command metadata from registry
-                    command_metadata = registry.get_command_metadata(cmdname)
+                    # Get command info from registry
+                    command_info = registry.get_command_info(cmdname)
+                    if command_info is None:
+                        raise NotFoundError(f"Command '{cmdname}' not found")
                     logger.debug(f"Получены метаданные для команды {cmdname}")
-                    return HelpResult(command_info=command_metadata)
+                    return HelpResult(command_info=command_info)
                 except NotFoundError:
                     logger.warning(f"Команда '{cmdname}' не найдена")
                     # Получаем список всех команд
-                    all_commands = list(registry.get_all_metadata().keys())
+                    all_commands = list(registry.get_all_commands().keys())
                     if all_commands:
                         example_cmd = all_commands[0]
                         example = {
@@ -218,9 +222,9 @@ class HelpCommand(Command):
             # Otherwise, return information about all available commands
             logger.debug("Обработка запроса для всех команд")
 
-            # Get metadata for all commands
-            all_metadata = registry.get_all_metadata()
-            logger.debug(f"Получены метаданные для {len(all_metadata)} команд")
+            # Get info for all commands
+            all_commands_info = registry.get_all_commands_info()
+            logger.debug(f"Получены метаданные для {len(all_commands_info.get('commands', {}))} команд")
 
             # Prepare response format with tool metadata
             result = {
@@ -240,17 +244,20 @@ class HelpCommand(Command):
             }
 
             # Add brief information about commands
-            for name, metadata in all_metadata.items():
+            commands_data = all_commands_info.get("commands", {})
+            for name, command_info in commands_data.items():
                 try:
                     logger.debug(f"Обработка метаданных команды {name}")
                     # Безопасное получение параметров с проверкой на наличие ключей
+                    metadata = command_info.get("metadata", {})
+                    schema = command_info.get("schema", {})
                     result["commands"][name] = {
                         "summary": metadata.get("summary", ""),
-                        "params_count": len(metadata.get("params", {}))
+                        "params_count": len(schema.get("properties", {}))
                     }
                 except Exception as e:
                     logger.error(f"Ошибка при обработке метаданных команды {name}: {e}")
-                    logger.debug(f"Метаданные команды {name}: {metadata}")
+                    logger.debug(f"Метаданные команды {name}: {command_info}")
                     # Пропускаем проблемную команду
                     continue