ticket #103 attempt 1

devplacepy/services/news/service.py

@@ -18,7 +18,9 @@ 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
@@ -151,6 +153,32 @@ 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):
@@ -165,13 +193,38 @@ 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 = await client.get(api_url)
+                resp, exc, attempts = await retry_send(
-                resp.raise_for_status()
+                    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}")
                 data = resp.json()
             except Exception as e:
-                self.log(f"Failed to fetch news API: {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="",
+                    )
                 return
 
             articles = data.get("articles", [])

devplacepy/static/css/base.css

@@ -513,24 +513,6 @@ img {
     display: inline-block;
 }
 
-.post-action-btn.is-loading,
-.comment-vote-btn.is-loading,
-.comment-action-btn.is-loading,
-.comment-form-submit.is-loading,
-.vote-star.is-loading,
-.poll-option.is-loading {
-    pointer-events: none;
-}
-
-.post-action-btn.is-loading .btn-spinner,
-.comment-vote-btn.is-loading .btn-spinner,
-.comment-action-btn.is-loading .btn-spinner,
-.comment-form-submit.is-loading .btn-spinner,
-.vote-star.is-loading .btn-spinner,
-.poll-option.is-loading .btn-spinner {
-    display: inline-block;
-}
-
 .badge {
     display: inline-flex;
     align-items: center;

devplacepy/static/js/BookmarkManager.js

@@ -22,6 +22,6 @@ export class BookmarkManager extends OptimisticAction {
             if (label) {
                 label.textContent = result.saved ? "Saved" : "Save";
             }
-        }, button);
+        });
     }
 }

devplacepy/static/js/CommentManager.js

@@ -23,10 +23,7 @@ export class CommentManager {
         const wrapper = form.closest(".comment");
         if (!wrapper) return;
         const button = form.querySelector("button[type='submit']");
-        if (button) {
+        if (button) button.disabled = true;
-            button.disabled = true;
-            button.classList.add("is-loading");
-        }
 
         const anchor = wrapper.previousElementSibling
             && wrapper.previousElementSibling.classList.contains("comment")
@@ -41,10 +38,7 @@ export class CommentManager {
             wrapper.remove();
             window.scrollTo({ top: Math.max(anchorTop, 0) });
         } catch (err) {
-            if (button) {
+            if (button) button.disabled = false;
-                button.disabled = false;
-                button.classList.remove("is-loading");
-            }
         }
     }
 
@@ -124,10 +118,7 @@ export class CommentManager {
 
     async submitEdit(form, text) {
         const save = form.querySelector("button[type='submit']");
-        if (save) {
+        if (save) save.disabled = true;
-            save.disabled = true;
-            save.classList.add("is-loading");
-        }
         const content = form.querySelector("textarea").value;
         try {
             const result = await Http.send(form.action, { content });
@@ -141,10 +132,7 @@ export class CommentManager {
             form.remove();
             text.style.display = "";
         } catch (err) {
-            if (save) {
+            if (save) save.disabled = false;
-                save.disabled = false;
-                save.classList.remove("is-loading");
-            }
         }
     }
 
@@ -217,10 +205,7 @@ export class CommentManager {
         }
         form.addEventListener("submit", () => {
             const btn = form.querySelector("button[type='submit']");
-            if (btn) {
+            if (btn) btn.disabled = true;
-                btn.disabled = true;
-                btn.classList.add("is-loading");
-            }
         });
     }
 }

devplacepy/static/js/OptimisticAction.js

@@ -4,11 +4,7 @@ import { Http } from "./Http.js";
 import { Toast } from "./Toast.js";
 
 export class OptimisticAction {
-    async submit(url, params, errorTarget, render, button = null) {
+    async submit(url, params, errorTarget, render) {
-        if (button) {
-            button.disabled = true;
-            button.classList.add("is-loading");
-        }
         try {
             const result = await Http.sendForm(url, params, { silent: true });
             if (render) render(result);
@@ -17,19 +13,10 @@ export class OptimisticAction {
             console.error("optimistic action failed", error);
             if (errorTarget) Toast.flash(errorTarget, "Error", 1500);
             return null;
-        } finally {
-            if (button) {
-                button.disabled = false;
-                button.classList.remove("is-loading");
-            }
         }
     }
 
-    async submitOptimistic(url, params, errorTarget, apply, revert, reconcile, button = null) {
+    async submitOptimistic(url, params, errorTarget, apply, revert, reconcile) {
-        if (button) {
-            button.disabled = true;
-            button.classList.add("is-loading");
-        }
         apply();
         try {
             const result = await Http.sendForm(url, params, { silent: true });
@@ -40,11 +27,6 @@ export class OptimisticAction {
             revert();
             if (errorTarget) Toast.flash(errorTarget, "Error", 1500);
             return null;
-        } finally {
-            if (button) {
-                button.disabled = false;
-                button.classList.remove("is-loading");
-            }
         }
     }
 }

devplacepy/static/js/PollManager.js

@@ -42,7 +42,7 @@ export class PollManager extends OptimisticAction {
         }
         const pollUid = poll.dataset.pollUid;
         const optionUid = option.dataset.optionUid;
-        await this.submit(`/polls/${pollUid}/vote`, { option_uid: optionUid }, null, (result) => this.render(poll, result), option);
+        await this.submit(`/polls/${pollUid}/vote`, { option_uid: optionUid }, null, (result) => this.render(poll, result));
     }
 
     render(poll, result) {

devplacepy/static/js/ReactionBar.js

@@ -75,7 +75,7 @@ export class ReactionBar extends OptimisticAction {
         const type = bar.dataset.reactionType;
         const uid = bar.dataset.reactionUid;
         const emoji = trigger.dataset.reactionEmoji;
-        await this.submit(`/reactions/${type}/${uid}`, { emoji }, null, (result) => this.render(bar, result), trigger);
+        await this.submit(`/reactions/${type}/${uid}`, { emoji }, null, (result) => this.render(bar, result));
         this.closeAllPalettes();
     }
 

devplacepy/static/js/VoteManager.js

@@ -34,7 +34,6 @@ export class VoteManager extends OptimisticAction {
             () => this.render(action, { net: predictedNet, value: newValue }),
             () => this.render(action, { net: prevNet, value: prevValue }),
             (result) => this.render(action, result),
-            button,
         );
     }
 

devplacepy/templates/_bookmark_button.html

@@ -1,3 +1,3 @@
 <button type="button" class="post-action-btn bookmark-btn{% if _bookmarked %} bookmarked{% endif %}" data-bookmark-type="{{ _type }}" data-bookmark-uid="{{ _uid }}" title="Save" aria-label="Save" aria-pressed="{% if _bookmarked %}true{% else %}false{% endif %}"{{ guest_disabled(user) }}>
-    <span class="btn-spinner" aria-hidden="true"></span><span class="bookmark-icon">&#x1F516;</span> <span class="bookmark-label">{% if _bookmarked %}Saved{% else %}Save{% endif %}</span>
+    <span class="bookmark-icon">&#x1F516;</span> <span class="bookmark-label">{% if _bookmarked %}Saved{% else %}Save{% endif %}</span>
 </button>

devplacepy/templates/_comment.html

@@ -3,12 +3,12 @@
     <div class="comment-votes" role="group" aria-label="Comment votes">
         <form method="POST" action="/votes/comment/{{ item.comment['uid'] }}">
             <input type="hidden" name="value" value="1">
-            <button type="submit" class="comment-vote-btn vote-up{% if item.my_vote == 1 %} voted{% endif %}" aria-label="Upvote" title="Upvote" aria-pressed="{% if item.my_vote == 1 %}true{% else %}false{% endif %}"{{ guest_disabled(user) }}><span class="btn-spinner" aria-hidden="true"></span>+</button>
+            <button type="submit" class="comment-vote-btn vote-up{% if item.my_vote == 1 %} voted{% endif %}" aria-label="Upvote" title="Upvote" aria-pressed="{% if item.my_vote == 1 %}true{% else %}false{% endif %}"{{ guest_disabled(user) }}>+</button>
         </form>
         <span class="comment-vote-count" data-vote-count="{{ item.comment['uid'] }}">{{ item.votes.up - item.votes.down }}</span>
         <form method="POST" action="/votes/comment/{{ item.comment['uid'] }}">
             <input type="hidden" name="value" value="-1">
-            <button type="submit" class="comment-vote-btn vote-down{% if item.my_vote == -1 %} voted{% endif %}" aria-label="Downvote" title="Downvote" aria-pressed="{% if item.my_vote == -1 %}true{% else %}false{% endif %}"{{ guest_disabled(user) }}><span class="btn-spinner" aria-hidden="true"></span>-</button>
+            <button type="submit" class="comment-vote-btn vote-down{% if item.my_vote == -1 %} voted{% endif %}" aria-label="Downvote" title="Downvote" aria-pressed="{% if item.my_vote == -1 %}true{% else %}false{% endif %}"{{ guest_disabled(user) }}>-</button>
         </form>
     </div>
 
@@ -25,11 +25,11 @@
         {% include "_attachment_display.html" %}
         {% endif %}
         <div class="comment-actions">
-            <button type="button" class="comment-action-btn" data-action="reply"{{ guest_disabled(user) }}><span class="btn-spinner" aria-hidden="true"></span><span class="icon">💬</span><span class="label"> Reply</span></button>
+            <button type="button" class="comment-action-btn" data-action="reply"{{ guest_disabled(user) }}><span class="icon">💬</span><span class="label"> Reply</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="btn-spinner" aria-hidden="true"></span><span class="icon">✏️</span><span class="label"> Edit</span></button>
+            <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'] }}">
-                <button type="submit" class="comment-action-btn" data-confirm="Delete this comment?"><span class="btn-spinner" aria-hidden="true"></span><span class="icon">🗑️</span><span class="label"> Delete</span></button>
+                <button type="submit" class="comment-action-btn" data-confirm="Delete this comment?"><span class="icon">🗑️</span><span class="label"> Delete</span></button>
             </form>
             {% endif %}
             {% set _type = "comment" %}{% set _uid = item.comment['uid'] %}{% set _reactions = item.reactions %}{% include "_reaction_bar.html" %}

devplacepy/templates/_comment_form.html

@@ -9,7 +9,7 @@
             max-size="{{ max_upload_size_mb() }}"
             max-files="{{ max_attachments_per_resource() }}"
             allowed-types="{{ allowed_file_types() }}"></dp-upload>
-        <button type="submit" class="comment-form-submit"><span class="btn-spinner" aria-hidden="true"></span><span class="icon">&#x1F4E4;</span><span class="label"> Post</span></button>
+        <button type="submit" class="comment-form-submit"><span class="icon">&#x1F4E4;</span><span class="label"> Post</span></button>
     </div>
 </form>
 {% else %}

devplacepy/templates/_poll.html

@@ -4,7 +4,6 @@
     <div class="poll-options" role="group" aria-label="Poll options">
         {% for opt in _poll.options %}
         <button type="button" class="poll-option{% if _poll.my_choice == opt.uid %} chosen{% endif %}" data-option-uid="{{ opt.uid }}" aria-pressed="{% if _poll.my_choice == opt.uid %}true{% else %}false{% endif %}"{{ guest_disabled(user) }}>
-            <span class="btn-spinner" aria-hidden="true"></span>
             <span class="poll-option-bar" style="--poll-pct: {{ opt.pct }}%;"></span>
             <span class="poll-option-label">{{ render_title(opt.label) }}</span>
             <span class="poll-option-meta">

devplacepy/templates/_post_votes.html

@@ -1,11 +1,11 @@
 <div class="post-votes" role="group" aria-label="Post votes">
     <form method="POST" action="/votes/post/{{ _uid }}" class="inline-form">
         <input type="hidden" name="value" value="-1">
-        <button type="submit" class="post-action-btn vote-down{% if _my_vote == -1 %} voted{% endif %}" aria-label="Downvote" title="Downvote" aria-pressed="{% if _my_vote == -1 %}true{% else %}false{% endif %}"{{ guest_disabled(user) }}><span class="btn-spinner" aria-hidden="true"></span>−</button>
+        <button type="submit" class="post-action-btn vote-down{% if _my_vote == -1 %} voted{% endif %}" aria-label="Downvote" title="Downvote" aria-pressed="{% if _my_vote == -1 %}true{% else %}false{% endif %}"{{ guest_disabled(user) }}>−</button>
     </form>
     <span class="post-vote-count" data-vote-count="{{ _uid }}">{{ _count }}</span>
     <form method="POST" action="/votes/post/{{ _uid }}" class="inline-form">
         <input type="hidden" name="value" value="1">
-        <button type="submit" class="post-action-btn vote-up{% if _my_vote == 1 %} voted{% endif %}" aria-label="Upvote" title="Upvote" aria-pressed="{% if _my_vote == 1 %}true{% else %}false{% endif %}"{{ guest_disabled(user) }}><span class="btn-spinner" aria-hidden="true"></span>+</button>
+        <button type="submit" class="post-action-btn vote-up{% if _my_vote == 1 %} voted{% endif %}" aria-label="Upvote" title="Upvote" aria-pressed="{% if _my_vote == 1 %}true{% else %}false{% endif %}"{{ guest_disabled(user) }}>+</button>
     </form>
 </div>

devplacepy/templates/_star_vote.html

@@ -1,4 +1,4 @@
 <form method="POST" action="/votes/{{ _type }}/{{ _uid }}" class="inline-form"{% if _stop %} data-stop-propagation{% endif %}>
     <input type="hidden" name="value" value="1">
-    <button type="submit" class="{{ _btn_class }} vote-star{% if _my_vote == 1 %} voted{% endif %}" aria-label="Star" aria-pressed="{% if _my_vote == 1 %}true{% else %}false{% endif %}"{{ guest_disabled(user) }}><span class="btn-spinner" aria-hidden="true"></span><span class="vote-count-value" data-vote-count="{{ _uid }}">{{ _count }}</span></button>
+    <button type="submit" class="{{ _btn_class }} vote-star{% if _my_vote == 1 %} voted{% endif %}" aria-label="Star" aria-pressed="{% if _my_vote == 1 %}true{% else %}false{% endif %}"{{ guest_disabled(user) }}><span class="vote-count-value" data-vote-count="{{ _uid }}">{{ _count }}</span></button>
 </form>

tests/unit/services/news.py

@@ -67,9 +67,14 @@ 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.HTTPError("api down")
+            raise httpx.RequestError("api down")
         return FakeResp_news_service(text="")
 GATEWAY_HEADERS = {
     "X-Gateway-Cost-USD": "0.00010000",
@@ -98,7 +103,7 @@ class UsageClient(FakeClient_news_service):
             json_data={"choices": [{"message": {"content": grade}}]},
             headers=GATEWAY_HEADERS,
         )
-def _settings_stub(threshold="7"):
+def _settings_stub(threshold="7", retries="3", backoff="5"):
     def fake_get_setting(key, default=None):
         return {
             "news_api_url": API_URL,
@@ -106,6 +111,8 @@ def _settings_stub(threshold="7"):
             "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
@@ -171,12 +178,47 @@ 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.httpx, "AsyncClient", lambda *a, **k: FailingApiClient([])
+        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))
+        ),
     )
     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):