forked from retoor/devplacepy
Compare commits
5
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
83a0d43199 | ||
|
|
e55b0dac0f | ||
|
|
f58a4cdf7a | ||
|
|
a3864c9bff | ||
|
|
33ca56ddc4 |
File diff suppressed because one or more lines are too long
@@ -1353,6 +1353,9 @@ def migrate_ai_gateway_settings() -> None:
|
||||
if not get_setting("gateway_vision_key", "") and openrouter:
|
||||
set_setting("gateway_vision_key", openrouter)
|
||||
logger.info("Migrated gateway vision key from environment")
|
||||
if not get_setting("gateway_embed_key", "") and openrouter:
|
||||
set_setting("gateway_embed_key", openrouter)
|
||||
logger.info("Migrated gateway embed key from environment")
|
||||
for key in ("news_ai_url", "bot_api_url", "devii_ai_url"):
|
||||
if get_setting(key, "") == OLD_GATEWAY_URL:
|
||||
set_setting(key, INTERNAL_GATEWAY_URL)
|
||||
|
||||
@@ -76,7 +76,7 @@ The gateway is the only place that holds real provider URLs/models/keys. Every o
|
||||
- Defaults live in `config.py`: `INTERNAL_GATEWAY_URL` (`http://localhost:10500/openai/v1/chat/completions`, override with `DEVPLACE_INTERNAL_BASE_URL`) and `INTERNAL_MODEL` (`molodetz`). `news_ai_url`, `bot_api_url`, `devii_ai_url` default to `INTERNAL_GATEWAY_URL`; their model defaults to `molodetz`.
|
||||
- Each consumer's key falls back to `database.internal_gateway_key()` (reads the `gateway_internal_key` setting) when its own key field/env is unset - the provider-key fallbacks (`DEEPSEEK_API_KEY`/`OPENROUTER_API_KEY`) were removed from news and bots.
|
||||
- `gateway_force_model` (default on) and a `molodetz`/empty alias in `handle_chat` make the upstream always receive `gateway_model`, so `molodetz` is a stable generic alias.
|
||||
- `database.migrate_ai_gateway_settings()` (called at the end of `init_db()`, under the startup `init_lock`): generates `gateway_internal_key` (uuid4) if missing; migrates `DEEPSEEK_API_KEY`/`OPENROUTER_API_KEY` env into `gateway_api_key`/`gateway_vision_key` when the db value is empty; and rewrites any consumer AI URL still equal to the old `openai.app.molodetz.nl` default to the gateway, plus `bot_model` `deepseek-chat` -> `molodetz` (only uncustomized values).
|
||||
- `database.migrate_ai_gateway_settings()` (called at the end of `init_db()`, under the startup `init_lock`): generates `gateway_internal_key` (uuid4) if missing; migrates `DEEPSEEK_API_KEY`/`OPENROUTER_API_KEY` env into `gateway_api_key`/`gateway_vision_key`/`gateway_embed_key` when the db value is empty; and rewrites any consumer AI URL still equal to the old `openai.app.molodetz.nl` default to the gateway, plus `bot_model` `deepseek-chat` -> `molodetz` (only uncustomized values).
|
||||
- The gateway's `gateway_api_key`/`gateway_vision_key`/`gateway_internal_key` fields are **non-secret** so the admin services page shows the value actually in use, editable.
|
||||
- Bot LLM calls are synchronous `urllib` but already run via `asyncio.to_thread` (`bot/bot.py`), so the local round-trip never blocks the event loop.
|
||||
- Real provider keys/URLs/models live ONLY in the gateway. The gateway is `default_enabled=True`.
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{% macro comment_cell(item, depth, parent_author=None, parent_url=None) %}
|
||||
{% macro comment_cell(item, depth, parent_author=None) %}
|
||||
<div class="comment" style="--comment-depth: {{ depth }};" data-depth="{{ depth }}">
|
||||
<div class="comment-votes" role="group" aria-label="Comment votes">
|
||||
<form method="POST" action="/votes/comment/{{ item.comment['uid'] }}">
|
||||
@@ -26,7 +26,6 @@
|
||||
{% endif %}
|
||||
<div class="comment-actions">
|
||||
<button type="button" class="comment-action-btn" data-action="reply"{{ guest_disabled(user) }}><span class="icon">đź’¬</span><span class="label"> Reply</span></button>
|
||||
<button type="button" class="comment-action-btn" data-share="{{ parent_url }}#comment-{{ item.comment['uid'] }}"><span class="icon">🔗</span><span class="label"> Share</span></button>
|
||||
{% if owns(item.comment, user) %}
|
||||
<button type="button" class="comment-action-btn" data-action="edit" data-edit-url="/comments/edit/{{ item.comment['uid'] }}"><span class="icon">✏️</span><span class="label"> Edit</span></button>
|
||||
<form method="POST" action="/comments/delete/{{ item.comment['uid'] }}" class="inline-form comment-delete-form" data-comment-uid="{{ item.comment['uid'] }}">
|
||||
@@ -40,21 +39,21 @@
|
||||
</div>
|
||||
{% endmacro %}
|
||||
|
||||
{% macro render_comment(item, depth=0, parent_url=None) %}
|
||||
{% macro render_comment(item, depth=0) %}
|
||||
{% set max_depth = 2 %}
|
||||
{% set visual_depth = depth if depth < max_depth else max_depth %}
|
||||
{% call comment_cell(item, visual_depth, parent_url=parent_url) %}
|
||||
{% call comment_cell(item, visual_depth) %}
|
||||
{% if item.children %}
|
||||
{% if depth < max_depth %}
|
||||
<div class="comment-replies">
|
||||
{% for child in item.children %}
|
||||
{{ render_comment(child, depth + 1, parent_url) }}
|
||||
{{ render_comment(child, depth + 1) }}
|
||||
{% endfor %}
|
||||
</div>
|
||||
{% else %}
|
||||
<div class="comment-replies comment-replies-flat">
|
||||
{% for child in item.children %}
|
||||
{{ render_comment_flat(child, max_depth, item.author, parent_url) }}
|
||||
{{ render_comment_flat(child, max_depth, item.author) }}
|
||||
{% endfor %}
|
||||
</div>
|
||||
{% endif %}
|
||||
@@ -62,9 +61,9 @@
|
||||
{% endcall %}
|
||||
{% endmacro %}
|
||||
|
||||
{% macro render_comment_flat(item, depth, parent_author, parent_url=None) %}
|
||||
{% call comment_cell(item, depth, parent_author, parent_url=parent_url) %}{% endcall %}
|
||||
{% macro render_comment_flat(item, depth, parent_author) %}
|
||||
{% call comment_cell(item, depth, parent_author) %}{% endcall %}
|
||||
{% for child in item.children %}
|
||||
{{ render_comment_flat(child, depth, item.author, parent_url) }}
|
||||
{{ render_comment_flat(child, depth, item.author) }}
|
||||
{% endfor %}
|
||||
{% endmacro %}
|
||||
|
||||
@@ -3,10 +3,8 @@
|
||||
|
||||
{% from "_comment.html" import render_comment with context %}
|
||||
|
||||
{% set parent_url = resolve_object_url(target_type, target_uid) %}
|
||||
|
||||
{% for item in comments %}
|
||||
{{ render_comment(item, 0, parent_url) }}
|
||||
{{ render_comment(item, 0) }}
|
||||
{% else %}
|
||||
<p class="no-comments-msg">No comments yet. Start the discussion.</p>
|
||||
{% endfor %}
|
||||
|
||||
@@ -9,7 +9,6 @@ from devplacepy.cache import TTLCache
|
||||
from devplacepy.config import STATIC_VERSION, TEMPLATES_DIR, TEMPLATE_AUTO_RELOAD, PRESENCE_TIMEOUT_SECONDS
|
||||
from devplacepy.constants import TOPICS, REACTION_EMOJI
|
||||
from devplacepy.database import get_int_setting, get_setting, get_table
|
||||
from devplacepy.database.content import resolve_object_url
|
||||
from devplacepy.avatar import avatar_url, avatar_seed
|
||||
from devplacepy.utils import format_date as _format_date
|
||||
from devplacepy.utils import time_ago as _time_ago
|
||||
@@ -50,7 +49,6 @@ templates.env.globals["is_self"] = is_self
|
||||
templates.env.globals["guest_disabled"] = guest_disabled
|
||||
templates.env.globals["is_online"] = presence.is_online
|
||||
templates.env.globals["presence_timeout"] = PRESENCE_TIMEOUT_SECONDS
|
||||
templates.env.globals["resolve_object_url"] = resolve_object_url
|
||||
|
||||
from devplacepy.docs_devrant import devrant_endpoints
|
||||
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
# retoor <retoor@molodetz.nl>
|
||||
|
||||
from devplacepy.database import get_setting, set_setting
|
||||
from devplacepy.database.schema import migrate_ai_gateway_settings
|
||||
|
||||
|
||||
def test_migrate_embed_key_populates_db(local_db, monkeypatch):
|
||||
monkeypatch.setenv("OPENROUTER_API_KEY", "sk-or-v1-test-embed-key")
|
||||
set_setting("gateway_embed_key", "")
|
||||
migrate_ai_gateway_settings()
|
||||
assert get_setting("gateway_embed_key", "") == "sk-or-v1-test-embed-key"
|
||||
@@ -0,0 +1,12 @@
|
||||
# retoor <retoor@molodetz.nl>
|
||||
|
||||
from devplacepy.database import set_setting
|
||||
from devplacepy.services.openai_gateway import GatewayService
|
||||
|
||||
|
||||
def test_effective_config_fallback_embed_key(local_db):
|
||||
set_setting("gateway_embed_key", "")
|
||||
set_setting("gateway_vision_key", "sk-or-v1-vision-test-key")
|
||||
svc = GatewayService()
|
||||
cfg = svc.effective_config()
|
||||
assert cfg["gateway_embed_key"] == "sk-or-v1-vision-test-key"
|
||||
Reference in New Issue
Block a user