dataquery-sdk 1.2.4__tar.gz → 1.2.6__tar.gz

{dataquery_sdk-1.2.4 → dataquery_sdk-1.2.6}/CHANGELOG.md

@@ -53,5 +53,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Exports: `Paginated`, `Link`, `APIResponseError` are now part of the public API
 ## [1.2.4] - 2026-08-12
 - MCP: `mcp-connect` accepts `--client-id`, `--client-secret` and `--bearer-token` and exports them into the `DATAQUERY_*` environment of the process, so the MCP bridge and the SDK share one credential set instead of each needing its own setup
- 
- 
+## [1.2.5] - 2026-08-21
+- MCP: `mcp-connect --url` is now optional
+## [1.2.6] - 2026-09-24
+- Bug fixes
+- MCP: capped the `mcp` extra to `fastmcp>=2.14,<4` — fastmcp 4.x repackages onto `httpx2` and drops `FastMCP.as_proxy()`, which broke `mcp-connect`; installs now resolve to the 3.x line

{dataquery_sdk-1.2.4 → dataquery_sdk-1.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dataquery-sdk
-Version: 1.2.4
+Version: 1.2.6
 Summary: Python SDK for DATAQUERY Data API - Query, download, and check availability of economic data files
 Author-email: DATAQUERY SDK Team <dataquery_support@jpmorgan.com>
 Project-URL: Homepage, https://github.com/jpmorganchase/dataquery-sdk
@@ -50,7 +50,7 @@ Requires-Dist: pymdown-extensions>=11.0.0; extra == "docs"
 Provides-Extra: pandas
 Requires-Dist: pandas>=2.0.0; extra == "pandas"
 Provides-Extra: mcp
-Requires-Dist: fastmcp>=2.14; extra == "mcp"
+Requires-Dist: fastmcp<4,>=2.14; extra == "mcp"
 Provides-Extra: all
 Requires-Dist: pytest>=7.0.0; extra == "all"
 Requires-Dist: pytest-asyncio>=0.21.0; extra == "all"
@@ -63,7 +63,7 @@ Requires-Dist: mkdocs-material>=9.0.0; extra == "all"
 Requires-Dist: mkdocstrings[python]>=0.24.0; extra == "all"
 Requires-Dist: mike>=1.1.0; extra == "all"
 Requires-Dist: pandas>=2.0.0; extra == "all"
-Requires-Dist: fastmcp>=2.14; extra == "all"
+Requires-Dist: fastmcp<4,>=2.14; extra == "all"
 Requires-Dist: pip-audit>=2.7.0; extra == "all"
 Requires-Dist: build>=1.3.0; extra == "all"
 Requires-Dist: urllib3>=2.7.0; extra == "all"
@@ -98,6 +98,7 @@ built in for both.
 - [Quick start — JSON Data API](#quick-start--json-data-api)
 - [Auto-download (SSE)](#auto-download-sse)
 - [CLI](#cli)
+- [MCP bridge (`mcp-connect`)](#mcp-bridge-mcp-connect)
 - [Configuration](#configuration)
 - [Logging](#logging)
 - [Error handling](#error-handling)
@@ -140,6 +141,9 @@ through one `DataQuery` client — pick the methods that match what you need.
 - **Retry + circuit breaker** — exponential backoff, configurable failure threshold
 - **Sync and async APIs** — every operation has `_async` and sync variants
 - **CLI** — `dataquery groups | files | availability | download | download-group | auth | config`
+- **MCP bridge** — `dataquery mcp-connect` connects any stdio MCP client
+  (Claude Desktop, Claude Code, …) to the remote DataQuery MCP server, minting
+  OAuth tokens for it
 
 ## New here? Three steps to your first download
 
@@ -172,6 +176,9 @@ pip install dataquery-sdk
 # With pandas DataFrame conversion
 pip install "dataquery-sdk[pandas]"
 
+# With the MCP bridge (dataquery mcp-connect)
+pip install "dataquery-sdk[mcp]"
+
 # With dev tooling (ruff, mypy, pytest)
 pip install "dataquery-sdk[dev]"
 ```
@@ -439,8 +446,134 @@ dataquery config template --output .env
 dataquery auth test
 ```
 
-Every subcommand accepts `--env-file PATH` (to point at a non-default `.env`) and
-most accept `--json` for machine-readable output.
+`--env-file PATH` (to point at a non-default `.env`) is a top-level flag, so it
+goes *before* the subcommand: `dataquery --env-file .env.prod groups`. Most
+subcommands accept `--json` for machine-readable output.
+
+## MCP bridge (`mcp-connect`)
+
+`dataquery mcp-connect` connects a desktop MCP client — Claude Desktop, Claude
+Code, or any stdio MCP host — to the remote DataQuery MCP server. It speaks
+stdio to the client and streamable HTTP to the server, stamping every outbound
+request with a fresh OAuth (AuthE) bearer token minted from your `DATAQUERY_*`
+credentials. Tokens are refreshed for the life of the session, and the MCP host
+itself never handles your client secret.
+
+It needs the `mcp` extra:
+
+```bash
+pip install "dataquery-sdk[mcp]"
+```
+
+### Wire it into an MCP client
+
+Add the server to your client's MCP config (`claude_desktop_config.json`,
+`.mcp.json`, or the equivalent for your host):
+
+```json
+{
+  "mcpServers": {
+    "dataquery": {
+      "command": "dataquery",
+      "args": ["mcp-connect", "--save-credentials"],
+      "env": {
+        "DATAQUERY_CLIENT_ID": "your_client_id",
+        "DATAQUERY_CLIENT_SECRET": "your_client_secret"
+      }
+    }
+  }
+}
+```
+
+`--save-credentials` copies the credentials it resolved into
+`~/.dataquery/.env` on the first launch (see [Credentials](#credentials)). From
+then on the bridge — and every other SDK call and CLI run on the machine —
+finds them there, so you can drop the `env` block from the config and keep your
+secret out of a file your MCP client reads on every start:
+
+```json
+{
+  "mcpServers": {
+    "dataquery": {
+      "command": "dataquery",
+      "args": ["mcp-connect"]
+    }
+  }
+}
+```
+
+To skip installing anything, run it straight from PyPI with `uvx`:
+
+```json
+{
+  "mcpServers": {
+    "dataquery": {
+      "command": "uvx",
+      "args": ["--from", "dataquery-sdk[mcp]", "dataquery", "mcp-connect", "--save-credentials"],
+      "env": {
+        "DATAQUERY_CLIENT_ID": "your_client_id",
+        "DATAQUERY_CLIENT_SECRET": "your_client_secret"
+      }
+    }
+  }
+}
+```
+
+### Endpoint
+
+`--url` is optional. The endpoint resolves as `--url` → `DATAQUERY_MCP_URL` →
+the production server
+`https://api-dataquery.jpmchase.com/research/dataquery-authe/v2/mcp`:
+
+```bash
+# Production (no arguments needed)
+dataquery mcp-connect
+
+# Another environment
+dataquery mcp-connect --url https://host/research/dataquery-authe/v2/mcp
+DATAQUERY_MCP_URL=https://host/research/dataquery-authe/v2/mcp dataquery mcp-connect
+```
+
+### Credentials
+
+Credentials resolve exactly as they do everywhere else in the SDK — flags win,
+then the process environment (what your MCP client exports), then a `.env`,
+then the saved user-level file:
+
+```bash
+# From the environment (recommended)
+dataquery mcp-connect
+
+# From flags — visible in the process list, so avoid on shared machines
+dataquery mcp-connect --client-id ID --client-secret SECRET
+
+# From a non-default .env (top-level flag: before the subcommand)
+dataquery --env-file .env.prod mcp-connect
+
+# Bearer token instead of OAuth
+dataquery mcp-connect --bearer-token TOKEN
+```
+
+Pass `--save-credentials` once and the resolved credentials are written to
+`~/.dataquery/.env` (owner-only `0600` file in a `0700` directory; override the
+directory with `DATAQUERY_CONFIG_DIR`). Every later SDK call and CLI run reads
+that file as a last-resort fallback, so a plain `DataQuery()` in a script
+authenticates with no environment of its own — while shell variables and a
+local `.env` still take precedence over it.
+
+### Flags
+
+| Flag | Default | Purpose |
+|---|---|---|
+| `--url URL` | `DATAQUERY_MCP_URL`, else the PROD endpoint | Remote MCP endpoint |
+| `--name NAME` | `dataquery-mcp` | Proxy server name reported to the MCP client |
+| `--client-id ID` | _(from env)_ | OAuth client ID; exported as `DATAQUERY_CLIENT_ID` |
+| `--client-secret SECRET` | _(from env)_ | OAuth client secret; exported as `DATAQUERY_CLIENT_SECRET` |
+| `--bearer-token TOKEN` | _(from env)_ | Use a bearer token instead of OAuth |
+| `--save-credentials` | off | Also persist the resolved credentials to `~/.dataquery/.env` |
+
+Because stdout carries the JSON-RPC channel, all logging and diagnostics go to
+stderr — look in your MCP client's server log when something fails.
 
 ## Configuration
 
@@ -457,6 +590,16 @@ All environment variables use the `DATAQUERY_` prefix.
 | `DATAQUERY_BEARER_TOKEN` | _(none)_ | Alternative to OAuth |
 | `DATAQUERY_OAUTH_ENABLED` | `true` | Set `false` to use bearer-token mode |
 
+**Endpoints**
+
+| Variable | Default | Notes |
+|---|---|---|
+| `DATAQUERY_BASE_URL` | `https://api-dataquery.jpmchase.com` | Host for both API surfaces |
+| `DATAQUERY_FILES_BASE_URL` | same as `BASE_URL` | Override only if file endpoints live on another host |
+| `DATAQUERY_OAUTH_TOKEN_URL` | `https://authe.jpmorgan.com/as/token.oauth2` | Token endpoint |
+| `DATAQUERY_OAUTH_AUD` | PROD audience | Set to the value provisioned for your client |
+| `DATAQUERY_MCP_URL` | PROD MCP endpoint | Endpoint used by [`mcp-connect`](#mcp-bridge-mcp-connect); `--url` overrides it |
+
 **HTTP / retry / rate limit**
 
 | Variable | Default |
@@ -621,6 +764,17 @@ async with DataQuery() as dq:
   `manager.clear_event_id()` (or `dataquery download --watch --reset-event-id`)
   only when you intentionally want a clean slate.
 
+**MCP client shows the server as failed**
+
+- `The MCP bridge requires the 'mcp' extra` in the server log means `fastmcp`
+  is missing — `pip install "dataquery-sdk[mcp]"`, or use the `uvx` form.
+- MCP hosts usually launch the command with a minimal environment, so a
+  `.env` in your shell's working directory may not be visible. Put the
+  credentials in the server's `env` block, or run `dataquery mcp-connect
+  --save-credentials` once from a terminal where they do resolve.
+- Auth failures surface as `Could not obtain an OAuth token`; verify the same
+  credentials with `dataquery auth test` before debugging the bridge.
+
 ## Date formats
 
 ```python

{dataquery_sdk-1.2.4 → dataquery_sdk-1.2.6}/README.md

@@ -26,6 +26,7 @@ built in for both.
 - [Quick start — JSON Data API](#quick-start--json-data-api)
 - [Auto-download (SSE)](#auto-download-sse)
 - [CLI](#cli)
+- [MCP bridge (`mcp-connect`)](#mcp-bridge-mcp-connect)
 - [Configuration](#configuration)
 - [Logging](#logging)
 - [Error handling](#error-handling)
@@ -68,6 +69,9 @@ through one `DataQuery` client — pick the methods that match what you need.
 - **Retry + circuit breaker** — exponential backoff, configurable failure threshold
 - **Sync and async APIs** — every operation has `_async` and sync variants
 - **CLI** — `dataquery groups | files | availability | download | download-group | auth | config`
+- **MCP bridge** — `dataquery mcp-connect` connects any stdio MCP client
+  (Claude Desktop, Claude Code, …) to the remote DataQuery MCP server, minting
+  OAuth tokens for it
 
 ## New here? Three steps to your first download
 
@@ -100,6 +104,9 @@ pip install dataquery-sdk
 # With pandas DataFrame conversion
 pip install "dataquery-sdk[pandas]"
 
+# With the MCP bridge (dataquery mcp-connect)
+pip install "dataquery-sdk[mcp]"
+
 # With dev tooling (ruff, mypy, pytest)
 pip install "dataquery-sdk[dev]"
 ```
@@ -367,8 +374,134 @@ dataquery config template --output .env
 dataquery auth test
 ```
 
-Every subcommand accepts `--env-file PATH` (to point at a non-default `.env`) and
-most accept `--json` for machine-readable output.
+`--env-file PATH` (to point at a non-default `.env`) is a top-level flag, so it
+goes *before* the subcommand: `dataquery --env-file .env.prod groups`. Most
+subcommands accept `--json` for machine-readable output.
+
+## MCP bridge (`mcp-connect`)
+
+`dataquery mcp-connect` connects a desktop MCP client — Claude Desktop, Claude
+Code, or any stdio MCP host — to the remote DataQuery MCP server. It speaks
+stdio to the client and streamable HTTP to the server, stamping every outbound
+request with a fresh OAuth (AuthE) bearer token minted from your `DATAQUERY_*`
+credentials. Tokens are refreshed for the life of the session, and the MCP host
+itself never handles your client secret.
+
+It needs the `mcp` extra:
+
+```bash
+pip install "dataquery-sdk[mcp]"
+```
+
+### Wire it into an MCP client
+
+Add the server to your client's MCP config (`claude_desktop_config.json`,
+`.mcp.json`, or the equivalent for your host):
+
+```json
+{
+  "mcpServers": {
+    "dataquery": {
+      "command": "dataquery",
+      "args": ["mcp-connect", "--save-credentials"],
+      "env": {
+        "DATAQUERY_CLIENT_ID": "your_client_id",
+        "DATAQUERY_CLIENT_SECRET": "your_client_secret"
+      }
+    }
+  }
+}
+```
+
+`--save-credentials` copies the credentials it resolved into
+`~/.dataquery/.env` on the first launch (see [Credentials](#credentials)). From
+then on the bridge — and every other SDK call and CLI run on the machine —
+finds them there, so you can drop the `env` block from the config and keep your
+secret out of a file your MCP client reads on every start:
+
+```json
+{
+  "mcpServers": {
+    "dataquery": {
+      "command": "dataquery",
+      "args": ["mcp-connect"]
+    }
+  }
+}
+```
+
+To skip installing anything, run it straight from PyPI with `uvx`:
+
+```json
+{
+  "mcpServers": {
+    "dataquery": {
+      "command": "uvx",
+      "args": ["--from", "dataquery-sdk[mcp]", "dataquery", "mcp-connect", "--save-credentials"],
+      "env": {
+        "DATAQUERY_CLIENT_ID": "your_client_id",
+        "DATAQUERY_CLIENT_SECRET": "your_client_secret"
+      }
+    }
+  }
+}
+```
+
+### Endpoint
+
+`--url` is optional. The endpoint resolves as `--url` → `DATAQUERY_MCP_URL` →
+the production server
+`https://api-dataquery.jpmchase.com/research/dataquery-authe/v2/mcp`:
+
+```bash
+# Production (no arguments needed)
+dataquery mcp-connect
+
+# Another environment
+dataquery mcp-connect --url https://host/research/dataquery-authe/v2/mcp
+DATAQUERY_MCP_URL=https://host/research/dataquery-authe/v2/mcp dataquery mcp-connect
+```
+
+### Credentials
+
+Credentials resolve exactly as they do everywhere else in the SDK — flags win,
+then the process environment (what your MCP client exports), then a `.env`,
+then the saved user-level file:
+
+```bash
+# From the environment (recommended)
+dataquery mcp-connect
+
+# From flags — visible in the process list, so avoid on shared machines
+dataquery mcp-connect --client-id ID --client-secret SECRET
+
+# From a non-default .env (top-level flag: before the subcommand)
+dataquery --env-file .env.prod mcp-connect
+
+# Bearer token instead of OAuth
+dataquery mcp-connect --bearer-token TOKEN
+```
+
+Pass `--save-credentials` once and the resolved credentials are written to
+`~/.dataquery/.env` (owner-only `0600` file in a `0700` directory; override the
+directory with `DATAQUERY_CONFIG_DIR`). Every later SDK call and CLI run reads
+that file as a last-resort fallback, so a plain `DataQuery()` in a script
+authenticates with no environment of its own — while shell variables and a
+local `.env` still take precedence over it.
+
+### Flags
+
+| Flag | Default | Purpose |
+|---|---|---|
+| `--url URL` | `DATAQUERY_MCP_URL`, else the PROD endpoint | Remote MCP endpoint |
+| `--name NAME` | `dataquery-mcp` | Proxy server name reported to the MCP client |
+| `--client-id ID` | _(from env)_ | OAuth client ID; exported as `DATAQUERY_CLIENT_ID` |
+| `--client-secret SECRET` | _(from env)_ | OAuth client secret; exported as `DATAQUERY_CLIENT_SECRET` |
+| `--bearer-token TOKEN` | _(from env)_ | Use a bearer token instead of OAuth |
+| `--save-credentials` | off | Also persist the resolved credentials to `~/.dataquery/.env` |
+
+Because stdout carries the JSON-RPC channel, all logging and diagnostics go to
+stderr — look in your MCP client's server log when something fails.
 
 ## Configuration
 
@@ -385,6 +518,16 @@ All environment variables use the `DATAQUERY_` prefix.
 | `DATAQUERY_BEARER_TOKEN` | _(none)_ | Alternative to OAuth |
 | `DATAQUERY_OAUTH_ENABLED` | `true` | Set `false` to use bearer-token mode |
 
+**Endpoints**
+
+| Variable | Default | Notes |
+|---|---|---|
+| `DATAQUERY_BASE_URL` | `https://api-dataquery.jpmchase.com` | Host for both API surfaces |
+| `DATAQUERY_FILES_BASE_URL` | same as `BASE_URL` | Override only if file endpoints live on another host |
+| `DATAQUERY_OAUTH_TOKEN_URL` | `https://authe.jpmorgan.com/as/token.oauth2` | Token endpoint |
+| `DATAQUERY_OAUTH_AUD` | PROD audience | Set to the value provisioned for your client |
+| `DATAQUERY_MCP_URL` | PROD MCP endpoint | Endpoint used by [`mcp-connect`](#mcp-bridge-mcp-connect); `--url` overrides it |
+
 **HTTP / retry / rate limit**
 
 | Variable | Default |
@@ -549,6 +692,17 @@ async with DataQuery() as dq:
   `manager.clear_event_id()` (or `dataquery download --watch --reset-event-id`)
   only when you intentionally want a clean slate.
 
+**MCP client shows the server as failed**
+
+- `The MCP bridge requires the 'mcp' extra` in the server log means `fastmcp`
+  is missing — `pip install "dataquery-sdk[mcp]"`, or use the `uvx` form.
+- MCP hosts usually launch the command with a minimal environment, so a
+  `.env` in your shell's working directory may not be visible. Put the
+  credentials in the server's `env` block, or run `dataquery mcp-connect
+  --save-credentials` once from a terminal where they do resolve.
+- Auth failures surface as `Could not obtain an OAuth token`; verify the same
+  credentials with `dataquery auth test` before debugging the bridge.
+
 ## Date formats
 
 ```python

{dataquery_sdk-1.2.4 → dataquery_sdk-1.2.6}/dataquery/__init__.py

@@ -1,6 +1,6 @@
 """DATAQUERY SDK - Python SDK for DATAQUERY Data API."""
 
-__version__ = "1.2.4"
+__version__ = "1.2.6"
 __author__ = "DATAQUERY SDK Team"
 __email__ = "dataquery_support@jpmorgan.com"
 __license__ = "MIT"

{dataquery_sdk-1.2.4 → dataquery_sdk-1.2.6}/dataquery/cli.py

@@ -353,7 +353,10 @@ def create_parser() -> argparse.ArgumentParser:
             "Bridge a desktop MCP client (stdio) to a remote streamable-HTTP MCP\n"
             "server, authenticating with an OAuth client-credentials (AuthE) token\n"
             "minted from the DATAQUERY_* environment. Point your MCP client's\n"
-            "`command` at:  dataquery mcp-connect --url <MCP_URL>\n"
+            "`command` at:  dataquery mcp-connect\n"
+            "\n"
+            "The endpoint defaults to the PROD MCP server; override it with --url\n"
+            "or DATAQUERY_MCP_URL to reach a different environment.\n"
             "\n"
             "Credentials passed as flags are exported into the DATAQUERY_*\n"
             "environment of this process; add --save-credentials to also write\n"
@@ -362,7 +365,11 @@ def create_parser() -> argparse.ArgumentParser:
         ),
         formatter_class=argparse.RawDescriptionHelpFormatter,
     )
-    p_connect.add_argument("--url", required=True, help="Remote MCP endpoint URL")
+    p_connect.add_argument(
+        "--url",
+        default=None,
+        help="Remote MCP endpoint URL (default: DATAQUERY_MCP_URL, else the PROD MCP endpoint)",
+    )
     p_connect.add_argument("--name", default="dataquery-mcp", help="Proxy server name (default: dataquery-mcp)")
     p_connect.add_argument("--client-id", default=None, help="OAuth client ID (exported as DATAQUERY_CLIENT_ID)")
     p_connect.add_argument(
@@ -817,7 +824,7 @@ async def cmd_mcp_connect(args: argparse.Namespace) -> int:
             "The MCP bridge requires the 'mcp' extra. Install it with:\n"
             "    pip install 'dataquery-sdk[mcp]'\n"
             "or run it directly with:\n"
-            "    uvx --from 'dataquery-sdk[mcp]' dataquery mcp-connect --url <MCP_URL>",
+            "    uvx --from 'dataquery-sdk[mcp]' dataquery mcp-connect",
             file=sys.stderr,
         )
         return 1
@@ -836,6 +843,15 @@ async def cmd_mcp_connect(args: argparse.Namespace) -> int:
         _save_mcp_credentials(savable)
 
     config = EnvConfig.create_client_config()
+    # --url wins; otherwise DATAQUERY_MCP_URL, and failing that the model
+    # default (PROD). Only an explicitly emptied env var leaves it unset.
+    url = getattr(args, "url", None) or config.mcp_url
+    if not url:
+        print(
+            "No MCP endpoint configured: pass --url or set DATAQUERY_MCP_URL.",
+            file=sys.stderr,
+        )
+        return 1
     token_manager = TokenManager(config)
 
     class _AutheAuth(httpx.Auth):
@@ -852,7 +868,7 @@ async def cmd_mcp_connect(args: argparse.Namespace) -> int:
             request.headers["Authorization"] = header
             yield request
 
-    transport = StreamableHttpTransport(args.url, auth=_AutheAuth())
+    transport = StreamableHttpTransport(url, auth=_AutheAuth())
     proxy = FastMCP.as_proxy(transport, name=args.name)
     await proxy.run_async(transport="stdio", show_banner=False)
     return 0

{dataquery_sdk-1.2.4 → dataquery_sdk-1.2.6}/dataquery/mcp_proxy.py

@@ -212,10 +212,20 @@ def _emit_stdout(message: Dict[str, Any]) -> None:
     sys.stdout.flush()
 
 
-async def run_mcp_proxy(url: str, env_file: Optional[Path] = None) -> int:
-    """Run the stdio <-> Streamable HTTP proxy until stdin closes."""
+async def run_mcp_proxy(url: Optional[str] = None, env_file: Optional[Path] = None) -> int:
+    """Run the stdio <-> Streamable HTTP proxy until stdin closes.
+
+    ``url`` defaults to ``DATAQUERY_MCP_URL``, and failing that to the PROD MCP
+    endpoint carried by :class:`ClientConfig`.
+    """
     _configure_stderr_logging()
     try:
+        if env_file is not None:
+            EnvConfig.load_env_file(env_file)
+        EnvConfig.load_user_env_file()
+        url = url or EnvConfig.get_env_var("MCP_URL")
+        if not url:
+            raise ConfigurationError("No MCP endpoint configured: pass a url or set DATAQUERY_MCP_URL")
         oauth = _build_oauth_manager(url, env_file)
         await oauth.authenticate()
     except (ConfigurationError, AuthenticationError) as exc:

{dataquery_sdk-1.2.4 → dataquery_sdk-1.2.6}/dataquery/types/models.py

@@ -63,6 +63,10 @@ class ClientConfig(BaseModel):
         default="/research/dataquery-authe/api/v2",
         description="Context path for the files host",
     )
+    mcp_url: Optional[str] = Field(
+        default="https://api-dataquery.jpmchase.com/research/dataquery-authe/v2/mcp",
+        description="Remote MCP endpoint bridged by `dataquery mcp-connect`",
+    )
 
     oauth_enabled: bool = Field(default=True, description="Enable OAuth authentication")
     oauth_token_url: Optional[str] = Field(

{dataquery_sdk-1.2.4 → dataquery_sdk-1.2.6}/dataquery/utils.py

@@ -52,6 +52,10 @@ DATAQUERY_BASE_URL=https://api-dataquery.jpmchase.com
 # DATAQUERY_FILES_BASE_URL=https://api-dataquery.jpmchase.com
 # DATAQUERY_FILES_CONTEXT_PATH=/research/dataquery-authe/api/v2
 
+# Optional: remote MCP endpoint bridged by `dataquery mcp-connect`
+# Defaults to the PROD endpoint below; override for another environment.
+# DATAQUERY_MCP_URL=https://api-dataquery.jpmchase.com/research/dataquery-authe/v2/mcp
+
 # =============================================================================
 # AUTHENTICATION: OAuth 2.0 Configuration (Recommended)
 # =============================================================================

{dataquery_sdk-1.2.4 → dataquery_sdk-1.2.6}/dataquery_sdk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dataquery-sdk
-Version: 1.2.4
+Version: 1.2.6
 Summary: Python SDK for DATAQUERY Data API - Query, download, and check availability of economic data files
 Author-email: DATAQUERY SDK Team <dataquery_support@jpmorgan.com>
 Project-URL: Homepage, https://github.com/jpmorganchase/dataquery-sdk
@@ -50,7 +50,7 @@ Requires-Dist: pymdown-extensions>=11.0.0; extra == "docs"
 Provides-Extra: pandas
 Requires-Dist: pandas>=2.0.0; extra == "pandas"
 Provides-Extra: mcp
-Requires-Dist: fastmcp>=2.14; extra == "mcp"
+Requires-Dist: fastmcp<4,>=2.14; extra == "mcp"
 Provides-Extra: all
 Requires-Dist: pytest>=7.0.0; extra == "all"
 Requires-Dist: pytest-asyncio>=0.21.0; extra == "all"
@@ -63,7 +63,7 @@ Requires-Dist: mkdocs-material>=9.0.0; extra == "all"
 Requires-Dist: mkdocstrings[python]>=0.24.0; extra == "all"
 Requires-Dist: mike>=1.1.0; extra == "all"
 Requires-Dist: pandas>=2.0.0; extra == "all"
-Requires-Dist: fastmcp>=2.14; extra == "all"
+Requires-Dist: fastmcp<4,>=2.14; extra == "all"
 Requires-Dist: pip-audit>=2.7.0; extra == "all"
 Requires-Dist: build>=1.3.0; extra == "all"
 Requires-Dist: urllib3>=2.7.0; extra == "all"
@@ -98,6 +98,7 @@ built in for both.
 - [Quick start — JSON Data API](#quick-start--json-data-api)
 - [Auto-download (SSE)](#auto-download-sse)
 - [CLI](#cli)
+- [MCP bridge (`mcp-connect`)](#mcp-bridge-mcp-connect)
 - [Configuration](#configuration)
 - [Logging](#logging)
 - [Error handling](#error-handling)
@@ -140,6 +141,9 @@ through one `DataQuery` client — pick the methods that match what you need.
 - **Retry + circuit breaker** — exponential backoff, configurable failure threshold
 - **Sync and async APIs** — every operation has `_async` and sync variants
 - **CLI** — `dataquery groups | files | availability | download | download-group | auth | config`
+- **MCP bridge** — `dataquery mcp-connect` connects any stdio MCP client
+  (Claude Desktop, Claude Code, …) to the remote DataQuery MCP server, minting
+  OAuth tokens for it
 
 ## New here? Three steps to your first download
 
@@ -172,6 +176,9 @@ pip install dataquery-sdk
 # With pandas DataFrame conversion
 pip install "dataquery-sdk[pandas]"
 
+# With the MCP bridge (dataquery mcp-connect)
+pip install "dataquery-sdk[mcp]"
+
 # With dev tooling (ruff, mypy, pytest)
 pip install "dataquery-sdk[dev]"
 ```
@@ -439,8 +446,134 @@ dataquery config template --output .env
 dataquery auth test
 ```
 
-Every subcommand accepts `--env-file PATH` (to point at a non-default `.env`) and
-most accept `--json` for machine-readable output.
+`--env-file PATH` (to point at a non-default `.env`) is a top-level flag, so it
+goes *before* the subcommand: `dataquery --env-file .env.prod groups`. Most
+subcommands accept `--json` for machine-readable output.
+
+## MCP bridge (`mcp-connect`)
+
+`dataquery mcp-connect` connects a desktop MCP client — Claude Desktop, Claude
+Code, or any stdio MCP host — to the remote DataQuery MCP server. It speaks
+stdio to the client and streamable HTTP to the server, stamping every outbound
+request with a fresh OAuth (AuthE) bearer token minted from your `DATAQUERY_*`
+credentials. Tokens are refreshed for the life of the session, and the MCP host
+itself never handles your client secret.
+
+It needs the `mcp` extra:
+
+```bash
+pip install "dataquery-sdk[mcp]"
+```
+
+### Wire it into an MCP client
+
+Add the server to your client's MCP config (`claude_desktop_config.json`,
+`.mcp.json`, or the equivalent for your host):
+
+```json
+{
+  "mcpServers": {
+    "dataquery": {
+      "command": "dataquery",
+      "args": ["mcp-connect", "--save-credentials"],
+      "env": {
+        "DATAQUERY_CLIENT_ID": "your_client_id",
+        "DATAQUERY_CLIENT_SECRET": "your_client_secret"
+      }
+    }
+  }
+}
+```
+
+`--save-credentials` copies the credentials it resolved into
+`~/.dataquery/.env` on the first launch (see [Credentials](#credentials)). From
+then on the bridge — and every other SDK call and CLI run on the machine —
+finds them there, so you can drop the `env` block from the config and keep your
+secret out of a file your MCP client reads on every start:
+
+```json
+{
+  "mcpServers": {
+    "dataquery": {
+      "command": "dataquery",
+      "args": ["mcp-connect"]
+    }
+  }
+}
+```
+
+To skip installing anything, run it straight from PyPI with `uvx`:
+
+```json
+{
+  "mcpServers": {
+    "dataquery": {
+      "command": "uvx",
+      "args": ["--from", "dataquery-sdk[mcp]", "dataquery", "mcp-connect", "--save-credentials"],
+      "env": {
+        "DATAQUERY_CLIENT_ID": "your_client_id",
+        "DATAQUERY_CLIENT_SECRET": "your_client_secret"
+      }
+    }
+  }
+}
+```
+
+### Endpoint
+
+`--url` is optional. The endpoint resolves as `--url` → `DATAQUERY_MCP_URL` →
+the production server
+`https://api-dataquery.jpmchase.com/research/dataquery-authe/v2/mcp`:
+
+```bash
+# Production (no arguments needed)
+dataquery mcp-connect
+
+# Another environment
+dataquery mcp-connect --url https://host/research/dataquery-authe/v2/mcp
+DATAQUERY_MCP_URL=https://host/research/dataquery-authe/v2/mcp dataquery mcp-connect
+```
+
+### Credentials
+
+Credentials resolve exactly as they do everywhere else in the SDK — flags win,
+then the process environment (what your MCP client exports), then a `.env`,
+then the saved user-level file:
+
+```bash
+# From the environment (recommended)
+dataquery mcp-connect
+
+# From flags — visible in the process list, so avoid on shared machines
+dataquery mcp-connect --client-id ID --client-secret SECRET
+
+# From a non-default .env (top-level flag: before the subcommand)
+dataquery --env-file .env.prod mcp-connect
+
+# Bearer token instead of OAuth
+dataquery mcp-connect --bearer-token TOKEN
+```
+
+Pass `--save-credentials` once and the resolved credentials are written to
+`~/.dataquery/.env` (owner-only `0600` file in a `0700` directory; override the
+directory with `DATAQUERY_CONFIG_DIR`). Every later SDK call and CLI run reads
+that file as a last-resort fallback, so a plain `DataQuery()` in a script
+authenticates with no environment of its own — while shell variables and a
+local `.env` still take precedence over it.
+
+### Flags
+
+| Flag | Default | Purpose |
+|---|---|---|
+| `--url URL` | `DATAQUERY_MCP_URL`, else the PROD endpoint | Remote MCP endpoint |
+| `--name NAME` | `dataquery-mcp` | Proxy server name reported to the MCP client |
+| `--client-id ID` | _(from env)_ | OAuth client ID; exported as `DATAQUERY_CLIENT_ID` |
+| `--client-secret SECRET` | _(from env)_ | OAuth client secret; exported as `DATAQUERY_CLIENT_SECRET` |
+| `--bearer-token TOKEN` | _(from env)_ | Use a bearer token instead of OAuth |
+| `--save-credentials` | off | Also persist the resolved credentials to `~/.dataquery/.env` |
+
+Because stdout carries the JSON-RPC channel, all logging and diagnostics go to
+stderr — look in your MCP client's server log when something fails.
 
 ## Configuration
 
@@ -457,6 +590,16 @@ All environment variables use the `DATAQUERY_` prefix.
 | `DATAQUERY_BEARER_TOKEN` | _(none)_ | Alternative to OAuth |
 | `DATAQUERY_OAUTH_ENABLED` | `true` | Set `false` to use bearer-token mode |
 
+**Endpoints**
+
+| Variable | Default | Notes |
+|---|---|---|
+| `DATAQUERY_BASE_URL` | `https://api-dataquery.jpmchase.com` | Host for both API surfaces |
+| `DATAQUERY_FILES_BASE_URL` | same as `BASE_URL` | Override only if file endpoints live on another host |
+| `DATAQUERY_OAUTH_TOKEN_URL` | `https://authe.jpmorgan.com/as/token.oauth2` | Token endpoint |
+| `DATAQUERY_OAUTH_AUD` | PROD audience | Set to the value provisioned for your client |
+| `DATAQUERY_MCP_URL` | PROD MCP endpoint | Endpoint used by [`mcp-connect`](#mcp-bridge-mcp-connect); `--url` overrides it |
+
 **HTTP / retry / rate limit**
 
 | Variable | Default |
@@ -621,6 +764,17 @@ async with DataQuery() as dq:
   `manager.clear_event_id()` (or `dataquery download --watch --reset-event-id`)
   only when you intentionally want a clean slate.
 
+**MCP client shows the server as failed**
+
+- `The MCP bridge requires the 'mcp' extra` in the server log means `fastmcp`
+  is missing — `pip install "dataquery-sdk[mcp]"`, or use the `uvx` form.
+- MCP hosts usually launch the command with a minimal environment, so a
+  `.env` in your shell's working directory may not be visible. Put the
+  credentials in the server's `env` block, or run `dataquery mcp-connect
+  --save-credentials` once from a terminal where they do resolve.
+- Auth failures surface as `Could not obtain an OAuth token`; verify the same
+  credentials with `dataquery auth test` before debugging the bridge.
+
 ## Date formats
 
 ```python

{dataquery_sdk-1.2.4 → dataquery_sdk-1.2.6}/dataquery_sdk.egg-info/requires.txt

@@ -16,7 +16,7 @@ mkdocs-material>=9.0.0
 mkdocstrings[python]>=0.24.0
 mike>=1.1.0
 pandas>=2.0.0
-fastmcp>=2.14
+fastmcp<4,>=2.14
 pip-audit>=2.7.0
 build>=1.3.0
 urllib3>=2.7.0
@@ -42,7 +42,7 @@ mike>=1.1.0
 pymdown-extensions>=11.0.0
 
 [mcp]
-fastmcp>=2.14
+fastmcp<4,>=2.14
 
 [pandas]
 pandas>=2.0.0

{dataquery_sdk-1.2.4 → dataquery_sdk-1.2.6}/pyproject.toml

@@ -77,7 +77,7 @@ pandas = [
     "pandas>=2.0.0",
 ]
 mcp = [
-    "fastmcp>=2.14",
+    "fastmcp>=2.14,<4",
 ]
 all = [
     "pytest>=7.0.0",
@@ -91,7 +91,7 @@ all = [
     "mkdocstrings[python]>=0.24.0",
     "mike>=1.1.0",
     "pandas>=2.0.0",
-    "fastmcp>=2.14",
+    "fastmcp>=2.14,<4",
     "pip-audit>=2.7.0",
     "build>=1.3.0",
     "urllib3>=2.7.0",