PyPI - open-edison - Versions diffs - 0.1.41__py3-none-any.whl → 0.1.42__py3-none-any.whl - Mend

open-edison 0.1.41py3-none-any.whl → 0.1.42py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (17) hide show

frontend_dist/index.html +6 -16
{open_edison-0.1.41.dist-info → open_edison-0.1.42.dist-info}/METADATA +10 -10
{open_edison-0.1.41.dist-info → open_edison-0.1.42.dist-info}/RECORD +11 -17
src/cli.py +8 -2
src/frontend_dist/index.html +6 -16
src/mcp_importer/api.py +18 -108
src/mcp_importer/quick_cli.py +15 -12
src/oauth_manager.py +1 -1
frontend_dist/assets/index-BUUcUfTt.js +0 -51
frontend_dist/assets/index-o6_8mdM8.css +0 -1
frontend_dist/sw.js +0 -71
src/frontend_dist/assets/index-BUUcUfTt.js +0 -51
src/frontend_dist/assets/index-o6_8mdM8.css +0 -1
src/frontend_dist/sw.js +0 -71
{open_edison-0.1.41.dist-info → open_edison-0.1.42.dist-info}/WHEEL +0 -0
{open_edison-0.1.41.dist-info → open_edison-0.1.42.dist-info}/entry_points.txt +0 -0
{open_edison-0.1.41.dist-info → open_edison-0.1.42.dist-info}/licenses/LICENSE +0 -0

frontend_dist/index.html CHANGED Viewed

@@ -1,21 +1,11 @@
-<!doctype html>
-<html lang="en">
+<!DOCTYPE html>
+<html>
 <head>
-    <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Open Edison Sessions</title>
-    <script>
-        // Prevents FOUC by setting theme asap
-        const prefersLight = window.matchMedia && window.matchMedia('(prefers-color-scheme: light)').matches;
-        document.documentElement.setAttribute('data-theme', prefersLight ? 'light' : 'dark');
-    </script>
-  <script type="module" crossorigin src="/assets/index-BUUcUfTt.js"></script>
-  <link rel="stylesheet" crossorigin href="/assets/index-o6_8mdM8.css">
+    <title>Open Edison Dashboard</title>
+    <meta charset="utf-8">
 </head>
 <body>
-    <div id="root"></div>
+    <h1>Open Edison Dashboard</h1>
+    <p>Frontend assets not available. Run 'make build_package' to build the full dashboard.</p>
 </body>
 </html>

{open_edison-0.1.41.dist-info → open_edison-0.1.42.dist-info}/METADATA RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: open-edison
-Version: 0.1.41
+Version: 0.1.42
 Summary: Open-source MCP security, aggregation, and monitoring. Single-user, self-hosted MCP proxy.
 Author-email: Hugo Berg <hugo@edison.watch>
 License-File: LICENSE
@@ -76,7 +76,7 @@ Optionally, import your existing MCP configs from Cursor, VS Code, or Claude Cod
 ```bash
 # From source (no install) — quick one-liner (add --dry-run to preview)
-uv run python -m src.mcp_importer.quick_cli --yes
+uv run python -m mcp_importer.quick_cli --yes
 ```
 <details>
@@ -139,29 +139,29 @@ OPEN_EDISON_CONFIG_DIR=~/edison-config open-edison run
     ```bash
     # From source (no install)
-    uv run python -m src.mcp_importer.quick_cli --yes
+    uv run python -m mcp_importer.quick_cli --yes
     ```
   - Preview what will be imported (no writes):
     ```bash
-    uv run python -m src.mcp_importer --source cursor --dry-run
+    uv run python -m mcp_importer --source cursor --dry-run
     ```
   - Import servers into Open Edison `config.json` (merge policy defaults to `skip`):
     ```bash
-    uv run python -m src.mcp_importer --source cursor
-    uv run python -m src.mcp_importer --source vscode
-    uv run python -m src.mcp_importer --source claude-code
+    uv run python -m mcp_importer --source cursor
+    uv run python -m mcp_importer --source vscode
+    uv run python -m mcp_importer --source claude-code
     ```
   - Point your editor to Open Edison (backup original config and replace with a single Open Edison server):
     ```bash
-    uv run python -m src.mcp_importer export --target cursor --yes
-    uv run python -m src.mcp_importer export --target vscode --yes
-    uv run python -m src.mcp_importer export --target claude-code --yes
+    uv run python -m mcp_importer export --target cursor --yes
+    uv run python -m mcp_importer export --target vscode --yes
+    uv run python -m mcp_importer export --target claude-code --yes
     ```
 </details>

{open_edison-0.1.41.dist-info → open_edison-0.1.42.dist-info}/RECORD RENAMED Viewed

@@ -1,21 +1,18 @@
 src/__init__.py,sha256=bEYMwBiuW9jzF07iWhas4Vb30EcpnqfpNfz_Q6yO1jU,209
 src/__main__.py,sha256=kQsaVyzRa_ESC57JpKDSQJAHExuXme0rM5beJsYxFeA,161
-src/cli.py,sha256=SE2N3AfgpHSmm5SAs8UkXr9zErT2zvMttMh_gi5wRv8,9562
+src/cli.py,sha256=P38IWER41S5oAfbd_7p89hBpnjClsNHpmE5pSsJc6uU,9733
 src/config.py,sha256=RSsAYzl8cj6eaDN1RORMcfKKWBcp4bKTQp2BdhAL9mg,10258
 src/config.pyi,sha256=FgehEGli8ZXSjGlANBgMGv5497q4XskQciOc1fUcxqM,2033
 src/events.py,sha256=aFQrVXDIZwt55Dz6OtyoXu2yi9evqo-8jZzo3CR2Tto,4965
-src/oauth_manager.py,sha256=W9QSo0vfGDQ_i-QWCngkv7YLSL3Rk5jfPmqjU1J2rnU,9911
+src/oauth_manager.py,sha256=qcQa5BDRZr4bjqiXNflCnrXOh9mo9JVjvP2Caseg2Uc,9943
 src/permissions.py,sha256=NGAnlG_z59HEiVA-k3cYvwmmiuHzxuNb5Tbd5umbL00,10483
 src/server.py,sha256=cnO5bgxT-lrfuwk9AIvB_HBV8SWOtFClfGUn5_zFWyo,45652
 src/single_user_mcp.py,sha256=rJrlqHcIubGkos_24ux5rb3OoKYDzvagCHghhfDeXTI,18535
 src/telemetry.py,sha256=-RZPIjpI53zbsKmp-63REeZ1JirWHV5WvpSRa2nqZEk,11321
-src/frontend_dist/index.html,sha256=s95FMkH8VLisvawLH7bZxbLzRUFvMhHkH6ZMzpVBngs,673
-src/frontend_dist/sw.js,sha256=rihX1es-vWwjmtnXyaksJjs2dio6MVAOTAWwQPeJUYw,2164
-src/frontend_dist/assets/index-BUUcUfTt.js,sha256=awoyPI6u0v6ao2iarZdSkrSDUvyU8aNkMLqHMvgVgyY,257666
-src/frontend_dist/assets/index-o6_8mdM8.css,sha256=nwmX_6q55mB9463XN2JM8BdeihjkALpQK83Fc3_iGvE,15936
+src/frontend_dist/index.html,sha256=rNNHhYAvyDujYAnwut4zIQfkSKEwES491uH4fEOjkIw,259
 src/mcp_importer/__init__.py,sha256=Mk59pVr7OMGfYGWeSYk8-URfhIcrs3SPLYS7fmJbMII,275
 src/mcp_importer/__main__.py,sha256=0jVfxKzyr6koVu1ghhWseah5ilKIoGovE6zkEZ-u-Og,515
-src/mcp_importer/api.py,sha256=t3Uet-8Dz3bCfj25muzkXDzenH_ueuE97Cs09UOGk0o,6226
+src/mcp_importer/api.py,sha256=kYhmVHBUekTXPv3xNdt8rJNH1mbWXvs2cTZZGOkVhAk,3383
 src/mcp_importer/cli.py,sha256=Pe0GLWm1nMd1VuNXOSkxIrFZuGNFc9dNvfBsvf-bdBI,3487
 src/mcp_importer/export_cli.py,sha256=daEadB6nL8P4OpEGFx0GshuN1a091L7BhiitpV1bPqA,6294
 src/mcp_importer/exporters.py,sha256=fSgl6seduoXFp7YnKH26UEaC1sFBnd4whSut7CJLBQs,11348
@@ -24,16 +21,13 @@ src/mcp_importer/importers.py,sha256=zGN8lT7qQJ95jDTd-ck09j_w5PSvH-uj33TILoHfHbs
 src/mcp_importer/merge.py,sha256=KIGT7UgbAm07-LdyoUXEJ7ABSIiPTFlj_qjz669yFxg,1569
 src/mcp_importer/parsers.py,sha256=JRE7y_Gg-QmlAARvZdrI9CmUyy-ODvDPbS695pb3Aw8,4856
 src/mcp_importer/paths.py,sha256=4L-cPr7KCM9X9gAUP7Da6ictLNrPWuQ_IM419zqY-2I,2700
-src/mcp_importer/quick_cli.py,sha256=4mJe10q_lZCYLm75QBt1rYy2j8mGEsRZoAqA0agjfSM,1834
+src/mcp_importer/quick_cli.py,sha256=24-R77-AuKsbeag0SyADba4Vf9oYHkaOBnRXK2sZt_4,1911
 src/mcp_importer/types.py,sha256=h03TbAnJbap6OWWd0dT0QcFWNvSaiVFWH9V9PD6x4s0,138
 src/middleware/data_access_tracker.py,sha256=bArBffWgYmvxOx9z_pgXQhogvnWQcc1m6WvEblDD4gw,15039
 src/middleware/session_tracking.py,sha256=5W1VH9HNqIZeX0HNxDEm41U4GY6SqKSXtApDEeZK2qo,23084
-frontend_dist/index.html,sha256=s95FMkH8VLisvawLH7bZxbLzRUFvMhHkH6ZMzpVBngs,673
-frontend_dist/sw.js,sha256=rihX1es-vWwjmtnXyaksJjs2dio6MVAOTAWwQPeJUYw,2164
-frontend_dist/assets/index-BUUcUfTt.js,sha256=awoyPI6u0v6ao2iarZdSkrSDUvyU8aNkMLqHMvgVgyY,257666
-frontend_dist/assets/index-o6_8mdM8.css,sha256=nwmX_6q55mB9463XN2JM8BdeihjkALpQK83Fc3_iGvE,15936
-open_edison-0.1.41.dist-info/METADATA,sha256=jsNn28vJxbSW62-N9LnJOxGmHeUvTqCwm1kbuv-m2OM,13188
-open_edison-0.1.41.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-open_edison-0.1.41.dist-info/entry_points.txt,sha256=YiGNm9x2I00hgT10HDyB4gxC1LcaV_mu8bXFjolu0Yw,171
-open_edison-0.1.41.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-open_edison-0.1.41.dist-info/RECORD,,
+frontend_dist/index.html,sha256=rNNHhYAvyDujYAnwut4zIQfkSKEwES491uH4fEOjkIw,259
+open_edison-0.1.42.dist-info/METADATA,sha256=ycCiWJGiiCWyiam8Du-w4YqfUbrIhBPL4mu8HYcd8l4,13152
+open_edison-0.1.42.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+open_edison-0.1.42.dist-info/entry_points.txt,sha256=YiGNm9x2I00hgT10HDyB4gxC1LcaV_mu8bXFjolu0Yw,171
+open_edison-0.1.42.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+open_edison-0.1.42.dist-info/RECORD,,

src/cli.py CHANGED Viewed

@@ -45,7 +45,7 @@ def _parse_args(argv: list[str] | None = None) -> argparse.Namespace:
     # import-mcp: import MCP servers from other tools into config.json
     sp_import = subparsers.add_parser(
         "import-mcp",
-        help="Import MCP servers from other tools (Cursor, VS Code, Claude Code)",
+        help="Import MCP servers from other tools (Cursor, Windsurf, Cline, Claude Desktop, etc.)",
         description=(
             "Import MCP server configurations from other tools into Open Edison config.json.\n"
             "Use --source to choose the tool and optional flags to control merging."
@@ -55,10 +55,16 @@ def _parse_args(argv: list[str] | None = None) -> argparse.Namespace:
         "--source",
         choices=[
             "cursor",
+            "windsurf",
+            "cline",
+            "claude-desktop",
             "vscode",
             "claude-code",
+            "gemini-cli",
+            "codex",
+            "interactive",
         ],
-        default="cursor",
+        default="interactive",
         help="Source application to import from",
     )
     sp_import.add_argument(

src/frontend_dist/index.html CHANGED Viewed

@@ -1,21 +1,11 @@
-<!doctype html>
-<html lang="en">
+<!DOCTYPE html>
+<html>
 <head>
-    <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Open Edison Sessions</title>
-    <script>
-        // Prevents FOUC by setting theme asap
-        const prefersLight = window.matchMedia && window.matchMedia('(prefers-color-scheme: light)').matches;
-        document.documentElement.setAttribute('data-theme', prefersLight ? 'light' : 'dark');
-    </script>
-  <script type="module" crossorigin src="/assets/index-BUUcUfTt.js"></script>
-  <link rel="stylesheet" crossorigin href="/assets/index-o6_8mdM8.css">
+    <title>Open Edison Dashboard</title>
+    <meta charset="utf-8">
 </head>
 <body>
-    <div id="root"></div>
+    <h1>Open Edison Dashboard</h1>
+    <p>Frontend assets not available. Run 'make build_package' to build the full dashboard.</p>
 </body>
 </html>

src/mcp_importer/api.py CHANGED Viewed

@@ -1,35 +1,21 @@
 # pyright: reportMissingImports=false, reportUnknownVariableType=false, reportUnknownMemberType=false, reportUnknownArgumentType=false, reportUnknownParameterType=false
-import asyncio
-from collections.abc import Awaitable
 from enum import Enum
 from pathlib import Path
-from typing import Any, Protocol, cast, runtime_checkable
-from fastmcp import FastMCP
+from typing import Any
 from src.config import Config, MCPServerConfig, get_config_json_path
 from src.mcp_importer import paths as _paths
-from src.mcp_importer.exporters import (
-    ExportResult,
-    export_to_claude_code,
-    export_to_cursor,
-    export_to_vscode,
+from src.mcp_importer.exporters import export_to_claude_code, export_to_cursor, export_to_vscode
+from src.mcp_importer.importers import (
+    import_from_claude_code as _import_from_claude_code,
+)
+from src.mcp_importer.importers import (
+    import_from_cursor as _import_from_cursor,
 )
 from src.mcp_importer.importers import (
-    import_from_claude_code,
-    import_from_cursor,
-    import_from_vscode,
+    import_from_vscode as _import_from_vscode,
 )
 from src.mcp_importer.merge import MergePolicy, merge_servers
-from src.oauth_manager import OAuthStatus, get_oauth_manager
-@runtime_checkable
-class _MCPClientLike(Protocol):
-    async def list_tools(self) -> Any: ...
-    async def list_resources(self) -> Any: ...
-    async def list_prompts(self) -> Any: ...
-    def shutdown(self) -> Awaitable[Any] | Any: ...
 class CLIENT(str, Enum):
@@ -37,12 +23,6 @@ class CLIENT(str, Enum):
     VSCODE = "vscode"
     CLAUDE_CODE = "claude-code"
-    def __str__(self) -> str:
-        return self.value.capitalize()
-    def __repr__(self) -> str:
-        return str(self)
 def detect_clients() -> set[CLIENT]:
     detected: set[CLIENT] = set()
@@ -55,31 +35,30 @@ def detect_clients() -> set[CLIENT]:
     return detected
+import_cursor = _import_from_cursor
+import_vscode = _import_from_vscode
+import_claude_code = _import_from_claude_code
 def import_from(client: CLIENT) -> list[MCPServerConfig]:
     if client == CLIENT.CURSOR:
-        return import_from_cursor()
+        return import_cursor()
     if client == CLIENT.VSCODE:
-        return import_from_vscode()
+        return import_vscode()
     if client == CLIENT.CLAUDE_CODE:
-        return import_from_claude_code()
+        return import_claude_code()
     raise ValueError(f"Unsupported client: {client}")
 def save_imported_servers(
     servers: list[MCPServerConfig],
     *,
-    dry_run: bool = False,
     merge_policy: str = MergePolicy.SKIP,
     config_dir: Path | None = None,
-) -> Path | None:
+) -> Path:
     target_path: Path = (
         get_config_json_path() if config_dir is None else (Path(config_dir) / "config.json")
     )
-    if dry_run:
-        print(
-            f"[dry-run] Would import {len(servers)} server(s) and save to config.json (at {target_path})"
-        )
-        return None
     cfg: Config = Config(target_path)
     merged = merge_servers(existing=cfg.mcp_servers, imported=servers, policy=merge_policy)
     cfg.mcp_servers = merged
@@ -96,17 +75,7 @@ def export_edison_to(
     dry_run: bool = False,
     force: bool = False,
     create_if_missing: bool = False,
-) -> ExportResult:
-    if dry_run:
-        print(
-            f"[dry-run] Would export Open Edison to '{client}' (backup and replace editor MCP config)"
-        )
-        return ExportResult(
-            target_path=Path(""),
-            backup_path=None,
-            wrote_changes=False,
-            dry_run=True,
-        )
+) -> Any:
     match client:
         case CLIENT.CURSOR:
             return export_to_cursor(
@@ -135,62 +104,3 @@ def export_edison_to(
                 force=force,
                 create_if_missing=create_if_missing,
             )
-def verify_mcp_server(server: MCPServerConfig) -> bool:  # noqa
-    """Minimal validation: try listing tools/resources/prompts via FastMCP within a timeout."""
-    async def _verify_async() -> bool:
-        if not server.command.strip():
-            return False
-        backend_cfg: dict[str, Any] = {
-            "mcpServers": {
-                server.name: {
-                    "command": server.command,
-                    "args": server.args,
-                    "env": server.env or {},
-                    **({"roots": server.roots} if server.roots else {}),
-                }
-            }
-        }
-        proxy: FastMCP[Any] | None = None
-        try:
-            proxy = FastMCP.as_proxy(backend=backend_cfg, name=f"open-edison-verify-{server.name}")
-            s: _MCPClientLike = cast(_MCPClientLike, proxy)
-            await asyncio.wait_for(
-                asyncio.gather(
-                    s.list_tools(),
-                    s.list_resources(),
-                    s.list_prompts(),
-                ),
-                timeout=15.0,
-            )
-            return True
-        except Exception:
-            return False
-        finally:
-            try:
-                if isinstance(proxy, FastMCP):
-                    result = proxy.shutdown()  # type: ignore[attr-defined]
-                    if isinstance(result, Awaitable):
-                        await result  # type: ignore[func-returns-value]
-            except Exception:
-                pass
-    return asyncio.run(_verify_async())
-def server_needs_oauth(server: MCPServerConfig) -> bool:  # noqa
-    """Return True if the remote server currently needs OAuth; False otherwise."""
-    async def _needs_oauth_async() -> bool:
-        if not server.is_remote_server():
-            return False
-        info = await get_oauth_manager().check_oauth_requirement(
-            server.name, server.get_remote_url()
-        )
-        return info.status == OAuthStatus.NEEDS_AUTH
-    return asyncio.run(_needs_oauth_async())

src/mcp_importer/quick_cli.py CHANGED Viewed

@@ -26,19 +26,10 @@ def run_cli(argv: list[str] | None = None) -> int:
     )
     parser.add_argument("--dry-run", action="store_true", help="Preview actions without writing")
     parser.add_argument("--yes", action="store_true", help="Skip confirmations (no effect here)")
-    parser.add_argument(
-        "--source-client", type=CLIENT, help="Client to import from", required=False, default=None
-    )
     args = parser.parse_args(argv)
     detected = detect_clients()
-    print(f"Detected clients: {detected}")
-    if args.source_client:
-        client = args.source_client
-        assert client in detected, f"Client {client} not detected"
-    else:
-        client = _pick_first(detected)
-    print(f"Going to import from client: {client}")
+    client = _pick_first(detected)
     if client is None:
         print("No supported clients detected.")
         return 2
@@ -48,8 +39,20 @@ def run_cli(argv: list[str] | None = None) -> int:
         print(f"No servers found to import from '{client.value}'.")
         return 0
-    save_imported_servers(servers, dry_run=args.dry_run)
-    export_edison_to(client, dry_run=args.dry_run, force=True, create_if_missing=True)
+    if args.dry_run:
+        print(
+            f"[dry-run] Would import {len(servers)} server(s) from '{client.value}' and save to config.json"
+        )
+        # Exercise export path safely (no writes)
+        export_edison_to(client, dry_run=True, force=True, create_if_missing=True)
+        print(
+            f"[dry-run] Would export Open Edison to '{client.value}' (backup and replace editor MCP config)"
+        )
+        print("Dry-run complete.")
+        return 0
+    save_imported_servers(servers)
+    export_edison_to(client, dry_run=False, force=True, create_if_missing=True)
     print(f"Completed quick import/export for {client.value}.")
     return 0

src/oauth_manager.py CHANGED Viewed

@@ -7,7 +7,6 @@ Provides detection, token management, and authentication flow coordination.
 import asyncio
 from dataclasses import dataclass
-from datetime import datetime, timedelta
 from enum import Enum
 from pathlib import Path
@@ -138,6 +137,7 @@ class OAuthManager:
                             expires_in = getattr(existing_tokens, "expires_in", None)
                             if expires_in:
                                 # If expires_in is available, we can calculate expiration
+                                from datetime import datetime, timedelta
                                 expiry = datetime.now() + timedelta(seconds=expires_in)
                                 token_expires_at = expiry.isoformat()

open-edison 0.1.41__py3-none-any.whl → 0.1.42__py3-none-any.whl

open-edison 0.1.41py3-none-any.whl → 0.1.42py3-none-any.whl