flexgate 0.2.0__tar.gz → 0.3.0__tar.gz

{flexgate-0.2.0 → flexgate-0.3.0}/CLAUDE.md

@@ -112,15 +112,14 @@ Claude Code → POST /v1/messages (model="claude-sonnet-4-6")
 ### Config location
 
 Config lives at `~/.flexgate/config.yaml` (override with `FLEXGATE_CONFIG`).
-An optional `confsync:` section (`server_url`, `app`) tweaks `flexgate sync`;
-normally no flexgate-side setup is needed — connection details come from the
-shared confsync credentials written by `confsync login --server <url>`
+`flexgate sync` needs no flexgate-side setup — connection details come from
+the shared confsync credentials written by `confsync login --server <url>`
 (`~/.confsync/credentials.json`). The whole config.yaml is synced as one
-encrypted document (default app `flexgate`, name `config.yaml`): pull merges
+encrypted document (app `flexgate`, name `config.yaml`): pull merges
 provider api_keys and imports remote-only providers (local routes/schedules
 untouched), bootstraps the file when missing, and `--full` replaces it with a
-timestamped backup. The confsync client package must be present in flexgate's
-environment (e.g. `uv tool inject flexgate <path-to-confsync>/client`).
+timestamped backup. The `confsync-client` package is a declared dependency
+(PyPI), so sync works out of the box once logged in.
 The persistent unit lives at `~/.config/systemd/user/flexgate.service`; logs are
 in the systemd user journal. `~/.flexgate/service-state.json` records the last
 successfully applied config path and endpoint. PID/guardian files are legacy artifacts only.

{flexgate-0.2.0 → flexgate-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: flexgate
-Version: 0.2.0
+Version: 0.3.0
 Summary: Flexible local API gateway for Claude Code — route models to different providers
 Project-URL: Homepage, https://github.com/Agony5757/flexible-gateway
 Project-URL: Repository, https://github.com/Agony5757/flexible-gateway
@@ -8,6 +8,7 @@ Project-URL: Issues, https://github.com/Agony5757/flexible-gateway/issues
 Author: agony
 License-Expression: MIT
 Requires-Python: >=3.11
+Requires-Dist: confsync-client>=0.1.0
 Requires-Dist: httpx[socks]>=0.27
 Requires-Dist: pyyaml>=6.0
 Requires-Dist: starlette>=0.37

{flexgate-0.2.0 → flexgate-0.3.0}/config.yaml.template

@@ -43,15 +43,6 @@ claude_settings:
   default_haiku_model: "claude-haiku-4-5"
   api_timeout_ms: 3000000
 
-# confsync 配置同步（可选）：`flexgate sync` 把整个 config.yaml 作为加密文档
-# 同步到你的 confsync 服务端。连接信息通常来自共享凭据（先执行
-# `confsync login --server <url>`，凭据存于 ~/.confsync/credentials.json），
-# flexgate 侧无需配置。下面的 confsync 段仅用于覆盖 server_url 或文档 app 名
-# （默认 app 为 "flexgate"，文档名 "config.yaml"）。
-# confsync:
-#   server_url: "https://confsync.example.com"
-#   app: "flexgate"
-
 # 定时路由（可选）：按时间自动切换模型配置，首个时间窗口命中生效
 # schedule:
 #   - name: "xiaomi-discount"

{flexgate-0.2.0 → flexgate-0.3.0}/flexgate/__init__.py

@@ -1,3 +1,3 @@
 """Flexgate — Flexible API Gateway for Claude Code."""
 
-__version__ = "0.2.0"
+__version__ = "0.3.0"

{flexgate-0.2.0 → flexgate-0.3.0}/flexgate/cli.py

@@ -700,17 +700,15 @@ def _print_sync_help() -> None:
     print("""\
 confsync sync (flexgate sync):
   Pushes/pulls config.yaml as an encrypted document on your confsync server.
-  Requires the confsync client package in flexgate's environment
-  (e.g. 'uv tool inject flexgate /path/to/confsync/client') and a one-time
-  'confsync login --server https://<server>' (shared credentials at
-  ~/.confsync/credentials.json). 'flexgate sync' (pull) updates api_keys of
+  Requires a one-time 'confsync login --server https://<server>' (shared
+  credentials at ~/.confsync/credentials.json); the confsync-client package
+  is a declared dependency. 'flexgate sync' (pull) updates api_keys of
   matching providers and imports providers present only remotely; local
   routes/schedules are untouched. On a machine without config.yaml the pull
   bootstraps the whole file. Use --full to replace the local config entirely
   (a timestamped backup is kept), 'flexgate sync push' to upload, and
-  --dry-run to preview. The optional 'confsync:' section in config.yaml
-  overrides server_url / app (default app 'flexgate', document 'config.yaml').
-  Changes hot-reload the running service automatically.
+  --dry-run to preview. The document lives at app 'flexgate', name
+  'config.yaml'. Changes hot-reload the running service automatically.
 """)
 
 

{flexgate-0.2.0 → flexgate-0.3.0}/flexgate/config.py

@@ -54,12 +54,6 @@ class ClaudeSettings:
     api_timeout_ms: int = 3000000
 
 
-@dataclass
-class ConfsyncConfig:
-    server_url: str = ""
-    app: str = "flexgate"
-
-
 @dataclass
 class ScheduleEntry:
     name: str
@@ -75,7 +69,6 @@ class GatewayConfig:
     routes: list[RouteConfig] = field(default_factory=list)
     schedule: list[ScheduleEntry] = field(default_factory=list)
     claude_settings: ClaudeSettings = field(default_factory=ClaudeSettings)
-    confsync: ConfsyncConfig = field(default_factory=ConfsyncConfig)
 
 
 def _parse_hhmm(value: str) -> int:
@@ -175,13 +168,6 @@ def load_config(path: str | None = None) -> GatewayConfig:
             api_timeout_ms=cs.get("api_timeout_ms", cfg.claude_settings.api_timeout_ms),
         )
 
-    cs2 = raw.get("confsync", {})
-    if cs2:
-        cfg.confsync = ConfsyncConfig(
-            server_url=str(cs2.get("server_url", "")),
-            app=str(cs2.get("app", "flexgate")),
-        )
-
     return cfg
 
 
@@ -221,12 +207,6 @@ def save_config(cfg: GatewayConfig, path: str | None = None) -> None:
         "routes": _serialize_routes(cfg.routes),
     }
 
-    if cfg.confsync.server_url:
-        data["confsync"] = {
-            "server_url": cfg.confsync.server_url,
-            "app": cfg.confsync.app,
-        }
-
     for name, prov in cfg.providers.items():
         entry: dict = {
             "base_url": prov.base_url,
@@ -305,16 +285,6 @@ claude_settings:
   default_haiku_model: "claude-haiku-4-5"
   api_timeout_ms: 3000000
 
-# confsync config sync (optional): `flexgate sync` pushes/pulls this whole
-# file as an encrypted document on your confsync server. Connection normally
-# comes from the shared confsync credentials (`confsync login --server ...`,
-# stored at ~/.confsync/credentials.json) — no flexgate-side setup needed.
-# The section below is only needed to override the server or the document
-# app name (default app: "flexgate", document name: "config.yaml").
-# confsync:
-#   server_url: "https://confsync.example.com"
-#   app: "flexgate"
-
 # Scheduled routes (optional): switch model config by time of day; the first
 # matching time window wins.
 # schedule:

{flexgate-0.2.0 → flexgate-0.3.0}/flexgate/migrate.py

@@ -18,7 +18,7 @@ import time
 from dataclasses import dataclass, field
 from typing import Callable
 
-CURRENT_CONFIG_VERSION = 2
+CURRENT_CONFIG_VERSION = 3
 
 # ── per-step migration rules ──────────────────────────────────────
 # Each rule takes the raw config dict at version N and returns it upgraded
@@ -51,10 +51,22 @@ def _migrate_1_to_2(data: dict) -> dict:
     return data
 
 
+def _migrate_2_to_3(data: dict) -> dict:
+    """Drop the removed `confsync:` section.
+
+    The confsync override section (server_url / app) was removed; sync now
+    always uses the shared confsync credentials (`confsync login --server ...`)
+    and the default document (app "flexgate", name "config.yaml").
+    """
+    data.pop("confsync", None)
+    return data
+
+
 # version N → rule upgrading N to N+1
 MIGRATIONS: dict[int, Callable[[dict], dict]] = {
     0: _migrate_0_to_1,
     1: _migrate_1_to_2,
+    2: _migrate_2_to_3,
 }
 
 

{flexgate-0.2.0 → flexgate-0.3.0}/flexgate/sync.py

@@ -2,8 +2,7 @@
 
 Connection details come from the shared confsync credentials
 (``confsync login --server <url>`` → ~/.confsync/credentials.json); the
-optional ``confsync:`` section in config.yaml only overrides the server URL
-and the document's app name (default app: "flexgate", name: "config.yaml").
+document is fixed at app "flexgate", name "config.yaml".
 
 Pull semantics:
   * local config missing → bootstrap: the remote document becomes the config
@@ -13,7 +12,6 @@ Pull semantics:
 """
 from __future__ import annotations
 
-import json
 import os
 import shutil
 import sys
@@ -31,9 +29,12 @@ def _import_confsync():
         from confsync import credentials  # noqa: PLC0415
         return confsync, credentials
     except ImportError:
-        print("The 'confsync' client package is not installed in flexgate's environment.")
-        print("Install it, e.g.:  uv tool inject flexgate /path/to/confsync/client")
-        print("Then run:          confsync login --server https://<your-confsync-server>")
+        # confsync-client is a declared dependency; reaching here means the
+        # installation is broken (e.g. an editable install predating the dep).
+        print("The 'confsync' client package is missing from flexgate's environment.")
+        print("Reinstall/upgrade flexgate to fix it (it is a declared dependency):")
+        print("  uv tool install --force -e .        # from the flexgate repo")
+        print("or inject it manually:  uv tool inject flexgate confsync-client")
         sys.exit(1)
 
 
@@ -43,35 +44,15 @@ def _mask_key(key: str) -> str:
     return key[:4] + "***" + key[-4:]
 
 
-def _get_client(config_path: str):
-    """Build a confsync client: shared credentials, optionally overridden by
-    the config's confsync: section (server_url / app)."""
+def _get_client():
+    """Build a confsync client from the shared confsync credentials."""
     confsync, credentials = _import_confsync()
-
-    server_url_override, app = "", DEFAULT_APP
-    if os.path.exists(config_path):
-        cfg = load_config(config_path)
-        server_url_override = cfg.confsync.server_url
-        app = cfg.confsync.app or DEFAULT_APP
-
     try:
         client = credentials.load_client()
     except confsync.ConfsyncError as e:
         print(str(e))
         sys.exit(1)
-
-    if server_url_override and server_url_override.rstrip("/") != client.server_url:
-        creds_path = credentials.get_credentials_path()
-        with open(creds_path) as f:
-            api_key = json.load(f)["api_key"]
-        client.close()
-        try:
-            client = confsync.ConfsyncClient(server_url_override, api_key)
-        except confsync.ConfsyncError as e:
-            print(str(e))
-            sys.exit(1)
-
-    return client, app
+    return client, DEFAULT_APP
 
 
 def sync_push(config_path: str) -> None:
@@ -82,7 +63,7 @@ def sync_push(config_path: str) -> None:
     with open(config_path, encoding="utf-8") as f:
         content = f.read()
 
-    client, app = _get_client(config_path)
+    client, app = _get_client()
     confsync, _ = _import_confsync()
     with client:
         try:
@@ -112,7 +93,7 @@ def sync_pull(config_path: str, dry_run: bool = False, full: bool = False) -> No
     """Pull the remote config: bootstrap, full replace (--full), or key merge."""
     import yaml
 
-    client, app = _get_client(config_path)
+    client, app = _get_client()
     confsync, _ = _import_confsync()
     with client:
         try:

{flexgate-0.2.0 → flexgate-0.3.0}/pyproject.toml

@@ -11,6 +11,7 @@ dependencies = [
     "uvicorn[standard]>=0.29",
     "httpx[socks]>=0.27",
     "pyyaml>=6.0",
+    "confsync-client>=0.1.0",
 ]
 
 [project.urls]