From f9577086dbabfd80bf823c409f4d6dec2f7689f4 Mon Sep 17 00:00:00 2001 From: Kamil Potrec Date: Mon, 15 Sep 2025 14:08:12 +0100 Subject: [PATCH] chore(keycardai-mcp-fastmcp): cleanup package structure --- packages/mcp-fastmcp/src/keycardai/__init__.py | 3 --- packages/mcp-fastmcp/src/keycardai/mcp/__init__.py | 3 --- .../mcp-fastmcp/src/keycardai/mcp/integrations/__init__.py | 5 ----- .../src/keycardai/mcp/integrations/fastmcp/__init__.py | 3 --- .../src/keycardai/mcp/integrations/fastmcp/middleware.py | 4 ++-- .../src/keycardai/mcp/integrations/fastmcp/provider.py | 6 +++--- 6 files changed, 5 insertions(+), 19 deletions(-) delete mode 100644 packages/mcp-fastmcp/src/keycardai/__init__.py delete mode 100644 packages/mcp-fastmcp/src/keycardai/mcp/__init__.py delete mode 100644 packages/mcp-fastmcp/src/keycardai/mcp/integrations/__init__.py diff --git a/packages/mcp-fastmcp/src/keycardai/__init__.py b/packages/mcp-fastmcp/src/keycardai/__init__.py deleted file mode 100644 index c30a950f..00000000 --- a/packages/mcp-fastmcp/src/keycardai/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -"""KeyCard AI namespace package for MCP FastMCP integration.""" - -__path__ = __import__('pkgutil').extend_path(__path__, __name__) diff --git a/packages/mcp-fastmcp/src/keycardai/mcp/__init__.py b/packages/mcp-fastmcp/src/keycardai/mcp/__init__.py deleted file mode 100644 index 8907e3f1..00000000 --- a/packages/mcp-fastmcp/src/keycardai/mcp/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -"""KeyCard AI MCP package.""" - -__path__ = __import__('pkgutil').extend_path(__path__, __name__) diff --git a/packages/mcp-fastmcp/src/keycardai/mcp/integrations/__init__.py b/packages/mcp-fastmcp/src/keycardai/mcp/integrations/__init__.py deleted file mode 100644 index 3e3051ff..00000000 --- a/packages/mcp-fastmcp/src/keycardai/mcp/integrations/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -"""KeyCard AI MCP integrations package.""" - -from . import fastmcp - -__all__ = ["fastmcp"] diff --git a/packages/mcp-fastmcp/src/keycardai/mcp/integrations/fastmcp/__init__.py b/packages/mcp-fastmcp/src/keycardai/mcp/integrations/fastmcp/__init__.py index d70f5462..53445a05 100644 --- a/packages/mcp-fastmcp/src/keycardai/mcp/integrations/fastmcp/__init__.py +++ b/packages/mcp-fastmcp/src/keycardai/mcp/integrations/fastmcp/__init__.py @@ -101,10 +101,7 @@ async def sync_calendar_to_drive(ctx: Context): from .middleware import AccessMiddleware from .provider import KeycardAuthProvider -__version__ = "0.0.1" - __all__ = [ - "__version__", "KeycardAuthProvider", "AccessMiddleware", ] diff --git a/packages/mcp-fastmcp/src/keycardai/mcp/integrations/fastmcp/middleware.py b/packages/mcp-fastmcp/src/keycardai/mcp/integrations/fastmcp/middleware.py index 5f606178..55e0f3a2 100644 --- a/packages/mcp-fastmcp/src/keycardai/mcp/integrations/fastmcp/middleware.py +++ b/packages/mcp-fastmcp/src/keycardai/mcp/integrations/fastmcp/middleware.py @@ -12,12 +12,12 @@ from functools import wraps from typing import TYPE_CHECKING, Any +from pydantic_settings import BaseSettings + from fastmcp import Context from fastmcp.server.dependencies import get_access_token from fastmcp.server.middleware import Middleware, MiddlewareContext from fastmcp.utilities.logging import get_logger -from pydantic_settings import BaseSettings - from keycardai.oauth import AsyncClient, ClientConfig from keycardai.oauth.types.models import TokenResponse diff --git a/packages/mcp-fastmcp/src/keycardai/mcp/integrations/fastmcp/provider.py b/packages/mcp-fastmcp/src/keycardai/mcp/integrations/fastmcp/provider.py index e7c96347..fd053b75 100644 --- a/packages/mcp-fastmcp/src/keycardai/mcp/integrations/fastmcp/provider.py +++ b/packages/mcp-fastmcp/src/keycardai/mcp/integrations/fastmcp/provider.py @@ -7,12 +7,12 @@ from __future__ import annotations -from fastmcp.server.auth import RemoteAuthProvider -from fastmcp.server.auth.providers.jwt import JWTVerifier -from fastmcp.utilities.logging import get_logger from pydantic import AnyHttpUrl, field_validator from pydantic_settings import BaseSettings +from fastmcp.server.auth import RemoteAuthProvider +from fastmcp.server.auth.providers.jwt import JWTVerifier +from fastmcp.utilities.logging import get_logger from keycardai.oauth import Client, ClientConfig logger = get_logger(__name__)