open-edison 0.1.37__py3-none-any.whl → 0.1.39__py3-none-any.whl

src/oauth_manager.py → oauth_manager.py

@@ -7,6 +7,7 @@ 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
 
@@ -137,7 +138,6 @@ 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.37.dist-info → open_edison-0.1.39.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: open-edison
-Version: 0.1.37
+Version: 0.1.39
 Summary: Open-source MCP security, aggregation, and monitoring. Single-user, self-hosted MCP proxy.
 Author-email: Hugo Berg <hugo@edison.watch>
 License-File: LICENSE
@@ -140,7 +140,6 @@ OPEN_EDISON_CONFIG_DIR=~/edison-config open-edison run
     ```bash
     # From source (no install)
     uv run python -m mcp_importer.quick_cli --yes
-    # After install: mcp-importer-quick --yes
     ```
 
   - Preview what will be imported (no writes):

open_edison-0.1.39.dist-info/RECORD

@@ -0,0 +1,22 @@
+__init__.py,sha256=bEYMwBiuW9jzF07iWhas4Vb30EcpnqfpNfz_Q6yO1jU,209
+__main__.py,sha256=kQsaVyzRa_ESC57JpKDSQJAHExuXme0rM5beJsYxFeA,161
+cli.py,sha256=P38IWER41S5oAfbd_7p89hBpnjClsNHpmE5pSsJc6uU,9733
+config.py,sha256=RSsAYzl8cj6eaDN1RORMcfKKWBcp4bKTQp2BdhAL9mg,10258
+config.pyi,sha256=FgehEGli8ZXSjGlANBgMGv5497q4XskQciOc1fUcxqM,2033
+events.py,sha256=aFQrVXDIZwt55Dz6OtyoXu2yi9evqo-8jZzo3CR2Tto,4965
+oauth_manager.py,sha256=W9QSo0vfGDQ_i-QWCngkv7YLSL3Rk5jfPmqjU1J2rnU,9911
+permissions.py,sha256=NGAnlG_z59HEiVA-k3cYvwmmiuHzxuNb5Tbd5umbL00,10483
+server.py,sha256=cnO5bgxT-lrfuwk9AIvB_HBV8SWOtFClfGUn5_zFWyo,45652
+single_user_mcp.py,sha256=rJrlqHcIubGkos_24ux5rb3OoKYDzvagCHghhfDeXTI,18535
+telemetry.py,sha256=-RZPIjpI53zbsKmp-63REeZ1JirWHV5WvpSRa2nqZEk,11321
+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
+middleware/data_access_tracker.py,sha256=bArBffWgYmvxOx9z_pgXQhogvnWQcc1m6WvEblDD4gw,15039
+middleware/session_tracking.py,sha256=5W1VH9HNqIZeX0HNxDEm41U4GY6SqKSXtApDEeZK2qo,23084
+open_edison-0.1.39.dist-info/METADATA,sha256=xCXSMsOP0Tn_T1x3QzU4YVgOodONGsr4U1JyCE7F6FI,13152
+open_edison-0.1.39.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+open_edison-0.1.39.dist-info/entry_points.txt,sha256=qUjYGPEfqSQyra9dTe1aRvHVAAzLzoNvZqNDk1t75IA,163
+open_edison-0.1.39.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+open_edison-0.1.39.dist-info/RECORD,,

open_edison-0.1.37.dist-info/RECORD

@@ -1,35 +0,0 @@
-src/__init__.py,sha256=bEYMwBiuW9jzF07iWhas4Vb30EcpnqfpNfz_Q6yO1jU,209
-src/__main__.py,sha256=kQsaVyzRa_ESC57JpKDSQJAHExuXme0rM5beJsYxFeA,161
-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=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/mcp_importer/__init__.py,sha256=Yqr4NVAbKRVIuDzOj-yXzyB8HWLl-I4KmP5pVIRxs1o,271
-src/mcp_importer/__main__.py,sha256=_2LUxAFFGJ9ECg5OoUqUZMxE6QBzhYPrfpLfKvCQM7k,507
-src/mcp_importer/api.py,sha256=8BwPCeve-rY6T9Xhn-9FptBR2K_v_UBxe7m6CaOUMnw,3354
-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
-src/mcp_importer/import_api.py,sha256=xWaKoE3vibSWpA5roVL7qEMS73vcmAC0tcHP6CsZw6E,95
-src/mcp_importer/importers.py,sha256=zGN8lT7qQJ95jDTd-ck09j_w5PSvH-uj33TILoHfHbs,2191
-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=MCkHr_ljyUPS0pzTwJf4bW-UpknQP8NPzIWMxjUu5Nc,1907
-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
-open_edison-0.1.37.dist-info/METADATA,sha256=41uTPLASX7MIufzvxIz_MQ7zAVkTfmNrrmz3afWqAu4,13198
-open_edison-0.1.37.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-open_edison-0.1.37.dist-info/entry_points.txt,sha256=qUjYGPEfqSQyra9dTe1aRvHVAAzLzoNvZqNDk1t75IA,163
-open_edison-0.1.37.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-open_edison-0.1.37.dist-info/RECORD,,

src/mcp_importer/__init__.py

@@ -1,15 +0,0 @@
-"""MCP importer package for Open Edison scripts.
-
-Import submodules explicitly as needed, e.g. `from mcp_importer import cli`.
-"""
-
-# pyright: reportUnsupportedDunderAll=false
-
-__all__ = [
-    "paths",
-    "parsers",
-    "importers",
-    "merge",
-    "cli",
-    "api",
-]

src/mcp_importer/__main__.py

@@ -1,19 +0,0 @@
-from __future__ import annotations
-
-import sys
-
-from mcp_importer.cli import run_cli as import_run_cli
-from mcp_importer.export_cli import run_cli as export_run_cli
-
-
-def main() -> int:
-    # Usage:
-    #   python -m mcp_importer            -> import CLI
-    #   python -m mcp_importer export ... -> export CLI
-    if len(sys.argv) > 1 and sys.argv[1] == "export":
-        return export_run_cli(sys.argv[2:])
-    return import_run_cli(sys.argv[1:])
-
-
-if __name__ == "__main__":
-    raise SystemExit(main())

src/mcp_importer/api.py

@@ -1,106 +0,0 @@
-# pyright: reportMissingImports=false, reportUnknownVariableType=false, reportUnknownMemberType=false, reportUnknownArgumentType=false, reportUnknownParameterType=false
-from enum import Enum
-from pathlib import Path
-from typing import Any
-
-import mcp_importer.paths as _paths
-from mcp_importer.exporters import export_to_claude_code, export_to_cursor, export_to_vscode
-from mcp_importer.importers import (
-    import_from_claude_code as _import_from_claude_code,
-)
-from mcp_importer.importers import (
-    import_from_cursor as _import_from_cursor,
-)
-from mcp_importer.importers import (
-    import_from_vscode as _import_from_vscode,
-)
-from mcp_importer.merge import MergePolicy, merge_servers
-from src.config import Config, MCPServerConfig, get_config_json_path
-
-
-class CLIENT(str, Enum):
-    CURSOR = "cursor"
-    VSCODE = "vscode"
-    CLAUDE_CODE = "claude-code"
-
-
-def detect_clients() -> set[CLIENT]:
-    detected: set[CLIENT] = set()
-    if _paths.detect_cursor_config_path() is not None:
-        detected.add(CLIENT.CURSOR)
-    if _paths.detect_vscode_config_path() is not None:
-        detected.add(CLIENT.VSCODE)
-    if _paths.detect_claude_code_config_path() is not None:
-        detected.add(CLIENT.CLAUDE_CODE)
-    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_cursor()
-    if client == CLIENT.VSCODE:
-        return import_vscode()
-    if client == CLIENT.CLAUDE_CODE:
-        return import_claude_code()
-    raise ValueError(f"Unsupported client: {client}")
-
-
-def save_imported_servers(
-    servers: list[MCPServerConfig],
-    *,
-    merge_policy: str = MergePolicy.SKIP,
-    config_dir: Path | None = None,
-) -> Path:
-    target_path: Path = (
-        get_config_json_path() if config_dir is None else (Path(config_dir) / "config.json")
-    )
-    cfg: Config = Config(target_path)
-    merged = merge_servers(existing=cfg.mcp_servers, imported=servers, policy=merge_policy)
-    cfg.mcp_servers = merged
-    cfg.save(target_path)
-    return target_path
-
-
-def export_edison_to(
-    client: CLIENT,
-    *,
-    url: str = "http://localhost:3000/mcp/",
-    api_key: str = "dev-api-key-change-me",
-    server_name: str = "open-edison",
-    dry_run: bool = False,
-    force: bool = False,
-    create_if_missing: bool = False,
-) -> Any:
-    match client:
-        case CLIENT.CURSOR:
-            return export_to_cursor(
-                url=url,
-                api_key=api_key,
-                server_name=server_name,
-                dry_run=dry_run,
-                force=force,
-                create_if_missing=create_if_missing,
-            )
-        case CLIENT.VSCODE:
-            return export_to_vscode(
-                url=url,
-                api_key=api_key,
-                server_name=server_name,
-                dry_run=dry_run,
-                force=force,
-                create_if_missing=create_if_missing,
-            )
-        case CLIENT.CLAUDE_CODE:
-            return export_to_claude_code(
-                url=url,
-                api_key=api_key,
-                server_name=server_name,
-                dry_run=dry_run,
-                force=force,
-                create_if_missing=create_if_missing,
-            )

src/mcp_importer/cli.py

@@ -1,113 +0,0 @@
-# pyright: reportMissingImports=false, reportUnknownVariableType=false, reportUnknownArgumentType=false, reportUnknownMemberType=false, reportUnknownParameterType=false
-import argparse
-import sys
-from pathlib import Path
-
-from loguru import logger as log
-
-from src.config import Config, get_config_dir
-
-from .importers import IMPORTERS
-from .merge import MergePolicy, merge_servers
-
-## Ensure import of src config (place src on sys.path before import)
-# THIS_FILE = Path(__file__).resolve()
-# REPO_ROOT = THIS_FILE.parents[2]
-# SRC_DIR = REPO_ROOT / "src"
-# if str(SRC_DIR) not in sys.path:
-#    sys.path.insert(0, str(SRC_DIR))
-
-
-def build_arg_parser() -> argparse.ArgumentParser:
-    p = argparse.ArgumentParser(
-        description="Import MCP servers from other tools into Open Edison config.json"
-    )
-    p.add_argument(
-        "--source",
-        choices=["cursor", "vscode", "claude-code"],
-        required=True,
-    )
-    p.add_argument(
-        "--config-dir",
-        type=Path,
-        help="Directory containing target config.json (default: OPEN_EDISON_CONFIG_DIR or repo root)",
-    )
-    p.add_argument(
-        "--merge",
-        choices=[MergePolicy.SKIP, MergePolicy.OVERWRITE, MergePolicy.RENAME],
-        default=MergePolicy.SKIP,
-    )
-    p.add_argument(
-        "--dry-run", action="store_true", help="Show changes without writing to config.json"
-    )
-    return p
-
-
-def run_cli(argv: list[str] | None = None) -> int:  # noqa: C901
-    parser = build_arg_parser()
-    args = parser.parse_args(argv)
-
-    source: str = args.source
-
-    importer = IMPORTERS.get(source)
-    if not importer:
-        print(f"Unsupported source: {source}", file=sys.stderr)
-        return 2
-
-    # Resolve target config path
-    target_dir: Path = args.config_dir or get_config_dir()
-    target_path = target_dir / "config.json"
-
-    # Load existing config (auto-creates default if missing via Config.load)
-    config_obj: Config = Config(target_dir)
-
-    # Import
-    imported_servers = importer()
-
-    if not imported_servers:
-        log.warning("No servers found to import from source '{}'", source)
-        return 0
-
-    # Merge
-    merged = merge_servers(
-        existing=config_obj.mcp_servers,
-        imported=imported_servers,
-        policy=args.merge,
-    )
-
-    existing_names: set[str] = {str(getattr(s, "name", "")) for s in config_obj.mcp_servers}
-    merged_names: set[str] = {str(getattr(s, "name", "")) for s in merged}
-    added = merged_names - existing_names
-    replaced: set[str] = set()
-    if args.merge == MergePolicy.OVERWRITE:
-        replaced = existing_names & {s.name for s in imported_servers}
-
-    log.info("Imported {} server(s) from '{}'", len(imported_servers), source)
-    try:
-        names_preview = ", ".join(sorted(getattr(s, "name", "") for s in imported_servers))
-        if names_preview:
-            log.info("Detected servers: {}", names_preview)
-    except Exception:
-        pass
-    if added:
-        log.info("Added: {}", ", ".join(sorted(added)))
-    if replaced:
-        log.info("Overwrote: {}", ", ".join(sorted(replaced)))
-
-    if args.dry_run:
-        log.info("Dry-run enabled; not writing changes to {}", target_path)
-        log.debug("Merged servers: {}", merged)
-        return 0
-
-    config_obj.mcp_servers = merged
-    config_obj.save(target_path)
-    log.info("Configuration updated: {}", target_path)
-    return 0
-
-
-def main() -> int:
-    return run_cli()
-
-
-if __name__ == "__main__":
-    raise SystemExit(main())

src/mcp_importer/export_cli.py

@@ -1,201 +0,0 @@
-import argparse
-from pathlib import Path
-
-from loguru import logger as log
-
-from .exporters import ExportError, export_to_claude_code, export_to_cursor, export_to_vscode
-from .paths import (
-    detect_cursor_config_path,
-    detect_vscode_config_path,
-    get_default_cursor_config_path,
-    get_default_vscode_config_path,
-)
-
-
-def _prompt_yes_no(message: str, *, default_no: bool = True) -> bool:
-    suffix = "[y/N]" if default_no else "[Y/n]"
-    while True:
-        resp = input(f"{message} {suffix} ").strip().lower()
-        if resp == "y" or resp == "yes":
-            return True
-        if resp == "n" or resp == "no":
-            return False
-        if resp == "" and default_no:
-            return False
-        if resp == "" and not default_no:
-            return True
-
-
-def build_arg_parser() -> argparse.ArgumentParser:
-    p = argparse.ArgumentParser(
-        description="Export editor MCP config to use Open Edison (Cursor support)",
-    )
-    p.add_argument("--target", choices=["cursor", "vscode", "claude-code"], default="cursor")
-    p.add_argument("--dry-run", action="store_true", help="Show actions without writing")
-    p.add_argument("--force", action="store_true", help="Rewrite even if already configured")
-    p.add_argument(
-        "--yes",
-        action="store_true",
-        help="Automatic yes to prompts (create missing files without confirmation)",
-    )
-    p.add_argument("--url", default="http://localhost:3000/mcp/", help="MCP URL")
-    p.add_argument(
-        "--api-key",
-        default="dev-api-key-change-me",
-        help="API key for Authorization header",
-    )
-    p.add_argument("--name", default="open-edison", help="Name of the server entry")
-    return p
-
-
-def _handle_cursor(args: argparse.Namespace) -> int:
-    detected = detect_cursor_config_path()
-    target_path: Path = detected if detected else get_default_cursor_config_path()
-
-    create_if_missing = False
-    if not target_path.exists():
-        if args.yes:
-            create_if_missing = True
-        else:
-            confirmed = _prompt_yes_no(
-                f"Cursor config not found at {target_path}. Create it?", default_no=False
-            )
-            if not confirmed:
-                log.info("Aborted: user declined to create missing file")
-                return 0
-            create_if_missing = True
-
-    try:
-        result = export_to_cursor(
-            url=args.url,
-            api_key=args.api_key,
-            server_name=args.name,
-            dry_run=args.dry_run,
-            force=args.force,
-            create_if_missing=create_if_missing,
-        )
-    except ExportError as e:
-        log.error(str(e))
-        return 1
-
-    if result.dry_run:
-        log.info("Dry-run complete. No changes written.")
-        return 0
-
-    if result.wrote_changes:
-        if result.backup_path is not None:
-            log.info("Backup created at {}", result.backup_path)
-        log.info("Updated {}", result.target_path)
-    else:
-        log.info("No changes were necessary.")
-    return 0
-
-
-def _handle_vscode(args: argparse.Namespace) -> int:
-    detected = detect_vscode_config_path()
-    target_path: Path = detected if detected else get_default_vscode_config_path()
-
-    create_if_missing = False
-    if not target_path.exists():
-        if args.yes:
-            create_if_missing = True
-        else:
-            confirmed = _prompt_yes_no(
-                f"VS Code MCP config not found at {target_path}. Create it?", default_no=False
-            )
-            if not confirmed:
-                log.info("Aborted: user declined to create missing file")
-                return 0
-            create_if_missing = True
-
-    try:
-        result = export_to_vscode(
-            url=args.url,
-            api_key=args.api_key,
-            server_name=args.name,
-            dry_run=args.dry_run,
-            force=args.force,
-            create_if_missing=create_if_missing,
-        )
-    except ExportError as e:
-        log.error(str(e))
-        return 1
-
-    if result.dry_run:
-        log.info("Dry-run complete. No changes written.")
-        return 0
-
-    if result.wrote_changes:
-        if result.backup_path is not None:
-            log.info("Backup created at {}", result.backup_path)
-        log.info("Updated {}", result.target_path)
-    else:
-        log.info("No changes were necessary.")
-    return 0
-
-
-def _handle_claude_code(args: argparse.Namespace) -> int:
-    from .paths import detect_claude_code_config_path, get_default_claude_code_config_path
-
-    detected = detect_claude_code_config_path()
-    target_path: Path = detected if detected else get_default_claude_code_config_path()
-
-    create_if_missing = False
-    if not target_path.exists():
-        if args.yes:
-            create_if_missing = True
-        else:
-            confirmed = _prompt_yes_no(
-                f"Claude Code config not found at {target_path}. Create it?", default_no=False
-            )
-            if not confirmed:
-                log.info("Aborted: user declined to create missing file")
-                return 0
-            create_if_missing = True
-
-    try:
-        result = export_to_claude_code(
-            url=args.url,
-            api_key=args.api_key,
-            server_name=args.name,
-            dry_run=args.dry_run,
-            force=args.force,
-            create_if_missing=create_if_missing,
-        )
-    except ExportError as e:
-        log.error(str(e))
-        return 1
-
-    if result.dry_run:
-        log.info("Dry-run complete. No changes written.")
-        return 0
-
-    if result.wrote_changes:
-        if result.backup_path is not None:
-            log.info("Backup created at {}", result.backup_path)
-        log.info("Updated {}", result.target_path)
-    else:
-        log.info("No changes were necessary.")
-    return 0
-
-
-def run_cli(argv: list[str] | None = None) -> int:
-    parser = build_arg_parser()
-    args = parser.parse_args(argv)
-
-    if args.target == "cursor":
-        return _handle_cursor(args)
-    if args.target == "vscode":
-        return _handle_vscode(args)
-    if args.target == "claude-code":
-        return _handle_claude_code(args)
-    log.error("Unsupported target: {}", args.target)
-    return 2
-
-
-def main() -> int:
-    return run_cli()
-
-
-if __name__ == "__main__":
-    raise SystemExit(main())