ticket #26 attempt 1

devplacepy/database/comments.py

@@ -93,6 +93,36 @@ def get_recent_comments_by_target_uids(target_type, target_uids, limit=3, user=N
     raw = _drop_blocked(raw, user)
     if not raw:
         return {}
+
+    # Fetch missing parent comments so the threaded hierarchy is preserved even
+    # when a parent is outside the row-number limit.
+    if "comments" in db.tables:
+        comments_table = db["comments"]
+        current_uids = {c["uid"] for c in raw}
+        seen = set(current_uids)
+        to_fetch = []
+        for c in raw:
+            puid = c.get("parent_uid")
+            if puid and puid not in seen:
+                seen.add(puid)
+                to_fetch.append(puid)
+        if to_fetch:
+            ancestors = []
+            queue = list(to_fetch)
+            fetched = set()
+            while queue:
+                uid = queue.pop(0)
+                if uid in fetched or uid in current_uids:
+                    continue
+                row = comments_table.find_one(uid=uid, deleted_at=None)
+                if row:
+                    ancestors.append(row)
+                    fetched.add(uid)
+                    grandparent = row.get("parent_uid")
+                    if grandparent and grandparent not in fetched and grandparent not in current_uids:
+                        queue.append(grandparent)
+            raw.extend(ancestors)
+
     items = _build_comment_items(raw, user)
     by_target = defaultdict(list)
     for c in raw:

devplacepy/database/schema.py

@@ -1353,9 +1353,6 @@ 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)

devplacepy/services/openai_gateway/CLAUDE.md

@@ -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`/`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).
+- `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).
 - 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`.

tests/e2e/feed.py

@@ -959,3 +959,72 @@ def test_feed_scroll_not_restored_on_fresh_visit(alice):
     page.goto(f"{BASE_URL}/feed", wait_until="domcontentloaded")
     page.wait_for_timeout(600)
     assert page.evaluate("window.scrollY") < 60
+
+
+def _seed_post_with_orphaned_parent():
+    owner = str(uuid4())
+    get_table("users").insert(
+        {
+            "uid": owner,
+            "username": f"opseed_{owner[:8]}",
+            "email": f"{owner[:8]}@op.seed",
+            "password_hash": "x",
+            "role": "Member",
+            "is_active": True,
+            "created_at": datetime.now(timezone.utc).isoformat(),
+        }
+    )
+    post_uid = str(uuid4())
+    marker = f"oppost-{post_uid[:8]}"
+    get_table("posts").insert(
+        {
+            "deleted_at": None,
+            "deleted_by": None,
+            "uid": post_uid,
+            "user_uid": owner,
+            "slug": make_combined_slug(marker, post_uid),
+            "title": None,
+            "content": marker,
+            "topic": "devlog",
+            "project_uid": None,
+            "image": None,
+            "stars": 0,
+            "created_at": datetime.now(timezone.utc).isoformat(),
+        }
+    )
+    orphan_parent = str(uuid4())
+    base = datetime.now(timezone.utc)
+    rows = [
+        (f"{marker}-orphan-parent", orphan_parent, None, -3),
+        (f"{marker}-older", str(uuid4()), None, -2),
+        (f"{marker}-flat", str(uuid4()), None, -1),
+        (f"{marker}-reply", str(uuid4()), orphan_parent, 0),
+    ]
+    comments = get_table("comments")
+    for content, cuid, par, off in rows:
+        comments.insert(
+            {
+                "deleted_at": None,
+                "deleted_by": None,
+                "uid": cuid,
+                "target_type": "post",
+                "target_uid": post_uid,
+                "post_uid": post_uid,
+                "user_uid": owner,
+                "content": content,
+                "parent_uid": par,
+                "created_at": (base + timedelta(seconds=off)).isoformat(),
+            }
+        )
+    return marker
+
+
+def test_feed_preserves_comment_hierarchy_with_orphaned_parent(page, app_server):
+    marker = _seed_post_with_orphaned_parent()
+    page.goto(f"{BASE_URL}/feed", wait_until="domcontentloaded")
+    card = page.locator(".post-card").filter(has_text=marker).first
+    card.wait_for(state="visible")
+    expect(card.locator(".post-card-comments")).to_contain_text(f"{marker}-orphan-parent")
+    expect(card.locator(".post-card-comments")).to_contain_text(f"{marker}-reply")
+    nested = card.locator(".post-card-comments .comment-replies .comment-text")
+    expect(nested).to_contain_text(f"{marker}-reply")

tests/e2e/gists.py

@@ -468,3 +468,70 @@ def test_gists_list_preserves_comment_hierarchy(page, app_server):
     expect(card.locator(".post-card-comments")).not_to_contain_text(f"{marker}-excluded")
     nested = card.locator(".post-card-comments .comment-replies .comment-text")
     expect(nested).to_contain_text(f"{marker}-reply")
+
+
+def _seed_gist_with_orphaned_parent():
+    owner = str(uuid4())
+    get_table("users").insert(
+        {
+            "uid": owner,
+            "username": f"gopseed_{owner[:8]}",
+            "email": f"{owner[:8]}@gop.seed",
+            "password_hash": "x",
+            "role": "Member",
+            "is_active": True,
+            "created_at": datetime.now(timezone.utc).isoformat(),
+        }
+    )
+    uid = str(uuid4())
+    marker = f"gistop-{uid[:8]}"
+    get_table("gists").insert(
+        {
+            "deleted_at": None,
+            "deleted_by": None,
+            "uid": uid,
+            "user_uid": owner,
+            "slug": make_combined_slug(marker, uid),
+            "title": marker,
+            "description": "Gist with orphaned parent hierarchy.",
+            "source_code": "print('x')",
+            "language": "python",
+            "stars": 0,
+            "created_at": datetime.now(timezone.utc).isoformat(),
+        }
+    )
+    orphan_parent = str(uuid4())
+    base = datetime.now(timezone.utc)
+    rows = [
+        (f"{marker}-orphan-parent", orphan_parent, None, -3),
+        (f"{marker}-older", str(uuid4()), None, -2),
+        (f"{marker}-flat", str(uuid4()), None, -1),
+        (f"{marker}-reply", str(uuid4()), orphan_parent, 0),
+    ]
+    comments = get_table("comments")
+    for content, cuid, par, off in rows:
+        comments.insert(
+            {
+                "deleted_at": None,
+                "deleted_by": None,
+                "uid": cuid,
+                "target_type": "gist",
+                "target_uid": uid,
+                "user_uid": owner,
+                "content": content,
+                "parent_uid": par,
+                "created_at": (base + timedelta(seconds=off)).isoformat(),
+            }
+        )
+    return marker
+
+
+def test_gists_list_preserves_comment_hierarchy_with_orphaned_parent(page, app_server):
+    marker = _seed_gist_with_orphaned_parent()
+    page.goto(f"{BASE_URL}/gists", wait_until="domcontentloaded")
+    card = page.locator(".gist-card").filter(has_text=marker).first
+    card.wait_for(state="visible")
+    expect(card.locator(".post-card-comments")).to_contain_text(f"{marker}-orphan-parent")
+    expect(card.locator(".post-card-comments")).to_contain_text(f"{marker}-reply")
+    nested = card.locator(".post-card-comments .comment-replies .comment-text")
+    expect(nested).to_contain_text(f"{marker}-reply")

tests/e2e/news.py

@@ -387,3 +387,75 @@ def test_news_list_preserves_comment_hierarchy(page, app_server):
     expect(card.locator(".post-card-comments")).not_to_contain_text(f"{marker}-excluded")
     nested = card.locator(".post-card-comments .comment-replies .comment-text")
     expect(nested).to_contain_text(f"{marker}-reply")
+
+
+def _seed_news_with_orphaned_parent():
+    owner = str(uuid4())
+    get_table("users").insert(
+        {
+            "uid": owner,
+            "username": f"nopseed_{owner[:8]}",
+            "email": f"{owner[:8]}@nop.seed",
+            "password_hash": "x",
+            "role": "Member",
+            "is_active": True,
+            "created_at": datetime.now(timezone.utc).isoformat(),
+        }
+    )
+    uid = str(uuid4())
+    marker = f"newsop-{uid[:8]}"
+    get_table("news").insert(
+        {
+            "deleted_at": None,
+            "deleted_by": None,
+            "uid": uid,
+            "slug": make_combined_slug(marker, uid),
+            "title": marker,
+            "description": "News with orphaned parent hierarchy.",
+            "content": "Body.",
+            "url": "https://example.com/nop",
+            "source_name": "NOPSource",
+            "external_id": f"nop_{uid[:8]}",
+            "status": "published",
+            "show_on_landing": 0,
+            "grade": 10,
+            "synced_at": datetime.now(timezone.utc).isoformat(),
+        }
+    )
+    orphan_parent = str(uuid4())
+    base = datetime.now(timezone.utc)
+    rows = [
+        (f"{marker}-orphan-parent", orphan_parent, None, -3),
+        (f"{marker}-older", str(uuid4()), None, -2),
+        (f"{marker}-flat", str(uuid4()), None, -1),
+        (f"{marker}-reply", str(uuid4()), orphan_parent, 0),
+    ]
+    comments = get_table("comments")
+    for content, cuid, par, off in rows:
+        comments.insert(
+            {
+                "deleted_at": None,
+                "deleted_by": None,
+                "uid": cuid,
+                "target_type": "news",
+                "target_uid": uid,
+                "user_uid": owner,
+                "content": content,
+                "parent_uid": par,
+                "created_at": (base + timedelta(seconds=off)).isoformat(),
+            }
+        )
+    return marker
+
+
+def test_news_list_preserves_comment_hierarchy_with_orphaned_parent(page, app_server):
+    from playwright.sync_api import expect
+
+    marker = _seed_news_with_orphaned_parent()
+    page.goto(f"{BASE_URL}/news", wait_until="domcontentloaded")
+    card = page.locator(".news-card").filter(has_text=marker).first
+    card.wait_for(state="visible")
+    expect(card.locator(".post-card-comments")).to_contain_text(f"{marker}-orphan-parent")
+    expect(card.locator(".post-card-comments")).to_contain_text(f"{marker}-reply")
+    nested = card.locator(".post-card-comments .comment-replies .comment-text")
+    expect(nested).to_contain_text(f"{marker}-reply")

tests/e2e/projects/index.py

@@ -1015,3 +1015,71 @@ def test_containers_menu_hidden_for_non_owner_admin_on_member_private_project(pa
     page.goto(f"{BASE_URL}/projects/{slug}", wait_until="domcontentloaded")
     page.locator(".project-actions-more").click()
     expect(page.locator(".context-menu-item:has-text('Containers')")).to_have_count(0)
+
+
+def _seed_project_with_orphaned_parent():
+    owner = str(uuid4())
+    get_table("users").insert(
+        {
+            "uid": owner,
+            "username": f"popseed_{owner[:8]}",
+            "email": f"{owner[:8]}@pop.seed",
+            "password_hash": "x",
+            "role": "Member",
+            "is_active": True,
+            "created_at": datetime.now(timezone.utc).isoformat(),
+        }
+    )
+    uid = str(uuid4())
+    marker = f"projop-{uid[:8]}"
+    get_table("projects").insert(
+        {
+            "deleted_at": None,
+            "deleted_by": None,
+            "uid": uid,
+            "user_uid": owner,
+            "slug": make_combined_slug(marker, uid),
+            "title": marker,
+            "description": "Project with orphaned parent hierarchy.",
+            "project_type": "software",
+            "platforms": "Linux",
+            "status": "Released",
+            "stars": 0,
+            "created_at": datetime.now(timezone.utc).isoformat(),
+        }
+    )
+    orphan_parent = str(uuid4())
+    base = datetime.now(timezone.utc)
+    rows = [
+        (f"{marker}-orphan-parent", orphan_parent, None, -3),
+        (f"{marker}-older", str(uuid4()), None, -2),
+        (f"{marker}-flat", str(uuid4()), None, -1),
+        (f"{marker}-reply", str(uuid4()), orphan_parent, 0),
+    ]
+    comments = get_table("comments")
+    for content, cuid, par, off in rows:
+        comments.insert(
+            {
+                "deleted_at": None,
+                "deleted_by": None,
+                "uid": cuid,
+                "target_type": "project",
+                "target_uid": uid,
+                "user_uid": owner,
+                "content": content,
+                "parent_uid": par,
+                "created_at": (base + timedelta(seconds=off)).isoformat(),
+            }
+        )
+    return marker
+
+
+def test_projects_list_preserves_comment_hierarchy_with_orphaned_parent(page, app_server):
+    marker = _seed_project_with_orphaned_parent()
+    page.goto(f"{BASE_URL}/projects", wait_until="domcontentloaded")
+    card = page.locator(".project-card").filter(has_text=marker).first
+    card.wait_for(state="visible")
+    expect(card.locator(".post-card-comments")).to_contain_text(f"{marker}-orphan-parent")
+    expect(card.locator(".post-card-comments")).to_contain_text(f"{marker}-reply")
+    nested = card.locator(".post-card-comments .comment-replies .comment-text")
+    expect(nested).to_contain_text(f"{marker}-reply")

tests/unit/services/openai_gateway/schema_test.py

@@ -1,11 +0,0 @@
-# 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"

tests/unit/services/openai_gateway/service_test.py

@@ -1,12 +0,0 @@
-# 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"