Интервал обновления квот
diff --git a/src/antigravity_provider/router/web/static/style.css b/src/antigravity_provider/router/web/static/style.css
index 0f593bb..40fc448 100644
--- a/src/antigravity_provider/router/web/static/style.css
+++ b/src/antigravity_provider/router/web/static/style.css
@@ -1823,9 +1823,14 @@ body[data-theme="medium"] .nav-icon { stroke:var(--canvas-ink); }
.account-summary strong { display:block; font-size:24px; font-weight:500; margin:6px 0; }
.account-summary span,.account-summary small { color:var(--text-muted); font-size:11px; }
.accounts-groups-container { display:grid; grid-template-columns:repeat(3,minmax(0,1fr)); gap:12px; }
-.provider-group,.accounts-grid { display:contents; }
-.provider-group-header { display:none; }
-.account-card { min-width:0; padding:16px; }
+.provider-group { grid-column:1 / -1; min-width:0; }
+.provider-group-header { display:flex; justify-content:space-between; align-items:center; margin:12px 0; }
+.accounts-grid { display:grid; grid-template-columns:repeat(auto-fill,minmax(min(100%,300px),1fr)); gap:12px; }
+.account-card { min-width:0; padding:16px; height:auto; min-height:164px; gap:10px; }
+.account-card-header { flex-wrap:wrap; }
+.account-badges { min-width:0; flex-wrap:wrap; }
+.account-card .badge-status { white-space:normal; overflow-wrap:anywhere; }
+.badge-status.unhealthy { color:var(--status-error); }
.account-card-header { gap:8px; }
.account-provider-tag { display:flex; align-items:center; gap:10px; }
.account-provider-tag img { width:30px; height:30px; object-fit:contain; }
@@ -1924,3 +1929,6 @@ body[data-theme="medium"] .nav-item.active .nav-icon { stroke:var(--text-accent)
.route-model-with-logo { display:flex; align-items:center; gap:6px; min-width:0; }
.route-model-with-logo select { min-width:0; }
.agent-node-icon .brand-logo { width:27px; height:27px; }
+
+.account-check { font-size:12px; line-height:1.5; color:var(--text-secondary); overflow-wrap:anywhere; }
+.badge-status.checking { color:var(--text-accent); }
diff --git a/src/antigravity_provider/router/web/static/workspace.js b/src/antigravity_provider/router/web/static/workspace.js
index 0e8514e..3111a51 100644
--- a/src/antigravity_provider/router/web/static/workspace.js
+++ b/src/antigravity_provider/router/web/static/workspace.js
@@ -200,7 +200,7 @@ function arrangeSettingsPanels() {
const first = view.querySelector('.settings-card');
const groups = [
['Общие настройки',['setting-theme']],
- ['Управление квотами',['setting-quota-interval','setting-quota-threshold-percent','setting-quota-threshold-action']],
+ ['Управление квотами',['setting-account-check-interval','setting-quota-interval','setting-quota-threshold-percent','setting-quota-threshold-action']],
['Безопасность и API',['setting-server-host','setting-server-token-input','setting-email-masking-mode']],
];
for (const [title,ids] of groups) {
diff --git a/tests/manual/a50_preview.py b/tests/manual/a50_preview.py
new file mode 100644
index 0000000..d5d0b38
--- /dev/null
+++ b/tests/manual/a50_preview.py
@@ -0,0 +1,50 @@
+"""Isolated UI preview with synthetic accounts and a loopback HTTP provider.
+
+Run with PYTHONPATH=src python tests/manual/a50_preview.py. No owner data used.
+"""
+import json
+import os
+import tempfile
+import threading
+import time
+from types import SimpleNamespace
+from http.server import BaseHTTPRequestHandler, ThreadingHTTPServer
+
+os.environ["HERMES_HOME"] = tempfile.mkdtemp(prefix="a50-ui-test-")
+
+from antigravity_provider.router.auto_assigner import AutoAssigner
+from antigravity_provider.router.profile_manager import ProfileAuthManager
+from antigravity_provider.router.router_config import RouterConfig, save_router_config
+from antigravity_provider.router.quota_collector import AccountQuotaService
+from antigravity_provider.router.web import server
+
+
+class FixtureProvider(BaseHTTPRequestHandler):
+ def do_GET(self):
+ self.send_response(200)
+ self.end_headers()
+ self.wfile.write(b'{"data":[{"id":"qwen3:fixture"}]}')
+
+ def do_POST(self):
+ time.sleep(20)
+ healthy = "/working/" in self.path
+ self.send_response(200 if healthy else 401)
+ self.end_headers()
+ data = {"choices": [{"message": {"content": "fixture OK"}}]} if healthy else {"error": {"message": "Invalid API key — A50 test fixture"}}
+ self.wfile.write(json.dumps(data).encode())
+
+ def log_message(self, *args):
+ pass
+
+
+http = ThreadingHTTPServer(("127.0.0.1", 5813), FixtureProvider)
+threading.Thread(target=http.serve_forever, daemon=True).start()
+save_router_config(RouterConfig())
+for provider, pid, mode in [("nvidia", "nvidia-1", "failed"), ("nvidia", "nvidia-2", "working"), ("openrouter", "openrouter-1", "failed"), ("local", "local-1", "working")]:
+ AutoAssigner.ensure_profile_definition(provider, pid)
+ ProfileAuthManager.save_profile_auth(provider, pid, {"api_key": "intentionally-invalid-a50-fixture", "base_url": f"http://127.0.0.1:5813/{mode}/v1", "email": f"A50-TEST-{pid}"})
+# No quota/OAuth/update network in this isolated UI fixture.
+AccountQuotaService.get().fetch_all_configured = lambda **kw: None
+AccountQuotaService.get().start_background_scheduler = lambda: None
+server.UpdateManager.check_for_updates = lambda self: SimpleNamespace(error=None, message="Обновления отключены на тестовом стенде A50", update_available=False, to_dict=lambda: {})
+server.run_web_server(host="127.0.0.1", port=5803)
diff --git a/tests/test_a42_provider_connect.py b/tests/test_a42_provider_connect.py
index 30edb4b..328e6b5 100644
--- a/tests/test_a42_provider_connect.py
+++ b/tests/test_a42_provider_connect.py
@@ -111,7 +111,7 @@ def test_p0_1_add_account_openrouter_default_base_url():
},
)
assert res["ok"] is True
- assert "успешно подключен" in res["message"]
+ assert "сохранён" in res["message"]
# Verify profile created and auth saved
auth = ProfileAuthManager.load_profile_auth("openrouter", "openrouter-1")
@@ -137,7 +137,7 @@ def test_p0_1_add_account_nvidia_default_base_url():
},
)
assert res["ok"] is True
- assert "успешно подключен" in res["message"]
+ assert "сохранён" in res["message"]
auth = ProfileAuthManager.load_profile_auth("nvidia", "nvidia-1")
assert auth is not None
diff --git a/tests/test_accounts_a50.py b/tests/test_accounts_a50.py
new file mode 100644
index 0000000..9aec6ad
--- /dev/null
+++ b/tests/test_accounts_a50.py
@@ -0,0 +1,199 @@
+"""A50 regressions: real local HTTP rejection and isolated account configuration."""
+import io
+import json
+import threading
+import urllib.error
+from http.server import BaseHTTPRequestHandler, ThreadingHTTPServer
+
+import pytest
+
+from antigravity_provider.router.account_probe_service import AccountProbeService
+from antigravity_provider.router.action_handler import ActionExecutor, do_test_profile
+from antigravity_provider.router.auto_assigner import AutoAssigner
+from antigravity_provider.router.model_discovery_service import ModelDiscoveryService
+from antigravity_provider.router.router_config import RouterConfig, load_router_config, save_router_config
+
+
+@pytest.fixture
+def isolated(tmp_path, monkeypatch):
+ monkeypatch.setenv("HERMES_HOME", str(tmp_path))
+ save_router_config(RouterConfig())
+ service = AccountProbeService()
+ monkeypatch.setattr(AccountProbeService, "_instance", service)
+ discovery = ModelDiscoveryService(tmp_path / "test-model-cache.json")
+ monkeypatch.setattr(ModelDiscoveryService, "_instance", discovery)
+ monkeypatch.setattr("antigravity_provider.router.action_handler._rescan_after_auth", lambda: None)
+ monkeypatch.setattr("antigravity_provider.router.state_store.HubStateStore.refresh", lambda *a, **kw: None)
+ ActionExecutor._pending_connections.clear()
+ yield service, discovery
+ service._pool.shutdown(wait=True)
+
+
+@pytest.mark.parametrize("provider", ["nvidia", "openrouter", "grok", "claude"])
+def test_foreign_slot_rejected_before_write(isolated, provider):
+ result = ActionExecutor.execute("add_account", {"provider": provider, "profile_id": "ag-w1", "token": "intentionally-invalid"})
+ assert not result["ok"]
+ assert "не принадлежит" in result["message"]
+ assert not load_router_config().profiles
+
+
+@pytest.mark.parametrize("slot", ["../ag-w1", "/tmp/slot", "nvidia-1/evil"])
+def test_unsafe_slot_rejected(isolated, slot):
+ assert not AutoAssigner.ensure_profile_definition("nvidia", slot)[0]
+
+
+@pytest.mark.parametrize("provider", ["nvidia", "openrouter"])
+def test_invalid_key_real_http_correct_slot(isolated, provider):
+ class Reject(BaseHTTPRequestHandler):
+ def do_POST(self):
+ self.send_response(401)
+ self.send_header("Content-Type", "application/json")
+ self.end_headers()
+ self.wfile.write(json.dumps({"error": {"message": "Invalid API key (A50 fixture)"}}).encode())
+
+ def do_GET(self):
+ self.do_POST()
+
+ def log_message(self, *args):
+ pass
+
+ server = ThreadingHTTPServer(("127.0.0.1", 0), Reject)
+ thread = threading.Thread(target=server.serve_forever, daemon=True)
+ thread.start()
+ try:
+ result = ActionExecutor.execute("add_account", {
+ "provider": provider, "token": "intentionally-invalid",
+ "base_url": f"http://127.0.0.1:{server.server_port}/v1",
+ })
+ assert result["ok"]
+ pid = result["data"]["profile_id"]
+ assert pid.startswith(provider + "-")
+ assert load_router_config().get_profile(pid).provider == provider
+ probe = do_test_profile(provider, pid)
+ assert not probe["success"]
+ assert "401" in probe["error"] and "Invalid API key" in probe["error"]
+ discovery = isolated[1]
+ assert discovery.discover_models_sync(provider, profile_id=pid) is None
+ assert "Invalid API key" in discovery.get_models_with_metadata(provider, pid)["error"]
+ finally:
+ server.shutdown()
+ server.server_close()
+ thread.join()
+
+
+def test_parallel_probe_dedup_and_failure_state(isolated, monkeypatch):
+ service, discovery = isolated
+ service.enabled = True
+ entered = threading.Event()
+ release = threading.Event()
+ def probe(*args, **kwargs):
+ entered.set()
+ assert release.wait(2)
+ return {"success": False, "error": "HTTP 401: Invalid API key"}
+ monkeypatch.setattr("antigravity_provider.router.action_handler.do_test_profile", probe)
+ monkeypatch.setattr(discovery, "discover_models_sync", lambda *a, **kw: [])
+ assert service.state("nvidia-1")["state"] == "never_checked"
+ assert service.schedule("nvidia", "nvidia-1")
+ assert entered.wait(2)
+ assert service.state("nvidia-1")["state"] == "checking"
+ assert not service.schedule("nvidia", "nvidia-1", force=True)
+ release.set()
+ service._pool.shutdown(wait=True)
+ assert service.state("nvidia-1")["state"] == "failed"
+ assert "401" in service.state("nvidia-1")["message"]
+ assert service.state("nvidia-1")["checked_at"]
+
+
+def test_model_caches_are_account_scoped(isolated, monkeypatch):
+ _, service = isolated
+ monkeypatch.setattr(service, "_probe_provider", lambda p: ([service._probe_context.profile_id], None))
+ service.discover_models_sync("grok", profile_id="grok-1")
+ service.discover_models_sync("grok", profile_id="grok-2")
+ assert service.get_models_with_metadata("grok", "grok-1")["models"] == ["grok-1"]
+ assert service.get_models_with_metadata("grok", "grok-2")["models"] == ["grok-2"]
+
+
+def test_model_error_retains_timestamped_cache(isolated, monkeypatch):
+ _, service = isolated
+ monkeypatch.setattr(service, "_probe_provider", lambda p: (["known-model"], None))
+ service.discover_models_sync("grok", profile_id="grok-1")
+ timestamp = service.get_models_with_metadata("grok", "grok-1")["discovered_at"]
+ monkeypatch.setattr(service, "_probe_provider", lambda p: (None, "HTTP 403: account refused"))
+ service.discover_models_sync("grok", profile_id="grok-1")
+ cached = service.get_models_with_metadata("grok", "grok-1")
+ assert cached["discovered_at"] == timestamp
+ assert cached["models"] == ["known-model"]
+ assert "403" in cached["error"]
+
+
+def test_cloud_catalog_documented_url_no_credentials(isolated, monkeypatch):
+ _, service = isolated
+ def urlopen(request, **kwargs):
+ assert request.full_url == "https://ollama.com/api/tags"
+ assert not request.has_header("Authorization")
+ return io.BytesIO(b'{"models":[{"name":"test-cloud"}]}')
+ monkeypatch.setattr("urllib.request.urlopen", urlopen)
+ result = service.discover_ollama_cloud()
+ assert result["models"] == ["test-cloud"]
+ assert result["discovered_at"]
+
+
+def test_llama_cpp_label_does_not_rename_id(isolated):
+ assert AutoAssigner.ensure_profile_definition("local", "local-1")[0]
+ assert AutoAssigner.get_display_name_and_role("local-1")[0] == "llama.cpp 1"
+ assert load_router_config().get_profile("local-1").provider == "local"
+
+
+def test_periodic_checks_start_automatically_and_respect_interval(isolated, monkeypatch):
+ service, _ = isolated
+ service.enabled = True
+ calls = []
+ monkeypatch.setattr(service, "schedule_all", lambda **kw: calls.append(kw) or 1)
+ assert service.tick(now=1000) == 1
+ assert service.tick(now=1001) == 0
+ assert service.tick(now=1299) == 0
+ assert service.tick(now=1300) == 1
+ assert calls == [{"force": True}, {"force": True}]
+
+
+def test_http_plaintext_error_preserved(isolated):
+ _, service = isolated
+ error = urllib.error.HTTPError("https://example.invalid/models", 403, "Forbidden", {}, io.BytesIO(b"Account disabled by provider"))
+ assert service._extract_http_error(error) == "HTTP 403: Account disabled by provider"
+
+
+def test_slow_action_does_not_block_web_health(isolated, monkeypatch):
+ import asyncio
+ import httpx
+ from antigravity_provider.router.web.server import app
+ entered = threading.Event()
+ release = threading.Event()
+ def slow_action(*args, **kwargs):
+ entered.set()
+ release.wait(2)
+ return {"ok": True, "message": "test fixture"}
+ monkeypatch.setattr(ActionExecutor, "execute", slow_action)
+ async def exercise():
+ async with httpx.AsyncClient(transport=httpx.ASGITransport(app=app), base_url="http://test") as client:
+ pending = asyncio.create_task(client.post("/api/action", json={"action": "add_account"}))
+ try:
+ assert await asyncio.to_thread(entered.wait, 1)
+ response = await client.get("/api/health")
+ assert response.status_code == 200
+ assert not pending.done(), "A slow account action blocked the event loop"
+ finally:
+ release.set()
+ await pending
+ asyncio.run(exercise())
+
+
+def test_repeated_connection_rejected_while_checking(isolated, monkeypatch):
+ service, _ = isolated
+ service.enabled = True
+ monkeypatch.setattr(service._pool, "submit", lambda *args: None)
+ payload = {"provider": "nvidia", "token": "intentionally-invalid-repeated"}
+ first = ActionExecutor.execute("add_account", payload)
+ second = ActionExecutor.execute("add_account", payload)
+ assert first["ok"] and first["data"]["profile_id"] == "nvidia-1"
+ assert not second["ok"] and "проверяется" in second["message"]
+ assert list(load_router_config().profiles) == ["nvidia-1"]
diff --git a/tests/test_memory_freshness_a47.py b/tests/test_memory_freshness_a47.py
index 9a22a7e..a38fb28 100644
--- a/tests/test_memory_freshness_a47.py
+++ b/tests/test_memory_freshness_a47.py
@@ -32,7 +32,8 @@ def test_check_memory_freshness_real_repo():
)
assert is_fresh is True
assert "FRESH" in summary
- assert "80aab00" in summary
+ recorded = extract_recorded_commit(canonical_memory.read_text(encoding="utf-8"))
+ assert recorded and recorded[:7] in summary
def test_check_memory_freshness_missing_file_strict_vs_non_strict(tmp_path):
diff --git a/tests/test_web_handlers_dom_contract.js b/tests/test_web_handlers_dom_contract.js
index 9efcbb0..00ad8c4 100644
--- a/tests/test_web_handlers_dom_contract.js
+++ b/tests/test_web_handlers_dom_contract.js
@@ -305,6 +305,24 @@ async function runTests() {
const refreshModelsAction = executedActions.find(a => a.action === 'refresh_models');
assert(refreshModelsAction, 'handleRefreshProviderModels did not trigger refresh_models action');
+ console.log('10. A50: abandoned Antigravity -> NVIDIA/OpenRouter does not retain its slot');
+ for (const provider of ['nvidia', 'openrouter']) {
+ sandbox.openAddAccountWizard();
+ sandbox.showWizardStep2('antigravity');
+ getOrCreateElement('wiz-redirect-slot').value = 'ag-w1';
+ sandbox.proceedToWizardStep3('antigravity');
+ assert.strictEqual(sandbox.window._wiz_device_profile, 'ag-w1');
+ sandbox.showWizardStep1();
+ sandbox.showWizardStep2(provider);
+ getOrCreateElement('wiz-redirect-slot').value = '';
+ getOrCreateElement('wiz-token-input').value = 'intentionally-invalid';
+ sandbox.proceedToWizardStep3(provider);
+ await sandbox.finishAddAccount(provider);
+ const action = [...executedActions].reverse().find(a => a.action === 'add_account');
+ assert.strictEqual(action.data.provider, provider);
+ assert.strictEqual(action.data.profile_id, '');
+ }
+
console.log('\nAll targeted Node.js DOM and contract test assertions PASSED successfully!');
process.exit(0);
}
})
${providerNames[providerId] || providerId}