1563b05f2e
Task 0.5 of clean-analyst-bootstrap. Greenfield rewrite — no fallback, no aliases. Existing dev environments lose their cached PAT and must re-authenticate. Env var renames (hard cutover): - DA_CONFIG_DIR -> AGNES_CONFIG_DIR - DA_SERVER -> AGNES_SERVER - DA_SERVER_URL -> AGNES_SERVER_URL (test-only stale ref, not in spec) - DA_NO_UPDATE_CHECK -> AGNES_NO_UPDATE_CHECK - DA_LOCAL_DIR -> AGNES_LOCAL_DIR - DA_TOKEN -> AGNES_TOKEN - DA_STREAM_RETRIES -> AGNES_STREAM_RETRIES Config dir rename: ~/.config/da/ -> ~/.config/agnes/ (across code, comments, docstrings, error messages, install templates, dev scripts). Stale `da X` references in CLI source (and adjacent app/, tests/): swept docstrings, comments, help text, and error messages where the verb survives the rewrite (init, pull, push, catalog, status, diagnose, auth, admin, skills, query, schema, describe, explore, disk-info, snapshot, login, logout, whoami, server, setup) and replaced `da X` with `agnes X`. Intentionally kept `da sync`, `da fetch`, `da analyst`, `da metrics` — those verbs are removed in later tasks; the legacy strings will be detected by `_LEGACY_STRINGS` (added in Task 2). Test fixes: - TestCLIVersion now asserts output starts with `agnes ` (was `da `). Test results: 2675 passed, 25 skipped (full pytest run, excluding 9 pre-existing test_db.py / test_user_management.py / test_e2e_extract.py / test_cli_binary_rename.py failures unrelated to this rename).
78 lines
2.3 KiB
Python
78 lines
2.3 KiB
Python
"""CLI configuration — token storage, server URL, sync state."""
|
|
|
|
import json
|
|
import os
|
|
from pathlib import Path
|
|
from typing import Optional
|
|
|
|
|
|
def _config_dir() -> Path:
|
|
d = Path(os.environ.get("AGNES_CONFIG_DIR", os.path.expanduser("~/.config/agnes")))
|
|
d.mkdir(parents=True, exist_ok=True)
|
|
return d
|
|
|
|
|
|
def get_server_url() -> str:
|
|
config = load_config()
|
|
return os.environ.get("AGNES_SERVER", config.get("server", "http://localhost:8000"))
|
|
|
|
|
|
def get_token() -> Optional[str]:
|
|
token_file = _config_dir() / "token.json"
|
|
if token_file.exists():
|
|
data = json.loads(token_file.read_text())
|
|
return data.get("access_token")
|
|
return os.environ.get("AGNES_TOKEN")
|
|
|
|
|
|
def save_token(token: str, email: str, role: Optional[str] = None):
|
|
"""Persist token + email to ~/.config/agnes/token.json.
|
|
|
|
The ``role`` parameter is accepted for back-compat with older callers
|
|
but is no longer written — authorization derives from group memberships
|
|
server-side, not from a CLI-cached label. Old token.json files with a
|
|
``role`` field are still readable; the field is simply ignored.
|
|
"""
|
|
token_file = _config_dir() / "token.json"
|
|
token_file.write_text(json.dumps({
|
|
"access_token": token,
|
|
"email": email,
|
|
}, indent=2))
|
|
|
|
|
|
def clear_token():
|
|
token_file = _config_dir() / "token.json"
|
|
if token_file.exists():
|
|
token_file.unlink()
|
|
|
|
|
|
def load_config() -> dict:
|
|
config_file = _config_dir() / "config.yaml"
|
|
if config_file.exists():
|
|
import yaml
|
|
return yaml.safe_load(config_file.read_text()) or {}
|
|
return {}
|
|
|
|
|
|
def get_sync_state() -> dict:
|
|
state_file = _config_dir() / "sync_state.json"
|
|
if state_file.exists():
|
|
return json.loads(state_file.read_text())
|
|
return {}
|
|
|
|
|
|
def save_sync_state(state: dict):
|
|
state_file = _config_dir() / "sync_state.json"
|
|
state_file.write_text(json.dumps(state, indent=2))
|
|
|
|
|
|
def save_config(data: dict):
|
|
"""Persist server URL and other config to config.yaml."""
|
|
import yaml
|
|
|
|
config_file = _config_dir() / "config.yaml"
|
|
existing = {}
|
|
if config_file.exists():
|
|
existing = yaml.safe_load(config_file.read_text()) or {}
|
|
existing.update(data)
|
|
config_file.write_text(yaml.dump(existing, default_flow_style=False))
|