transcript-viewer 0.16.0__tar.gz → 0.16.1__tar.gz

{transcript_viewer-0.16.0 → transcript_viewer-0.16.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: transcript-viewer
-Version: 0.16.0
+Version: 0.16.1
 Summary: Browse agent transcripts in a local, dependency-free web viewer.
 License: MIT
 Requires-Python: >=3.12

{transcript_viewer-0.16.0 → transcript_viewer-0.16.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "transcript-viewer"
-version = "0.16.0"
+version = "0.16.1"
 description = "Browse agent transcripts in a local, dependency-free web viewer."
 readme = "README.md"
 requires-python = ">=3.12"

{transcript_viewer-0.16.0 → transcript_viewer-0.16.1}/src/transcript_viewer/db.py

@@ -103,6 +103,11 @@ def now() -> str:
     return datetime.now(UTC).isoformat(timespec="seconds").replace("+00:00", "Z")
 
 
+def _where(value: Path | str) -> str:
+    """A store's address as written, whether it arrived as a path or a URL."""
+    return value if isinstance(value, str) else str(value)
+
+
 def _postgres(url: str) -> bool:
     return url.startswith(("postgres://", "postgresql://"))
 
@@ -209,10 +214,20 @@ def _open(where: str) -> Store:
     return Store(conn, postgres=False)
 
 
-def connect(path: Path | None = None) -> Store:
-    """The store for this thread, opened and set up on first use."""
+def connect(where: Path | str | None = None) -> Store:
+    """The store for this thread, opened and set up on first use.
+
+    A path or a URL. Both, because a caller that has one should not have to
+    know which the other would be — and wrapping a URL in `Path` to satisfy a
+    narrower type silently destroys it: `Path` collapses the `//` in
+    `postgresql://` to one slash, which stops looking like a URL and starts
+    looking like a relative filename. That produced a SQLite file named after
+    the database it was supposed to be, and a test comparing the two engines
+    that was quietly comparing SQLite with itself.
+    """
     where = (
-        str(path) if path is not None else (deploy.current().database or str(DB_PATH))
+        _where(where) if where is not None
+        else (deploy.current().database or str(DB_PATH))
     )
     have = getattr(_local, "conns", None)
     if have is None:
@@ -268,10 +283,11 @@ def _prepare(conn: Store) -> None:
     conn._conn.commit()
 
 
-def close(path: Path | None = None) -> None:
+def close(where: Path | str | None = None) -> None:
     """Drop this thread's connection. Tests reopen against a new store."""
     where = (
-        str(path) if path is not None else (deploy.current().database or str(DB_PATH))
+        _where(where) if where is not None
+        else (deploy.current().database or str(DB_PATH))
     )
     conn = (getattr(_local, "conns", None) or {}).pop(where, None)
     if conn is not None:

{transcript_viewer-0.16.0 → transcript_viewer-0.16.1}/src/transcript_viewer/library.py

@@ -134,7 +134,7 @@ def _clean(name: str, value: Any) -> Any:
     return str(value).strip()[:500] if value is not None else ""
 
 
-def load(path: Path | None = None) -> dict[str, dict]:
+def load(path: Path | str | None = None) -> dict[str, dict]:
     """Every annotation, by key.
 
     Two queries and one pass, because this answers a whole page load. Asking per
@@ -151,7 +151,7 @@ def load(path: Path | None = None) -> dict[str, dict]:
     return by_key
 
 
-def get(key: str, path: Path | None = None) -> dict:
+def get(key: str, path: Path | str | None = None) -> dict:
     """One record, with defaults filled in, whether or not it is annotated."""
     conn = db.connect(path)
     row = conn.execute(f"{_READ} WHERE t.content_hash = ?", (ME, key)).fetchone()
@@ -168,7 +168,7 @@ def get(key: str, path: Path | None = None) -> dict:
     )
 
 
-def update(key: str, path: Path | None = None, **fields: Any) -> dict:
+def update(key: str, path: Path | str | None = None, **fields: Any) -> dict:
     """Merge fields into one record and persist. Returns the merged record."""
     if not key:
         raise ValueError("a key is required")
@@ -251,30 +251,37 @@ def _forget_if_bare(conn: Any, key: str) -> None:
     ).fetchone()
     if row is None or row["source"] or row["into_dir"]:
         return
+    # Positional, and the key given three times. Named placeholders are spelled
+    # differently by every driver, and one style throughout is what keeps the
+    # translation to a single substitution.
+    # Every column is named and read by name. SQLite's rows answer to a number
+    # as well; PostgreSQL's, as this reads them, do not — so a positional read
+    # works until the day it is asked of the other engine.
     held = conn.execute(
-        "SELECT EXISTS(SELECT 1 FROM labels WHERE content_hash = :k) "
-        "    OR EXISTS(SELECT 1 FROM tags   WHERE content_hash = :k) "
-        "    OR EXISTS(SELECT 1 FROM marks  WHERE content_hash = :k)",
-        {"k": key},
-    ).fetchone()[0]
+        "SELECT EXISTS(SELECT 1 FROM labels WHERE content_hash = ?) "
+        "    OR EXISTS(SELECT 1 FROM tags   WHERE content_hash = ?) "
+        "    OR EXISTS(SELECT 1 FROM marks  WHERE content_hash = ?) AS held",
+        (key, key, key),
+    ).fetchone()["held"]
     if not held:
         conn.execute("DELETE FROM transcripts WHERE content_hash = ?", (key,))
 
 
-def remove(key: str, path: Path | None = None) -> bool:
+def remove(key: str, path: Path | str | None = None) -> bool:
     """Forget one record. True when there was something to forget."""
     conn = db.connect(path)
     with _lock, conn:
         conn.begin()
         existed = conn.execute(
-            "SELECT EXISTS(SELECT 1 FROM transcripts WHERE content_hash = ?)", (key,)
-        ).fetchone()[0]
+            "SELECT EXISTS(SELECT 1 FROM transcripts WHERE content_hash = ?) AS there",
+            (key,),
+        ).fetchone()["there"]
         for table in ("labels", "tags", "marks", "transcripts"):
             conn.execute(f"DELETE FROM {table} WHERE content_hash = ?", (key,))
     return bool(existed)
 
 
-def clear(path: Path | None = None) -> None:
+def clear(path: Path | str | None = None) -> None:
     """Forget every record. What the library's own clear-all is made of."""
     conn = db.connect(path)
     with _lock, conn:
@@ -283,7 +290,7 @@ def clear(path: Path | None = None) -> None:
             conn.execute(f"DELETE FROM {table}")
 
 
-def tags(path: Path | None = None) -> list[tuple[str, int]]:
+def tags(path: Path | str | None = None) -> list[tuple[str, int]]:
     """Every tag with a count, most used first."""
     return [
         (row["tag"], row["n"])
@@ -293,7 +300,7 @@ def tags(path: Path | None = None) -> list[tuple[str, int]]:
     ]
 
 
-def decorate(rows: list[dict], path: Path | None = None) -> list[dict]:
+def decorate(rows: list[dict], path: Path | str | None = None) -> list[dict]:
     """Fold annotations into index rows so a client gets one object per session."""
     entries = load(path)
     for row in rows:

{transcript_viewer-0.16.0 → transcript_viewer-0.16.1}/tests/test_db.py

@@ -387,7 +387,7 @@ def test_postgresql_and_sqlite_give_the_same_answers(tmp_path):
         TRANSCRIPT_VIEWER_TEST_DATABASE=postgresql://postgres:x@localhost/postgres \\
           uv run --extra parquet --extra postgres pytest -q tests/test_db.py
     """
-    url = Path(os.environ["TRANSCRIPT_VIEWER_TEST_DATABASE"])
+    url = os.environ["TRANSCRIPT_VIEWER_TEST_DATABASE"]
 
     conn = db.connect(url)
     for table in ("labels", "tags", "marks", "transcripts", "schema_version"):
@@ -407,3 +407,35 @@ def test_postgresql_and_sqlite_give_the_same_answers(tmp_path):
     assert on_sqlite["written"]["tags"] == ["b", "a"], "insertion order, not sorted"
     assert on_sqlite["and once nothing is left"] == {}
 
+
+
+def test_a_database_url_is_not_turned_into_a_filename():
+    """`Path("postgresql://x")` collapses the `//` to one slash, which stops
+    looking like a URL and starts looking like a relative filename. That opened
+    a SQLite file named after the database it was meant to be — and made a test
+    comparing the two engines compare SQLite with itself, passing."""
+    url = "postgresql://postgres:x@localhost/postgres"
+
+    assert db._where(url) == url
+    assert db._postgres(db._where(url))
+    # And the shape that caused it, so the coercion cannot come back.
+    assert not db._postgres(str(Path(url)))
+
+
+def test_only_one_kind_of_placeholder_is_used():
+    """The translation into PostgreSQL is a single substitution of `?`. A named
+    placeholder passes straight through it and reaches the driver as a colon
+    the server does not understand — which is what `:k` did, in the one query
+    that decides whether a record is still worth keeping.
+    """
+    import re
+    from pathlib import Path
+
+    root = Path(__file__).resolve().parent.parent / "src/transcript_viewer"
+    for name in ("db.py", "library.py"):
+        for line in (root / name).read_text().splitlines():
+            if "SELECT" not in line and "INSERT" not in line and "DELETE" not in line:
+                continue
+            assert not re.search(r"= :\w", line), (
+                f"{name} uses a named placeholder: {line.strip()}"
+            )

{transcript_viewer-0.16.0 → transcript_viewer-0.16.1}/uv.lock

@@ -452,7 +452,7 @@ wheels = [
 
 [[package]]
 name = "transcript-viewer"
-version = "0.16.0"
+version = "0.16.1"
 source = { editable = "." }
 dependencies = [
     { name = "atif-make" },