ver 1.3 and 1.3.1

2026-06-23 22:17:39 -05:00
parent 1881d2b105
commit b4605a52f2
53 changed files with 549 additions and 297 deletions
@@ -76,19 +76,45 @@ def main() -> int:
    check("H5 classify/preview/apply wired",
          all(callable(getattr(rf, n, None)) for n in ("classify", "preview", "apply")))

-    # M1 — secret resolution order is implemented; env wins, then the credentials file.
-    import echo_secrets as s
-    os.environ["ECHO_KEY"] = "env-key-123"
-    check("M1 env ECHO_KEY wins", s.resolve_key("legacy-fallback") == "env-key-123")
-    with tempfile.TemporaryDirectory() as d:
-        os.environ["ECHO_STATE_DIR"] = d
-        os.environ.pop("ECHO_KEY", None)
-        s.write_key("file-key-xyz")
-        check("M1 write_key -> credentials -> resolve_key reads it", s.resolve_key() == "file-key-xyz")
-        os.environ["ECHO_KEY_LEGACY_OK"] = "1"  # silence the warning for the legacy-path check
-        os.environ["ECHO_STATE_DIR"] = os.path.join(d, "empty")  # an empty dir: no creds file
-        check("M1 legacy fallback when env+file absent", s.resolve_key("legacy-fallback") == "legacy-fallback")
-    os.environ["ECHO_KEY"] = "env-key-123"  # restore for any later checks
+    # Config — owner/endpoint/key resolve from env -> machine-local config.json (no baked
+    # defaults). Env wins per field; the file fills the rest; missing required -> raises.
+    import echo_config as cfg
+    saved_env = {k: os.environ.get(k) for k in ("ECHO_KEY", "ECHO_BASE", "ECHO_OWNER", "ECHO_CONFIG")}
+    try:
+        for k in saved_env:
+            os.environ.pop(k, None)
+        with tempfile.TemporaryDirectory() as d:
+            cfgfile = os.path.join(d, "config.json")
+            os.environ["ECHO_CONFIG"] = cfgfile
+            # init writes the placeholder template only when absent.
+            p, created = cfg.init_template()
+            check("config init scaffolds the template", created and os.path.exists(cfgfile))
+            p2, created2 = cfg.init_template()
+            check("config init is idempotent (no clobber)", created2 is False)
+            # write_config persists a filled-in config; load() reads it back.
+            cfg.write_config("Owner Name", "https://obsidian.example.com/", "file-key-xyz")
+            loaded = cfg.load()
+            check("config file round-trips owner/endpoint/key",
+                  loaded == {"owner": "Owner Name",
+                             "endpoint": "https://obsidian.example.com",  # trailing / stripped
+                             "key": "file-key-xyz"})
+            # env overrides the file, per field.
+            os.environ["ECHO_KEY"] = "env-key-123"
+            check("env ECHO_KEY overrides config", cfg.resolve_key() == "env-key-123")
+            os.environ.pop("ECHO_KEY", None)
+            # missing required field raises a helpful error.
+            cfg.write_config("Owner Name", "", "")
+            try:
+                cfg.resolve_key()
+                check("missing key raises", False)
+            except RuntimeError:
+                check("missing key raises", True)
+    finally:
+        for k, v in saved_env.items():
+            if v is None:
+                os.environ.pop(k, None)
+            else:
+                os.environ[k] = v

    # M2 — slug collision + link-confidence helpers are implemented.
    import echo_quality as qual