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

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

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

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

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

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

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

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

@@ -35,6 +35,7 @@ from .helpers import (
     debug_api_key_context,
     extract_token_from_header,
     get_api_key,
+    get_auth_token,
     get_provider_token,
     set_api_key,
 )
@@ -72,6 +73,7 @@ __all__ = [
     "debug_api_key_context",
     "extract_token_from_header",
     "get_api_key",
+    "get_auth_token",
     "get_provider_token",
     "set_api_key",
 ]
@@ -195,14 +197,14 @@ def configure_dev_auth(
 
 
 def configure_oauth_proxy(
-    upstream_authorization_endpoint: str,
-    upstream_token_endpoint: str,
-    upstream_client_id: str,
-    upstream_client_secret: str,
+    authorization_endpoint: str,
+    token_endpoint: str,
+    client_id: str,
+    client_secret: str,
     base_url: str,
     token_verifier_config: JWTAuthConfig | StaticTokenConfig,
     scopes_supported: list[str] | None = None,
-    upstream_revocation_endpoint: str | None = None,
+    revocation_endpoint: str | None = None,
     redirect_path: str = "/oauth/callback",
 ) -> None:
     """Configure OAuth proxy authentication for non-DCR providers.
@@ -212,25 +214,25 @@ def configure_oauth_proxy(
     fixed client credentials.
 
     Args:
-        upstream_authorization_endpoint: Provider's authorization URL
-        upstream_token_endpoint: Provider's token endpoint URL
-        upstream_client_id: Your client ID registered with the provider
-        upstream_client_secret: Your client secret from the provider
+        authorization_endpoint: Provider's authorization URL
+        token_endpoint: Provider's token endpoint URL
+        client_id: Your client ID registered with the provider
+        client_secret: Your client secret from the provider
         base_url: This proxy server's public URL
         token_verifier_config: JWT or static token config for token verification
         scopes_supported: Scopes to advertise to MCP clients
-        upstream_revocation_endpoint: Optional token revocation endpoint
+        revocation_endpoint: Optional token revocation endpoint
         redirect_path: OAuth callback path (default: /oauth/callback)
 
     Note:
         Requires golf-mcp-enterprise package for implementation.
     """
     config = OAuthProxyConfig(
-        upstream_authorization_endpoint=upstream_authorization_endpoint,
-        upstream_token_endpoint=upstream_token_endpoint,
-        upstream_client_id=upstream_client_id,
-        upstream_client_secret=upstream_client_secret,
-        upstream_revocation_endpoint=upstream_revocation_endpoint,
+        authorization_endpoint=authorization_endpoint,
+        token_endpoint=token_endpoint,
+        client_id=client_id,
+        client_secret=client_secret,
+        revocation_endpoint=revocation_endpoint,
         base_url=base_url,
         redirect_path=redirect_path,
         scopes_supported=scopes_supported or [],

{golf_mcp-0.2.4 → golf_mcp-0.2.6}/src/golf/auth/helpers.py

@@ -142,6 +142,72 @@ def get_api_key_from_request(request: Request) -> str | None:
     return _current_api_key.get()
 
 
+def get_auth_token() -> str | None:
+    """Get the authorization token from the current request context.
+
+    This function should be used in tools to retrieve the authorization token
+    (typically a JWT or OAuth token) that was sent in the request headers.
+
+    Unlike get_api_key(), this function extracts the raw token from the Authorization
+    header without stripping any prefix, making it suitable for passing through
+    to upstream APIs that expect the full Authorization header value.
+
+    Returns:
+        The authorization token if available, None otherwise
+
+    Example:
+        # In a tool file
+        from golf.auth import get_auth_token
+
+        async def call_upstream_api():
+            auth_token = get_auth_token()
+            if not auth_token:
+                return {"error": "No authorization token provided"}
+
+            # Use the full token in upstream request
+            headers = {"Authorization": f"Bearer {auth_token}"}
+            async with httpx.AsyncClient() as client:
+                response = await client.get("https://api.example.com/data", headers=headers)
+            ...
+    """
+    # Try to get directly from HTTP request if available (FastMCP pattern)
+    try:
+        # This follows the FastMCP pattern for accessing HTTP requests
+        from fastmcp.server.dependencies import get_http_request
+
+        request = get_http_request()
+
+        if request and hasattr(request, "state") and hasattr(request.state, "auth_token"):
+            return request.state.auth_token
+
+        if request:
+            # Extract authorization token from Authorization header
+            auth_header = None
+            for k, v in request.headers.items():
+                if k.lower() == "authorization":
+                    auth_header = v
+                    break
+
+            if auth_header:
+                # Extract the token part (everything after "Bearer ")
+                token = extract_token_from_header(auth_header)
+                if token:
+                    return token
+
+                # If not Bearer format, return the whole header value minus "Bearer " prefix if present
+                if auth_header.lower().startswith("bearer "):
+                    return auth_header[7:]  # Remove "Bearer " prefix
+                return auth_header
+
+    except (ImportError, RuntimeError):
+        # FastMCP not available or not in HTTP context
+        pass
+    except Exception:
+        pass
+
+    return None
+
+
 def debug_api_key_context() -> dict[str, Any]:
     """Debug function to inspect API key context.
 

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

@@ -458,12 +458,12 @@ class OAuthProxyConfig(BaseModel):
 
     provider_type: Literal["oauth_proxy"] = "oauth_proxy"
 
-    # Upstream OAuth provider configuration
-    upstream_authorization_endpoint: str = Field(..., description="Upstream provider's authorization endpoint URL")
-    upstream_token_endpoint: str = Field(..., description="Upstream provider's token endpoint URL")
-    upstream_client_id: str = Field(..., description="Your registered client ID with the upstream provider")
-    upstream_client_secret: str = Field(..., description="Your registered client secret with the upstream provider")
-    upstream_revocation_endpoint: str | None = Field(None, description="Optional upstream token revocation endpoint")
+    # OAuth provider configuration
+    authorization_endpoint: str = Field(..., description="OAuth provider's authorization endpoint URL")
+    token_endpoint: str = Field(..., description="OAuth provider's token endpoint URL")
+    client_id: str = Field(..., description="Your registered client ID with the OAuth provider")
+    client_secret: str = Field(..., description="Your registered client secret with the OAuth provider")
+    revocation_endpoint: str | None = Field(None, description="Optional token revocation endpoint")
 
     # This proxy server configuration
     base_url: str = Field(..., description="Public URL of this OAuth proxy server")
@@ -476,22 +476,18 @@ class OAuthProxyConfig(BaseModel):
     )
 
     # Environment variable names for runtime configuration
-    upstream_authorization_endpoint_env_var: str | None = Field(
-        None, description="Environment variable name for upstream authorization endpoint"
+    authorization_endpoint_env_var: str | None = Field(
+        None, description="Environment variable name for authorization endpoint"
     )
-    upstream_token_endpoint_env_var: str | None = Field(
-        None, description="Environment variable name for upstream token endpoint"
-    )
-    upstream_client_id_env_var: str | None = Field(None, description="Environment variable name for upstream client ID")
-    upstream_client_secret_env_var: str | None = Field(
-        None, description="Environment variable name for upstream client secret"
-    )
-    upstream_revocation_endpoint_env_var: str | None = Field(
-        None, description="Environment variable name for upstream revocation endpoint"
+    token_endpoint_env_var: str | None = Field(None, description="Environment variable name for token endpoint")
+    client_id_env_var: str | None = Field(None, description="Environment variable name for client ID")
+    client_secret_env_var: str | None = Field(None, description="Environment variable name for client secret")
+    revocation_endpoint_env_var: str | None = Field(
+        None, description="Environment variable name for revocation endpoint"
     )
     base_url_env_var: str | None = Field(None, description="Environment variable name for base URL")
 
-    @field_validator("upstream_authorization_endpoint", "upstream_token_endpoint", "base_url")
+    @field_validator("authorization_endpoint", "token_endpoint", "base_url")
     @classmethod
     def validate_required_urls(cls, v: str) -> str:
         """Validate required URLs are properly formatted."""
@@ -514,7 +510,7 @@ class OAuthProxyConfig(BaseModel):
 
         return url
 
-    @field_validator("upstream_revocation_endpoint")
+    @field_validator("revocation_endpoint")
     @classmethod
     def validate_optional_url(cls, v: str | None) -> str | None:
         """Validate optional URLs are properly formatted."""
@@ -588,12 +584,12 @@ class OAuthProxyConfig(BaseModel):
 
             urls_to_check = [
                 ("base_url", self.base_url),
-                ("upstream_authorization_endpoint", self.upstream_authorization_endpoint),
-                ("upstream_token_endpoint", self.upstream_token_endpoint),
+                ("authorization_endpoint", self.authorization_endpoint),
+                ("token_endpoint", self.token_endpoint),
             ]
 
-            if self.upstream_revocation_endpoint:
-                urls_to_check.append(("upstream_revocation_endpoint", self.upstream_revocation_endpoint))
+            if self.revocation_endpoint:
+                urls_to_check.append(("revocation_endpoint", self.revocation_endpoint))
 
             for field_name, url in urls_to_check:
                 parsed = urlparse(url)

{golf_mcp-0.2.4 → golf_mcp-0.2.6}/src/golf/examples/basic/resources/weather/city.py

@@ -3,7 +3,7 @@
 from datetime import datetime
 from typing import Any
 
-from .common import weather_client
+from .client import weather_client
 
 # The URI template that clients will use to access this resource
 # The {city} parameter makes this a resource template
@@ -16,7 +16,7 @@ async def get_weather_for_city(city: str) -> dict[str, Any]:
     This example demonstrates:
     1. Resource templates with URI parameters ({city})
     2. Dynamic resource access based on parameters
-    3. Using shared client from the common.py file
+    3. Using shared client from the client.py file
     4. FastMCP 2.11+ ResourceTemplate.from_function() usage
 
     Args:
@@ -25,7 +25,7 @@ async def get_weather_for_city(city: str) -> dict[str, Any]:
     Returns:
         Weather data for the specified city
     """
-    # Use the shared weather client from common.py
+    # Use the shared weather client from client.py
     weather_data = await weather_client.get_current(city)
 
     # Add some additional data

golf_mcp-0.2.4/src/golf/examples/basic/resources/weather/common.py → golf_mcp-0.2.6/src/golf/examples/basic/resources/weather/client.py

@@ -1,7 +1,8 @@
 """Weather shared functionality.
 
-This common.py file demonstrates the recommended pattern for
+This file demonstrates the recommended pattern for
 sharing functionality across multiple resources in a directory.
+Golf automatically discovers and includes shared Python files in builds.
 """
 
 import os

{golf_mcp-0.2.4 → golf_mcp-0.2.6}/src/golf/examples/basic/resources/weather/current.py

@@ -3,7 +3,7 @@
 from datetime import datetime
 from typing import Any
 
-from .common import weather_client
+from .client import weather_client
 
 # The URI that clients will use to access this resource
 resource_uri = "weather://current"
@@ -15,9 +15,9 @@ async def current_weather() -> dict[str, Any]:
     This example demonstrates:
     1. Nested resource organization (resources/weather/current.py)
     2. Resource without URI parameters
-    3. Using shared client from the common.py file
+    3. Using shared client from the client.py file
     """
-    # Use the shared weather client from common.py
+    # Use the shared weather client from client.py
     weather_data = await weather_client.get_current("New York")
 
     # Add some additional data

{golf_mcp-0.2.4 → golf_mcp-0.2.6}/src/golf/examples/basic/resources/weather/forecast.py

@@ -3,7 +3,7 @@
 from datetime import datetime
 from typing import Any
 
-from .common import weather_client
+from .client import weather_client
 
 # The URI that clients will use to access this resource
 resource_uri = "weather://forecast"
@@ -15,9 +15,9 @@ async def forecast_weather() -> dict[str, Any]:
     This example demonstrates:
     1. Nested resource organization (resources/weather/forecast.py)
     2. Resource without URI parameters
-    3. Using shared client from the common.py file
+    3. Using shared client from the client.py file
     """
-    # Use the shared weather client from common.py
+    # Use the shared weather client from client.py
     forecast_data = await weather_client.get_forecast("New York", days=5)
 
     # Add some additional data

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

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

{golf_mcp-0.2.4 → golf_mcp-0.2.6}/src/golf_mcp.egg-info/SOURCES.txt

@@ -41,7 +41,7 @@ src/golf/examples/basic/prompts/welcome.py
 src/golf/examples/basic/resources/current_time.py
 src/golf/examples/basic/resources/info.py
 src/golf/examples/basic/resources/weather/city.py
-src/golf/examples/basic/resources/weather/common.py
+src/golf/examples/basic/resources/weather/client.py
 src/golf/examples/basic/resources/weather/current.py
 src/golf/examples/basic/resources/weather/forecast.py
 src/golf/examples/basic/tools/calculator.py