mirror of
https://github.com/zvx-echo6/recon.git
synced 2026-08-26 17:21:33 +00:00
cleanup: pull the entire /nav-i/* subtree (api-keys page is a weaker dup of /settings/keys)
Completes the contacts cleanup by removing the rest of /nav-i/. The /nav-i/api-keys page was (a) a weaker duplicate of /settings/keys for Gemini (it lacked remove + reload-from-.env), and (b) a write-only-to-dead-files surface for TomTom + Google Places: it wrote /opt/recon/.env, but the live navi-traffic (:8421) and navi-places (:8425) services read their own /etc/navi-backend/<svc>.env and have ignored recon's copy since extractions #1 + #5. End state: no /nav-i/* URLs in recon. Removed: - /nav-i/api-keys route + template (templates/navi/api_keys.html) - all /api/nav-i/api-keys/* endpoints (list/update/test/restart-recon) - lib/api_keys_admin.py (its only importers were those 4 endpoints; _KEY_DEFS/ _read_env/_write_env were private to it) - the now-orphaned NAVI_SUBNAV - the "Nav-I" top-nav entry in base.html (reverses the /nav-i->/nav-i/api-keys repoint from the previous commit, now that the page itself is gone) Kept (Gemini's real home, recon-product): - /settings/keys + /api/keys/* + lib/key_manager.py (KeyManager) — they import key_manager directly, never api_keys_admin, so untouched. Note: TOMTOM_API_KEY now has zero recon .py references. GOOGLE_PLACES_API_KEY still has one (lib/google_places.py), kept in the prior /api/place cleanup as place_detail's dep; its only caller (_enrich_with_google) is unreachable since the /api/place handlers were removed — left in place pending /api/wiki-enrich retirement (out of scope here). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
parent
e0fc8d0cff
commit
f3831386cd
4 changed files with 0 additions and 692 deletions
64
lib/api.py
64
lib/api.py
|
|
@ -101,10 +101,6 @@ SETTINGS_SUBNAV = [
|
||||||
{'href': '/settings/health', 'label': 'Service Health'},
|
{'href': '/settings/health', 'label': 'Service Health'},
|
||||||
]
|
]
|
||||||
|
|
||||||
NAVI_SUBNAV = [
|
|
||||||
{'href': '/nav-i/api-keys', 'label': 'API Keys'},
|
|
||||||
]
|
|
||||||
|
|
||||||
|
|
||||||
def _format_source_citation(payload):
|
def _format_source_citation(payload):
|
||||||
"""Format a human-readable citation from a search result payload."""
|
"""Format a human-readable citation from a search result payload."""
|
||||||
|
|
@ -331,12 +327,6 @@ def failures_page():
|
||||||
failures=failures)
|
failures=failures)
|
||||||
|
|
||||||
|
|
||||||
@app.route("/nav-i/api-keys")
|
|
||||||
def navi_api_keys_page():
|
|
||||||
return render_template("navi/api_keys.html",
|
|
||||||
domain="navi", subnav=NAVI_SUBNAV, active_page="/nav-i/api-keys")
|
|
||||||
|
|
||||||
|
|
||||||
@app.route('/peertube')
|
@app.route('/peertube')
|
||||||
def peertube_dashboard():
|
def peertube_dashboard():
|
||||||
return render_template('peertube/dashboard.html',
|
return render_template('peertube/dashboard.html',
|
||||||
|
|
@ -1374,60 +1364,6 @@ def api_keys_reload():
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# ── Nav-I API Key Admin ──
|
|
||||||
|
|
||||||
@app.route('/api/nav-i/api-keys/list', methods=['GET'])
|
|
||||||
def navi_api_keys_list():
|
|
||||||
from .api_keys_admin import list_keys
|
|
||||||
return jsonify({'keys': list_keys()})
|
|
||||||
|
|
||||||
|
|
||||||
@app.route('/api/nav-i/api-keys/update', methods=['POST'])
|
|
||||||
def navi_api_keys_update():
|
|
||||||
from .auth import require_auth
|
|
||||||
from .api_keys_admin import update_key, update_gemini_key
|
|
||||||
data = request.get_json(force=True)
|
|
||||||
name = data.get('name', '')
|
|
||||||
new_value = data.get('new_value', '')
|
|
||||||
index = data.get('index') # optional, for Gemini key replacement
|
|
||||||
if not name or not new_value:
|
|
||||||
return jsonify({'error': 'name and new_value required'}), 400
|
|
||||||
if name == 'GEMINI_KEY' and index is not None:
|
|
||||||
result = update_gemini_key(int(index), new_value)
|
|
||||||
else:
|
|
||||||
result = update_key(name, new_value)
|
|
||||||
if result.get('success'):
|
|
||||||
return jsonify(result)
|
|
||||||
return jsonify(result), 400
|
|
||||||
|
|
||||||
|
|
||||||
@app.route('/api/nav-i/api-keys/test', methods=['POST'])
|
|
||||||
def navi_api_keys_test():
|
|
||||||
from .api_keys_admin import test_key
|
|
||||||
data = request.get_json(force=True)
|
|
||||||
name = data.get('name', '')
|
|
||||||
index = data.get('index') # optional, for testing specific Gemini key
|
|
||||||
if not name:
|
|
||||||
return jsonify({'error': 'name required'}), 400
|
|
||||||
result = test_key(name, index=int(index) if index is not None else None)
|
|
||||||
return jsonify(result)
|
|
||||||
|
|
||||||
|
|
||||||
@app.route('/api/nav-i/api-keys/restart-recon', methods=['POST'])
|
|
||||||
def navi_api_keys_restart():
|
|
||||||
import subprocess
|
|
||||||
try:
|
|
||||||
result = subprocess.run(
|
|
||||||
['sudo', 'systemctl', 'restart', 'recon'],
|
|
||||||
capture_output=True, text=True, timeout=30
|
|
||||||
)
|
|
||||||
if result.returncode == 0:
|
|
||||||
return jsonify({'success': True, 'note': 'RECON service restarted'})
|
|
||||||
return jsonify({'success': False, 'error': result.stderr.strip()}), 500
|
|
||||||
except subprocess.TimeoutExpired:
|
|
||||||
return jsonify({'success': False, 'error': 'Restart timed out'}), 500
|
|
||||||
except Exception as e:
|
|
||||||
return jsonify({'success': False, 'error': str(e)}), 500
|
|
||||||
|
|
||||||
|
|
||||||
# ── YouTube Cookie Management ──
|
# ── YouTube Cookie Management ──
|
||||||
|
|
|
||||||
|
|
@ -1,358 +0,0 @@
|
||||||
"""
|
|
||||||
Nav-I API Keys Admin — unified view/update/test for third-party API keys.
|
|
||||||
|
|
||||||
Manages three provider categories:
|
|
||||||
- Gemini (multiple keys via KeyManager singleton)
|
|
||||||
- TomTom (single key in .env)
|
|
||||||
- Google Places (single key in .env)
|
|
||||||
|
|
||||||
All key values are masked in responses. Full values never leave the server
|
|
||||||
except as user-supplied input on update.
|
|
||||||
"""
|
|
||||||
import os
|
|
||||||
import re
|
|
||||||
import shutil
|
|
||||||
import tempfile
|
|
||||||
import time
|
|
||||||
|
|
||||||
import requests as http_requests
|
|
||||||
|
|
||||||
from .utils import setup_logging
|
|
||||||
|
|
||||||
logger = setup_logging('recon.api_keys_admin')
|
|
||||||
|
|
||||||
ENV_PATH = os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), '.env')
|
|
||||||
|
|
||||||
# Key definitions: env_name → display metadata
|
|
||||||
_KEY_DEFS = {
|
|
||||||
'TOMTOM_API_KEY': {
|
|
||||||
'display_name': 'TomTom',
|
|
||||||
'provider': 'tomtom',
|
|
||||||
},
|
|
||||||
'GOOGLE_PLACES_API_KEY': {
|
|
||||||
'display_name': 'Google Places',
|
|
||||||
'provider': 'google_places',
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
# ── .env read/write helpers ─────────────────────────────────────────────
|
|
||||||
|
|
||||||
def _read_env():
|
|
||||||
"""Read .env file into a dict of key=value pairs, preserving order."""
|
|
||||||
entries = [] # list of (key, value, raw_line) — preserves order and comments
|
|
||||||
if not os.path.exists(ENV_PATH):
|
|
||||||
return entries
|
|
||||||
with open(ENV_PATH, 'r') as f:
|
|
||||||
for line in f:
|
|
||||||
raw = line.rstrip('\n')
|
|
||||||
stripped = raw.strip()
|
|
||||||
if not stripped or stripped.startswith('#'):
|
|
||||||
entries.append((None, None, raw))
|
|
||||||
continue
|
|
||||||
m = re.match(r'^([A-Za-z_][A-Za-z0-9_]*)=(.*)$', stripped)
|
|
||||||
if m:
|
|
||||||
entries.append((m.group(1), m.group(2).strip().strip('"').strip("'"), raw))
|
|
||||||
else:
|
|
||||||
entries.append((None, None, raw))
|
|
||||||
return entries
|
|
||||||
|
|
||||||
|
|
||||||
def _write_env(entries):
|
|
||||||
"""Atomically write .env from entries list. Backs up to .env.bak first."""
|
|
||||||
# Backup current .env
|
|
||||||
if os.path.exists(ENV_PATH):
|
|
||||||
bak_path = ENV_PATH + '.bak'
|
|
||||||
shutil.copy2(ENV_PATH, bak_path)
|
|
||||||
|
|
||||||
# Write to temp file, then rename (atomic on same filesystem)
|
|
||||||
fd, tmp_path = tempfile.mkstemp(dir=os.path.dirname(ENV_PATH), prefix='.env.', suffix='.tmp')
|
|
||||||
try:
|
|
||||||
with os.fdopen(fd, 'w') as f:
|
|
||||||
for key, value, raw in entries:
|
|
||||||
if key is not None:
|
|
||||||
f.write(f'{key}={value}\n')
|
|
||||||
else:
|
|
||||||
f.write(raw + '\n')
|
|
||||||
os.rename(tmp_path, ENV_PATH)
|
|
||||||
except Exception:
|
|
||||||
# Clean up temp file on failure
|
|
||||||
try:
|
|
||||||
os.unlink(tmp_path)
|
|
||||||
except OSError:
|
|
||||||
pass
|
|
||||||
raise
|
|
||||||
|
|
||||||
logger.info(f"Wrote .env atomically ({len([e for e in entries if e[0]])} keys)")
|
|
||||||
|
|
||||||
|
|
||||||
def _get_env_value(name):
|
|
||||||
"""Get a single value from .env by key name."""
|
|
||||||
for key, value, _ in _read_env():
|
|
||||||
if key == name:
|
|
||||||
return value
|
|
||||||
return None
|
|
||||||
|
|
||||||
|
|
||||||
def _set_env_value(name, new_value):
|
|
||||||
"""Set a single value in .env. Adds if not present."""
|
|
||||||
entries = _read_env()
|
|
||||||
found = False
|
|
||||||
for i, (key, value, raw) in enumerate(entries):
|
|
||||||
if key == name:
|
|
||||||
entries[i] = (name, new_value, f'{name}={new_value}')
|
|
||||||
found = True
|
|
||||||
break
|
|
||||||
if not found:
|
|
||||||
entries.append((name, new_value, f'{name}={new_value}'))
|
|
||||||
_write_env(entries)
|
|
||||||
|
|
||||||
|
|
||||||
# ── Masking ─────────────────────────────────────────────────────────────
|
|
||||||
|
|
||||||
def _mask_key(value):
|
|
||||||
"""Mask a key: first 4 chars + '...' + last 4 chars. Never return full value."""
|
|
||||||
if not value:
|
|
||||||
return None
|
|
||||||
if len(value) <= 8:
|
|
||||||
return '****'
|
|
||||||
return value[:4] + '...' + value[-4:]
|
|
||||||
|
|
||||||
|
|
||||||
# ── List ────────────────────────────────────────────────────────────────
|
|
||||||
|
|
||||||
def list_keys():
|
|
||||||
"""
|
|
||||||
Return masked status of all managed API keys.
|
|
||||||
|
|
||||||
Returns list of dicts with: name, display_name, provider, masked_value,
|
|
||||||
is_set, count (for multi-key providers like Gemini).
|
|
||||||
"""
|
|
||||||
result = []
|
|
||||||
env_mtime = None
|
|
||||||
if os.path.exists(ENV_PATH):
|
|
||||||
env_mtime = time.strftime('%Y-%m-%dT%H:%M:%SZ',
|
|
||||||
time.gmtime(os.path.getmtime(ENV_PATH)))
|
|
||||||
|
|
||||||
# Gemini keys (via KeyManager)
|
|
||||||
from .key_manager import get_key_manager
|
|
||||||
km = get_key_manager()
|
|
||||||
gemini_keys = km.get_masked_keys()
|
|
||||||
gemini_count = len(gemini_keys)
|
|
||||||
# Show a single summary entry for Gemini with count
|
|
||||||
first_masked = gemini_keys[0]['masked'] if gemini_keys else None
|
|
||||||
result.append({
|
|
||||||
'name': 'GEMINI_KEY',
|
|
||||||
'display_name': 'Gemini',
|
|
||||||
'provider': 'gemini',
|
|
||||||
'masked_value': first_masked,
|
|
||||||
'is_set': gemini_count > 0,
|
|
||||||
'count': gemini_count,
|
|
||||||
'last_modified': env_mtime,
|
|
||||||
'keys': gemini_keys, # full list with per-key stats
|
|
||||||
})
|
|
||||||
|
|
||||||
# Single-value keys
|
|
||||||
for env_name, meta in _KEY_DEFS.items():
|
|
||||||
value = _get_env_value(env_name)
|
|
||||||
result.append({
|
|
||||||
'name': env_name,
|
|
||||||
'display_name': meta['display_name'],
|
|
||||||
'provider': meta['provider'],
|
|
||||||
'masked_value': _mask_key(value),
|
|
||||||
'is_set': bool(value),
|
|
||||||
'count': 1 if value else 0,
|
|
||||||
'last_modified': env_mtime,
|
|
||||||
})
|
|
||||||
|
|
||||||
return result
|
|
||||||
|
|
||||||
|
|
||||||
# ── Update ──────────────────────────────────────────────────────────────
|
|
||||||
|
|
||||||
def update_key(name, new_value):
|
|
||||||
"""
|
|
||||||
Update a key value. For Gemini, name should be 'GEMINI_KEY' with an
|
|
||||||
optional 'index' for replacing a specific key, or use the KeyManager API.
|
|
||||||
For TomTom/Google Places, writes directly to .env.
|
|
||||||
|
|
||||||
Returns dict with success status and masked value.
|
|
||||||
"""
|
|
||||||
new_value = new_value.strip()
|
|
||||||
if not new_value:
|
|
||||||
return {'success': False, 'error': 'Key value cannot be empty'}
|
|
||||||
|
|
||||||
if name == 'GEMINI_KEY':
|
|
||||||
# Use KeyManager for Gemini
|
|
||||||
from .key_manager import get_key_manager
|
|
||||||
km = get_key_manager()
|
|
||||||
try:
|
|
||||||
idx = km.add_gemini_key(new_value)
|
|
||||||
return {
|
|
||||||
'success': True,
|
|
||||||
'name': name,
|
|
||||||
'masked_value': _mask_key(new_value),
|
|
||||||
'action': 'added',
|
|
||||||
'index': idx,
|
|
||||||
}
|
|
||||||
except ValueError as e:
|
|
||||||
return {'success': False, 'error': str(e)}
|
|
||||||
|
|
||||||
if name in _KEY_DEFS:
|
|
||||||
_set_env_value(name, new_value)
|
|
||||||
return {
|
|
||||||
'success': True,
|
|
||||||
'name': name,
|
|
||||||
'masked_value': _mask_key(new_value),
|
|
||||||
'action': 'updated',
|
|
||||||
}
|
|
||||||
|
|
||||||
return {'success': False, 'error': f'Unknown key: {name}'}
|
|
||||||
|
|
||||||
|
|
||||||
def update_gemini_key(index, new_value):
|
|
||||||
"""Replace a specific Gemini key by index."""
|
|
||||||
new_value = new_value.strip()
|
|
||||||
if not new_value:
|
|
||||||
return {'success': False, 'error': 'Key value cannot be empty'}
|
|
||||||
|
|
||||||
from .key_manager import get_key_manager
|
|
||||||
km = get_key_manager()
|
|
||||||
try:
|
|
||||||
km.replace_gemini_key(index, new_value)
|
|
||||||
return {
|
|
||||||
'success': True,
|
|
||||||
'name': 'GEMINI_KEY',
|
|
||||||
'index': index,
|
|
||||||
'masked_value': _mask_key(new_value),
|
|
||||||
'action': 'replaced',
|
|
||||||
}
|
|
||||||
except (ValueError, IndexError) as e:
|
|
||||||
return {'success': False, 'error': str(e)}
|
|
||||||
|
|
||||||
|
|
||||||
# ── Test ────────────────────────────────────────────────────────────────
|
|
||||||
|
|
||||||
def test_key(name, index=None):
|
|
||||||
"""
|
|
||||||
Test a key against its provider API using the current .env value.
|
|
||||||
|
|
||||||
Returns dict with: success, latency_ms, error, note.
|
|
||||||
"""
|
|
||||||
if name == 'GEMINI_KEY':
|
|
||||||
return _test_gemini(index)
|
|
||||||
elif name == 'TOMTOM_API_KEY':
|
|
||||||
return _test_tomtom()
|
|
||||||
elif name == 'GOOGLE_PLACES_API_KEY':
|
|
||||||
return _test_google_places()
|
|
||||||
else:
|
|
||||||
return {'success': False, 'error': f'Unknown key: {name}', 'latency_ms': 0}
|
|
||||||
|
|
||||||
|
|
||||||
def _test_gemini(index=None):
|
|
||||||
"""Test Gemini key by listing models."""
|
|
||||||
from .key_manager import get_key_manager
|
|
||||||
km = get_key_manager()
|
|
||||||
|
|
||||||
if index is not None:
|
|
||||||
key = km.get_gemini_key(index)
|
|
||||||
if not key:
|
|
||||||
return {'success': False, 'error': f'Gemini key index {index} not found', 'latency_ms': 0}
|
|
||||||
else:
|
|
||||||
key = km.get_gemini_key(0)
|
|
||||||
if not key:
|
|
||||||
return {'success': False, 'error': 'No Gemini keys configured', 'latency_ms': 0}
|
|
||||||
|
|
||||||
t0 = time.time()
|
|
||||||
try:
|
|
||||||
resp = http_requests.get(
|
|
||||||
f"https://generativelanguage.googleapis.com/v1beta/models?key={key}",
|
|
||||||
timeout=10
|
|
||||||
)
|
|
||||||
latency = int((time.time() - t0) * 1000)
|
|
||||||
|
|
||||||
if resp.status_code == 200 and 'models' in resp.text:
|
|
||||||
return {'success': True, 'latency_ms': latency, 'error': None,
|
|
||||||
'note': 'Models list returned successfully'}
|
|
||||||
elif resp.status_code == 403:
|
|
||||||
return {'success': False, 'latency_ms': latency,
|
|
||||||
'error': 'Key disabled or quota exhausted'}
|
|
||||||
elif resp.status_code == 429:
|
|
||||||
return {'success': True, 'latency_ms': latency, 'error': None,
|
|
||||||
'note': 'Valid key — currently rate-limited'}
|
|
||||||
else:
|
|
||||||
return {'success': False, 'latency_ms': latency,
|
|
||||||
'error': f'HTTP {resp.status_code}'}
|
|
||||||
except Exception as e:
|
|
||||||
latency = int((time.time() - t0) * 1000)
|
|
||||||
return {'success': False, 'latency_ms': latency, 'error': str(e)}
|
|
||||||
|
|
||||||
|
|
||||||
def _test_tomtom():
|
|
||||||
"""Test TomTom key with a minimal geocode request."""
|
|
||||||
key = _get_env_value('TOMTOM_API_KEY')
|
|
||||||
if not key:
|
|
||||||
return {'success': False, 'error': 'TOMTOM_API_KEY not set', 'latency_ms': 0}
|
|
||||||
|
|
||||||
t0 = time.time()
|
|
||||||
try:
|
|
||||||
resp = http_requests.get(
|
|
||||||
f"https://api.tomtom.com/search/2/geocode/Boise.json",
|
|
||||||
params={'key': key, 'limit': 1},
|
|
||||||
timeout=10
|
|
||||||
)
|
|
||||||
latency = int((time.time() - t0) * 1000)
|
|
||||||
|
|
||||||
if resp.status_code == 200:
|
|
||||||
data = resp.json()
|
|
||||||
count = data.get('summary', {}).get('totalResults', 0)
|
|
||||||
return {'success': True, 'latency_ms': latency, 'error': None,
|
|
||||||
'note': f'Geocode returned {count} result(s)'}
|
|
||||||
elif resp.status_code == 403:
|
|
||||||
return {'success': False, 'latency_ms': latency,
|
|
||||||
'error': 'Invalid or expired key'}
|
|
||||||
else:
|
|
||||||
return {'success': False, 'latency_ms': latency,
|
|
||||||
'error': f'HTTP {resp.status_code}'}
|
|
||||||
except Exception as e:
|
|
||||||
latency = int((time.time() - t0) * 1000)
|
|
||||||
return {'success': False, 'latency_ms': latency, 'error': str(e)}
|
|
||||||
|
|
||||||
|
|
||||||
def _test_google_places():
|
|
||||||
"""Test Google Places (New) API key with a minimal searchText request."""
|
|
||||||
key = _get_env_value('GOOGLE_PLACES_API_KEY')
|
|
||||||
if not key:
|
|
||||||
return {'success': False, 'error': 'GOOGLE_PLACES_API_KEY not set', 'latency_ms': 0}
|
|
||||||
|
|
||||||
t0 = time.time()
|
|
||||||
try:
|
|
||||||
resp = http_requests.post(
|
|
||||||
"https://places.googleapis.com/v1/places:searchText",
|
|
||||||
json={'textQuery': 'Boise Idaho', 'maxResultCount': 1},
|
|
||||||
headers={
|
|
||||||
'X-Goog-Api-Key': key,
|
|
||||||
'X-Goog-FieldMask': 'places.displayName',
|
|
||||||
},
|
|
||||||
timeout=10
|
|
||||||
)
|
|
||||||
latency = int((time.time() - t0) * 1000)
|
|
||||||
|
|
||||||
if resp.status_code == 200:
|
|
||||||
data = resp.json()
|
|
||||||
count = len(data.get('places', []))
|
|
||||||
return {'success': True, 'latency_ms': latency, 'error': None,
|
|
||||||
'note': f'searchText returned {count} place(s)'}
|
|
||||||
elif resp.status_code == 403:
|
|
||||||
return {'success': False, 'latency_ms': latency,
|
|
||||||
'error': 'Key not authorized for Places API (New)'}
|
|
||||||
elif resp.status_code == 429:
|
|
||||||
return {'success': True, 'latency_ms': latency, 'error': None,
|
|
||||||
'note': 'Valid key — quota exceeded'}
|
|
||||||
else:
|
|
||||||
body = resp.text[:200]
|
|
||||||
return {'success': False, 'latency_ms': latency,
|
|
||||||
'error': f'HTTP {resp.status_code}: {body}'}
|
|
||||||
except Exception as e:
|
|
||||||
latency = int((time.time() - t0) * 1000)
|
|
||||||
return {'success': False, 'latency_ms': latency, 'error': str(e)}
|
|
||||||
|
|
@ -21,7 +21,6 @@
|
||||||
<a href="/peertube"{% if domain == 'peertube' %} class="active"{% endif %}>PeerTube</a>
|
<a href="/peertube"{% if domain == 'peertube' %} class="active"{% endif %}>PeerTube</a>
|
||||||
<a href="/kiwix"{% if domain == 'kiwix' %} class="active"{% endif %}>Kiwix</a>
|
<a href="/kiwix"{% if domain == 'kiwix' %} class="active"{% endif %}>Kiwix</a>
|
||||||
<a href="/search"{% if domain == 'search' %} class="active"{% endif %}>Search</a>
|
<a href="/search"{% if domain == 'search' %} class="active"{% endif %}>Search</a>
|
||||||
<a href="/nav-i/api-keys"{% if domain == 'navi' %} class="active"{% endif %}>Nav-I</a>
|
|
||||||
<a href="/settings/keys"{% if domain == 'settings' %} class="active"{% endif %}>Settings</a>
|
<a href="/settings/keys"{% if domain == 'settings' %} class="active"{% endif %}>Settings</a>
|
||||||
</div>
|
</div>
|
||||||
{% if subnav %}
|
{% if subnav %}
|
||||||
|
|
|
||||||
|
|
@ -1,269 +0,0 @@
|
||||||
{% extends "base.html" %}
|
|
||||||
{% block content %}
|
|
||||||
<h3 style="color:var(--orange);margin-bottom:16px;">API Keys</h3>
|
|
||||||
|
|
||||||
<div class="panel" style="margin-bottom:16px;padding:10px 14px;border-left:3px solid var(--orange);">
|
|
||||||
<p class="text-dim" style="font-size:12px;margin:0;">Updating keys does not restart RECON. After updates, click <strong style="color:var(--text-primary);">Restart RECON</strong> below or restart manually from terminal.</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div id="keys-loading" class="text-dim" style="padding:20px;">Loading keys...</div>
|
|
||||||
<div id="keys-error" style="display:none;padding:12px;color:#ff4444;"></div>
|
|
||||||
|
|
||||||
<table id="keys-table" style="display:none;">
|
|
||||||
<thead>
|
|
||||||
<tr><th>Provider</th><th>Masked Value</th><th>Count</th><th>Last Modified</th><th style="width:200px;">Actions</th></tr>
|
|
||||||
</thead>
|
|
||||||
<tbody id="keys-tbody"></tbody>
|
|
||||||
</table>
|
|
||||||
|
|
||||||
<div id="gemini-detail" style="display:none;margin-top:16px;">
|
|
||||||
<h4 style="color:var(--text-primary);margin-bottom:8px;font-size:13px;">Gemini Keys</h4>
|
|
||||||
<table style="font-size:12px;">
|
|
||||||
<thead>
|
|
||||||
<tr><th>#</th><th>Masked Key</th><th>Calls</th><th>Errors</th><th>Last Used</th><th style="width:200px;">Actions</th></tr>
|
|
||||||
</thead>
|
|
||||||
<tbody id="gemini-tbody"></tbody>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div style="margin-top:20px;padding-top:16px;border-top:1px solid var(--border-light);">
|
|
||||||
<button class="btn" onclick="restartRecon(this)" style="border-color:var(--orange);color:var(--orange);">Restart RECON</button>
|
|
||||||
<span id="restart-status" class="text-dim text-xs" style="margin-left:8px;"></span>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Update modal -->
|
|
||||||
<div id="update-modal" style="display:none;position:fixed;inset:0;z-index:50;background:rgba(0,0,0,0.6);align-items:center;justify-content:center;">
|
|
||||||
<div style="background:var(--bg-secondary);border:1px solid var(--border-light);padding:24px;max-width:440px;width:90%;">
|
|
||||||
<h4 style="color:var(--orange);margin-bottom:12px;">Update Key</h4>
|
|
||||||
<p class="text-dim" style="margin-bottom:4px;font-size:12px;">Provider: <span id="modal-provider" style="color:var(--text-primary);"></span></p>
|
|
||||||
<p class="text-dim" style="margin-bottom:12px;font-size:12px;">Key: <span id="modal-key-name" style="color:var(--text-primary);font-family:var(--font-mono);"></span></p>
|
|
||||||
<div style="position:relative;">
|
|
||||||
<input id="modal-new-value" type="password" placeholder="Paste new key value..." autocomplete="off" style="width:100%;padding:6px 36px 6px 10px;background:var(--bg-tertiary);border:1px solid var(--border-light);color:var(--text-primary);font-family:var(--font-mono);font-size:13px;">
|
|
||||||
<button onclick="toggleKeyVisibility()" style="position:absolute;right:4px;top:50%;transform:translateY(-50%);background:none;border:none;color:var(--text-dim);cursor:pointer;font-size:11px;padding:4px;" title="Toggle visibility" id="modal-toggle-vis">show</button>
|
|
||||||
</div>
|
|
||||||
<div style="display:flex;gap:8px;justify-content:flex-end;margin-top:16px;">
|
|
||||||
<button class="btn" onclick="closeUpdateModal()">Cancel</button>
|
|
||||||
<button class="btn" id="modal-save" onclick="saveKey()" style="border-color:var(--green);color:var(--green);">Save</button>
|
|
||||||
</div>
|
|
||||||
<p id="modal-error" style="display:none;color:#ff4444;font-size:12px;margin-top:8px;"></p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% endblock %}
|
|
||||||
|
|
||||||
{% block scripts %}
|
|
||||||
<script>
|
|
||||||
var pendingUpdate = null; // {name, index, provider}
|
|
||||||
|
|
||||||
async function loadKeys() {
|
|
||||||
try {
|
|
||||||
var resp = await fetch('/api/nav-i/api-keys/list');
|
|
||||||
if (!resp.ok) throw new Error('HTTP ' + resp.status);
|
|
||||||
var data = await resp.json();
|
|
||||||
renderKeys(data.keys);
|
|
||||||
} catch(e) {
|
|
||||||
document.getElementById('keys-loading').style.display = 'none';
|
|
||||||
var errEl = document.getElementById('keys-error');
|
|
||||||
errEl.textContent = 'Failed to load keys: ' + e.message;
|
|
||||||
errEl.style.display = 'block';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function renderKeys(keys) {
|
|
||||||
document.getElementById('keys-loading').style.display = 'none';
|
|
||||||
document.getElementById('keys-table').style.display = '';
|
|
||||||
|
|
||||||
var tbody = document.getElementById('keys-tbody');
|
|
||||||
tbody.innerHTML = '';
|
|
||||||
|
|
||||||
keys.forEach(function(k) {
|
|
||||||
var tr = document.createElement('tr');
|
|
||||||
tr.id = 'row-' + k.name;
|
|
||||||
|
|
||||||
var masked = k.masked_value || '<span class="text-dim">not set</span>';
|
|
||||||
var countStr = k.count.toString();
|
|
||||||
var mtime = k.last_modified ? k.last_modified.replace('T', ' ').replace('Z', '') : '—';
|
|
||||||
|
|
||||||
tr.innerHTML =
|
|
||||||
'<td style="font-weight:600;">' + k.display_name + '</td>' +
|
|
||||||
'<td><code style="font-size:12px;">' + masked + '</code></td>' +
|
|
||||||
'<td style="text-align:center;">' + countStr + '</td>' +
|
|
||||||
'<td class="text-dim text-xs">' + mtime + '</td>' +
|
|
||||||
'<td>' +
|
|
||||||
(k.provider === 'gemini'
|
|
||||||
? '<button class="btn" onclick="toggleGeminiDetail()">Details</button> '
|
|
||||||
: '<button class="btn" onclick="openUpdateModal(\'' + k.name + '\', null, \'' + k.display_name + '\')">Update</button> ') +
|
|
||||||
'<button class="btn" onclick="testKey(\'' + k.name + '\', null, this)">Test</button>' +
|
|
||||||
'<span class="test-result text-xs" style="margin-left:6px;"></span>' +
|
|
||||||
'</td>';
|
|
||||||
tbody.appendChild(tr);
|
|
||||||
|
|
||||||
// Render Gemini sub-table
|
|
||||||
if (k.provider === 'gemini' && k.keys) {
|
|
||||||
renderGeminiKeys(k.keys);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function renderGeminiKeys(keys) {
|
|
||||||
var tbody = document.getElementById('gemini-tbody');
|
|
||||||
tbody.innerHTML = '';
|
|
||||||
|
|
||||||
keys.forEach(function(k) {
|
|
||||||
var tr = document.createElement('tr');
|
|
||||||
var lastUsed = k.last_used ? k.last_used.replace('T', ' ').replace('Z', '') : '—';
|
|
||||||
tr.innerHTML =
|
|
||||||
'<td>' + k.index + '</td>' +
|
|
||||||
'<td><code style="font-size:11px;">' + k.masked + '</code></td>' +
|
|
||||||
'<td style="text-align:center;">' + k.calls + '</td>' +
|
|
||||||
'<td style="text-align:center;">' + (k.errors || 0) + '</td>' +
|
|
||||||
'<td class="text-dim text-xs">' + lastUsed + '</td>' +
|
|
||||||
'<td>' +
|
|
||||||
'<button class="btn" onclick="openUpdateModal(\'GEMINI_KEY\', ' + k.index + ', \'Gemini #' + k.index + '\')">Update</button> ' +
|
|
||||||
'<button class="btn" onclick="testKey(\'GEMINI_KEY\', ' + k.index + ', this)">Test</button>' +
|
|
||||||
'<span class="test-result text-xs" style="margin-left:6px;"></span>' +
|
|
||||||
'</td>';
|
|
||||||
tbody.appendChild(tr);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function toggleGeminiDetail() {
|
|
||||||
var el = document.getElementById('gemini-detail');
|
|
||||||
el.style.display = el.style.display === 'none' ? '' : 'none';
|
|
||||||
}
|
|
||||||
|
|
||||||
function openUpdateModal(name, index, displayName) {
|
|
||||||
pendingUpdate = {name: name, index: index};
|
|
||||||
document.getElementById('modal-provider').textContent = displayName;
|
|
||||||
document.getElementById('modal-key-name').textContent = name + (index !== null ? ' [' + index + ']' : '');
|
|
||||||
document.getElementById('modal-new-value').value = '';
|
|
||||||
document.getElementById('modal-new-value').type = 'password';
|
|
||||||
document.getElementById('modal-toggle-vis').textContent = 'show';
|
|
||||||
document.getElementById('modal-error').style.display = 'none';
|
|
||||||
document.getElementById('update-modal').style.display = 'flex';
|
|
||||||
document.getElementById('modal-new-value').focus();
|
|
||||||
}
|
|
||||||
|
|
||||||
function closeUpdateModal() {
|
|
||||||
document.getElementById('update-modal').style.display = 'none';
|
|
||||||
pendingUpdate = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
function toggleKeyVisibility() {
|
|
||||||
var inp = document.getElementById('modal-new-value');
|
|
||||||
var btn = document.getElementById('modal-toggle-vis');
|
|
||||||
if (inp.type === 'password') {
|
|
||||||
inp.type = 'text';
|
|
||||||
btn.textContent = 'hide';
|
|
||||||
} else {
|
|
||||||
inp.type = 'password';
|
|
||||||
btn.textContent = 'show';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function saveKey() {
|
|
||||||
if (!pendingUpdate) return;
|
|
||||||
var newValue = document.getElementById('modal-new-value').value.trim();
|
|
||||||
if (!newValue) {
|
|
||||||
var errEl = document.getElementById('modal-error');
|
|
||||||
errEl.textContent = 'Key value cannot be empty.';
|
|
||||||
errEl.style.display = 'block';
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
var saveBtn = document.getElementById('modal-save');
|
|
||||||
saveBtn.disabled = true;
|
|
||||||
saveBtn.textContent = 'Saving...';
|
|
||||||
|
|
||||||
try {
|
|
||||||
var body = {name: pendingUpdate.name, new_value: newValue};
|
|
||||||
if (pendingUpdate.index !== null) body.index = pendingUpdate.index;
|
|
||||||
|
|
||||||
var resp = await fetch('/api/nav-i/api-keys/update', {
|
|
||||||
method: 'POST',
|
|
||||||
headers: {'Content-Type': 'application/json'},
|
|
||||||
body: JSON.stringify(body)
|
|
||||||
});
|
|
||||||
var data = await resp.json();
|
|
||||||
if (data.success) {
|
|
||||||
closeUpdateModal();
|
|
||||||
loadKeys(); // refresh table
|
|
||||||
} else {
|
|
||||||
var errEl = document.getElementById('modal-error');
|
|
||||||
errEl.textContent = data.error || 'Update failed';
|
|
||||||
errEl.style.display = 'block';
|
|
||||||
}
|
|
||||||
} catch(e) {
|
|
||||||
var errEl = document.getElementById('modal-error');
|
|
||||||
errEl.textContent = 'Error: ' + e.message;
|
|
||||||
errEl.style.display = 'block';
|
|
||||||
} finally {
|
|
||||||
saveBtn.disabled = false;
|
|
||||||
saveBtn.textContent = 'Save';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function testKey(name, index, btn) {
|
|
||||||
var resultSpan = btn.nextElementSibling;
|
|
||||||
resultSpan.textContent = 'testing...';
|
|
||||||
resultSpan.style.color = 'var(--text-dim)';
|
|
||||||
btn.disabled = true;
|
|
||||||
|
|
||||||
try {
|
|
||||||
var body = {name: name};
|
|
||||||
if (index !== null) body.index = index;
|
|
||||||
|
|
||||||
var resp = await fetch('/api/nav-i/api-keys/test', {
|
|
||||||
method: 'POST',
|
|
||||||
headers: {'Content-Type': 'application/json'},
|
|
||||||
body: JSON.stringify(body)
|
|
||||||
});
|
|
||||||
var data = await resp.json();
|
|
||||||
if (data.success) {
|
|
||||||
resultSpan.innerHTML = '<span style="color:var(--green);">✓</span> Pass — ' + data.latency_ms + 'ms';
|
|
||||||
if (data.note) resultSpan.innerHTML += ' <span class="text-dim">(' + data.note + ')</span>';
|
|
||||||
} else {
|
|
||||||
resultSpan.innerHTML = '<span style="color:#ff4444;">✗</span> Failed: ' + (data.error || 'unknown');
|
|
||||||
}
|
|
||||||
} catch(e) {
|
|
||||||
resultSpan.innerHTML = '<span style="color:#ff4444;">✗</span> Error: ' + e.message;
|
|
||||||
} finally {
|
|
||||||
btn.disabled = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function restartRecon(btn) {
|
|
||||||
if (!confirm('Restart RECON service? Active enrichment/embedding workers will be interrupted.')) return;
|
|
||||||
|
|
||||||
var statusEl = document.getElementById('restart-status');
|
|
||||||
btn.disabled = true;
|
|
||||||
statusEl.textContent = 'Restarting...';
|
|
||||||
statusEl.style.color = 'var(--text-dim)';
|
|
||||||
|
|
||||||
try {
|
|
||||||
var resp = await fetch('/api/nav-i/api-keys/restart-recon', {method: 'POST'});
|
|
||||||
var data = await resp.json();
|
|
||||||
if (data.success) {
|
|
||||||
statusEl.innerHTML = '<span style="color:var(--green);">✓</span> Restarted successfully';
|
|
||||||
} else {
|
|
||||||
statusEl.innerHTML = '<span style="color:#ff4444;">✗</span> ' + (data.error || 'Failed');
|
|
||||||
}
|
|
||||||
} catch(e) {
|
|
||||||
statusEl.innerHTML = '<span style="color:#ff4444;">✗</span> ' + e.message;
|
|
||||||
} finally {
|
|
||||||
btn.disabled = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Close modal on Escape key
|
|
||||||
document.addEventListener('keydown', function(e) {
|
|
||||||
if (e.key === 'Escape') closeUpdateModal();
|
|
||||||
});
|
|
||||||
// Close modal on backdrop click
|
|
||||||
document.getElementById('update-modal').addEventListener('click', function(e) {
|
|
||||||
if (e.target === this) closeUpdateModal();
|
|
||||||
});
|
|
||||||
|
|
||||||
// Load on page init
|
|
||||||
loadKeys();
|
|
||||||
</script>
|
|
||||||
{% endblock %}
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue