open-edison 0.1.34__py3-none-any.whl → 0.1.36__py3-none-any.whl

{open_edison-0.1.34.dist-info → open_edison-0.1.36.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: open-edison
-Version: 0.1.34
+Version: 0.1.36
 Summary: Open-source MCP security, aggregation, and monitoring. Single-user, self-hosted MCP proxy.
 Author-email: Hugo Berg <hugo@edison.watch>
 License-File: LICENSE
@@ -20,10 +20,6 @@ Requires-Dist: pyyaml>=6.0.2
 Requires-Dist: sqlalchemy>=2.0.41
 Requires-Dist: starlette>=0.47.1
 Requires-Dist: uvicorn>=0.35.0
-Provides-Extra: dev
-Requires-Dist: pytest-asyncio>=1.0.0; extra == 'dev'
-Requires-Dist: pytest>=8.3.3; extra == 'dev'
-Requires-Dist: ruff>=0.12.3; extra == 'dev'
 Description-Content-Type: text/markdown
 
 # OpenEdison 🔒⚡️

{open_edison-0.1.34.dist-info → open_edison-0.1.36.dist-info}/RECORD

@@ -1,11 +1,12 @@
 src/__init__.py,sha256=QWeZdjAm2D2B0eWhd8m2-DPpWvIP26KcNJxwEoU1oEQ,254
 src/__main__.py,sha256=kQsaVyzRa_ESC57JpKDSQJAHExuXme0rM5beJsYxFeA,161
-src/cli.py,sha256=Mz8nMlCHJk0Il8Kr6wB5iKPPMb3WpbBfU2PPLsnYicE,10235
-src/config.py,sha256=CHrKta7WZbwhKy7FK9y1FEmhbg6VyI5mXhRJ0GHGM6s,10130
-src/events.py,sha256=rBH7rnaSWZ7GIC8zyBTwpcvIKWmKYCki-DNGgJhxPow,5001
+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=DLs-ak35cyEDROctDjzI6-C_ymWe3RekETW0XA5ag_M,45650
+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
@@ -14,8 +15,8 @@ src/frontend_dist/assets/index-BUUcUfTt.js,sha256=awoyPI6u0v6ao2iarZdSkrSDUvyU8a
 src/frontend_dist/assets/index-o6_8mdM8.css,sha256=nwmX_6q55mB9463XN2JM8BdeihjkALpQK83Fc3_iGvE,15936
 src/middleware/data_access_tracker.py,sha256=bArBffWgYmvxOx9z_pgXQhogvnWQcc1m6WvEblDD4gw,15039
 src/middleware/session_tracking.py,sha256=5W1VH9HNqIZeX0HNxDEm41U4GY6SqKSXtApDEeZK2qo,23084
-open_edison-0.1.34.dist-info/METADATA,sha256=UkIWgEvTC1MzzM9xu2sTg4Ik2MVoG99pAE5W2UOa1d4,12077
-open_edison-0.1.34.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-open_edison-0.1.34.dist-info/entry_points.txt,sha256=qNAkJcnoTXRhj8J--3PDmXz_TQKdB8H_0C9wiCtDIyA,72
-open_edison-0.1.34.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-open_edison-0.1.34.dist-info/RECORD,,
+open_edison-0.1.36.dist-info/METADATA,sha256=o3ys6S2yDzXOQXKUqJ43lArMvpxeUYYqwDnOAqbl5gs,11915
+open_edison-0.1.36.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+open_edison-0.1.36.dist-info/entry_points.txt,sha256=qNAkJcnoTXRhj8J--3PDmXz_TQKdB8H_0C9wiCtDIyA,72
+open_edison-0.1.36.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+open_edison-0.1.36.dist-info/RECORD,,

src/cli.py

@@ -4,8 +4,6 @@ CLI entrypoint for Open Edison.
 Provides `open-edison` executable when installed via pip/uvx/pipx.
 """
 
-from __future__ import annotations
-
 import argparse
 import asyncio
 import os
@@ -69,11 +67,6 @@ def _parse_args(argv: list[str] | None = None) -> argparse.Namespace:
         default="interactive",
         help="Source application to import from",
     )
-    sp_import.add_argument(
-        "--project-dir",
-        type=Path,
-        help="When --source=cursor, path to the project containing .cursor/mcp.json",
-    )
     sp_import.add_argument(
         "--config-dir",
         type=Path,
@@ -250,11 +243,6 @@ def main(argv: list[str] | None = None) -> NoReturn:  # noqa: C901
         importer_argv: list[str] = []
         if args.source:
             importer_argv += ["--source", str(args.source)]
-        if getattr(args, "project_dir", None):
-            importer_argv += [
-                "--project-dir",
-                str(Path(args.project_dir).expanduser().resolve()),
-            ]
         if getattr(args, "config_dir", None):
             importer_argv += [
                 "--config-dir",
@@ -262,8 +250,6 @@ def main(argv: list[str] | None = None) -> NoReturn:  # noqa: C901
             ]
         if args.merge:
             importer_argv += ["--merge", str(args.merge)]
-        if bool(getattr(args, "enable_imported", False)):
-            importer_argv += ["--enable-imported"]
         if bool(getattr(args, "dry_run", False)):
             importer_argv += ["--dry-run"]
 

src/config.py

@@ -142,11 +142,16 @@ class TelemetryConfig:
 def load_json_file(path: Path) -> dict[str, Any]:
     """Load a JSON file from the given path.
     Kept as a separate function because we want to manually clear cache sometimes (update in config)"""
-    log.info(f"Loading configuration from {path}")
+    log.trace(f"Loading configuration from {path}")
     with open(path) as f:
         return json.load(f)
 
 
+def clear_json_file_cache() -> None:
+    """Clear the cache for the given JSON file path"""
+    load_json_file.cache_clear()
+
+
 @dataclass
 class Config:
     """Main configuration class"""

src/config.pyi

@@ -0,0 +1,80 @@
+from pathlib import Path
+from typing import Any, overload
+
+# Module constants
+DEFAULT_OTLP_METRICS_ENDPOINT: str
+root_dir: Path
+
+def get_config_dir() -> Path: ...
+def get_config_json_path() -> Path: ...
+
+class ServerConfig:
+    host: str
+    port: int
+    api_key: str
+
+class LoggingConfig:
+    level: str
+    database_path: str
+
+class MCPServerConfig:
+    name: str
+    command: str
+    args: list[str]
+    env: dict[str, str] | None
+    enabled: bool
+    roots: list[str] | None
+    oauth_scopes: list[str] | None
+    oauth_client_name: str | None
+
+    def __init__(
+        self,
+        *,
+        name: str,
+        command: str,
+        args: list[str],
+        env: dict[str, str] | None = None,
+        enabled: bool = True,
+        roots: list[str] | None = None,
+        oauth_scopes: list[str] | None = None,
+        oauth_client_name: str | None = None,
+    ) -> None: ...
+    def is_remote_server(self) -> bool: ...
+    def get_remote_url(self) -> str | None: ...
+
+class TelemetryConfig:
+    enabled: bool
+    otlp_endpoint: str | None
+    headers: dict[str, str] | None
+    export_interval_ms: int
+    def __init__(
+        self,
+        *,
+        enabled: bool = True,
+        otlp_endpoint: str | None = None,
+        headers: dict[str, str] | None = None,
+        export_interval_ms: int = 60000,
+    ) -> None: ...
+
+def load_json_file(path: Path) -> dict[str, Any]: ...
+def clear_json_file_cache() -> None: ...
+
+class Config:
+    @property
+    def version(self) -> str: ...
+    server: ServerConfig
+    logging: LoggingConfig
+    mcp_servers: list[MCPServerConfig]
+    telemetry: TelemetryConfig | None
+    @overload
+    def __init__(self, config_path: Path | None = None) -> None: ...
+    @overload
+    def __init__(
+        self,
+        server: ServerConfig,
+        logging: LoggingConfig,
+        mcp_servers: list[MCPServerConfig],
+        telemetry: TelemetryConfig | None = None,
+    ) -> None: ...
+    def save(self, config_path: Path | None = None) -> None: ...
+    def create_default(self) -> None: ...

src/events.py

@@ -5,8 +5,6 @@ Provides a simple publisher/subscriber model to stream JSON events to
 connected dashboard clients over Server-Sent Events (SSE).
 """
 
-from __future__ import annotations
-
 import asyncio
 import json
 from collections.abc import AsyncIterator, Callable

src/server.py

@@ -30,7 +30,7 @@ from loguru import logger as log
 from pydantic import BaseModel, Field
 
 from src import events
-from src.config import Config, MCPServerConfig, load_json_file
+from src.config import Config, MCPServerConfig, clear_json_file_cache
 from src.config import get_config_dir as _get_cfg_dir  # type: ignore[attr-defined]
 from src.middleware.session_tracking import (
     MCPSessionModel,
@@ -275,7 +275,7 @@ class OpenEdisonProxy:
 
                 # Clear cache for the config file, if it was config.json
                 if name == "config.json":
-                    load_json_file.cache_clear()
+                    clear_json_file_cache()
 
                 return {"status": "ok"}
             except Exception as e:  # noqa: BLE001