bazaar-compute-node 0.2.1rc3__tar.gz → 0.2.1rc5__tar.gz

{bazaar_compute_node-0.2.1rc3 → bazaar_compute_node-0.2.1rc5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bazaar-compute-node
-Version: 0.2.1rc3
+Version: 0.2.1rc5
 Summary: Runtime-agnostic computer node daemon for agents and channels.
 License-Expression: AGPL-3.0-only
 License-File: LICENSE

{bazaar_compute_node-0.2.1rc3 → bazaar_compute_node-0.2.1rc5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "bazaar-compute-node"
-version = "0.2.1rc3"
+version = "0.2.1rc5"
 description = "Runtime-agnostic computer node daemon for agents and channels."
 readme = "README.md"
 license = "AGPL-3.0-only"

{bazaar_compute_node-0.2.1rc3 → bazaar_compute_node-0.2.1rc5}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "bazaar-compute-node"
-version = "0.2.1rc3"
+version = "0.2.1rc5"
 description = "Runtime-agnostic computer node daemon for agents and channels."
 readme = "README.md"
 license = "AGPL-3.0-only"

{bazaar_compute_node-0.2.1rc3 → bazaar_compute_node-0.2.1rc5}/src/bazaar_compute_server/activity.py

@@ -14,6 +14,7 @@ CARD_EVENTS = 5
 
 @dataclass(frozen=True, slots=True)
 class ActivityLine:
+    at_ms: int
     time: str
     text: str
 
@@ -87,7 +88,9 @@ async def recent_lines(
     )
     return [
         ActivityLine(
-            time=clock_text(item.created_at_ms, tz), text=event_text(translator, item)
+            at_ms=item.created_at_ms,
+            time=clock_text(item.created_at_ms, tz),
+            text=event_text(translator, item),
         )
         for item in recent
     ]

{bazaar_compute_node-0.2.1rc3 → bazaar_compute_node-0.2.1rc5}/src/bazaar_compute_server/configure.py

@@ -140,6 +140,56 @@ class Origins:
     runtime: tuple[int | None, ...]
 
 
+def editor(
+    values: Mapping[str, Any],
+    reply: str,
+    *,
+    kept: bool = False,
+    origins: Origins | None = None,
+) -> dict[str, Any]:
+    """Only the editable fields and credential-presence flags for the browser."""
+
+    cards: dict[str, list[dict[str, Any]]] = {"channel": [], "runtime": []}
+    number = 0
+    for family, items in cards.items():
+        for index, value in enumerate(values.get(family, ())):
+            origin = getattr(origins, family)[index] if origins else index
+            origin = origin if kept else None
+            present = values.get("secrets", ())
+            fields = (
+                ("app_id", "region", "bot_id", "websocket_url")
+                if family == "channel"
+                else ("model", "effort", "sandbox_mode", "network_access")
+            )
+            items.append(
+                {
+                    "id": number,
+                    "kind": value["kind"],
+                    "was": origin,
+                    **{key: value[key] for key in fields if value.get(key) is not None},
+                    "secret_set": bool(
+                        family == "channel"
+                        and origin is not None
+                        and origin < len(present)
+                        and present[origin].get(SECRETS.get(value["kind"]))
+                    ),
+                    "env": [
+                        {"id": i, "name": name, "was": name}
+                        for i, name in enumerate(value.get("env", {}))
+                    ],
+                }
+            )
+            number += 1
+    return {
+        "name": values.get("name", ""),
+        "mode": values.get("mode", "session"),
+        "idle_timeout": values.get("idle_timeout", 0),
+        "reply": reply,
+        "cards": cards,
+        "next": number,
+    }
+
+
 def configuration(
     form: Mapping[str, str],
     kept: Mapping[str, Any] | None = None,

{bazaar_compute_node-0.2.1rc3 → bazaar_compute_node-0.2.1rc5}/src/bazaar_compute_server/contrib/sqlite/storage.py

@@ -534,6 +534,47 @@ class SqliteStorage(IStorage):
             row = await cursor.fetchone()
         return 0 if row is None or row["id"] is None else int(row["id"])
 
+    async def latest_activity_event(
+        self, computer_id: str, agent_id: str, *, skipping: Sequence[str]
+    ) -> int:
+        async with (
+            self._reader() as reader,
+            reader.execute(
+                "SELECT COALESCE(MAX(id), 0) AS id FROM events"
+                " WHERE computer_id = ? AND agent_id = ?"
+                f" AND event_name NOT IN ({_marks(skipping)})",
+                (computer_id, agent_id, *skipping),
+            ) as cursor,
+        ):
+            (row,) = await cursor.fetchall()
+        return int(row["id"])
+
+    async def latest_named_event(
+        self,
+        computer_id: str,
+        agent_id: str,
+        *,
+        names: Sequence[str],
+        thread_id: str | None = None,
+    ) -> int:
+        async with (
+            self._reader() as reader,
+            reader.execute(
+                "SELECT COALESCE(MAX(id), 0) AS id FROM events"
+                " WHERE computer_id = ? AND agent_id = ?"
+                f" AND event_name IN ({_marks(names)})"
+                + (" AND thread_id = ?" if thread_id is not None else ""),
+                (
+                    computer_id,
+                    agent_id,
+                    *names,
+                    *((thread_id,) if thread_id is not None else ()),
+                ),
+            ) as cursor,
+        ):
+            (row,) = await cursor.fetchall()
+        return int(row["id"])
+
     async def computer_health(
         self, computers: Sequence[Computer]
     ) -> list[ComputerHealth]:

{bazaar_compute_node-0.2.1rc3 → bazaar_compute_node-0.2.1rc5}/src/bazaar_compute_server/markdown.py

@@ -7,7 +7,9 @@ from collections.abc import Callable, Mapping, Sequence
 from typing import Any
 
 from markdown_it import MarkdownIt
+from markdown_it.renderer import RendererHTML
 from markdown_it.token import Token
+from markdown_it.utils import EnvType, OptionsDict
 from markupsafe import Markup
 from pygments import highlight
 from pygments.formatters import HtmlFormatter
@@ -51,9 +53,22 @@ def _image(
     )
 
 
+class _ContentRenderer(RendererHTML):
+    def renderInline(
+        self, tokens: Sequence[Token], options: OptionsDict, env: EnvType
+    ) -> str:
+        # Prose stays outside Alpine; the trusted code-block copy control is
+        # a separate component, beside its own ignored code content.
+        return (
+            "<span x-ignore>" + super().renderInline(tokens, options, env) + "</span>"
+        )
+
+
 # html off: what the agent wrote is text, however it looks; a link is only a
 # link on a scheme markdown-it lets through
-_MARKDOWN = MarkdownIt("commonmark", {"html": False}).enable(["table", "strikethrough"])
+_MARKDOWN = MarkdownIt(
+    "commonmark", {"html": False}, renderer_cls=_ContentRenderer
+).enable(["table", "strikethrough"])
 _MARKDOWN.add_render_rule("fence", _fence)
 _MARKDOWN.add_render_rule("image", _image)
 

{bazaar_compute_node-0.2.1rc3 → bazaar_compute_node-0.2.1rc5}/src/bazaar_compute_server/pages/__init__.py

@@ -15,6 +15,7 @@ from ..storage import IStorage
 from .agents import AgentPages
 from .computers import ComputerPages
 from .login import LoginPages
+from .poll import PollPages
 from .profile import ProfilePages
 from .settings import SettingsPages
 
@@ -37,7 +38,9 @@ def routes(
     computers = ComputerPages(storage, controls, renderer, refs)
     login = LoginPages(storage, renderer, sessions)
     settings = SettingsPages(storage, renderer, sessions)
+    poll = PollPages(storage, renderer, refs)
     return [
+        Route("/poll", poll.check, methods=["POST"]),
         Route("/", home),
         Route("/login", login.form),
         Route("/login", login.login, methods=["POST"]),
@@ -49,6 +52,12 @@ def routes(
         Route("/agents", agents.list),
         Route("/agents/list", agents.list_fragment),
         Route("/agents/{computer_id}/{agent_id}", agents.show),
+        Route("/agents/{computer_id}/{agent_id}/row", agents.row_fragment),
+        Route("/agents/{computer_id}/{agent_id}/head", agents.head),
+        Route(
+            "/agents/{computer_id}/{agent_id}/contacts/{thread_id}/reminders",
+            agents.reminder_fragment,
+        ),
         Route("/agents/{computer_id}/{agent_id}/activity", agents.activity_card),
         Route("/agents/{computer_id}/{agent_id}/contacts", agents.contacts),
         Route(
@@ -73,6 +82,7 @@ def routes(
         ),
         Route("/agents/{computer_id}/{agent_id}/profile/remove", profile.remove_ask),
         Route("/agents/{computer_id}/{agent_id}/profile/events", profile.events),
+        Route("/agents/{computer_id}/{agent_id}/profile/head", profile.head),
         Route("/agents/{computer_id}/{agent_id}/profile/{tab}", profile.tab),
         Route("/agents/{computer_id}/{agent_id}", profile.remove, methods=["DELETE"]),
         Route("/computers", computers.list),
@@ -80,6 +90,7 @@ def routes(
         Route("/computers/list", computers.list_fragment),
         Route("/computers", computers.enrol, methods=["POST"]),
         Route("/computers/{computer_id}", computers.show),
+        Route("/computers/{computer_id}/row", computers.row_fragment),
         Route("/computers/{computer_id}/detail", computers.detail),
         Route("/computers/{computer_id}/presence", computers.presence),
         Route("/computers/{computer_id}/remove", computers.remove_form),

{bazaar_compute_node-0.2.1rc3 → bazaar_compute_node-0.2.1rc5}/src/bazaar_compute_server/pages/agents.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import asyncio
+import json
 from collections.abc import Iterable
 from urllib.parse import urlencode
 
@@ -11,10 +12,12 @@ from starlette.responses import HTMLResponse, Response
 
 from ..access import Access, allowed, sees
 from ..activity import recent_lines, usage_today
+from ..clock import day_text, now_ms
 from ..contacts import contacts
 from ..control import Controls
 from ..fleet import PAGE_SIZE, AgentPage, AgentView, agent_page, agent_view
 from ..history import Contact, earlier, later, latest, news
+from ..polling import CARD_QUIET, REMINDERS, activity_state, agent_info
 from ..refs import Refs, expanded
 from ..rendering import Renderer
 from ..review import Request as ReviewRequest
@@ -74,7 +77,10 @@ class AgentPages:
         if contact is None:
             return HTMLResponse("", status_code=404)
         # htmx names the element it will swap as `tag#id`
-        if request.headers.get("HX-Target") == "div#chat":
+        if (
+            request.headers.get("HX-Target") == "div#chat"
+            and request.headers.get("HX-History-Restore-Request") != "true"
+        ):
             # picked from the list: the column alone, the lists staying put
             selected = await agent_view(
                 self._storage,
@@ -105,6 +111,8 @@ class AgentPages:
         page: AgentPage,
         selected: AgentView | None,
         contact: Contact | None = None,
+        *,
+        pending: bool | None = None,
     ) -> Response:
         await self.refs.load(
             [
@@ -112,10 +120,12 @@ class AgentPages:
                 *(contact.named if contact else []),
             ]
         )
+        if pending is None:
+            pending = _pending(request)
         # a conversation still waiting opens on the question about it
         asked = (
             await request_of(self._controls, selected, contact)
-            if selected is not None and contact is not None and _pending(request)
+            if selected is not None and contact is not None and pending
             else None
         )
         return self._render.page(
@@ -132,6 +142,7 @@ class AgentPages:
             contact=contact,
             latest=request.query_params.get("latest"),
             asked=asked,
+            pending=pending,
         )
 
     async def _chat(
@@ -163,11 +174,8 @@ class AgentPages:
     @sees("computer", "computer_id")
     @sees("agent", "agent_id")
     async def review(self, request: Request) -> Response:
-        """Let a conversation in or turn it away; the column comes back as
-        the chat when let in, empty when turned away - and the page's address
-        follows: the conversation's own once let in, the agent's once turned
-        away, so a reload does not ask the question again or open what was
-        turned away."""
+        """Let a conversation in or turn it away, updating the module and
+        address together so its tabs, selected row and chat agree on reload."""
 
         params = request.path_params
         contact = await self._contact(request)
@@ -209,26 +217,19 @@ class AgentPages:
                 ),
             )
         agent_url = f"/agents/{self.refs.ref(selected.computer_id)}/{self.refs.ref(selected.id)}"
+        response = await self._page(
+            request,
+            await agent_page(self._storage, Access.of(request)),
+            selected,
+            contact if review == "approved" else None,
+            pending=False,
+        )
+        response.headers["HX-Retarget"] = "#main"
+        response.headers["HX-Reswap"] = "innerMorph"
         if review == "denied":
-            response = self._render.fragment(
-                request,
-                "chat.html",
-                selected=selected,
-                contact=None,
-                latest=None,
-                asked=None,
-            )
             response.headers["HX-Push-Url"] = agent_url
             return response
         latest = request.query_params.get("latest")
-        response = self._render.fragment(
-            request,
-            "chat.html",
-            selected=selected,
-            contact=contact,
-            latest=latest,
-            asked=None,
-        )
         response.headers["HX-Push-Url"] = (
             f"{agent_url}/contacts/{self.refs.ref(contact.thread_id)}?"
             + urlencode(
@@ -261,15 +262,99 @@ class AgentPages:
         if selected is None:
             return HTMLResponse("", status_code=404)
         await self.refs.load([*named([selected]), *contact.named])
+        since = await self._storage.latest_named_event(
+            selected.computer_id,
+            selected.id,
+            names=REMINDERS,
+            thread_id=contact.thread_id,
+        )
         return self._render.fragment(
             request,
             "profile.html",
+            reminder_since=since,
             selected=selected,
             contact=contact,
             reminders=await reminders(self._controls, selected, contact),
             failed=None,
         )
 
+    @allowed("agents.view")
+    @expanded("computer_id", "agent_id")
+    @sees("computer", "computer_id")
+    @sees("agent", "agent_id")
+    async def row_fragment(self, request: Request) -> Response:
+        agent = await agent_view(
+            self._storage,
+            Access.of(request),
+            request.path_params["computer_id"],
+            request.path_params["agent_id"],
+        )
+        if agent is None:
+            return HTMLResponse("", status_code=404)
+        await self.refs.load(named([agent]))
+        return self._render.fragment(
+            request,
+            "agent_row.html",
+            agent=agent,
+            selected_key=request.query_params.get("selected"),
+            poll_state=agent_info(agent),
+        )
+
+    @allowed("agents.view")
+    @expanded("computer_id", "agent_id")
+    @sees("computer", "computer_id")
+    @sees("agent", "agent_id")
+    async def head(self, request: Request) -> Response:
+        selected = await agent_view(
+            self._storage,
+            Access.of(request),
+            request.path_params["computer_id"],
+            request.path_params["agent_id"],
+        )
+        if selected is None:
+            return HTMLResponse("", status_code=404)
+        await self.refs.load(named([selected]))
+        return self._render.fragment(
+            request,
+            "agent_contacts_head.html",
+            selected=selected,
+            poll_state=agent_info(selected),
+        )
+
+    @allowed("agents.view")
+    @expanded("computer_id", "agent_id", "thread_id")
+    @sees("computer", "computer_id")
+    @sees("agent", "agent_id")
+    async def reminder_fragment(self, request: Request) -> Response:
+        selected = await agent_view(
+            self._storage,
+            Access.of(request),
+            request.path_params["computer_id"],
+            request.path_params["agent_id"],
+        )
+        contact = await self._contact(request)
+        if selected is None or contact is None:
+            return HTMLResponse("", status_code=404)
+        await self.refs.load([*named([selected]), *contact.named])
+        since = await self._storage.latest_named_event(
+            selected.computer_id,
+            selected.id,
+            names=REMINDERS,
+            thread_id=contact.thread_id,
+        )
+        listed = await reminders(self._controls, selected, contact)
+        return self._render.fragment(
+            request,
+            "conversation_reminders.html",
+            selected=selected,
+            contact=contact,
+            reminders=listed,
+            reminder_since=since,
+            poll_state={"since": since, "offline": selected.status == "offline"}
+            if listed.answer in ("listed", "offline")
+            else None,
+        )
+
     async def _ids(self, key: str | None) -> str | None:
         """The ids behind a row key as a link names it; nothing for no key,
         or one that names nothing."""
@@ -327,6 +412,10 @@ class AgentPages:
         computer_id = request.path_params["computer_id"]
         agent_id = request.path_params["agent_id"]
         tz = self._render.zone(request)
+        since = await self._storage.latest_activity_event(
+            computer_id, agent_id, skipping=CARD_QUIET
+        )
+        day = day_text(now_ms(), tz)
         agent, activity, usage = await asyncio.gather(
             agent_view(self._storage, Access.of(request), computer_id, agent_id),
             recent_lines(
@@ -342,7 +431,12 @@ class AgentPages:
             return HTMLResponse("", status_code=404)
         await self.refs.load(named([agent]))
         return self._render.fragment(
-            request, "activity_card.html", agent=agent, activity=activity, usage=usage
+            request,
+            "activity_card.html",
+            agent=agent,
+            activity=activity,
+            usage=usage,
+            poll_state=activity_state(agent, since, day),
         )
 
     @allowed("agents.view")
@@ -371,7 +465,14 @@ class AgentPages:
                 agent.computer_id, agent.id
             )
             if latest <= int(since):
-                return Response(status_code=204)
+                return Response(
+                    status_code=204,
+                    headers={
+                        "X-Poll-State": json.dumps(
+                            {"since": int(since), "offline": offline}
+                        )
+                    },
+                )
         offset = int(query.get("offset") or 0)
         listing = await contacts(
             self._storage,
@@ -434,7 +535,14 @@ class AgentPages:
                 shown=query.get("shown"),
             )
             if history is None:
-                return Response(status_code=204)
+                return Response(
+                    status_code=204,
+                    headers={
+                        "X-Poll-State": json.dumps(
+                            {"since": int(since), "offline": agent.status == "offline"}
+                        )
+                    },
+                )
             return self._render.fragment(request, "history_tail.html", history=history)
         # a column with no message to read after - empty, or one that got
         # none - is read afresh once something is new, and left until then
@@ -448,7 +556,14 @@ class AgentPages:
             )
             is None
         ):
-            return Response(status_code=204)
+            return Response(
+                status_code=204,
+                headers={
+                    "X-Poll-State": json.dumps(
+                        {"since": int(since), "offline": agent.status == "offline"}
+                    )
+                },
+            )
         before = query.get("before")
         if before is not None:
             history = await earlier(

{bazaar_compute_node-0.2.1rc3 → bazaar_compute_node-0.2.1rc5}/src/bazaar_compute_server/pages/computers.py

@@ -13,6 +13,7 @@ from ..access import Access, allowed, sees
 from ..configure import SECRETS, configuration, create, kinds, models
 from ..control import Controls
 from ..fleet import ComputerView, Fleet, computer_view, fleet
+from ..polling import computer_info
 from ..protocol import MAX_NAME_CHARS
 from ..refs import Refs, expanded
 from ..rendering import Renderer
@@ -34,7 +35,10 @@ class ComputerPages:
 
         page = await fleet(self._storage, Access.of(request))
         return await self._page(
-            request, page, page.computers[0] if page.computers else None
+            request,
+            page,
+            page.computers[0] if page.computers else None,
+            view="computers",
         )
 
     @allowed("computers.view")
@@ -51,7 +55,7 @@ class ComputerPages:
         )
         if selected is None:
             return HTMLResponse("", status_code=404)
-        return await self._page(request, page, selected)
+        return await self._page(request, page, selected, view="computer")
 
     async def _id(self, short: str | None) -> str | None:
         """The id behind a number a link carries; nothing for none, or one
@@ -63,7 +67,7 @@ class ComputerPages:
         return None if ids is None else ids[0]
 
     async def _page(
-        self, request: Request, page: Fleet, selected: ComputerView | None
+        self, request: Request, page: Fleet, selected: ComputerView | None, *, view: str
     ) -> Response:
         await self.refs.load(_named(page.computers, selected))
         return self._render.page(
@@ -77,6 +81,7 @@ class ComputerPages:
             if selected is None
             else str(self.refs.ref(selected.computer.id)),
             enrolment=None,
+            view=view,
         )
 
     @allowed("computers.view")
@@ -97,6 +102,21 @@ class ComputerPages:
             selected_key=query.get("selected") or None,
         )
 
+    @allowed("computers.view")
+    @expanded("computer_id")
+    @sees("computer", "computer_id")
+    async def row_fragment(self, request: Request) -> Response:
+        item = await self._selected(request)
+        if item is None:
+            return HTMLResponse("", status_code=404)
+        return self._render.fragment(
+            request,
+            "computer_row.html",
+            item=item,
+            selected_key=request.query_params.get("selected"),
+            poll_state=computer_info(item),
+        )
+
     @allowed("computers.view")
     @expanded("computer_id")
     @sees("computer", "computer_id")
@@ -289,6 +309,7 @@ class ComputerPages:
             selected=item,
             selected_key=key,
             enrolment=enrolment,
+            view="computer",
             item=item,
             base_url=str(request.base_url).rstrip("/"),
             system=_system_of(request),