golf-mcp 0.2.7__tar.gz → 0.2.10__tar.gz

{golf_mcp-0.2.7 → golf_mcp-0.2.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: golf-mcp
-Version: 0.2.7
+Version: 0.2.10
 Summary: Framework for building MCP servers
 Author-email: Antoni Gmitruk <antoni@golf.dev>
 License-Expression: Apache-2.0

{golf_mcp-0.2.7 → golf_mcp-0.2.10}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "golf-mcp"
-version = "0.2.7"
+version = "0.2.10"
 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.7"
+version = "0.2.10"
 description = "Framework for building MCP servers with zero boilerplate"
 authors = ["Antoni Gmitruk <antoni@golf.dev>"]
 license = "Apache-2.0"

{golf_mcp-0.2.7 → golf_mcp-0.2.10}/src/golf/__init__.py

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

{golf_mcp-0.2.7 → golf_mcp-0.2.10}/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.7 → golf_mcp-0.2.10}/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.7 → golf_mcp-0.2.10}/src/golf/core/builder.py

@@ -581,6 +581,70 @@ class CodeGenerator:
             # Default to older behavior for safety
             return False
 
+    def _generate_startup_section(self, project_path: Path) -> list[str]:
+        """Generate code section for startup.py execution during server runtime."""
+        startup_path = project_path / "startup.py"
+
+        if not startup_path.exists():
+            return []
+
+        return [
+            "",
+            "# Execute startup script for loading secrets and initialization",
+            "import importlib.util",
+            "import sys",
+            "import os",
+            "from pathlib import Path",
+            "",
+            "# Look for startup.py in the same directory as this server.py",
+            "startup_path = Path(__file__).parent / 'startup.py'",
+            "if startup_path.exists():",
+            "    try:",
+            "        # Save original environment for restoration",
+            "        try:",
+            "            original_dir = os.getcwd()",
+            "        except (FileNotFoundError, OSError):",
+            "            # Use server directory as fallback",
+            "            original_dir = str(Path(__file__).parent)",
+            "            os.chdir(original_dir)",
+            "        original_path = sys.path.copy()",
+            "        ",
+            "        # Set context for startup script execution",
+            "        script_dir = str(startup_path.parent)",
+            "        os.chdir(script_dir)",
+            "        sys.path.insert(0, script_dir)",
+            "        ",
+            "        # Debug output for startup script development",
+            "        if os.environ.get('GOLF_DEBUG'):",
+            "            print(f'Executing startup script: {startup_path}')",
+            "            print(f'Working directory: {os.getcwd()}')",
+            "            print(f'Python path: {sys.path[:3]}...')",  # Show first 3 entries
+            "        ",
+            "        # Load and execute startup script",
+            "        spec = importlib.util.spec_from_file_location('startup', startup_path)",
+            "        if spec and spec.loader:",
+            "            startup_module = importlib.util.module_from_spec(spec)",
+            "            spec.loader.exec_module(startup_module)",
+            "        else:",
+            "            print('Warning: Could not load startup.py', file=sys.stderr)",
+            "        ",
+            "    except Exception as e:",
+            "        import traceback",
+            "        print(f'Warning: Startup script execution failed: {e}', file=sys.stderr)",
+            "        print(traceback.format_exc(), file=sys.stderr)",
+            "        # Continue server startup despite script failure",
+            "        ",
+            "    finally:",
+            "        # Always restore original environment",
+            "        try:",
+            "            os.chdir(original_dir)",
+            "            sys.path[:] = original_path",
+            "        except Exception:",
+            "            # If directory restoration fails, at least fix the path",
+            "            sys.path[:] = original_path",
+            "",
+        ]
+
     def _generate_server(self) -> None:
         """Generate the main server entry point."""
         server_file = self.output_dir / "server.py"
@@ -935,6 +999,9 @@ class CodeGenerator:
             "",
         ]
 
+        # Generate startup section
+        startup_section = self._generate_startup_section(self.project_path)
+
         # OpenTelemetry setup code will be handled through imports and lifespan
 
         # Add auth setup code if auth is configured
@@ -1145,12 +1212,13 @@ class CodeGenerator:
             ]
 
         # Combine all sections
-        # Order: imports, env_section, auth_setup, server_code (mcp init),
+        # Order: imports, env_section, startup_section, auth_setup, server_code (mcp init),
         # early_telemetry_init, early_metrics_init, component_registrations,
         # metrics_route_code, health_check_code, main_code (run block)
         code = "\n".join(
             imports
             + env_section
+            + startup_section
             + auth_setup_code
             + server_code_lines
             + early_telemetry_init
@@ -1352,6 +1420,13 @@ def build_project(
     generator = CodeGenerator(project_path, settings, output_dir, build_env=build_env, copy_env=copy_env)
     generator.generate()
 
+    # Copy startup.py to output directory if it exists (after server generation)
+    startup_path = project_path / "startup.py"
+    if startup_path.exists():
+        dest_path = output_dir / "startup.py"
+        shutil.copy2(startup_path, dest_path)
+        console.print(get_status_text("success", "Startup script copied to build directory"))
+
     # Platform registration (only for prod builds)
     if build_env == "prod":
         console.print()

{golf_mcp-0.2.7 → golf_mcp-0.2.10}/src/golf_mcp.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: golf-mcp
-Version: 0.2.7
+Version: 0.2.10
 Summary: Framework for building MCP servers
 Author-email: Antoni Gmitruk <antoni@golf.dev>
 License-Expression: Apache-2.0