golf-mcp 0.2.6__tar.gz → 0.2.9__tar.gz

{golf_mcp-0.2.6 → golf_mcp-0.2.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: golf-mcp
-Version: 0.2.6
+Version: 0.2.9
 Summary: Framework for building MCP servers
 Author-email: Antoni Gmitruk <antoni@golf.dev>
 License-Expression: Apache-2.0
@@ -132,7 +132,6 @@ A Golf project initialized with `golf init` will have a structure similar to thi
 -   **`auth.py`**: Dedicated authentication configuration file (new in v0.2.0, breaking change from v0.1.x authentication API) for JWT, OAuth Server, API key, or development authentication.
 -   **`tools/`**, **`resources/`**, **`prompts/`**: Contain your Python files, each defining a single component. These directories can also contain nested subdirectories to further organize your components (e.g., `tools/payments/charge.py`). The module docstring of each file serves as the component's description.
     -   Component IDs are automatically derived from their file path. For example, `tools/hello.py` becomes `hello`, and a nested file like `tools/payments/submit.py` would become `submit_payments` (filename, followed by reversed parent directories under the main category, joined by underscores).
--   **`common.py`** (not shown, but can be placed in subdirectories like `tools/payments/common.py`): Used to share code (clients, models, etc.) among components in the same subdirectory.
 
 ## Example: Defining a Tool
 

{golf_mcp-0.2.6 → golf_mcp-0.2.9}/README.md

@@ -92,7 +92,6 @@ A Golf project initialized with `golf init` will have a structure similar to thi
 -   **`auth.py`**: Dedicated authentication configuration file (new in v0.2.0, breaking change from v0.1.x authentication API) for JWT, OAuth Server, API key, or development authentication.
 -   **`tools/`**, **`resources/`**, **`prompts/`**: Contain your Python files, each defining a single component. These directories can also contain nested subdirectories to further organize your components (e.g., `tools/payments/charge.py`). The module docstring of each file serves as the component's description.
     -   Component IDs are automatically derived from their file path. For example, `tools/hello.py` becomes `hello`, and a nested file like `tools/payments/submit.py` would become `submit_payments` (filename, followed by reversed parent directories under the main category, joined by underscores).
--   **`common.py`** (not shown, but can be placed in subdirectories like `tools/payments/common.py`): Used to share code (clients, models, etc.) among components in the same subdirectory.
 
 ## Example: Defining a Tool
 

{golf_mcp-0.2.6 → golf_mcp-0.2.9}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "golf-mcp"
-version = "0.2.6"
+version = "0.2.9"
 description = "Framework for building MCP servers"
 authors = [
     {name = "Antoni Gmitruk", email = "antoni@golf.dev"}
@@ -66,7 +66,7 @@ golf = ["examples/**/*"]
 
 [tool.poetry]
 name = "golf-mcp"
-version = "0.2.6"
+version = "0.2.9"
 description = "Framework for building MCP servers with zero boilerplate"
 authors = ["Antoni Gmitruk <antoni@golf.dev>"]
 license = "Apache-2.0"

{golf_mcp-0.2.6 → golf_mcp-0.2.9}/src/golf/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.2.6"
+__version__ = "0.2.9"
 
 # Import endpoints with fallback for dev mode
 try:

{golf_mcp-0.2.6 → golf_mcp-0.2.9}/src/golf/auth/__init__.py

@@ -206,6 +206,7 @@ def configure_oauth_proxy(
     scopes_supported: list[str] | None = None,
     revocation_endpoint: str | None = None,
     redirect_path: str = "/oauth/callback",
+    **env_vars: str,
 ) -> None:
     """Configure OAuth proxy authentication for non-DCR providers.
 
@@ -223,6 +224,9 @@ def configure_oauth_proxy(
         scopes_supported: Scopes to advertise to MCP clients
         revocation_endpoint: Optional token revocation endpoint
         redirect_path: OAuth callback path (default: /oauth/callback)
+        **env_vars: Environment variable names (authorization_endpoint_env_var,
+            token_endpoint_env_var, client_id_env_var, client_secret_env_var,
+            base_url_env_var, revocation_endpoint_env_var)
 
     Note:
         Requires golf-mcp-enterprise package for implementation.
@@ -235,8 +239,9 @@ def configure_oauth_proxy(
         revocation_endpoint=revocation_endpoint,
         base_url=base_url,
         redirect_path=redirect_path,
-        scopes_supported=scopes_supported or [],
+        scopes_supported=scopes_supported,
         token_verifier_config=token_verifier_config,
+        **env_vars,
     )
     configure_auth(config)
 

{golf_mcp-0.2.6 → golf_mcp-0.2.9}/src/golf/auth/providers.py

@@ -470,7 +470,9 @@ class OAuthProxyConfig(BaseModel):
     redirect_path: str = Field("/oauth/callback", description="OAuth callback path (must match provider registration)")
 
     # Scopes and token verification
-    scopes_supported: list[str] = Field(default_factory=list, description="Scopes supported by this proxy")
+    scopes_supported: list[str] | None = Field(
+        None, description="Scopes supported by this proxy (optional, can be empty for intelligent fallback)"
+    )
     token_verifier_config: JWTAuthConfig | StaticTokenConfig = Field(
         ..., description="Token verifier configuration for validating upstream tokens"
     )
@@ -536,40 +538,14 @@ class OAuthProxyConfig(BaseModel):
 
         return url
 
-    @field_validator("scopes_supported")
-    @classmethod
-    def validate_scopes_supported(cls, v: list[str]) -> list[str]:
-        """Validate scopes_supported format and security."""
-        if not v:
-            return v
-
-        cleaned_scopes = []
-        for scope in v:
-            scope = scope.strip()
-            if not scope:
-                raise ValueError("Scopes cannot be empty or whitespace-only")
-
-            # OAuth 2.0 scope format validation (RFC 6749)
-            if not all(32 < ord(c) < 127 and c not in ' "\\' for c in scope):
-                raise ValueError(
-                    f"Invalid scope format: '{scope}' - must be ASCII printable without spaces, quotes, or backslashes"
-                )
-
-            # Reasonable length limit to prevent abuse
-            if len(scope) > 128:
-                raise ValueError(f"Scope too long: '{scope}' - maximum 128 characters")
-
-            cleaned_scopes.append(scope)
-
-        return cleaned_scopes
-
     @model_validator(mode="after")
     def validate_oauth_proxy_config(self) -> "OAuthProxyConfig":
         """Validate OAuth proxy configuration consistency."""
         # Validate token verifier config is compatible
         if not isinstance(self.token_verifier_config, JWTAuthConfig | StaticTokenConfig):
             raise ValueError(
-                f"token_verifier_config must be JWTAuthConfig or StaticTokenConfig, got {type(self.token_verifier_config).__name__}"
+                f"token_verifier_config must be JWTAuthConfig or StaticTokenConfig, "
+                f"got {type(self.token_verifier_config).__name__}"
             )
 
         # Warn about HTTPS requirements in production

{golf_mcp-0.2.6 → golf_mcp-0.2.9}/src/golf/core/builder.py

@@ -170,6 +170,41 @@ class ManifestBuilder:
         console.print(f"[green]Manifest saved to {output_path}[/green]")
         return output_path
 
+    def _get_fastmcp_version(self) -> str | None:
+        """Get the installed FastMCP version.
+
+        Returns:
+            FastMCP version string (e.g., "2.12.0") or None if not available
+        """
+        try:
+            import fastmcp
+
+            return fastmcp.__version__
+        except (ImportError, AttributeError):
+            return None
+
+    def _is_fastmcp_version_gte(self, target_version: str) -> bool:
+        """Check if installed FastMCP version is >= target version.
+
+        Args:
+            target_version: Version string to compare against (e.g., "2.12.0")
+
+        Returns:
+            True if FastMCP version >= target_version, False otherwise
+        """
+        try:
+            from packaging import version
+
+            current_version = self._get_fastmcp_version()
+            if current_version is None:
+                # Default to older behavior for safety
+                return False
+
+            return version.parse(current_version) >= version.parse(target_version)
+        except (ImportError, ValueError):
+            # Default to older behavior for safety
+            return False
+
 
 def build_manifest(project_path: Path, settings: Settings) -> dict[str, Any]:
     """Build a FastMCP manifest from parsed components.
@@ -511,6 +546,41 @@ class CodeGenerator:
             and len(component.parameters) > 0
         )
 
+    def _get_fastmcp_version(self) -> str | None:
+        """Get the installed FastMCP version.
+
+        Returns:
+            FastMCP version string (e.g., "2.12.0") or None if not available
+        """
+        try:
+            import fastmcp
+
+            return fastmcp.__version__
+        except (ImportError, AttributeError):
+            return None
+
+    def _is_fastmcp_version_gte(self, target_version: str) -> bool:
+        """Check if installed FastMCP version is >= target version.
+
+        Args:
+            target_version: Version string to compare against (e.g., "2.12.0")
+
+        Returns:
+            True if FastMCP version >= target_version, False otherwise
+        """
+        try:
+            from packaging import version
+
+            current_version = self._get_fastmcp_version()
+            if current_version is None:
+                # Default to older behavior for safety
+                return False
+
+            return version.parse(current_version) >= version.parse(target_version)
+        except (ImportError, ValueError):
+            # Default to older behavior for safety
+            return False
+
     def _generate_server(self) -> None:
         """Generate the main server entry point."""
         server_file = self.output_dir / "server.py"
@@ -956,23 +1026,40 @@ class CodeGenerator:
                 main_code.extend(middleware_setup)
                 main_code.append(f"    middleware = [{', '.join(middleware_list)}]")
                 main_code.append("")
-                main_code.extend(
-                    [
-                        "    # Run SSE server with middleware using FastMCP's run method",
-                        f'    mcp.run(transport="sse", host=host, port=port, '
-                        f'path="{endpoint_path}", log_level="info", '
-                        f"middleware=middleware, show_banner=False)",
-                    ]
-                )
+                if self._is_fastmcp_version_gte("2.12.0"):
+                    main_code.extend(
+                        [
+                            "    # Run SSE server with middleware using FastMCP's run method",
+                            '    mcp.run(transport="sse", host=host, port=port, '
+                            'log_level="info", middleware=middleware, show_banner=False)',
+                        ]
+                    )
+                else:
+                    main_code.extend(
+                        [
+                            "    # Run SSE server with middleware using FastMCP's run method",
+                            f'    mcp.run(transport="sse", host=host, port=port, '
+                            f'path="{endpoint_path}", log_level="info", '
+                            f"middleware=middleware, show_banner=False)",
+                        ]
+                    )
             else:
-                main_code.extend(
-                    [
-                        "    # Run SSE server using FastMCP's run method",
-                        f'    mcp.run(transport="sse", host=host, port=port, '
-                        f'path="{endpoint_path}", log_level="info", '
-                        f"show_banner=False)",
-                    ]
-                )
+                if self._is_fastmcp_version_gte("2.12.0"):
+                    main_code.extend(
+                        [
+                            "    # Run SSE server using FastMCP's run method",
+                            '    mcp.run(transport="sse", host=host, port=port, log_level="info", show_banner=False)',
+                        ]
+                    )
+                else:
+                    main_code.extend(
+                        [
+                            "    # Run SSE server using FastMCP's run method",
+                            f'    mcp.run(transport="sse", host=host, port=port, '
+                            f'path="{endpoint_path}", log_level="info", '
+                            f"show_banner=False)",
+                        ]
+                    )
 
         elif self.settings.transport in ["streamable-http", "http"]:
             # Check if we need middleware for streamable-http
@@ -999,23 +1086,41 @@ class CodeGenerator:
                 main_code.extend(middleware_setup)
                 main_code.append(f"    middleware = [{', '.join(middleware_list)}]")
                 main_code.append("")
-                main_code.extend(
-                    [
-                        "    # Run HTTP server with middleware using FastMCP's run method",
-                        f'    mcp.run(transport="streamable-http", host=host, '
-                        f'port=port, path="{endpoint_path}", log_level="info", '
-                        f"middleware=middleware, show_banner=False)",
-                    ]
-                )
+                if self._is_fastmcp_version_gte("2.12.0"):
+                    main_code.extend(
+                        [
+                            "    # Run HTTP server with middleware using FastMCP's run method",
+                            '    mcp.run(transport="streamable-http", host=host, '
+                            'port=port, log_level="info", middleware=middleware, show_banner=False)',
+                        ]
+                    )
+                else:
+                    main_code.extend(
+                        [
+                            "    # Run HTTP server with middleware using FastMCP's run method",
+                            f'    mcp.run(transport="streamable-http", host=host, '
+                            f'port=port, path="{endpoint_path}", log_level="info", '
+                            f"middleware=middleware, show_banner=False)",
+                        ]
+                    )
             else:
-                main_code.extend(
-                    [
-                        "    # Run HTTP server using FastMCP's run method",
-                        f'    mcp.run(transport="streamable-http", host=host, '
-                        f'port=port, path="{endpoint_path}", log_level="info", '
-                        f"show_banner=False)",
-                    ]
-                )
+                if self._is_fastmcp_version_gte("2.12.0"):
+                    main_code.extend(
+                        [
+                            "    # Run HTTP server using FastMCP's run method",
+                            '    mcp.run(transport="streamable-http", host=host, '
+                            'port=port, log_level="info", show_banner=False)',
+                        ]
+                    )
+                else:
+                    main_code.extend(
+                        [
+                            "    # Run HTTP server using FastMCP's run method",
+                            f'    mcp.run(transport="streamable-http", host=host, '
+                            f'port=port, path="{endpoint_path}", log_level="info", '
+                            f"show_banner=False)",
+                        ]
+                    )
         else:
             # For stdio transport, use mcp.run()
             main_code.extend(["    # Run with stdio transport", '    mcp.run(transport="stdio", show_banner=False)'])

{golf_mcp-0.2.6 → golf_mcp-0.2.9}/src/golf_mcp.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: golf-mcp
-Version: 0.2.6
+Version: 0.2.9
 Summary: Framework for building MCP servers
 Author-email: Antoni Gmitruk <antoni@golf.dev>
 License-Expression: Apache-2.0
@@ -132,7 +132,6 @@ A Golf project initialized with `golf init` will have a structure similar to thi
 -   **`auth.py`**: Dedicated authentication configuration file (new in v0.2.0, breaking change from v0.1.x authentication API) for JWT, OAuth Server, API key, or development authentication.
 -   **`tools/`**, **`resources/`**, **`prompts/`**: Contain your Python files, each defining a single component. These directories can also contain nested subdirectories to further organize your components (e.g., `tools/payments/charge.py`). The module docstring of each file serves as the component's description.
     -   Component IDs are automatically derived from their file path. For example, `tools/hello.py` becomes `hello`, and a nested file like `tools/payments/submit.py` would become `submit_payments` (filename, followed by reversed parent directories under the main category, joined by underscores).
--   **`common.py`** (not shown, but can be placed in subdirectories like `tools/payments/common.py`): Used to share code (clients, models, etc.) among components in the same subdirectory.
 
 ## Example: Defining a Tool