Update MCP server dependencies and refactor imports

Upgraded Python requirement to 3.10 and updated several dependencies in pyproject.toml. Refactored authentication to use JWTVerifier and adjusted related imports. Removed unused __init__.py files from multiple modules to clean up the package structure.

Author: Fr4nc3

src/backend/v3/mcp_server/Dockerfile

@@ -13,7 +13,7 @@ COPY requirements.txt .
 
 # Install Python dependencies
 RUN pip install --no-cache-dir -r requirements.txt
-
+####
 # Copy the application
 COPY . .
 

src/backend/v3/mcp_server/__init__.py

@@ -1,5 +0,0 @@
-"""
-MCP Server package for MACAE.
-"""
-
-__version__ = "1.0.0"

src/backend/v3/mcp_server/config/__init__.py

@@ -1,7 +0,0 @@
-"""
-Configuration module for MCP server.
-"""
-
-from .settings import config, get_auth_config, get_server_config
-
-__all__ = ["config", "get_auth_config", "get_server_config"]

src/backend/v3/mcp_server/core/__init__.py

@@ -1,7 +0,0 @@
-"""
-Core MCP server components.
-"""
-
-from .factory import MCPToolFactory, MCPToolBase, Domain
-
-__all__ = ["MCPToolFactory", "MCPToolBase", "Domain"]

src/backend/v3/mcp_server/mcp_server.py

@@ -2,16 +2,22 @@
 MACAE MCP Server - FastMCP server with organized tools and services.
 """
 
+###
 import sys
 import argparse
 from pathlib import Path
 from fastmcp import FastMCP
-from fastmcp.server.auth import BearerAuthProvider
+from fastmcp.server.auth.providers.jwt import JWTVerifier
 import logging
 from typing import Optional
 
 from core.factory import MCPToolFactory
-from services import HRService, TechSupportService, GeneralService, DataToolService
+from services import (
+    HRService,
+    TechSupportService,
+    GeneralService,
+    DataToolService,
+)
 from config.settings import config
 
 # Setup logging
@@ -42,7 +48,7 @@ def create_fastmcp_server():
                 "audience": config.audience,
             }
             if all(auth_config.values()):
-                auth = BearerAuthProvider(
+                auth = JWTVerifier(
                     jwks_uri=auth_config["jwks_uri"],
                     issuer=auth_config["issuer"],
                     algorithm="RS256",

src/backend/v3/mcp_server/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "hatchling.build"
 name = "macae-mcp-server"
 description = "FastMCP-based Model Context Protocol (MCP) server for the MACAE solution accelerator"
 readme = "README.md"
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 license = { text = "MIT" }
 authors = [
   { name = "Microsoft MACAE Team" }
@@ -15,11 +15,11 @@ dynamic = ["version"]
 
 # Core runtime dependencies (kept in sync with requirements.txt)
 dependencies = [
-  "fastmcp==2.2.4",
+  "fastmcp==2.11.3",
   "uvicorn[standard]==0.32.1",
-  "python-dotenv==1.0.1",
+  "python-dotenv>=1.1.0",
   "azure-identity==1.19.0",
-  "pydantic==2.10.4",
+  "pydantic==2.11.7",
   "pydantic-settings==2.6.1",
   "python-multipart==0.0.17",
   "httpx==0.28.1",
@@ -42,8 +42,8 @@ path = "__init__.py"
 # Hatch build configuration. Since this folder is itself the package root,
 # include everything under it (no src/ layout).
 [tool.hatch.build.targets.wheel]
-include = [
-  "**/*.py",
-  "README.md",
-  "*.env*",
-]
+packages = ["."]
+include = ["**/*", "README.md"]
+
+[project.scripts]
+mcp-server = "mcp_server.app:main"

src/backend/v3/mcp_server/requirements.txt

@@ -1,10 +0,0 @@
-"""
-Services module for MCP server.
-"""
-
-from .hr_service import HRService
-from .tech_support_service import TechSupportService
-from .general_service import GeneralService
-from .data_tool_service import DataToolService
-
-__all__ = ["HRService", "TechSupportService", "GeneralService", "DataToolService"]

src/backend/v3/mcp_server/services/__init__.py

@@ -1,23 +0,0 @@
-"""
-Utilities for MCP server.
-"""
-
-from .date_utils import (
-    format_date_for_user,
-    get_current_timestamp,
-    format_timestamp_for_display,
-)
-from .formatters import (
-    format_mcp_response,
-    format_error_response,
-    format_success_response,
-)
-
-__all__ = [
-    "format_date_for_user",
-    "get_current_timestamp",
-    "format_timestamp_for_display",
-    "format_mcp_response",
-    "format_error_response",
-    "format_success_response",
-]