golf-mcp 0.2.6__py3-none-any.whl → 0.2.8__py3-none-any.whl

golf/__init__.py

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

golf/auth/__init__.py

@@ -235,7 +235,7 @@ 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,
     )
     configure_auth(config)

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/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.dist-info → golf_mcp-0.2.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: golf-mcp
-Version: 0.2.6
+Version: 0.2.8
 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.dist-info → golf_mcp-0.2.8.dist-info}/RECORD

@@ -1,12 +1,12 @@
-golf/__init__.py,sha256=qWIRfT1s1Et0Jru9N8JfQhbMc-CsZpqWQV9S0Ay5YPk,306
+golf/__init__.py,sha256=22iRBt6mUc1Eiq6uhr-REdh-_NN9o_9MFc7aHLsImkM,306
 golf/_endpoints.py,sha256=-mvAmjx3YtqfAdajO13Kv7LKVBMdqsKqX0_3aCmCK4I,317
 golf/_endpoints.py.in,sha256=MeqcSF6xinnPknpBGF26xA9FYmSYKSWqCFXOSDlXiOA,216
 golf/_endpoints_fallback.py,sha256=CD6m45Ams1A9HVKowY8dCFUDMiFmJ8ZWSwHCENvU5u4,386
-golf/auth/__init__.py,sha256=u-6_EFTvfs91B2Jko39swp3tCpHkj3r9wDQzQBmfxn0,8027
+golf/auth/__init__.py,sha256=9VsuGjoP-MTY-CRiPfPKGuD096OMUpCQoAlMJU8RzIE,8021
 golf/auth/api_key.py,sha256=OonqTlG6USJxqK8TlPviJTv7sgYmTVfCxG_JsEjnEM4,2320
 golf/auth/factory.py,sha256=3-il1GbjjZlQfvWUZs-09r61Y_-b5cYEegWF7sY_cUs,13128
 golf/auth/helpers.py,sha256=WoYyjUAQwgDnLvJDvyhuEOmm8w0fQ-ZDqaYxs_lC8nw,8127
-golf/auth/providers.py,sha256=qgybeHtrb0MojUsXZm813gzT4zBCNxCiSCWvxKG2iis,25950
+golf/auth/providers.py,sha256=f89WeQUrYopS0GBcTO3yXlqyPQvG7s7GpaiUK2tb2ME,25048
 golf/auth/registry.py,sha256=Rjj7LnWvzEsI1GCnFbFcxpRllrVanD9bumWPaJ1giFQ,7960
 golf/cli/__init__.py,sha256=R8Y8KdD2C8gDo24fXGq-fdWWNeaq3MYjrbaSB8Hb-Hg,45
 golf/cli/branding.py,sha256=ndpy2kVxBzqr4fwsAlh_fbhxqgRPoF6kM3ufP9hg5QI,6896
@@ -16,7 +16,7 @@ golf/commands/build.py,sha256=sLq9lSW4naq2vIlBreKI5SGnviQrhBWw13zfOZOKhuM,2293
 golf/commands/init.py,sha256=KkAg_3-KxBDFOcZqUHqcPAkDipykFVaLWpQ2tydnVPk,9617
 golf/commands/run.py,sha256=a8GSwLt6E2cUJespv-u3jbD-rNUMHqF3VArD1uXV-Vk,4299
 golf/core/__init__.py,sha256=4bKeskJ2fPaZqkz2xQScSa3phRLLrmrczwSL632jv-o,52
-golf/core/builder.py,sha256=Ghm9YUDIWnUc0bIxfKD75OZIa-h0B61iC26OEmfA4ug,62214
+golf/core/builder.py,sha256=Tx6AtWnnasY_Rfu1CEdhE7y3hZdN0RuhwLevJU9vZgo,66355
 golf/core/builder_auth.py,sha256=SXPCpc5ipntoNqIAIA2ZCeGmEua6QVs7yC3MDtGKAro,8224
 golf/core/builder_metrics.py,sha256=j6Gtgd867o46JbDfSNGNsHt1QtV1XHKUJs1z8r4siQM,8830
 golf/core/builder_telemetry.py,sha256=86bp7UlMUN6JyQRrZ5EizovP6AJ_q65OANJTeJXDIKc,3421
@@ -48,9 +48,9 @@ golf/utilities/__init__.py,sha256=X9iY9yi3agz1GVcn8-qWeOCt8CSSsruHxqPNtiF63TY,53
 golf/utilities/context.py,sha256=DGGvhVe---QMhy0wtdWhNp-_WVk1NvAcOFn0uBKBpYo,1579
 golf/utilities/elicitation.py,sha256=MParZZZsY45s70-KXduHa6IvpWXnLW2FCPfrGijMaHs,5223
 golf/utilities/sampling.py,sha256=88nDv-trBE4gZQbcnMjXl3LW6TiIhv5zR_cuEIGjaIM,7233
-golf_mcp-0.2.6.dist-info/licenses/LICENSE,sha256=5_j2f6fTJmvfmUewzElhkpAaXg2grVoxKouOA8ihV6E,11348
-golf_mcp-0.2.6.dist-info/METADATA,sha256=yE954KDxWowq6DfMIUQne6Ypl4LsWEqSTeqeHFXomaE,9558
-golf_mcp-0.2.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-golf_mcp-0.2.6.dist-info/entry_points.txt,sha256=5y7rHYM8jGpU-nfwdknCm5XsApLulqsnA37MO6BUTYg,43
-golf_mcp-0.2.6.dist-info/top_level.txt,sha256=BQToHcBUufdyhp9ONGMIvPE40jMEtmI20lYaKb4hxOg,5
-golf_mcp-0.2.6.dist-info/RECORD,,
+golf_mcp-0.2.8.dist-info/licenses/LICENSE,sha256=5_j2f6fTJmvfmUewzElhkpAaXg2grVoxKouOA8ihV6E,11348
+golf_mcp-0.2.8.dist-info/METADATA,sha256=ebA3N_gR-sN6BRMP8j-2I-7VOn52L18Yih6C6vlK4cs,9370
+golf_mcp-0.2.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+golf_mcp-0.2.8.dist-info/entry_points.txt,sha256=5y7rHYM8jGpU-nfwdknCm5XsApLulqsnA37MO6BUTYg,43
+golf_mcp-0.2.8.dist-info/top_level.txt,sha256=BQToHcBUufdyhp9ONGMIvPE40jMEtmI20lYaKb4hxOg,5
+golf_mcp-0.2.8.dist-info/RECORD,,