Possibility to filter by multiple tags

Also, demo now allows to select tags to filter on.

README.md

@@ -94,8 +94,8 @@ python -m pytest tests/
 
 ```sh
 mypy src/
-black src/ && black tests/
-ruff src/ && ruff tests/
+black src/ && black tests/ && black demo.py
+ruff src/ && ruff tests/ && ruff demo.py
 ```
 
 ## TODOs

demo.py

@@ -3,6 +3,12 @@ import gradio as gr
 
 
 client = httpx.Client()
+# TODO: update the tags somehow; re-fetching inside of check_status doesn't work
+tag_counts = {
+    key.strip("#"): val
+    for key, val in client.get("http://localhost:8080/tag_counts/").json().items()
+    if key.strip("#")
+}
 
 
 def submit(inputs):
@@ -17,8 +23,12 @@ def check_status():
     return response.json()
 
 
-def get_results():
-    response = httpx.get("http://localhost:8080/recent/")
+def get_results(inputs: list[str]):
+    if not inputs:
+        response = httpx.get("http://localhost:8080/recent/")
+    else:
+        tags = [tag.split(" ", 1)[0] for tag in inputs]
+        response = httpx.get("http://localhost:8080/recent/" + ",".join(tags))
     entries = response.json()
     texts: list[str] = []
     for i, entry in enumerate(entries, start=1):
@@ -31,21 +41,36 @@ def get_results():
     return "\n\n---\n\n".join(texts)
 
 
+INPUT_DESCRIPTION = """Input currently supports:
+- plain text
+- a URL to a webpage
+- a URL to a youtube video (the video will be transcribed)
+- a URL to an image (the image description will be used)
+"""
+
+
 def get_demo():
     with gr.Blocks() as demo:
         # submit new input
-        inputs = gr.Textbox(lines=3, label="Input (text, URL)")
+        gr.Markdown(INPUT_DESCRIPTION)
+        inputs = gr.Textbox(lines=3, label="Input")
         btn_submit = gr.Button("Submit")
 
         # check job status
         gr.HTML(value=check_status, label="Status", every=3)
 
+        # check box of tags to filter on
+        tag_choices = sorted(f"{key} ({val})" for key, val in tag_counts.items())
+        tags = gr.CheckboxGroup(
+            tag_choices, label="Filter on tags (no selection = all)"
+        )
+
         # display output
         btn_output = gr.Button("Show results")
         output = gr.Markdown()
 
         btn_submit.click(submit, inputs=inputs)
-        btn_output.click(get_results, outputs=[output])
+        btn_output.click(get_results, inputs=[tags], outputs=[output])
 
     return demo
 

src/gistillery/webservice.py

@@ -87,7 +87,7 @@ def recent() -> list[EntriesResult]:
             JOIN tags t ON e.id = t.entry_id
             GROUP BY e.id
             ORDER BY e.created_at DESC
-            LIMIT 10
+            LIMIT 100
             """)
         results = cursor.fetchall()
 
@@ -102,10 +102,10 @@ def recent() -> list[EntriesResult]:
 
 @app.get("/recent/{tag}")
 def recent_tag(tag: str) -> list[EntriesResult]:
-    if not tag.startswith("#"):
-        tag = "#" + tag
+    tags = tag.split(",")
+    tags = ["#" + tag for tag in tags if not tag.startswith("#")]
 
-    # same as recent, but filter by tag
+    # same as recent, but filter by tags, where at least one tag matches
     with get_db_cursor() as cursor:
         cursor.execute(
             """
@@ -115,25 +115,39 @@ def recent_tag(tag: str) -> list[EntriesResult]:
             JOIN summaries s ON e.id = s.entry_id
             JOIN tags t ON e.id = t.entry_id
             WHERE e.id IN (
-                SELECT entry_id FROM tags WHERE tag = ?
+              SELECT entry_id FROM tags WHERE tag IN ({})
             )
             GROUP BY e.id
             ORDER BY e.created_at DESC
-            LIMIT 10
-            """,
-            (tag,),
+            LIMIT 100
+            """.format(",".join("?" * len(tags))),
+            tags,
         )
         results = cursor.fetchall()
 
     entries = []
-    for _id, author, summary, tags, date in results:
+    for _id, author, summary, tag, date in results:
         entry = EntriesResult(
-            id=_id, author=author, summary=summary, tags=tags.split(","), date=date
+            id=_id, author=author, summary=summary, tags=tag.split(","), date=date
         )
         entries.append(entry)
     return entries
 
 
+@app.get("/tag_counts/")
+def tag_counts() -> dict[str, int]:
+    with get_db_cursor() as cursor:
+        cursor.execute("""
+            SELECT tag, COUNT(*) count
+            FROM tags
+            GROUP BY tag
+            ORDER BY count DESC
+            """)
+        results = cursor.fetchall()
+
+    return {tag: count for tag, count in results}
+
+
 @app.get("/clear/")
 def clear() -> str:
     # clear all tables

tests/test_app.py

@@ -90,11 +90,10 @@ class TestWebservice:
         resp = client.get("/recent")
         assert resp.json() == []
 
-    def test_recent_tag_empty(self, client):
+    def test_recent_tag_empty(self, client, monkeypatch):
         resp = client.get("/recent/general")
         assert resp.json() == []
 
-    def test_submitted_job_status_pending(self, client, monkeypatch):
         # monkeypatch uuid4 to return a known value
         job_id = "abc1234"
         monkeypatch.setattr("uuid.uuid4", lambda: SimpleNamespace(hex=job_id))
@@ -238,6 +237,59 @@ class TestWebservice:
         assert resp0["summary"] == "this would"
         assert resp0["tags"] == sorted(["#this", "#would", "#be"])
 
+    def test_recent_multiple_entries(self, client, registry):
+        # submit 2 entries
+        client.post(
+            "/submit", json={"author": "maxi", "content": "aardvark ant antelope"}
+        )
+        client.post(
+            "/submit",
+            json={"author": "mini", "content": "bat bear bee"},
+        )
+        client.post(
+            "/submit",
+            json={"author": "mini", "content": "camel canary cat"},
+        )
+        self.process_jobs(registry)
+
+        # the "ant" tag is in only one entry
+        resp = client.get("/recent/ant").json()
+        assert len(resp) == 1
+
+        # "ant" and "bee" are in two entries
+        resp = client.get("/recent/ant,bee").json()
+        assert len(resp) == 2
+
+        # "ant" and "bee" and "cat" are in three entries
+        resp = client.get("/recent/cat,ant,bee").json()
+        assert len(resp) == 3
+
+    def test_tag_count(self, client, registry):
+        # submit 2 entries
+        client.post(
+            "/submit", json={"author": "ben", "content": "aardvark ant antelope"}
+        )
+        client.post(
+            "/submit",
+            json={"author": "ben", "content": "aardvark ant bat"},
+        )
+        client.post(
+            "/submit",
+            json={"author": "ben", "content": "aardvark camel canary"},
+        )
+        self.process_jobs(registry)
+
+        resp = client.get("/tag_counts").json()
+        expected = {
+            "#aardvark": 3,
+            "#ant": 2,
+            "#antelope": 1,
+            "#bat": 1,
+            "#camel": 1,
+            "#canary": 1,
+        }
+        assert resp == expected
+
     def test_clear(self, client, cursor, registry):
         client.post("/submit", json={"author": "ben", "content": "this is a test"})
         self.process_jobs(registry)