ticket #90 attempt 1

devplacepy/services/news/service.py

@@ -18,9 +18,7 @@ from devplacepy.services.openai_gateway.usage import (
     usage_metric_cards,
 )
 from devplacepy.utils import generate_uid, make_combined_slug
-from devplacepy.utils.notifications import create_notification
 from devplacepy.services.audit import record as audit
-from devplacepy.services.openai_gateway.reliability import retry_send
 from devplacepy.services.seo_meta import schedule_seo_meta
 
 from . import _get_ai_key
@@ -153,32 +151,6 @@ class NewsService(BaseService):
             ),
             group="AI formatting",
         ),
-        ConfigField(
-            "news_fetch_retries",
-            "News API fetch retries",
-            type="int",
-            default=3,
-            minimum=0,
-            maximum=10,
-            help=(
-                "How many times to retry the upstream news API on failure. "
-                "Each retry waits longer (linear backoff). Set 0 for no retries."
-            ),
-            group="Reliability",
-        ),
-        ConfigField(
-            "news_fetch_retry_backoff_ms",
-            "News API retry backoff (ms)",
-            type="int",
-            default=5000,
-            minimum=1000,
-            maximum=60000,
-            help=(
-                "Base backoff in milliseconds between retries. The actual "
-                "delay is backoff * attempt number."
-            ),
-            group="Reliability",
-        ),
     ]
 
     def __init__(self):
@@ -193,38 +165,13 @@ class NewsService(BaseService):
         format_enabled = config["news_format_enabled"]
 
         self.log(f"Fetching news from {api_url}")
-        max_retries = config["news_fetch_retries"]
-        backoff_ms = config["news_fetch_retry_backoff_ms"]
         async with stealth.stealth_async_client(timeout=30.0) as client:
             try:
-                resp, exc, attempts = await retry_send(
-                    do_call=lambda: client.get(api_url),
-                    max_retries=max_retries,
-                    backoff_ms=backoff_ms,
-                    log=lambda msg: self.log(msg),
-                )
-                if exc is not None:
-                    raise exc
-                if resp is None or resp.status_code >= 400:
-                    raise httpx.HTTPError(f"status {resp.status_code if resp else 0}")
+                resp = await client.get(api_url)
+                resp.raise_for_status()
                 data = resp.json()
             except Exception as e:
-                self.log(f"Failed to fetch news API after {attempts} attempts: {e}")
-                audit.record_system(
-                    "news.service.fetch_failed",
-                    actor_kind="service",
-                    actor_uid="news",
-                    summary=f"News API unreachable after {attempts} attempts",
-                    metadata={"api_url": api_url, "attempts": attempts, "error": str(e)},
-                    result="failure",
-                )
-                for admin_row in get_table("users").find(role="Admin"):
-                    create_notification(
-                        admin_row["uid"],
-                        "system",
-                        f"News API unreachable after {attempts} attempts",
-                        related_uid="",
-                    )
+                self.log(f"Failed to fetch news API: {e}")
                 return
 
             articles = data.get("articles", [])

devplacepy/templates/_comment.html

@@ -1,4 +1,4 @@
-{% macro comment_cell(item, depth, parent_author=None) %}
+{% macro comment_cell(item, depth, parent_author=None, parent_url=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,6 +26,7 @@
         {% 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">&#x1F517;</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'] }}">
@@ -39,21 +40,21 @@
 </div>
 {% endmacro %}
 
-{% macro render_comment(item, depth=0) %}
+{% macro render_comment(item, depth=0, parent_url=None) %}
 {% set max_depth = 2 %}
 {% set visual_depth = depth if depth < max_depth else max_depth %}
-{% call comment_cell(item, visual_depth) %}
+{% call comment_cell(item, visual_depth, parent_url=parent_url) %}
     {% if item.children %}
     {% if depth < max_depth %}
     <div class="comment-replies">
         {% for child in item.children %}
-        {{ render_comment(child, depth + 1) }}
+        {{ render_comment(child, depth + 1, parent_url) }}
         {% endfor %}
     </div>
     {% else %}
     <div class="comment-replies comment-replies-flat">
         {% for child in item.children %}
-        {{ render_comment_flat(child, max_depth, item.author) }}
+        {{ render_comment_flat(child, max_depth, item.author, parent_url) }}
         {% endfor %}
     </div>
     {% endif %}
@@ -61,9 +62,9 @@
 {% endcall %}
 {% endmacro %}
 
-{% macro render_comment_flat(item, depth, parent_author) %}
-{% call comment_cell(item, depth, parent_author) %}{% endcall %}
+{% macro render_comment_flat(item, depth, parent_author, parent_url=None) %}
+{% call comment_cell(item, depth, parent_author, parent_url=parent_url) %}{% endcall %}
 {% for child in item.children %}
-{{ render_comment_flat(child, depth, item.author) }}
+{{ render_comment_flat(child, depth, item.author, parent_url) }}
 {% endfor %}
 {% endmacro %}

devplacepy/templates/_comment_section.html

@@ -3,8 +3,10 @@
 
     {% 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) }}
+    {{ render_comment(item, 0, parent_url) }}
     {% else %}
     <p class="no-comments-msg">No comments yet. Start the discussion.</p>
     {% endfor %}

devplacepy/templating.py

@@ -9,6 +9,7 @@ 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
@@ -49,6 +50,7 @@ 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
 

tests/unit/services/news.py

@@ -67,14 +67,9 @@ class FakeClient_news_service:
         grade = "9" if "HighArticle" in prompt else "3"
         return FakeResp_news_service(json_data={"choices": [{"message": {"content": grade}}]})
 class FailingApiClient(FakeClient_news_service):
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.call_count = 0
-
     async def get(self, url, timeout=None):
-        self.call_count += 1
         if url == API_URL:
-            raise httpx.RequestError("api down")
+            raise httpx.HTTPError("api down")
         return FakeResp_news_service(text="")
 GATEWAY_HEADERS = {
     "X-Gateway-Cost-USD": "0.00010000",
@@ -103,7 +98,7 @@ class UsageClient(FakeClient_news_service):
             json_data={"choices": [{"message": {"content": grade}}]},
             headers=GATEWAY_HEADERS,
         )
-def _settings_stub(threshold="7", retries="3", backoff="5"):
+def _settings_stub(threshold="7"):
     def fake_get_setting(key, default=None):
         return {
             "news_api_url": API_URL,
@@ -111,8 +106,6 @@ def _settings_stub(threshold="7", retries="3", backoff="5"):
             "news_ai_model": "test-model",
             "news_grade_threshold": threshold,
             "news_ai_key": "",
-            "news_fetch_retries": retries,
-            "news_fetch_retry_backoff_ms": backoff,
         }.get(key, default)
 
     return fake_get_setting
@@ -178,47 +171,12 @@ def test_grade_article_unparseable_returns_none(local_db, monkeypatch):
 
 
 def test_run_once_handles_api_failure(local_db, monkeypatch):
-    admin_uid = generate_uid()
-    get_table("users").insert({
-        "uid": admin_uid,
-        "username": "testadmin",
-        "role": "Admin",
-        "email": "admin@test.test",
-        "password": "hash",
-        "api_key": generate_uid(),
-        "created_at": "2025-01-01T00:00:00Z",
-    })
     monkeypatch.setattr(news_mod, "get_setting", _settings_stub())
     monkeypatch.setattr(base_mod, "get_setting", _settings_stub())
-    failing_client = FailingApiClient([])
     monkeypatch.setattr(
-        news_mod.stealth, "stealth_async_client",
-        lambda *a, **k: failing_client,
-    )
-    notifications = []
-    monkeypatch.setattr(
-        news_mod, "create_notification",
-        lambda user_uid, notification_type, message, related_uid, target_url=None: (
-            notifications.append((user_uid, message))
-        ),
+        news_mod.httpx, "AsyncClient", lambda *a, **k: FailingApiClient([])
     )
     run_async(NewsService().run_once())
-    assert failing_client.call_count == 4
-    assert len(notifications) == 1
-    assert notifications[0][0] == admin_uid
-    assert "News API unreachable" in notifications[0][1]
-
-
-def test_run_once_handles_api_failure_zero_retries(local_db, monkeypatch):
-    monkeypatch.setattr(news_mod, "get_setting", _settings_stub(retries="0"))
-    monkeypatch.setattr(base_mod, "get_setting", _settings_stub(retries="0"))
-    failing_client = FailingApiClient([])
-    monkeypatch.setattr(
-        news_mod.stealth, "stealth_async_client",
-        lambda *a, **k: failing_client,
-    )
-    run_async(NewsService().run_once())
-    assert failing_client.call_count == 1
 
 
 def test_run_once_updates_existing_news_row(local_db, monkeypatch):