mcp-proxy-adapter 6.9.17__py3-none-any.whl → 6.9.19__py3-none-any.whl

mcp_proxy_adapter/commands/reload_command.py

@@ -9,7 +9,7 @@ from typing import Any, Dict, Optional
 
 from mcp_proxy_adapter.commands.base import Command
 from mcp_proxy_adapter.commands.command_registry import registry
-from mcp_proxy_adapter.core.logging import logger
+from mcp_proxy_adapter.core.logging import get_global_logger
 
 
 class ReloadResult:
@@ -156,12 +156,12 @@ class ReloadCommand(Command):
             ReloadResult with reload information
         """
         try:
-            logger.info("🔄 Starting configuration and commands reload...")
+            get_global_logger().info("🔄 Starting configuration and commands reload...")
 
             # Get config path from parameters
             config_path = params.get("config_path")
             if not config_path:
-                logger.warning("No config_path provided, using default configuration")
+                get_global_logger().warning("No config_path provided, using default configuration")
 
             # Perform reload using unified initialization
             reload_info = await registry.reload_system(config_path=config_path)
@@ -178,11 +178,11 @@ class ReloadCommand(Command):
                 success=True,
             )
 
-            logger.info(f"✅ Reload completed successfully: {result.to_dict()}")
+            get_global_logger().info(f"✅ Reload completed successfully: {result.to_dict()}")
             return result
 
         except Exception as e:
-            logger.error(f"❌ Reload failed: {str(e)}")
+            get_global_logger().error(f"❌ Reload failed: {str(e)}")
             return ReloadResult(
                 config_reloaded=False,
                 builtin_commands=0,

mcp_proxy_adapter/commands/role_test_command.py

@@ -13,6 +13,7 @@ from mcp_proxy_adapter.commands.base import Command
 from mcp_proxy_adapter.commands.result import SuccessResult
 
 
+from mcp_proxy_adapter.core.logging import get_global_logger
 logger = logging.getLogger(__name__)
 
 
@@ -104,7 +105,7 @@ class RoleTestCommand(Command):
         # Check if action is allowed
         allowed = self._check_permission(action, permissions)
 
-        logger.info(f"Role test: user={user_role}, action={action}, allowed={allowed}")
+        get_global_logger().info(f"Role test: user={user_role}, action={action}, allowed={allowed}")
 
         return RoleTestCommandResult(user_role, permissions, action, allowed)
 

mcp_proxy_adapter/commands/roles_management_command.py

@@ -18,6 +18,7 @@ from .result import CommandResult, SuccessResult, ErrorResult
 from ..core.role_utils import RoleUtils
 from ..core.errors import ValidationError, NotFoundError, InternalError
 
+from mcp_proxy_adapter.core.logging import get_global_logger
 logger = logging.getLogger(__name__)
 
 
@@ -319,7 +320,7 @@ class RolesManagementCommand(Command):
         try:
             config_path = Path(self.roles_config_path)
             if not config_path.exists():
-                logger.warning(f"Roles config file not found: {self.roles_config_path}")
+                get_global_logger().warning(f"Roles config file not found: {self.roles_config_path}")
                 return {"roles": {}, "server_roles": {}, "role_hierarchy": {}}
 
             with open(config_path, "r", encoding="utf-8") as f:
@@ -328,7 +329,7 @@ class RolesManagementCommand(Command):
             return config
 
         except Exception as e:
-            logger.error(f"Failed to load roles configuration: {e}")
+            get_global_logger().error(f"Failed to load roles configuration: {e}")
             return {"roles": {}, "server_roles": {}, "role_hierarchy": {}}
 
     def _save_roles_config(self) -> None:
@@ -342,10 +343,10 @@ class RolesManagementCommand(Command):
             with open(config_path, "w", encoding="utf-8") as f:
                 json.dump(self.roles_config, f, indent=2, ensure_ascii=False)
 
-            logger.info(f"Roles configuration saved to {self.roles_config_path}")
+            get_global_logger().info(f"Roles configuration saved to {self.roles_config_path}")
 
         except Exception as e:
-            logger.error(f"Failed to save roles configuration: {e}")
+            get_global_logger().error(f"Failed to save roles configuration: {e}")
             raise InternalError(f"Failed to save roles configuration: {e}")
 
     async def execute(self, **kwargs) -> CommandResult:
@@ -378,7 +379,7 @@ class RolesManagementCommand(Command):
                 )
 
         except Exception as e:
-            logger.error(f"Roles management command failed: {e}")
+            get_global_logger().error(f"Roles management command failed: {e}")
             return ErrorResult(str(e))
 
     async def roles_list(self, **kwargs) -> RolesListResult:
@@ -473,7 +474,7 @@ class RolesManagementCommand(Command):
         # Save configuration
         self._save_roles_config()
 
-        logger.info(f"Role {role_name} created successfully")
+        get_global_logger().info(f"Role {role_name} created successfully")
         return RolesCreateResult(role_name, role_config)
 
     async def roles_update(self, **kwargs) -> RolesUpdateResult:
@@ -522,7 +523,7 @@ class RolesManagementCommand(Command):
         # Save configuration
         self._save_roles_config()
 
-        logger.info(f"Role {role_name} updated successfully")
+        get_global_logger().info(f"Role {role_name} updated successfully")
         return RolesUpdateResult(role_name, updated_config)
 
     async def roles_delete(self, **kwargs) -> RolesDeleteResult:
@@ -563,7 +564,7 @@ class RolesManagementCommand(Command):
         # Save configuration
         self._save_roles_config()
 
-        logger.info(f"Role {role_name} deleted successfully")
+        get_global_logger().info(f"Role {role_name} deleted successfully")
         return RolesDeleteResult(role_name)
 
     async def roles_validate(self, **kwargs) -> RolesValidateResult:

mcp_proxy_adapter/commands/security_command.py

@@ -16,6 +16,7 @@ from .base import Command
 from .result import CommandResult, SuccessResult, ErrorResult
 from mcp_proxy_adapter.core.security_integration import create_security_integration
 
+from mcp_proxy_adapter.core.logging import get_global_logger
 logger = logging.getLogger(__name__)
 
 
@@ -101,7 +102,7 @@ class SecurityCommand(Command):
         self.security_integration = create_security_integration(config)
 
         if not self.security_integration:
-            logger.warning(
+            get_global_logger().warning(
                 "Security framework not available, security command will fail"
             )
 
@@ -151,7 +152,7 @@ class SecurityCommand(Command):
                 )
 
         except Exception as e:
-            logger.error(f"Security command error: {e}")
+            get_global_logger().error(f"Security command error: {e}")
             return SecurityResult(
                 operation=action,
                 success=False,

mcp_proxy_adapter/commands/ssl_setup_command.py

@@ -11,6 +11,7 @@ import logging
 import ssl
 from typing import Dict, Any, Optional
 
+from mcp_proxy_adapter.core.logging import get_global_logger
 # Import mcp_security_framework
 try:
     from mcp_security_framework.core.ssl_manager import SSLManager
@@ -84,7 +85,7 @@ class SSLSetupCommand(Command):
                 )
 
         except Exception as e:
-            logger.error(f"SSL setup command failed: {e}")
+            get_global_logger().error(f"SSL setup command failed: {e}")
             return ErrorResult(message=f"SSL setup command failed: {str(e)}")
 
     async def _get_ssl_config(self) -> SuccessResult | ErrorResult:
@@ -99,7 +100,7 @@ class SSLSetupCommand(Command):
             return SuccessResult(data={"ssl_config": ssl_config})
 
         except Exception as e:
-            logger.error(f"Failed to get SSL config: {e}")
+            get_global_logger().error(f"Failed to get SSL config: {e}")
             return ErrorResult(message=f"Failed to get SSL config: {str(e)}")
 
     async def _set_ssl_config(
@@ -127,7 +128,7 @@ class SSLSetupCommand(Command):
             )
 
         except Exception as e:
-            logger.error(f"Failed to set SSL config: {e}")
+            get_global_logger().error(f"Failed to set SSL config: {e}")
             return ErrorResult(message=f"Failed to set SSL config: {str(e)}")
 
     async def _update_ssl_config(
@@ -163,7 +164,7 @@ class SSLSetupCommand(Command):
             )
 
         except Exception as e:
-            logger.error(f"Failed to update SSL config: {e}")
+            get_global_logger().error(f"Failed to update SSL config: {e}")
             return ErrorResult(message=f"Failed to update SSL config: {str(e)}")
 
     async def _reset_ssl_config(self) -> SuccessResult | ErrorResult:
@@ -190,7 +191,7 @@ class SSLSetupCommand(Command):
             )
 
         except Exception as e:
-            logger.error(f"Failed to reset SSL config: {e}")
+            get_global_logger().error(f"Failed to reset SSL config: {e}")
             return ErrorResult(message=f"Failed to reset SSL config: {str(e)}")
 
     async def _test_ssl_config(
@@ -218,7 +219,7 @@ class SSLSetupCommand(Command):
                 return await self._test_ssl_config_fallback(cert_file, key_file)
 
         except Exception as e:
-            logger.error(f"Failed to test SSL config: {e}")
+            get_global_logger().error(f"Failed to test SSL config: {e}")
             return ErrorResult(message=f"Failed to test SSL config: {str(e)}")
 
     async def _test_ssl_config_with_framework(

mcp_proxy_adapter/commands/token_management_command.py

@@ -25,6 +25,7 @@ from .result import SuccessResult, ErrorResult, CommandResult
 from ..core.auth_validator import AuthValidator
 
 
+from mcp_proxy_adapter.core.logging import get_global_logger
 class TokenManagementCommand(Command):
     """
     Token management commands.
@@ -87,7 +88,7 @@ class TokenManagementCommand(Command):
                 return ErrorResult(message=f"Unknown method: {method}", code=-32601)
 
         except Exception as e:
-            self.logger.error(f"Token management command execution error: {e}")
+            self.get_global_logger().error(f"Token management command execution error: {e}")
             return ErrorResult(
                 message=f"Token management command failed: {str(e)}", code=-32603
             )
@@ -121,7 +122,7 @@ class TokenManagementCommand(Command):
                 return await self._create_api_token(token_data)
 
         except Exception as e:
-            self.logger.error(f"Token creation error: {e}")
+            self.get_global_logger().error(f"Token creation error: {e}")
             return ErrorResult(message=f"Token creation failed: {str(e)}", code=-32603)
 
     async def token_validate(
@@ -164,7 +165,7 @@ class TokenManagementCommand(Command):
                 )
 
         except Exception as e:
-            self.logger.error(f"Token validation error: {e}")
+            self.get_global_logger().error(f"Token validation error: {e}")
             return ErrorResult(
                 message=f"Token validation failed: {str(e)}", code=-32603
             )
@@ -207,7 +208,7 @@ class TokenManagementCommand(Command):
             )
 
         except Exception as e:
-            self.logger.error(f"Token revocation error: {e}")
+            self.get_global_logger().error(f"Token revocation error: {e}")
             return ErrorResult(
                 message=f"Token revocation failed: {str(e)}", code=-32603
             )
@@ -260,7 +261,7 @@ class TokenManagementCommand(Command):
             )
 
         except Exception as e:
-            self.logger.error(f"Token listing error: {e}")
+            self.get_global_logger().error(f"Token listing error: {e}")
             return ErrorResult(message=f"Token listing failed: {str(e)}", code=-32603)
 
     async def token_refresh(self, token: str) -> Union[SuccessResult, ErrorResult]:
@@ -326,7 +327,7 @@ class TokenManagementCommand(Command):
             )
 
         except Exception as e:
-            self.logger.error(f"Token refresh error: {e}")
+            self.get_global_logger().error(f"Token refresh error: {e}")
             return ErrorResult(message=f"Token refresh failed: {str(e)}", code=-32603)
 
     async def _create_jwt_token(
@@ -371,7 +372,7 @@ class TokenManagementCommand(Command):
             )
 
         except Exception as e:
-            self.logger.error(f"JWT token creation error: {e}")
+            self.get_global_logger().error(f"JWT token creation error: {e}")
             return ErrorResult(
                 message=f"JWT token creation failed: {str(e)}", code=-32603
             )
@@ -420,7 +421,7 @@ class TokenManagementCommand(Command):
             )
 
         except Exception as e:
-            self.logger.error(f"API token creation error: {e}")
+            self.get_global_logger().error(f"API token creation error: {e}")
             return ErrorResult(
                 message=f"API token creation failed: {str(e)}", code=-32603
             )
@@ -460,7 +461,7 @@ class TokenManagementCommand(Command):
             return None
 
         except Exception as e:
-            self.logger.error(f"Failed to get token expiry: {e}")
+            self.get_global_logger().error(f"Failed to get token expiry: {e}")
             return None
 
     def _load_tokens(self) -> Dict[str, Any]:
@@ -478,7 +479,7 @@ class TokenManagementCommand(Command):
                 return json.load(f)
 
         except Exception as e:
-            self.logger.error(f"Failed to load tokens: {e}")
+            self.get_global_logger().error(f"Failed to load tokens: {e}")
             return {}
 
     def _save_tokens(self, tokens: Dict[str, Any]) -> None:
@@ -496,5 +497,5 @@ class TokenManagementCommand(Command):
                 json.dump(tokens, f, indent=2, ensure_ascii=False)
 
         except Exception as e:
-            self.logger.error(f"Failed to save tokens: {e}")
+            self.get_global_logger().error(f"Failed to save tokens: {e}")
             raise

mcp_proxy_adapter/commands/transport_management_command.py

@@ -8,7 +8,7 @@ from typing import Dict, Any, ClassVar
 from mcp_proxy_adapter.commands.base import Command
 from mcp_proxy_adapter.commands.result import SuccessResult, ErrorResult
 from mcp_proxy_adapter.core.transport_manager import transport_manager
-from mcp_proxy_adapter.core.logging import logger
+from mcp_proxy_adapter.core.logging import get_global_logger
 
 
 class TransportManagementResult(SuccessResult):
@@ -85,7 +85,7 @@ class TransportManagementCommand(Command):
                 )
 
         except Exception as e:
-            logger.error(f"Transport management command error: {e}")
+            get_global_logger().error(f"Transport management command error: {e}")
             return TransportManagementResult(
                 transport_info={"error": str(e)},
                 message=f"Transport management failed: {e}",

mcp_proxy_adapter/config.py

@@ -507,11 +507,11 @@ class Config:
         # Log validation results
         for result in self.validation_results:
             if result.level == ValidationLevel.ERROR:
-                logger.error(f"Configuration error: {result.message}")
+                get_global_logger().error(f"Configuration error: {result.message}")
             elif result.level == ValidationLevel.WARNING:
-                logger.warning(f"Configuration warning: {result.message}")
+                get_global_logger().warning(f"Configuration warning: {result.message}")
             else:
-                logger.info(f"Configuration info: {result.message}")
+                get_global_logger().info(f"Configuration info: {result.message}")
         
         # Raise ConfigError if there are critical errors
         errors = [r for r in self.validation_results if r.level == ValidationLevel.ERROR]

mcp_proxy_adapter/core/__init__.py

@@ -15,7 +15,7 @@ __all__ = [
     # Logging
     "setup_logging",
     "get_logger",
-    "logger",
+    "get_global_logger()",
     "RequestLogger",
     "CustomFormatter",
     "RequestContextFilter",

mcp_proxy_adapter/core/app_runner.py

@@ -228,15 +228,15 @@ class ApplicationRunner:
         # Add startup event
         @self.app.on_event("startup")
         async def startup_event():
-            logger.info("Application starting up")
-            logger.info(
+            get_global_logger().info("Application starting up")
+            get_global_logger().info(
                 f"Configuration validation passed with {len(self.errors)} errors"
             )
 
         # Add shutdown event
         @self.app.on_event("shutdown")
         async def shutdown_event():
-            logger.info("Application shutting down")
+            get_global_logger().info("Application shutting down")
 
     def run(self) -> None:
         """

mcp_proxy_adapter/core/auth_validator.py

@@ -182,7 +182,7 @@ class AuthValidator:
                 return self.validate_ssl(auth_data.get("server_cert"))
 
         except Exception as e:
-            self.logger.error(f"Authentication validation error: {e}")
+            self.get_global_logger().error(f"Authentication validation error: {e}")
             return AuthValidationResult(
                 is_valid=False,
                 error_code=-32603,
@@ -256,7 +256,7 @@ class AuthValidator:
             return AuthValidationResult(is_valid=True, roles=roles)
 
         except Exception as e:
-            self.logger.error(f"Certificate validation error: {e}")
+            self.get_global_logger().error(f"Certificate validation error: {e}")
             return AuthValidationResult(
                 is_valid=False,
                 error_code=-32003,
@@ -296,7 +296,7 @@ class AuthValidator:
                 )
 
         except Exception as e:
-            self.logger.error(f"Token validation error: {e}")
+            self.get_global_logger().error(f"Token validation error: {e}")
             return AuthValidationResult(
                 is_valid=False,
                 error_code=-32004,
@@ -345,7 +345,7 @@ class AuthValidator:
             return AuthValidationResult(is_valid=True, roles=client_result.roles)
 
         except Exception as e:
-            self.logger.error(f"mTLS validation error: {e}")
+            self.get_global_logger().error(f"mTLS validation error: {e}")
             return AuthValidationResult(
                 is_valid=False,
                 error_code=-32005,
@@ -374,7 +374,7 @@ class AuthValidator:
             return self.validate_certificate(server_cert, "server")
 
         except Exception as e:
-            self.logger.error(f"SSL validation error: {e}")
+            self.get_global_logger().error(f"SSL validation error: {e}")
             return AuthValidationResult(
                 is_valid=False,
                 error_code=-32006,
@@ -444,7 +444,7 @@ class AuthValidator:
             return []
 
         except Exception as e:
-            self.logger.error(f"Failed to extract roles from certificate: {e}")
+            self.get_global_logger().error(f"Failed to extract roles from certificate: {e}")
             return []
 
     def _validate_server_certificate(self, cert: x509.Certificate) -> bool:
@@ -467,7 +467,7 @@ class AuthValidator:
             return True
 
         except Exception as e:
-            self.logger.error(f"Server certificate validation error: {e}")
+            self.get_global_logger().error(f"Server certificate validation error: {e}")
             return False
 
     def _validate_client_certificate(self, cert: x509.Certificate) -> bool:
@@ -492,7 +492,7 @@ class AuthValidator:
             return True
 
         except Exception as e:
-            self.logger.error(f"Client certificate validation error: {e}")
+            self.get_global_logger().error(f"Client certificate validation error: {e}")
             return False
 
     def _validate_jwt_token(self, token: str) -> AuthValidationResult:
@@ -596,5 +596,5 @@ class AuthValidator:
             return True
 
         except Exception as e:
-            self.logger.error(f"Certificate chain verification error: {e}")
+            self.get_global_logger().error(f"Certificate chain verification error: {e}")
             return False