Task ID: task_e_682fe1ef04b483239f6cc0533792d297
Configuring language runtimes...
+ rm -- /tmp/Gkgx0c-setup_script.sh
+ source ./codex_setup.sh
++ uv sync --frozen
Using CPython 3.12.3 interpreter at: /usr/bin/python3.12
Creating virtual environment at: .venv
Building scubaduck @ file:///workspace/scubaduck
Downloading playwright (43.1MiB)
Downloading pyright (5.3MiB)
Downloading duckdb (19.3MiB)
Downloading ruff (11.0MiB)
Downloading ruff
Built scubaduck @ file:///workspace/scubaduck
Downloading duckdb
Downloading playwright
Downloading pyright
Prepared 33 packages in 2.53s
Installed 33 packages in 92ms
+ blinker==1.9.0
+ certifi==2025.4.26
+ charset-normalizer==3.4.2
+ click==8.2.0
+ duckdb==1.2.2
+ execnet==2.1.1
+ flask==3.1.1
+ greenlet==3.2.2
+ idna==3.10
+ iniconfig==2.1.0
+ itsdangerous==2.2.0
+ jinja2==3.1.6
+ markupsafe==3.0.2
+ nodeenv==1.9.1
+ packaging==25.0
+ playwright==1.52.0
+ pluggy==1.6.0
+ pyee==13.0.0
+ pyright==1.1.400
+ pytest==8.3.5
+ pytest-base-url==2.1.0
+ pytest-playwright==0.7.0
+ pytest-xdist==3.6.1
+ python-dateutil==2.9.0.post0
+ python-slugify==8.0.4
+ requests==2.32.3
+ ruff==0.11.10
+ scubaduck==0.1.0 (from file:///workspace/scubaduck)
+ six==1.17.0
+ text-unidecode==1.3
+ typing-extensions==4.13.2
+ urllib3==2.4.0
+ werkzeug==3.1.3
++ source .venv/bin/activate
+++ '[' -z '' ']'
+++ '[' -n x ']'
+++ SCRIPT_PATH=.venv/bin/activate
+++ '[' .venv/bin/activate = /tmp/Gkgx0c-setup_script.sh ']'
+++ deactivate nondestructive
+++ unset -f pydoc
+++ '[' -z '' ']'
+++ '[' -z '' ']'
+++ hash -r
+++ '[' -z '' ']'
+++ unset VIRTUAL_ENV
+++ unset VIRTUAL_ENV_PROMPT
+++ '[' '!' nondestructive = nondestructive ']'
+++ VIRTUAL_ENV=/workspace/scubaduck/.venv
+++ '[' linux-gnu = cygwin ']'
+++ '[' linux-gnu = msys ']'
+++ export VIRTUAL_ENV
+++ '[' -z '' ']'
+++ unset SCRIPT_PATH
+++ _OLD_VIRTUAL_PATH=/root/.cargo/bin:/root/.rbenv/shims:/root/.rbenv/bin:/root/.rbenv/shims:/root/.local/share/swiftly/bin:/root/.bun/bin:/root/.nvm/versions/node/v22.16.0/bin:/root/.pyenv/shims:3441PYENV_ROOT/shims:/root/.pyenv/bin:/usr/local/go/bin:/root/go/bin:/root/.rbenv/bin:/root/.rbenv/shims:/root/.bun/bin:/root/.local/bin:/root/.pyenv/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+++ PATH=/workspace/scubaduck/.venv/bin:/root/.cargo/bin:/root/.rbenv/shims:/root/.rbenv/bin:/root/.rbenv/shims:/root/.local/share/swiftly/bin:/root/.bun/bin:/root/.nvm/versions/node/v22.16.0/bin:/root/.pyenv/shims:3441PYENV_ROOT/shims:/root/.pyenv/bin:/usr/local/go/bin:/root/go/bin:/root/.rbenv/bin:/root/.rbenv/shims:/root/.bun/bin:/root/.local/bin:/root/.pyenv/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+++ export PATH
+++ '[' xscubaduck '!=' x ']'
+++ VIRTUAL_ENV_PROMPT=scubaduck
+++ export VIRTUAL_ENV_PROMPT
+++ '[' -z '' ']'
+++ '[' -z '' ']'
+++ _OLD_VIRTUAL_PS1=
+++ PS1='(scubaduck) '
+++ export PS1
+++ alias pydoc
+++ true
+++ hash -r
++ python -c 'import os; import duckdb; con = duckdb.connect(); con.execute(f"SET http_proxy = '\''{os.getenv("HTTP_PROXY")}'\''"); con.execute("INSTALL '\''sqlite'\'';")'
++ playwright install chromium
Downloading Chromium 136.0.7103.25 (playwright build v1169) from https://cdn.playwright.dev/dbazure/download/playwright/builds/chromium/1169/chromium-linux.zip
167.7 MiB [] 0% 0.0s167.7 MiB [] 0% 168.7s167.7 MiB [] 0% 110.3s167.7 MiB [] 0% 138.1s167.7 MiB [] 0% 114.5s167.7 MiB [] 0% 96.9s167.7 MiB [] 0% 85.3s167.7 MiB [] 0% 75.5s167.7 MiB [] 0% 68.1s167.7 MiB [] 0% 57.6s167.7 MiB [] 0% 45.9s167.7 MiB [] 0% 39.0s167.7 MiB [] 0% 33.1s167.7 MiB [] 0% 27.2s167.7 MiB [] 1% 22.4s167.7 MiB [] 1% 18.4s167.7 MiB [] 1% 15.3s167.7 MiB [] 2% 12.8s167.7 MiB [] 3% 10.1s167.7 MiB [] 3% 8.9s167.7 MiB [] 4% 7.9s167.7 MiB [] 5% 7.0s167.7 MiB [] 5% 6.6s167.7 MiB [] 6% 6.3s167.7 MiB [] 7% 5.8s167.7 MiB [] 7% 5.5s167.7 MiB [] 8% 5.1s167.7 MiB [] 9% 4.9s167.7 MiB [] 9% 4.7s167.7 MiB [] 10% 4.5s167.7 MiB [] 10% 4.4s167.7 MiB [] 11% 4.2s167.7 MiB [] 12% 4.1s167.7 MiB [] 12% 4.0s167.7 MiB [] 13% 3.9s167.7 MiB [] 13% 3.8s167.7 MiB [] 14% 3.7s167.7 MiB [] 15% 3.6s167.7 MiB [] 15% 3.5s167.7 MiB [] 16% 3.4s167.7 MiB [] 17% 3.3s167.7 MiB [] 18% 3.2s167.7 MiB [] 19% 3.1s167.7 MiB [] 20% 3.1s167.7 MiB [] 20% 3.0s167.7 MiB [] 21% 3.0s167.7 MiB [] 22% 3.0s167.7 MiB [] 22% 2.9s167.7 MiB [] 23% 2.9s167.7 MiB [] 24% 2.8s167.7 MiB [] 25% 2.6s167.7 MiB [] 26% 2.6s167.7 MiB [] 27% 2.5s167.7 MiB [] 28% 2.5s167.7 MiB [] 28% 2.4s167.7 MiB [] 29% 2.4s167.7 MiB [] 30% 2.4s167.7 MiB [] 30% 2.3s167.7 MiB [] 31% 2.3s167.7 MiB [] 32% 2.2s167.7 MiB [] 33% 2.2s167.7 MiB [] 34% 2.2s167.7 MiB [] 35% 2.1s167.7 MiB [] 36% 2.1s167.7 MiB [] 37% 2.0s167.7 MiB [] 38% 2.0s167.7 MiB [] 39% 1.9s167.7 MiB [] 40% 1.9s167.7 MiB [] 41% 1.9s167.7 MiB [] 41% 1.8s167.7 MiB [] 42% 1.8s167.7 MiB [] 43% 1.8s167.7 MiB [] 44% 1.7s167.7 MiB [] 45% 1.7s167.7 MiB [] 46% 1.7s167.7 MiB [] 46% 1.6s167.7 MiB [] 47% 1.6s167.7 MiB [] 48% 1.6s167.7 MiB [] 49% 1.5s167.7 MiB [] 50% 1.5s167.7 MiB [] 51% 1.5s167.7 MiB [] 52% 1.4s167.7 MiB [] 53% 1.4s167.7 MiB [] 54% 1.4s167.7 MiB [] 55% 1.4s167.7 MiB [] 55% 1.3s167.7 MiB [] 56% 1.3s167.7 MiB [] 57% 1.3s167.7 MiB [] 58% 1.2s167.7 MiB [] 59% 1.2s167.7 MiB [] 60% 1.2s167.7 MiB [] 61% 1.1s167.7 MiB [] 62% 1.1s167.7 MiB [] 63% 1.1s167.7 MiB [] 64% 1.1s167.7 MiB [] 64% 1.0s167.7 MiB [] 65% 1.0s167.7 MiB [] 66% 1.0s167.7 MiB [] 67% 1.0s167.7 MiB [] 67% 0.9s167.7 MiB [] 68% 0.9s167.7 MiB [] 69% 0.9s167.7 MiB [] 70% 0.9s167.7 MiB [] 71% 0.8s167.7 MiB [] 72% 0.8s167.7 MiB [] 73% 0.8s167.7 MiB [] 74% 0.7s167.7 MiB [] 75% 0.7s167.7 MiB [] 76% 0.7s167.7 MiB [] 77% 0.7s167.7 MiB [] 77% 0.6s167.7 MiB [] 78% 0.6s167.7 MiB [] 79% 0.6s167.7 MiB [] 80% 0.6s167.7 MiB [] 80% 0.5s167.7 MiB [] 81% 0.5s167.7 MiB [] 82% 0.5s167.7 MiB [] 83% 0.5s167.7 MiB [] 84% 0.5s167.7 MiB [] 84% 0.4s167.7 MiB [] 85% 0.4s167.7 MiB [] 86% 0.4s167.7 MiB [] 87% 0.4s167.7 MiB [] 88% 0.3s167.7 MiB [] 89% 0.3s167.7 MiB [] 90% 0.3s167.7 MiB [] 91% 0.2s167.7 MiB [] 92% 0.2s167.7 MiB [] 93% 0.2s167.7 MiB [] 94% 0.2s167.7 MiB [] 95% 0.1s167.7 MiB [] 96% 0.1s167.7 MiB [] 97% 0.1s167.7 MiB [] 98% 0.1s167.7 MiB [] 98% 0.0s167.7 MiB [] 99% 0.0s167.7 MiB [] 100% 0.0s
Chromium 136.0.7103.25 (playwright build v1169) downloaded to /root/.cache/ms-playwright/chromium-1169
Downloading FFMPEG playwright build v1011 from https://cdn.playwright.dev/dbazure/download/playwright/builds/ffmpeg/1011/ffmpeg-linux.zip
2.3 MiB [] 0% 0.0s2.3 MiB [] 3% 0.4s2.3 MiB [] 7% 0.4s2.3 MiB [] 16% 0.2s2.3 MiB [] 36% 0.1s2.3 MiB [] 67% 0.0s2.3 MiB [] 100% 0.0s
FFMPEG playwright build v1011 downloaded to /root/.cache/ms-playwright/ffmpeg-1011
Downloading Chromium Headless Shell 136.0.7103.25 (playwright build v1169) from https://cdn.playwright.dev/dbazure/download/playwright/builds/chromium/1169/chromium-headless-shell-linux.zip
101.4 MiB [] 0% 6.8s101.4 MiB [] 1% 1.4s101.4 MiB [] 2% 1.4s101.4 MiB [] 3% 1.4s101.4 MiB [] 4% 1.5s101.4 MiB [] 5% 1.5s101.4 MiB [] 7% 1.4s101.4 MiB [] 8% 1.4s101.4 MiB [] 8% 1.5s101.4 MiB [] 10% 1.3s101.4 MiB [] 10% 1.4s101.4 MiB [] 12% 1.3s101.4 MiB [] 13% 1.3s101.4 MiB [] 14% 1.3s101.4 MiB [] 15% 1.3s101.4 MiB [] 16% 1.3s101.4 MiB [] 17% 1.3s101.4 MiB [] 18% 1.3s101.4 MiB [] 19% 1.2s101.4 MiB [] 20% 1.2s101.4 MiB [] 22% 1.2s101.4 MiB [] 24% 1.2s101.4 MiB [] 25% 1.2s101.4 MiB [] 26% 1.1s101.4 MiB [] 27% 1.1s101.4 MiB [] 28% 1.1s101.4 MiB [] 29% 1.1s101.4 MiB [] 30% 1.1s101.4 MiB [] 31% 1.1s101.4 MiB [] 32% 1.0s101.4 MiB [] 33% 1.0s101.4 MiB [] 34% 1.0s101.4 MiB [] 35% 1.0s101.4 MiB [] 36% 1.0s101.4 MiB [] 38% 0.9s101.4 MiB [] 40% 0.9s101.4 MiB [] 41% 0.9s101.4 MiB [] 42% 0.9s101.4 MiB [] 43% 0.9s101.4 MiB [] 44% 0.9s101.4 MiB [] 45% 0.8s101.4 MiB [] 46% 0.8s101.4 MiB [] 47% 0.8s101.4 MiB [] 48% 0.8s101.4 MiB [] 49% 0.8s101.4 MiB [] 50% 0.8s101.4 MiB [] 52% 0.7s101.4 MiB [] 53% 0.7s101.4 MiB [] 54% 0.7s101.4 MiB [] 55% 0.7s101.4 MiB [] 56% 0.7s101.4 MiB [] 57% 0.7s101.4 MiB [] 58% 0.6s101.4 MiB [] 59% 0.6s101.4 MiB [] 60% 0.6s101.4 MiB [] 61% 0.6s101.4 MiB [] 62% 0.6s101.4 MiB [] 63% 0.6s101.4 MiB [] 64% 0.5s101.4 MiB [] 66% 0.5s101.4 MiB [] 67% 0.5s101.4 MiB [] 68% 0.5s101.4 MiB [] 69% 0.5s101.4 MiB [] 70% 0.5s101.4 MiB [] 71% 0.4s101.4 MiB [] 72% 0.4s101.4 MiB [] 73% 0.4s101.4 MiB [] 74% 0.4s101.4 MiB [] 76% 0.4s101.4 MiB [] 77% 0.4s101.4 MiB [] 78% 0.3s101.4 MiB [] 79% 0.3s101.4 MiB [] 80% 0.3s101.4 MiB [] 81% 0.3s101.4 MiB [] 82% 0.3s101.4 MiB [] 83% 0.3s101.4 MiB [] 84% 0.2s101.4 MiB [] 85% 0.2s101.4 MiB [] 87% 0.2s101.4 MiB [] 88% 0.2s101.4 MiB [] 89% 0.2s101.4 MiB [] 90% 0.1s101.4 MiB [] 91% 0.1s101.4 MiB [] 92% 0.1s101.4 MiB [] 93% 0.1s101.4 MiB [] 94% 0.1s101.4 MiB [] 95% 0.1s101.4 MiB [] 96% 0.1s101.4 MiB [] 97% 0.0s101.4 MiB [] 98% 0.0s101.4 MiB [] 99% 0.0s101.4 MiB [] 100% 0.0s
Chromium Headless Shell 136.0.7103.25 (playwright build v1169) downloaded to /root/.cache/ms-playwright/chromium_headless_shell-1169
++ echo 'source .venv/bin/activate'
I'm checking out AGENTS.md to see what instructions I need to follow.
ls
bash: .venv/bin/activate: No such file or directory
root@a3e762c027ed:/workspace# ls
scubaduck
root@a3e762c027ed:/workspace# cd scubaduck
root@a3e762c027ed:/workspace/scubaduck# ls
AGENTS.md codex_setup.sh scubaduck tests
README.md pyproject.toml stubs uv.lock
root@a3e762c027ed:/workspace/scubaduck# cat AGENTS.md
- Use "source .venv/bin/activate" to activate the virtual environment before
running any commands
- ONLY use non-interactive commands like cat, sed, apply_patch to do edits.
Do NOT use interactive editors.
- Do NOT attempt to install packages. Only the packages specified in
pyproject.toml are available. You cannot add new packages. If you
desperately want another package, make a note of it in the final PR
description.
- Use conventional commits to format PR title
- There are no nested AGENTS.md files, this is the only agents file
- When using Playwright, ONLY use chromium browser. This browser is already
installed.
- Use "ruff check" to check lint, "ruff format" to autoformat files and
"pyright" to typecheck.
- When writing the PR description, include the original prompt supplied by the
user.
- When you add functionality to the server, add server tests to
tests/test_server.py. When you add features to the frontend, add frontend
tests to tests/test_web.py
I'll follow AGENTS' guidelines: use ruff tools, update tests, and run pytest after modifications.
root@a3e762c027ed:/workspace/scubaduck# cat README.md | head
I really like Scuba (Meta's internal real-time database system). The distributed
, real-time database part of Scuba is quite difficult (and expensive) to replica
te, but I also really like Scuba's UI for doing queries, and I have found myself
wishing that I have access to it even for "small" databases, e.g., I have a sql
ite dataset I want to explore.
Pivotal ideas:
* Time series by default. In the dedicated "time series" view, there are many fe
atures specifically oriented towards working towards tables that represent event
s that occurred over time: the start, end, compare, aggregate and granularity fi
elds all specially privilege the timestamp field. In fact, you can't log events
to Scuba's backing data store without a timestamp, they always come with one. (S
cuba also supports other views that don't presuppose a time series, but the time
series is the most beloved and well used view.) This is in contrast to typical
software which tries to generalize to arbitrary data first, with time series bei
ng added on later.
* It's all about exploration. Scuba is predicated on the idea that you don't kno
w what you're looking for, that you are going to spend time tweaking queries and
changing filters/grouping as part of an investigation to figure out why a syste
m behaves the way it is. So the filters/comparisons/groupings you want to edit a
re always visible on the left sidebar, with the expectation that you're going to
tweak the query to look at something else. Similarly, all the parameters of you
r query get saved into your URL, so your browser history can double up as a quer
y history / you can easily share a query with someone else. This is contrast to
typical software which is often oriented to making pretty dashboards and reports
. (This function is important too, but it's not what I want in exploration mode!
)
* You can fix data problems in the query editor. It's pretty common to have mess
ed up and ended up with a database that doesn't have exactly the columns you nee
d, or some columns that are corrupted in some way. Scuba has pretty robust suppo
rt for defining custom columns with arbitrary SQL functions, grouping over them
as if they were native functions, and doing so with minimal runtime cost (Scuba
aims to turn around your query in milliseconds!) Having to go and run a huge dat
a pipeline to fix your data is a big impediment to exploration; quick and easy c
ustom columns means you can patch over problems when you're investigating and fi
x them for real later.
I'll check the repository structure to understand how filtering should be implemented.
root@a3e762c027ed:/workspace/scubaduck# ls
AGENTS.md codex_setup.sh scubaduck tests
README.md pyproject.toml stubs uv.lock
I’m accessing the scubaduck directory.
root@a3e762c027ed:/workspace/scubaduck# ls scubaduck
__init__.py sample.csv server.py static
Time to take a look at the server.py file. Let's dive in!
root@a3e762c027ed:/workspace/scubaduck# sed -n '1,160p' scubaduck/server.py
from __future__ import annotations
from dataclasses import dataclass, field, replace
from typing import Any, Dict, List, Tuple, cast
import re
from datetime import datetime, timedelta, timezone
import time
from pathlib import Path
import os
import traceback
import math
import duckdb
from dateutil import parser as dtparser
from dateutil.relativedelta import relativedelta
from flask import Flask, jsonify, request, send_from_directory
def _quote(ident: str) -> str:
"""Return identifier quoted for SQL."""
return f'"{ident.replace('"', '""')}"'
@dataclass
class Filter:
column: str
op: str
value: str | int | float | list[str] | None
@dataclass
class QueryParams:
start: str | None = None
end: str | None = None
order_by: str | None = None
order_dir: str = "ASC"
limit: int | None = None
columns: list[str] = field(default_factory=lambda: [])
filters: list[Filter] = field(default_factory=lambda: [])
derived_columns: dict[str, str] = field(default_factory=lambda: {})
graph_type: str = "samples"
group_by: list[str] = field(default_factory=lambda: [])
aggregate: str | None = None
show_hits: bool = False
x_axis: str | None = None
granularity: str = "Auto"
fill: str = "0"
table: str = "events"
time_column: str | None = "timestamp"
time_unit: str = "s"
def _load_database(path: Path) -> duckdb.DuckDBPyConnection:
if not path.exists():
raise FileNotFoundError(path)
ext = path.suffix.lower()
if ext == ".csv":
con = duckdb.connect()
con.execute(
f"CREATE TABLE events AS SELECT * FROM read_csv_auto('{path.as_posix
()}')"
)
elif ext in {".db", ".sqlite"}:
con = duckdb.connect()
con.execute("LOAD sqlite")
con.execute(f"ATTACH '{path.as_posix()}' AS db (TYPE SQLITE)")
tables = [
r[0]
for r in con.execute(
"SELECT name FROM sqlite_master WHERE type='table'"
).fetchall()
]
for t in tables:
con.execute(f'CREATE VIEW "{t}" AS SELECT * FROM db."{t}"')
else:
con = duckdb.connect(path)
return con
def _create_test_database() -> duckdb.DuckDBPyConnection:
"""Return a DuckDB connection with a small multi-table dataset."""
con = duckdb.connect()
con.execute(
"CREATE TABLE events (id INTEGER PRIMARY KEY, ts INTEGER, val REAL, name
TEXT, flag BOOLEAN)"
)
con.execute("INSERT INTO events VALUES (1, 1704067200, 1.5, 'alice', 1)")
con.execute("INSERT INTO events VALUES (2, 1704070800, 2.0, 'bob', 0)")
con.execute('CREATE TABLE extra (ts INTEGER, "desc" TEXT, num INTEGER)')
con.execute("INSERT INTO extra VALUES (1704067200, 'x', 1)")
con.execute("INSERT INTO extra VALUES (1704070800, 'y', 2)")
return con
_REL_RE = re.compile(
r"([+-]?\d+(?:\.\d*)?)\s*(hour|hours|day|days|week|weeks|fortnight|fortnight
s|month|months|year|years)",
re.IGNORECASE,
)
def parse_time(val: str | None) -> str | None:
"""Parse an absolute or relative time string into ``YYYY-MM-DD HH:MM:SS``.""
"
if val is None or val == "":
return None
s = val.strip()
if s.lower() == "now":
dt = datetime.now(timezone.utc)
return dt.replace(microsecond=0).strftime("%Y-%m-%d %H:%M:%S")
m = _REL_RE.fullmatch(s)
if m:
qty = float(m.group(1))
unit = m.group(2).lower()
now = datetime.now(timezone.utc)
dt: datetime
if unit.startswith("hour"):
dt = now + timedelta(hours=qty)
elif unit.startswith("day"):
dt = now + timedelta(days=qty)
elif unit.startswith("week"):
dt = now + timedelta(weeks=qty)
elif unit.startswith("fortnight"):
dt = now + timedelta(weeks=2 * qty)
elif unit.startswith("month"):
if qty.is_integer():
dt = now + relativedelta(months=int(qty))
else:
dt = now + timedelta(days=30 * qty)
elif unit.startswith("year"):
if qty.is_integer():
dt = now + relativedelta(years=int(qty))
else:
dt = now + timedelta(days=365 * qty)
else: # pragma: no cover - defensive
raise ValueError(f"Unsupported unit: {unit}")
return dt.replace(microsecond=0).strftime("%Y-%m-%d %H:%M:%S")
dt = dtparser.parse(s)
return dt.replace(microsecond=0, tzinfo=None).strftime("%Y-%m-%d %H:%M:%S")
def _numeric_to_datetime(value: int | float, unit: str) -> datetime:
"""Convert a numeric timestamp ``value`` with unit ``unit`` to ``datetime``.
Heuristically fall back to seconds when the converted value is before 1990
but the seconds interpretation is in a reasonable range. This handles
integer columns stored in seconds even when ``unit`` is mistakenly set to a
finer granularity.
"""
divisor = {
"s": 1,
"ms": 1000,
"us": 1_000_000,
"ns": 1_000_000_000,
}.get(unit, 1)
dt = datetime.fromtimestamp(int(value) / divisor, tz=timezone.utc)
if unit != "s" and dt.year < 1990:
root@a3e762c027ed:/workspace/scubaduck# sed -n '160,320p' scubaduck/server.py
if unit != "s" and dt.year < 1990:
alt = datetime.fromtimestamp(int(value), tz=timezone.utc)
if alt.year >= 1990:
dt = alt
return dt
def _granularity_seconds(granularity: str, start: str | None, end: str | None) -
> int:
gran = granularity.lower()
mapping = {
"1 second": 1,
"5 seconds": 5,
"10 seconds": 10,
"30 seconds": 30,
"1 minute": 60,
"4 minutes": 240,
"5 minutes": 300,
"10 minutes": 600,
"15 minutes": 900,
"30 minutes": 1800,
"1 hour": 3600,
"3 hours": 10800,
"6 hours": 21600,
"1 day": 86400,
"1 week": 604800,
"30 days": 2592000,
}
if gran in mapping:
return mapping[gran]
if gran in {"auto", "fine"} and start and end:
try:
s = dtparser.parse(start)
e = dtparser.parse(end)
except Exception:
return 3600
total = max((e - s).total_seconds(), 1)
buckets = 100 if gran == "auto" else 500
return max(int(total // buckets), 1)
return 3600
def _time_expr(col: str, column_types: Dict[str, str] | None, unit: str) -> str:
"""Return SQL expression for column interpreted as timestamp."""
qcol = _quote(col)
if column_types is None:
return qcol
ctype = column_types.get(col, "").upper()
if not any(t in ctype for t in ["TIMESTAMP", "DATE", "TIME"]):
if any(
t in ctype
for t in [
"INT",
"DECIMAL",
"REAL",
"DOUBLE",
"FLOAT",
"NUMERIC",
"HUGEINT",
]
):
if unit == "ns":
# Use nanosecond helper unless column cannot represent such larg
e values
if "INT" in ctype and "BIGINT" not in ctype and "HUGEINT" not in
ctype:
unit = "s"
else:
expr = f"CAST({qcol} AS BIGINT)"
return f"make_timestamp_ns({expr})"
if (
unit != "s"
and "INT" in ctype
and "BIGINT" not in ctype
and "HUGEINT" not in ctype
):
# 32-bit integers cannot store sub-second precision for modern d
ates
unit = "s"
multiplier = {
"s": 1_000_000,
"ms": 1_000,
"us": 1,
}.get(unit, 1_000_000)
base = f"CAST({qcol} AS BIGINT)"
expr = f"CAST({base} * {multiplier} AS BIGINT)" if multiplier != 1 e
lse base
return f"make_timestamp({expr})"
return qcol
def build_query(params: QueryParams, column_types: Dict[str, str] | None = None)
-> str:
select_parts: list[str] = []
group_cols = params.group_by[:]
selected_for_order = set(params.columns) | set(params.derived_columns.keys()
)
if params.graph_type == "timeseries":
sec = _granularity_seconds(params.granularity, params.start, params.end)
x_axis = params.x_axis or params.time_column
if x_axis is None:
raise ValueError("x_axis required for timeseries")
xexpr = _time_expr(x_axis, column_types, params.time_unit)
if params.start:
bucket_expr = (
f"TIMESTAMP '{params.start}' + INTERVAL '{sec} second' * "
f"CAST(floor((epoch({xexpr}) - epoch(TIMESTAMP '{params.start}')
)/{sec}) AS BIGINT)"
)
else:
bucket_expr = (
f"TIMESTAMP 'epoch' + INTERVAL '{sec} second' * "
f"CAST(floor(epoch({xexpr})/{sec}) AS BIGINT)"
)
select_parts.append(f"{bucket_expr} AS bucket")
group_cols = ["bucket"] + group_cols
selected_for_order.add("bucket")
has_agg = bool(group_cols) or params.aggregate is not None
if has_agg:
select_cols = (
group_cols[1:] if params.graph_type == "timeseries" else group_cols
)
select_parts.extend(_quote(c) for c in select_cols)
agg = (params.aggregate or "count").lower()
selected_for_order.update(group_cols)
def agg_expr(col: str) -> str:
expr = _quote(col)
ctype = column_types.get(col, "").upper() if column_types else ""
if "BOOL" in ctype:
expr = f"CAST({_quote(col)} AS BIGINT)"
if agg.startswith("p"):
quant = float(agg[1:]) / 100
return f"quantile({expr}, {quant})"
if agg == "count distinct":
return f"count(DISTINCT {expr})"
if agg == "avg" and column_types is not None:
if "TIMESTAMP" in ctype or "DATE" in ctype or "TIME" in ctype:
return (
"TIMESTAMP 'epoch' + INTERVAL '1 second' * "
f"CAST(avg(epoch({_quote(col)})) AS BIGINT)"
)
return f"{agg}({expr})"
if agg == "count":
if params.graph_type != "table":
select_parts.append("count(*) AS Count")
selected_for_order.add("Count")
else:
for col in params.columns:
if col in group_cols:
continue
select_parts.append(f"{agg_expr(col)} AS {_quote(col)}")
selected_for_order.add(col)
select_parts.insert(len(group_cols), "count(*) AS Hits")
selected_for_order.add("Hits")
else:
select_parts.extend(_quote(c) for c in params.columns)
selected_for_order.update(params.columns)
order_by = params.order_by
if order_by == "Samples":
order_by = "Hits"
order_by = order_by if order_by in selected_for_order else None
if has_agg and params.derived_columns:
inner_params = replace(
root@a3e762c027ed:/workspace/scubaduck# sed -n '320,640p' scubaduck/server.py
inner_params = replace(
params,
derived_columns={},
order_by=None,
limit=None,
)
inner_sql = build_query(inner_params, column_types)
outer_select = ["t.*"] + [
f"{expr} AS {name}" for name, expr in params.derived_columns.items()
]
indented_inner = "\n".join(" " + line for line in inner_sql.splitline
s())
lines = [
f"SELECT {', '.join(outer_select)}",
"FROM (",
indented_inner,
") t",
]
if order_by:
lines.append(f"ORDER BY {_quote(order_by)} {params.order_dir}")
elif params.graph_type == "timeseries":
lines.append("ORDER BY bucket")
if params.limit is not None:
lines.append(f"LIMIT {params.limit}")
return "\n".join(lines)
for name, expr in params.derived_columns.items():
select_parts.append(f"{expr} AS {name}")
selected_for_order.add(name)
select_clause = ", ".join(select_parts) if select_parts else "*"
lines = [f"SELECT {select_clause}", f'FROM "{params.table}"']
where_parts: list[str] = []
if params.time_column:
time_expr = _time_expr(params.time_column, column_types, params.time_uni
t)
else:
time_expr = None
if time_expr and params.start:
where_parts.append(f"{time_expr} >= '{params.start}'")
if time_expr and params.end:
where_parts.append(f"{time_expr} <= '{params.end}'")
for f in params.filters:
op = f.op
if op in {"empty", "!empty"}:
val = "''"
else:
if f.value is None:
continue
if isinstance(f.value, list):
if not f.value:
continue
if op == "=":
qcol = _quote(f.column)
vals = " OR ".join(f"{qcol} = '{v}'" for v in f.value)
where_parts.append(f"({vals})")
continue
val = f"'{f.value}'" if isinstance(f.value, str) else str(f.value)
qcol = _quote(f.column)
if op == "contains":
where_parts.append(f"{qcol} ILIKE '%' || {val} || '%'")
elif op == "!contains":
where_parts.append(f"{qcol} NOT ILIKE '%' || {val} || '%'")
elif op == "empty":
where_parts.append(f"{qcol} = {val}")
elif op == "!empty":
where_parts.append(f"{qcol} != {val}")
else:
where_parts.append(f"{qcol} {op} {val}")
if where_parts:
lines.append("WHERE " + " AND ".join(where_parts))
if group_cols:
lines.append("GROUP BY " + ", ".join(_quote(c) for c in group_cols))
if order_by:
lines.append(f"ORDER BY {_quote(order_by)} {params.order_dir}")
elif params.graph_type == "timeseries":
lines.append("ORDER BY bucket")
if params.limit is not None:
lines.append(f"LIMIT {params.limit}")
return "\n".join(lines)
def create_app(db_file: str | Path | None = None) -> Flask:
app = Flask(__name__, static_folder="static")
if db_file is None:
env_db = os.environ.get("SCUBADUCK_DB")
if env_db:
db_file = env_db
if isinstance(db_file, str) and db_file.upper() == "TEST":
con = _create_test_database()
else:
db_path = Path(db_file or Path(__file__).with_name("sample.csv")).resolv
e()
con = _load_database(db_path)
tables = [r[0] for r in con.execute("SHOW TABLES").fetchall()]
if not tables:
raise ValueError("No tables found in database")
default_table = tables[0]
columns_cache: Dict[str, Dict[str, str]] = {}
def get_columns(table: str) -> Dict[str, str]:
if table not in columns_cache:
rows = con.execute(f'PRAGMA table_info("{table}")').fetchall()
if not rows:
raise ValueError(f"Unknown table: {table}")
columns_cache[table] = {r[1]: r[2] for r in rows}
return columns_cache[table]
sample_cache: Dict[Tuple[str, str, str], Tuple[List[str], float]] = {}
CACHE_TTL = 60.0
CACHE_LIMIT = 200
@app.route("/")
def index() -> Any: # pyright: ignore[reportUnusedFunction]
assert app.static_folder is not None
return send_from_directory(app.static_folder, "index.html")
@app.route("/js/<path:filename>")
def js(filename: str) -> Any: # pyright: ignore[reportUnusedFunction]
assert app.static_folder is not None
folder = Path(app.static_folder) / "js"
return send_from_directory(folder, filename)
...
params.filters.append(Filter(f["column"], f["op"], f.get("value")))
if params.table not in tables:
return jsonify({"error": "Invalid table"}), 400
column_types = get_columns(params.table)
if params.time_column and params.time_column not in column_types:
return jsonify({"error": "Invalid time_column"}), 400
if params.time_unit not in {"s", "ms", "us", "ns"}:
return jsonify({"error": "Invalid time_unit"}), 400
if params.graph_type not in {"table", "timeseries"} and (
params.group_by or params.aggregate or params.show_hits
):
return (
jsonify(
{
"error": "group_by, aggregate and show_hits are only val
id for table or timeseries view"
}
),
400,
)
valid_cols = set(column_types.keys())
valid_cols.update(params.derived_columns.keys())
valid_cols.add("Hits")
if params.graph_type == "timeseries":
if params.x_axis is None:
params.x_axis = params.time_column
if params.x_axis is None or params.x_axis not in valid_cols:
return jsonify({"error": "Invalid x_axis"}), 400
ctype = column_types.get(params.x_axis, "").upper()
is_time = any(t in ctype for t in ["TIMESTAMP", "DATE", "TIME"])
is_numeric = any(
t in ctype
for t in [
"INT",
"DECIMAL",
"REAL",
"DOUBLE",
"FLOAT",
"NUMERIC",
"HUGEINT",
]
)
if not (is_time or is_numeric):
return jsonify({"error": "x_axis must be a time column"}), 400
for col in params.columns:
if col not in valid_cols:
return jsonify({"error": f"Unknown column: {col}"}), 400
for col in params.group_by:
if col not in valid_cols:
return jsonify({"error": f"Unknown column: {col}"}), 400
if params.order_by and params.order_by not in valid_cols:
return jsonify({"error": f"Unknown column: {params.order_by}"}), 400
if params.group_by or params.graph_type == "timeseries":
agg = (params.aggregate or "count").lower()
if agg.startswith("p") or agg == "sum":
need_numeric = True
allow_time = False
elif agg == "avg" or agg in {"min", "max"}:
need_numeric = False
allow_time = True
else:
need_numeric = False
allow_time = False
if need_numeric or allow_time:
for c in params.columns:
if c in params.group_by or c == params.x_axis:
continue
if c not in column_types:
continue
ctype = column_types.get(c, "").upper()
is_numeric = "BOOL" in ctype or any(
t in ctype
for t in [
"INT",
"DECIMAL",
"REAL",
"DOUBLE",
"FLOAT",
"NUMERIC",
"HUGEINT",
]
)
is_time = "TIMESTAMP" in ctype or "DATE" in ctype or "TIME"
in ctype
if need_numeric and not is_numeric:
return (
jsonify(
{
"error": f"Aggregate {agg} cannot be applied
to column {c}",
}
),
400,
)
if allow_time and not (is_numeric or is_time):
return (
jsonify(
{
"error": f"Aggregate {agg} cannot be applied
to column {c}",
}
),
400,
)
if (params.start is None or params.end is None) and (
params.x_axis or params.time_column
):
axis = params.x_axis or params.time_column
assert axis is not None
row = cast(
tuple[datetime | None, datetime | None],
con.execute(
f'SELECT min({_quote(axis)}), max({_quote(axis)}) FROM "{par
ams.table}"'
).fetchall()[0],
)
mn, mx = row
root@a3e762c027ed:/workspace/scubaduck# sed -n '640,960p' scubaduck/server.py
mn, mx = row
if isinstance(mn, (int, float)):
try:
mn = _numeric_to_datetime(mn, params.time_unit)
except Exception:
return (
jsonify(
{
"error": (
f"Invalid time value {mn} for column {axis}"
f" with time_unit {params.time_unit}"
)
}
),
400,
)
if isinstance(mx, (int, float)):
try:
mx = _numeric_to_datetime(mx, params.time_unit)
except Exception:
return (
jsonify(
{
"error": (
f"Invalid time value {mx} for column {axis}"
f" with time_unit {params.time_unit}"
)
}
),
400,
)
if params.start is None and mn is not None:
params.start = (
mn.strftime("%Y-%m-%d %H:%M:%S") if not isinstance(mn, str)
else mn
)
if params.end is None and mx is not None:
params.end = (
mx.strftime("%Y-%m-%d %H:%M:%S") if not isinstance(mx, str)
else mx
)
bucket_size: int | None = None
if params.graph_type == "timeseries":
bucket_size = _granularity_seconds(
params.granularity,
params.start if isinstance(params.start, str) else None,
params.end if isinstance(params.end, str) else None,
)
if (
params.limit is not None
and params.start is not None
and params.end is not None
):
try:
start_dt = dtparser.parse(params.start)
end_dt = dtparser.parse(params.end)
buckets = math.ceil(
(end_dt - start_dt).total_seconds() / bucket_size
)
if buckets > 1:
params.limit *= buckets
except Exception:
pass
sql = build_query(params, column_types)
try:
rows = con.execute(sql).fetchall()
except Exception as exc:
tb = traceback.format_exc()
print(f"Query failed:\n{sql}\n{tb}")
return (
jsonify({"sql": sql, "error": str(exc), "traceback": tb}),
400,
)
def _serialize(value: Any) -> Any:
if isinstance(value, bytes):
return repr(value)
return value
rows = [[_serialize(v) for v in r] for r in rows]
result: Dict[str, Any] = {"sql": sql, "rows": rows}
if params.start is not None:
result["start"] = str(params.start)
if params.end is not None:
result["end"] = str(params.end)
if bucket_size is not None:
result["bucket_size"] = bucket_size
return jsonify(result)
return app
app = create_app()
if __name__ == "__main__":
app.run(debug=True)
The current issue is that sparse buckets create extra series beyond the limit. I'll adjust the limit for sparsely populated buckets to ensure only the top N series are fetched based on hits or defined sorting order.
If buckets are sparse, the limit might still give more series than expected. I'll check tests/test_server.py
to clarify the behavior.
root@a3e762c027ed:/workspace/scubaduck# sed -n '1,160p' tests/test_server.py
"""Legacy test module.
Tests have been split into multiple files:
- test_server_basic.py
- test_server_db_types.py
- test_server_time.py
- test_server_errors.py
- test_server_timeseries.py
"""
root@a3e762c027ed:/workspace/scubaduck# ls tests
conftest.py test_server_time.py test_web_graph.py
test_multi_table_web.py test_server_timeseries.py test_web_table.py
test_server.py test_web.py test_web_timeseries.py
test_server_basic.py test_web_basics.py web_utils.py
test_server_db_types.py test_web_chips.py
test_server_errors.py test_web_columns.py
root@a3e762c027ed:/workspace/scubaduck# sed -n '1,160p' tests/test_server_timese
ries.py
from __future__ import annotations
import json
from typing import Any, cast
from scubaduck import server
def test_group_by_table() -> None:
app = server.app
client = app.test_client()
payload: dict[str, Any] = {
"table": "events",
"start": "2024-01-01 00:00:00",
"end": "2024-01-03 00:00:00",
"graph_type": "table",
"order_by": "user",
"limit": 10,
"columns": ["value"],
"group_by": ["user"],
"aggregate": "Sum",
"show_hits": True,
}
rv = client.post(
"/api/query", data=json.dumps(payload), content_type="application/json"
)
rows = rv.get_json()["rows"]
assert rows[0][0] == "alice"
assert rows[0][1] == 2
assert rows[0][2] == 40
def test_table_avg_with_timestamp() -> None:
app = server.app
client = app.test_client()
payload: dict[str, Any] = {
"table": "events",
"start": "2024-01-01 00:00:00",
"end": "2024-01-03 00:00:00",
"graph_type": "table",
"order_by": "user",
"limit": 100,
"columns": ["user", "timestamp", "value"],
"group_by": ["user"],
"aggregate": "Avg",
}
rv = client.post(
"/api/query", data=json.dumps(payload), content_type="application/json"
)
data = rv.get_json()
assert rv.status_code == 200
assert "error" not in data
rows = data["rows"]
assert rows[0][0] == "alice"
from dateutil import parser
ts = parser.parse(rows[0][2]).replace(tzinfo=None)
assert ts == parser.parse("2024-01-01 12:00:00")
def test_timeseries_basic() -> None:
app = server.app
client = app.test_client()
payload: dict[str, Any] = {
"table": "events",
"start": "2024-01-01 00:00:00",
"end": "2024-01-03 00:00:00",
"graph_type": "timeseries",
"limit": 100,
"group_by": ["user"],
"aggregate": "Count",
"columns": ["value"],
"x_axis": "timestamp",
"granularity": "1 day",
}
rv = client.post(
"/api/query", data=json.dumps(payload), content_type="application/json"
)
data = rv.get_json()
assert rv.status_code == 200
assert len(data["rows"]) == 4
def test_timeseries_orders_by_xaxis() -> None:
app = server.app
client = app.test_client()
payload: dict[str, Any] = {
"table": "events",
"start": "2024-01-01 00:00:00",
"end": "2024-01-03 00:00:00",
"graph_type": "timeseries",
"limit": 100,
"columns": ["value"],
"x_axis": "timestamp",
"granularity": "1 day",
}
rv = client.post(
"/api/query", data=json.dumps(payload), content_type="application/json"
)
data = rv.get_json()
assert rv.status_code == 200
rows = data["rows"]
from dateutil import parser
timestamps = [parser.parse(r[0]).replace(tzinfo=None) for r in rows]
assert timestamps == sorted(timestamps)
def test_timeseries_count_no_columns() -> None:
app = server.app
client = app.test_client()
payload: dict[str, Any] = {
"table": "events",
"start": "2024-01-01 00:00:00",
"end": "2024-01-03 00:00:00",
"graph_type": "timeseries",
"granularity": "1 day",
"columns": [],
}
rv = client.post(
"/api/query", data=json.dumps(payload), content_type="application/json"
)
data = rv.get_json()
assert rv.status_code == 200
rows = data["rows"]
assert len(rows) == 2
assert rows[0][1] == 2
assert rows[1][1] == 2
assert len(rows[0]) == 3
def test_timeseries_limit_applies_to_series() -> None:
app = server.app
client = app.test_client()
payload: dict[str, Any] = {
"table": "events",
"start": "2024-01-01 00:00:00",
"end": "2024-01-03 00:00:00",
"graph_type": "timeseries",
"limit": 1,
"order_by": "user",
"group_by": ["user"],
"aggregate": "Count",
"columns": ["value"],
"x_axis": "timestamp",
"granularity": "1 day",
}
rv = client.post(
"/api/query", data=json.dumps(payload), content_type="application/json"
)
data = rv.get_json()
assert rv.status_code == 200
assert len(data["rows"]) == 2
assert all(r[1] == "alice" for r in data["rows"])
def test_timeseries_auto_and_fine_buckets() -> None:
app = server.app
client = app.test_client()
"graph_type": "timeseries",
"columns": ["value"],
"x_axis": "timestamp",
"granularity": gran,
}
rv = client.post(
"/api/query", data=json.dumps(payload), content_type="application/js
on"
)
data = rv.get_json()
assert rv.status_code == 200
from dateutil import parser
start = parser.parse(cast(str, payload["start"])).replace(tzinfo=None)
buckets = [
parser.parse(cast(str, r[0])).replace(tzinfo=None) for r in data["ro
ws"]
]
assert buckets[0] == start
if len(buckets) > 1:
step = (buckets[1] - buckets[0]).total_seconds()
assert step % data["bucket_size"] == 0
assert any(r[1] != 0 for r in data["rows"])
run("Auto")
run("Fine")
def test_timeseries_string_column_error() -> None:
app = server.app
client = app.test_client()
payload = {
"table": "events",
"start": "2024-01-01 00:00:00",
"end": "2024-01-03 00:00:00",
"graph_type": "timeseries",
"limit": 7,
"columns": ["timestamp", "event", "value", "user"],
"x_axis": "timestamp",
"granularity": "1 hour",
}
rv = client.post(
"/api/query", data=json.dumps(payload), content_type="application/json"
)
assert rv.status_code == 200
def test_derived_column_basic() -> None:
app = server.app
client = app.test_client()
payload = {
"table": "events",
"start": "2024-01-01 00:00:00",
"end": "2024-01-03 00:00:00",
"limit": 10,
"columns": ["timestamp"],
"derived_columns": {"val2": "value * 2"},
"filters": [],
}
rv = client.post(
"/api/query", data=json.dumps(payload), content_type="application/json"
)
data = rv.get_json()
assert rv.status_code == 200
assert data["rows"][0][1] == 20
def test_timeseries_derived_column() -> None:
app = server.app
client = app.test_client()
payload = {
"table": "events",
"start": "2024-01-01 00:00:00",
"end": "2024-01-03 00:00:00",
"graph_type": "timeseries",
"granularity": "1 hour",
"limit": 7,
"columns": ["value"],
"derived_columns": {"derived_1": "value * 2"},
"aggregate": "Avg",
}
rv = client.post(
"/api/query", data=json.dumps(payload), content_type="application/json"
)
data = rv.get_json()
assert rv.status_code == 200
rows = data["rows"]
assert all(r[3] == r[2] * 2 for r in rows)
def test_reserved_word_column() -> None:
app = server.create_app("TEST")
client = app.test_client()
payload = {
"table": "extra",
"columns": ["ts", "desc"],
"order_by": "ts",
"time_column": "",
}
rv = client.post(
"/api/query", data=json.dumps(payload), content_type="application/json"
)
data = rv.get_json()
assert rv.status_code == 200
assert len(data["rows"]) == 2
assert data["rows"][0][1] == "x"
def test_table_count_group_by_extra() -> None:
app = server.create_app("TEST")
client = app.test_client()
payload = {
"table": "extra",
"graph_type": "table",
"time_column": "",
"group_by": ["num"],
"aggregate": "Count",
"columns": [],
}
rv = client.post(
"/api/query", data=json.dumps(payload), content_type="application/json"
)
data = rv.get_json()
assert rv.status_code == 200
rows = sorted(data["rows"])
assert rows == [[1, 1], [2, 1]]
assert all(len(r) == 2 for r in rows)
def test_order_by_samples_table() -> None:
app = server.app
client = app.test_client()
payload: dict[str, Any] = {
"table": "events",
"start": "2024-01-01 00:00:00",
"end": "2024-01-03 00:00:00",
"graph_type": "table",
"order_by": "Samples",
"order_dir": "DESC",
"limit": 10,
"columns": [],
"group_by": ["user"],
}
rv = client.post(
"/api/query", data=json.dumps(payload), content_type="application/json"
)
data = rv.get_json()
assert rv.status_code == 200
assert 'ORDER BY "Hits" DESC' in data["sql"]
def test_order_by_samples_timeseries() -> None:
app = server.app
client = app.test_client()
payload: dict[str, Any] = {
"table": "events",
"start": "2024-01-01 00:00:00",
"end": "2024-01-03 00:00:00",
series.py
"end": "2024-01-03 00:00:00",
"graph_type": "timeseries",
"order_by": "Samples",
"order_dir": "DESC",
"x_axis": "timestamp",
"granularity": "1 day",
"columns": [],
}
rv = client.post(
"/api/query", data=json.dumps(payload), content_type="application/json"
)
data = rv.get_json()
assert rv.status_code == 200
assert 'ORDER BY "Hits" DESC' in data["sql"]
def test_show_hits_client_side() -> None:
app = server.app
client = app.test_client()
payload = {
"table": "events",
"start": "2024-01-01 00:00:00",
"end": "2024-01-03 00:00:00",
"graph_type": "table",
"columns": ["value"],
"group_by": ["user"],
"aggregate": "Sum",
"show_hits": False,
}
rv = client.post(
"/api/query", data=json.dumps(payload), content_type="application/json"
)
data = rv.get_json()
assert rv.status_code == 200
assert "count(*) AS Hits" in data["sql"]
I'm continuing to scroll through to check the remaining tests at the bottom.
root@a3e762c027ed:/workspace/scubaduck# sed -n '640,960p' tests/test_server_time
series.py
I'll check out the test_timeseries_limit_applies_to_series
test to understand its behavior.
rver_timeseries.py
132:def test_timeseries_limit_applies_to_series() -> None:
I'll review earlier lines to confirm the query is correctly limiting the series count.
series.py
assert rv.status_code == 200
rows = data["rows"]
assert len(rows) == 2
assert rows[0][1] == 2
assert rows[1][1] == 2
assert len(rows[0]) == 3
def test_timeseries_limit_applies_to_series() -> None:
app = server.app
client = app.test_client()
payload: dict[str, Any] = {
"table": "events",
"start": "2024-01-01 00:00:00",
"end": "2024-01-03 00:00:00",
"graph_type": "timeseries",
"limit": 1,
"order_by": "user",
"group_by": ["user"],
"aggregate": "Count",
"columns": ["value"],
"x_axis": "timestamp",
"granularity": "1 day",
}
rv = client.post(
"/api/query", data=json.dumps(payload), content_type="application/json"
)
data = rv.get_json()
assert rv.status_code == 200
assert len(data["rows"]) == 2
assert all(r[1] == "alice" for r in data["rows"])
def test_timeseries_auto_and_fine_buckets() -> None:
app = server.app
client = app.test_client()
I’ll look back at lines 110 or 120 to understand the full context.
data = rv.get_json()
assert rv.status_code == 200
rows = data["rows"]
from dateutil import parser
timestamps = [parser.parse(r[0]).replace(tzinfo=None) for r in rows]
assert timestamps == sorted(timestamps)
def test_timeseries_count_no_columns() -> None:
app = server.app
client = app.test_client()
payload: dict[str, Any] = {
"table": "events",
"start": "2024-01-01 00:00:00",
"end": "2024-01-03 00:00:00",
"graph_type": "timeseries",
"granularity": "1 day",
"columns": [],
}
rv = client.post(
"/api/query", data=json.dumps(payload), content_type="application/json"
)
data = rv.get_json()
assert rv.status_code == 200
rows = data["rows"]
assert len(rows) == 2
assert rows[0][1] == 2
assert rows[1][1] == 2
assert len(rows[0]) == 3
def test_timeseries_limit_applies_to_series() -> None:
app = server.app
client = app.test_client()
payload: dict[str, Any] = {
"table": "events",
"start": "2024-01-01 00:00:00",
"end": "2024-01-03 00:00:00",
"graph_type": "timeseries",
"limit": 1,
I'll check the scubaduck/static
folder to see if there's front-end code, though we're focused on the server side.
root@a3e762c027ed:/workspace/scubaduck# ls scubaduck/static
index.html js
root@a3e762c027ed:/workspace/scubaduck# ls scubaduck/static/js
chip_input.js table_view.js timeseries_chart.js
sidebar.js time_column.js view_settings.js
I'm opening timeseries_chart.js to check the front-end logic for limits or series.
series_chart.js
let resizeObserver = null;
let currentChart = null;
function showTimeSeries(data) {
function parseTs(s) {
if (s.match(/GMT/) || s.endsWith('Z') || /\+\d{2}:?\d{2}$/.test(s)) {
return new Date(s).getTime();
}
return new Date(s + 'Z').getTime();
}
const view = document.getElementById('view');
if (data.rows.length === 0) {
view.innerHTML = '<p id="empty-message">Empty data provided to table</p>';
return;
}
const height = 600;
view.innerHTML =
'<div id="ts-container"><div id="legend"></div><div id="chart-wrapper"><svg
id="chart" height="' +
height +
'"></svg></div></div>';
const svg = document.getElementById('chart');
const legend = document.getElementById('legend');
const crosshairLine = document.createElementNS('http://www.w3.org/2000/svg', '
line');
crosshairLine.id = 'crosshair_line';
crosshairLine.setAttribute('stroke', '#555');
crosshairLine.style.display = 'none';
const crosshairDots = document.createElementNS('http://www.w3.org/2000/svg', '
g');
crosshairDots.id = 'crosshair_dots';
crosshairDots.style.display = 'none';
const groups = groupBy.chips || [];
const hasHits = document.getElementById('show_hits').checked ? 1 : 0;
const fill = document.getElementById('fill').value;
const bucketMs = (data.bucket_size || 3600) * 1000;
const start = data.start ? parseTs(data.start) : null;
const end = data.end ? parseTs(data.end) : null;
const startIdx = 1 + groups.length + hasHits;
let valueCols = selectedColumns.slice(groups.length + hasHits);
if (
valueCols.length === 0 &&
document.getElementById('aggregate').value.toLowerCase() === 'count'
) {
valueCols = ['Count'];
}
const series = {};
data.rows.forEach(r => {
const ts = parseTs(r[0]);
const groupKey = groups.map((_, i) => r[1 + i]).join(':') || 'all';
valueCols.forEach((name, i) => {
const val = Number(r[startIdx + i]);
const key = groupKey === 'all' ? name : groupKey + ':' + name;
if (!series[key]) series[key] = {};
series[key][ts] = val;
});
});
const buckets = [];
let minX = start !== null ? start : Infinity;
let maxX = end !== null ? end : -Infinity;
if (start !== null && end !== null) {
for (let t = start; t <= end; t += bucketMs) {
buckets.push(t);
}
} else {
Object.keys(series).forEach(k => {
const s = series[k];
Object.keys(s).forEach(t => {
const n = Number(t);
if (n < minX) minX = n;
if (n > maxX) maxX = n;
});
});
for (let t = minX; t <= maxX; t += bucketMs) {
buckets.push(t);
}
}
let minY = Infinity,
maxY = -Infinity;
Object.keys(series).forEach(key => {
const vals = series[key];
buckets.forEach(b => {
const v = vals[b];
const val = v === undefined && fill === '0' ? 0 : v;
if (val === undefined) return;
if (val < minY) minY = val;
if (val > maxY) maxY = val;
});
});
if (fill === '0') {
if (minY > 0) minY = 0;
if (maxY < 0) maxY = 0;
}
const colors = [
'#1f77b4',
'#ff7f0e',
'#2ca02c',
'#d62728',
'#9467bd',
'#8c564b',
'#e377c2'
];
currentChart = {
svg,
legend,
series,
buckets,
minX,
maxX,
minY,
maxY,
fill,
colors,
height,
crosshairLine,
crosshairDots,
seriesEls: {},
bucketPixels: [],
xScale: null,
yScale: null,
selected: null,
frozen: false
};
const intervals = [
{unit: 'second', step: 1, ms: 1000},
{unit: 'second', step: 2, ms: 2000},
{unit: 'second', step: 5, ms: 5000},
{unit: 'second', step: 10, ms: 10000},
{unit: 'second', step: 15, ms: 15000},
{unit: 'second', step: 30, ms: 30000},
{unit: 'minute', step: 1, ms: 60000},
{unit: 'minute', step: 2, ms: 120000},
{unit: 'minute', step: 5, ms: 300000},
{unit: 'minute', step: 10, ms: 600000},
{unit: 'minute', step: 15, ms: 900000},
{unit: 'minute', step: 30, ms: 1800000},
{unit: 'hour', step: 1, ms: 3600000},
{unit: 'hour', step: 2, ms: 7200000},
{unit: 'hour', step: 3, ms: 10800000},
{unit: 'hour', step: 4, ms: 14400000},
{unit: 'hour', step: 6, ms: 21600000},
{unit: 'hour', step: 12, ms: 43200000},
{unit: 'day', step: 1, ms: 86400000},
{unit: 'day', step: 2, ms: 172800000},
{unit: 'week', step: 1, ms: 604800000},
{unit: 'week', step: 2, ms: 1209600000},
{unit: 'month', step: 1},
{unit: 'month', step: 3},
{unit: 'month', step: 6},
{unit: 'year', step: 1},
{unit: 'year', step: 2},
{unit: 'year', step: 5},
{unit: 'year', step: 10}
];
function chooseInterval(start, end) {
const span = end - start;
function approxMs(i) {
if (i.ms) return i.ms;
if (i.unit === 'month') return i.step * 2629800000;
if (i.unit === 'year') return i.step * 31557600000;
return 1000;
}
let best = intervals[0];
let bestScore = Infinity;
intervals.forEach(i => {
const count = span / approxMs(i);
const score = Math.abs(count - 15);
if (score < bestScore) {
best = i;
bestScore = score;
}
});
return best;
}
function generateTicks(start, end, intv) {
const ticks = [];
if (intv.unit === 'month' || intv.unit === 'year') {
let d = new Date(start);
d.setUTCDate(1);
if (intv.unit === 'year') d.setUTCMonth(0);
let unitVal =
intv.unit === 'month'
? d.getUTCFullYear() * 12 + d.getUTCMonth()
: d.getUTCFullYear();
unitVal = Math.ceil(unitVal / intv.step) * intv.step;
while (true) {
const year =
intv.unit === 'month' ? Math.floor(unitVal / 12) : unitVal;
const month = intv.unit === 'month' ? unitVal % 12 : 0;
const t = Date.UTC(year, month, 1);
if (t > end) break;
if (t >= start) ticks.push(t);
unitVal += intv.step;
}
} else {
I'll look for references to "limit" or "series" in the codebase.
root@a3e762c027ed:/workspace/scubaduck# grep -n "limit" -n scubaduck/static/js/t
imeseries_chart.js
I'll check tests/test_web_timeseries.py for potential references to the limit in front-end tests.
from tests.web_utils import select_value
from collections.abc import Iterator
import threading
import pytest
from werkzeug.serving import make_server
from scubaduck.server import create_app
@pytest.fixture()
def test_dataset_server_url() -> Iterator[str]:
app = create_app("TEST")
httpd = make_server("127.0.0.1", 0, app)
port = httpd.server_port
thread = threading.Thread(target=httpd.serve_forever)
thread.start()
try:
yield f"http://127.0.0.1:{port}"
finally:
httpd.shutdown()
thread.join()
def test_timeseries_default_query(page: Any, server_url: str) -> None:
page.goto(server_url)
page.wait_for_selector("#graph_type", state="attached")
select_value(page, "#graph_type", "timeseries")
page.click("text=Columns")
page.check("#column_groups input[value='value']")
page.click("text=View Settings")
page.evaluate("window.lastResults = undefined")
page.click("text=Dive")
page.wait_for_function("window.lastResults !== undefined")
data = page.evaluate("window.lastResults")
assert "error" not in data
assert page.is_visible("#chart")
page.click("text=Columns")
assert not page.is_checked("#column_groups input[value='timestamp']")
def test_timeseries_single_bucket(page: Any, server_url: str) -> None:
page.goto(server_url)
page.wait_for_selector("#graph_type", state="attached")
page.fill("#start", "2024-01-01 00:00:00")
page.fill("#end", "2024-01-01 00:00:00")
select_value(page, "#graph_type", "timeseries")
page.click("text=Columns")
page.check("#column_groups input[value='value']")
page.click("text=View Settings")
page.evaluate("window.lastResults = undefined")
page.click("text=Dive")
page.wait_for_function("window.lastResults !== undefined")
path = page.get_attribute("#chart path", "d")
assert path is not None and "NaN" not in path
def test_timeseries_fill_options(page: Any, server_url: str) -> None:
page.goto(server_url)
page.wait_for_selector("#graph_type", state="attached")
page.fill("#start", "2024-01-01 00:00:00")
page.fill("#end", "2024-01-02 03:00:00")
select_value(page, "#graph_type", "timeseries")
page.click("text=Columns")
page.check("#column_groups input[value='value']")
page.click("text=View Settings")
select_value(page, "#granularity", "1 hour")
select_value(page, "#fill", "0")
page.evaluate("window.lastResults = undefined")
page.click("text=Dive")
page.wait_for_function("window.lastResults !== undefined")
path_zero = page.get_attribute("#chart path", "d")
assert path_zero is not None and path_zero.count("L") > 20
select_value(page, "#fill", "connect")
page.evaluate("window.lastResults = undefined")
page.click("text=Dive")
page.wait_for_function("window.lastResults !== undefined")
path_conn = page.get_attribute("#chart path", "d")
assert path_conn is not None and path_conn.count("M") == 1
select_value(page, "#fill", "blank")
page.evaluate("window.lastResults = undefined")
page.click("text=Dive")
page.wait_for_function("window.lastResults !== undefined")
path_blank = page.get_attribute("#chart path", "d")
assert path_blank is not None and path_blank.count("M") > 1
def test_timeseries_hover_highlight(page: Any, server_url: str) -> None:
page.goto(server_url)
page.wait_for_selector("#graph_type", state="attached")
select_value(page, "#graph_type", "timeseries")
page.click("text=Columns")
page.check("#column_groups input[value='value']")
page.click("text=View Settings")
page.evaluate("window.lastResults = undefined")
page.click("text=Dive")
page.wait_for_function("window.lastResults !== undefined")
page.wait_for_selector("#chart path", state="attached")
path_el = page.query_selector("#chart path")
assert path_el
page.evaluate(
"el => el.dispatchEvent(new MouseEvent('mouseenter', {bubbles: true}))",
path_el,
)
width = page.evaluate(
"getComputedStyle(document.querySelector('#chart path')).strokeWidth"
)
assert "2.5" in width
color = page.evaluate(
"getComputedStyle(document.querySelector('#legend .legend-item')).backgr
oundColor"
)
assert "221, 221, 221" in color
def test_timeseries_crosshair(page: Any, server_url: str) -> None:
page.goto(server_url)
page.wait_for_selector("#graph_type", state="attached")
select_value(page, "#graph_type", "timeseries")
page.click("text=Columns")
page.check("#column_groups input[value='value']")
page.click("text=View Settings")
page.evaluate("window.lastResults = undefined")
page.click("text=Dive")
page.wait_for_function("window.lastResults !== undefined")
page.wait_for_selector("#chart path", state="attached")
page.eval_on_selector(
"#chart",
"el => { const r = el.getBoundingClientRect(); el.dispatchEvent(new Mous
eEvent('mousemove', {clientX: r.left + r.width/2, clientY: r.top + r.height/2, b
ubbles: true})); }",
)
line_display = page.evaluate(
"document.getElementById('crosshair_line').style.display"
)
assert line_display != "none"
count = page.eval_on_selector_all("#crosshair_dots circle", "els => els.leng
th")
assert count > 0
page.eval_on_selector(
"#chart",
"el => el.dispatchEvent(new MouseEvent('mouseleave', {bubbles: true}))",
)
line_display = page.evaluate(
"document.getElementById('crosshair_line').style.display"
)
assert line_display == "none"
def test_timeseries_crosshair_freeze(page: Any, server_url: str) -> None:
page.goto(server_url)
page.wait_for_selector("#graph_type", state="attached")
select_value(page, "#graph_type", "timeseries")
page.click("text=Columns")
page.check("#column_groups input[value='value']")
page.click("text=View Settings")
page.evaluate("window.lastResults = undefined")
page.click("text=Dive")
page.wait_for_function("window.lastResults !== undefined")
The timeseries_web_end seems large; I’ll search for any limit on this.
root@a3e762c027ed:/workspace/scubaduck# grep -n "limit" -n tests/test_web_timese
ries.py
I'll check server_basic for the timeseries limit or related tests.
root@a3e762c027ed:/workspace/scubaduck# grep -n "limit" -n tests/test_server_bas
ic.py
17: "limit": 10,
49: "limit": 10,
72: "limit": 100,
100: "limit": 10,
121: "limit": 100,
def test_basic_query() -> None:
app = server.app
client = app.test_client()
payload = {
"table": "events",
"start": "2024-01-01 00:00:00",
"end": "2024-01-02 00:00:00",
"order_by": "timestamp",
"order_dir": "ASC",
"limit": 10,
"columns": ["timestamp", "event", "value", "user"],
"filters": [],
}
rv = client.post(
"/api/query", data=json.dumps(payload), content_type="application/json"
)
data = rv.get_json()
assert data
rows = data["rows"]
# We expect first three rows (until 2024-01-02 00:00:00)
assert len(rows) == 3
assert rows[0][1] == "login"
assert rows[1][1] == "logout"
def test_js_served() -> None:
app = server.app
client = app.test_client()
rv = client.get("/js/chip_input.js")
assert rv.status_code == 200
assert b"initChipInput" in rv.data
def test_filter_multi_token() -> None:
app = server.app
client = app.test_client()
payload = {
"table": "events",
"start": "2024-01-01 00:00:00",
"end": "2024-01-02 03:00:00",
"order_by": "timestamp",
"limit": 10,
"columns": ["timestamp", "event", "value", "user"],
"filters": [{"column": "user", "op": "=", "value": ["alice", "charlie"]}
],
}
rv = client.post(
"/api/query", data=json.dumps(payload), content_type="application/json"
)
data = rv.get_json()
assert data
rows = data["rows"]
# Should only return rows for alice and charlie
assert len(rows) == 3
assert rows[0][3] == "alice"
assert rows[-1][3] == "charlie"
def test_empty_filter_is_noop() -> None:
app = server.app
client = app.test_client()
base_payload = {
"table": "events",
"start": "2024-01-01 00:00:00",
"end": "2024-01-03 00:00:00",
"limit": 100,
"columns": ["timestamp", "event", "value", "user"],
}
no_filter = {**base_payload, "filters": []}
empty_filter = {
**base_payload,
"filters": [{"column": "user", "op": "=", "value": None}],
}
rv1 = client.post(
"/api/query", data=json.dumps(no_filter), content_type="application/json
"
)
rv2 = client.post(
"/api/query", data=json.dumps(empty_filter), content_type="application/j
son"
)
rows1 = rv1.get_json()["rows"]
rows2 = rv2.get_json()["rows"]
assert rows1 == rows2
def test_select_columns() -> None:
app = server.app
client = app.test_client()
payload = {
"table": "events",
"start": "2024-01-01 00:00:00",
"end": "2024-01-03 00:00:00",
"order_by": "timestamp",
"limit": 10,
"columns": ["timestamp", "user"],
"filters": [],
}
rv = client.post(
"/api/query", data=json.dumps(payload), content_type="application/json"
)
data = rv.get_json()
assert data
rows = data["rows"]
assert len(rows[0]) == 2
assert rows[0][1] == "alice"
def test_string_filter_ops() -> None:
app = server.app
client = app.test_client()
base = {
"start": "2024-01-01 00:00:00",
"end": "2024-01-03 00:00:00",
"order_by": "timestamp",
"limit": 100,
"columns": ["timestamp", "event", "value", "user"],
}
contains = {
**base,
"filters": [{"column": "user", "op": "contains", "value": "ali"}],
}
rv = client.post(
"/api/query", data=json.dumps(contains), content_type="application/json"
)
rows = rv.get_json()["rows"]
assert all("ali" in r[3] for r in rows)
regex = {
**base,
"filters": [{"column": "user", "op": "~", "value": "^a.*"}],
}
rv = client.post(
"/api/query", data=json.dumps(regex), content_type="application/json"
I'm continuing to scroll for more details.
root@a3e762c027ed:/workspace/scubaduck# sed -n '140,280p' tests/test_server_basi
c.py
"/api/query", data=json.dumps(regex), content_type="application/json"
)
rows = rv.get_json()["rows"]
assert all(r[3].startswith("a") for r in rows)
assert len(rows) == 2
not_empty = {**base, "filters": [{"column": "user", "op": "!empty"}]}
rv = client.post(
"/api/query", data=json.dumps(not_empty), content_type="application/json
"
)
assert len(rv.get_json()["rows"]) == 4
def test_order_by_ignored_when_not_selected() -> None:
app = server.app
client = app.test_client()
payload = {
"table": "events",
"order_by": "value",
"columns": ["timestamp"],
}
rv = client.post(
"/api/query", data=json.dumps(payload), content_type="application/json"
)
data = rv.get_json()
assert rv.status_code == 200
assert "ORDER BY" not in data["sql"]
I’ll check tests/test_web_graph.py for time-series tests, since there’s no server test for limits.
import pytest
from scubaduck import server
def test_integer_time_column(tmp_path: Path) -> None:
csv_file = tmp_path / "events.csv"
csv_file.write_text("created,event\n1704067200,login\n1704070800,logout\n")
app = server.create_app(csv_file)
client = app.test_client()
payload = {
"table": "events",
"start": "2024-01-01 00:00:00",
"end": "2024-01-01 01:00:00",
"order_by": "created",
"columns": ["created", "event"],
"time_column": "created",
}
rv = client.post(
"/api/query", data=json.dumps(payload), content_type="application/json"
)
data = rv.get_json()
assert rv.status_code == 200
assert len(data["rows"]) == 2
def test_integer_time_unit_ms(tmp_path: Path) -> None:
csv_file = tmp_path / "events.csv"
csv_file.write_text("created,event\n1704067200000,login\n1704070800000,logou
t\n")
app = server.create_app(csv_file)
client = app.test_client()
payload = {
"table": "events",
"start": "2024-01-01 00:00:00",
"end": "2024-01-01 01:00:00",
"order_by": "created",
"columns": ["created", "event"],
"time_column": "created",
"time_unit": "ms",
}
rv = client.post(
"/api/query", data=json.dumps(payload), content_type="application/json"
)
data = rv.get_json()
assert rv.status_code == 200
assert len(data["rows"]) == 2
def test_timeseries_default_xaxis_uses_time_column(tmp_path: Path) -> None:
csv_file = tmp_path / "events.csv"
csv_file.write_text("created,event\n1704067200000,login\n1704070800000,logou
t\n")
app = server.create_app(csv_file)
client = app.test_client()
payload = {
"table": "events",
"start": "2024-01-01 00:00:00",
"end": "2024-01-01 01:00:00",
"graph_type": "timeseries",
"granularity": "1 hour",
"columns": ["event"],
"aggregate": "Count",
"time_column": "created",
"time_unit": "ms",
}
rv = client.post(
"/api/query", data=json.dumps(payload), content_type="application/json"
)
data = rv.get_json()
assert rv.status_code == 200
assert len(data["rows"]) == 2
def test_integer_time_unit_us_default_start_end(tmp_path: Path) -> None:
csv_file = tmp_path / "events.csv"
csv_file.write_text(
"created,event\n1704067200000000,login\n1704070800000000,logout\n"
)
app = server.create_app(csv_file)
client = app.test_client()
payload = {
"table": "events",
"order_by": "created",
"columns": ["created", "event"],
"time_column": "created",
"time_unit": "us",
}
rv = client.post(
"/api/query", data=json.dumps(payload), content_type="application/json"
)
data = rv.get_json()
assert rv.status_code == 200
assert data["start"] == "2024-01-01 00:00:00"
assert data["end"] == "2024-01-01 01:00:00"
assert len(data["rows"]) == 2
def test_sqlite_integer_time_unit_us(tmp_path: Path) -> None:
sqlite_file = tmp_path / "events.sqlite"
import sqlite3
conn = sqlite3.connect(sqlite_file)
conn.execute("CREATE TABLE visits (visit_time INTEGER, event TEXT)")
big_ts = 13384551652000000
conn.execute("INSERT INTO visits VALUES (?, ?)", (big_ts, "foo"))
conn.commit()
conn.close() # pyright: ignore[reportUnknownMemberType, reportAttributeAcce
ssIssue]
app = server.create_app(sqlite_file)
client = app.test_client()
payload = {
"table": "visits",
"start": "2394-02-20 00:00:00",
"end": "2394-02-21 00:00:00",
"order_by": "visit_time",
"columns": ["visit_time", "event"],
"time_column": "visit_time",
"time_unit": "us",
}
rv = client.post(
"/api/query", data=json.dumps(payload), content_type="application/json"
)
data = rv.get_json()
assert rv.status_code == 200
assert len(data["rows"]) == 1
def test_relative_time_query(monkeypatch: pytest.MonkeyPatch) -> None:
app = server.app
client = app.test_client()
from datetime import datetime
fixed_now = datetime(2024, 1, 2, 4, 0, 0)
class FixedDateTime(datetime):
@classmethod
def now(cls, tz=None): # type: ignore[override]
return fixed_now if tz is None else fixed_now.astimezone(tz)
monkeypatch.setattr(server, "datetime", FixedDateTime)
payload = {
"table": "events",
"start": "-1 hour",
"end": "now",
"order_by": "timestamp",
"limit": 100,
"columns": ["timestamp", "event", "value", "user"],
"filters": [],
}
rv = client.post(
"/api/query", data=json.dumps(payload), content_type="application/json"
)
data = rv.get_json()
The output was cut off, so I'll open the rest for a complete view.
root@a3e762c027ed:/workspace/scubaduck# sed -n '280,560p' tests/test_server_basi
c.py
The server multiplies the limit by bucket count. I'll verify if the behavior is correct.
The server needs to filter groups after retrieving rows to respect the limit.
The query orders by bucket if no order is specified. This affects the row limit.
After retrieving rows, group by series keys and filter to the top groups.
Group columns are added during query building. I'll confirm which columns are selected.
root@a3e762c027ed:/workspace/scubaduck# python - <<'PY'
> import json
> from scubaduck import server
>
> app = server.app
> client = app.test_client()
> payload = {
> 'table': 'events',
> 'start': '2024-01-01 00:00:00',
> 'end': '2024-01-03 00:00:00',
> 'graph_type': 'timeseries',
> 'limit': 1,
> 'order_by': 'user',
> 'group_by': ['user'],
> 'aggregate': 'Count',
> 'columns': ['value'],
> 'x_axis': 'timestamp',
> 'granularity': '1 day'
> }
> rv = client.post('/api/query', data=json.dumps(payload), content_type='applica
tion/json')
> print('status', rv.status_code)
> print('data', rv.get_json())
> PY
Traceback (most recent call last):
File "<stdin>", line 2, in <module>
File "/workspace/scubaduck/scubaduck/server.py", line 23
return f'"{ident.replace('"', '""')}"'
^
SyntaxError: unterminated string literal (detected at line 23)
I accidentally used single quotes—I'll escape them and try to run again.
root@a3e762c027ed:/workspace/scubaduck# python - <<'PY'
> import json
> from scubaduck import server
>
> app = server.app
> client = app.test_client()
> payload = {
> "table": "events",
> "start": "2024-01-01 00:00:00",
> "end": "2024-01-03 00:00:00",
> "graph_type": "timeseries",
> "limit": 1,
> "order_by": "user",
> "group_by": ["user"],
> "aggregate": "Count",
> "columns": ["value"],
> "x_axis": "timestamp",
> "granularity": "1 day",
> }
> rv = client.post("/api/query", data=json.dumps(payload), content_type="applica
tion/json")
> print("status", rv.status_code)
> print(json.dumps(rv.get_json(), indent=2))
> PY
Traceback (most recent call last):
File "<stdin>", line 2, in <module>
File "/workspace/scubaduck/scubaduck/server.py", line 23
return f'"{ident.replace('"', '""')}"'
^
SyntaxError: unterminated string literal (detected at line 23)
The script looks fine, but the server fails due to quoting within the function. I'll check.
root@a3e762c027ed:/workspace/scubaduck# sed -n '16,28p' scubaduck/server.py
from dateutil import parser as dtparser
from dateutil.relativedelta import relativedelta
from flask import Flask, jsonify, request, send_from_directory
def _quote(ident: str) -> str:
"""Return identifier quoted for SQL."""
return f'"{ident.replace('"', '""')}"'
@dataclass
class Filter:
column: str
I need proper escaping for quotes inside a string. Let me review the above code.
root@a3e762c027ed:/workspace/scubaduck# nl -ba scubaduck/server.py | sed -n '18,
26p'
18 from flask import Flask, jsonify, request, send_from_directory
19
20
21 def _quote(ident: str) -> str:
22 """Return identifier quoted for SQL."""
23 return f'"{ident.replace('"', '""')}"'
24
25
26 @dataclass
The quoting seems off! I'll check the file with cat
to verify how it's done.
t -v
def _quote(ident: str) -> str:
"""Return identifier quoted for SQL."""
return f'"{ident.replace('"', '""')}"'
It seems the Python syntax is invalid, but tests might not have run yet. I'll double-check the file's quoting and ensure tests are properly executed.
'1,40p'
from __future__ import annotations
from dataclasses import dataclass, field, replace
from typing import Any, Dict, List, Tuple, cast
import re
from datetime import datetime, timedelta, timezone
import time
from pathlib import Path
import os
import traceback
import math
import duckdb
from dateutil import parser as dtparser
from dateutil.relativedelta import relativedelta
from flask import Flask, jsonify, request, send_from_directory
def _quote(ident: str) -> str:
"""Return identifier quoted for SQL."""
return f'"{ident.replace('"', '""')}"'
@dataclass
class Filter:
column: str
op: str
value: str | int | float | list[str] | None
@dataclass
class QueryParams:
start: str | None = None
end: str | None = None
order_by: str | None = None
order_dir: str = "ASC"
limit: int | None = None
columns: list[str] = field(default_factory=lambda: [])
I think the issue is with quoting—let's try opening the file with "sed -n '1,25p'".
from dataclasses import dataclass, field, replace
from typing import Any, Dict, List, Tuple, cast
import re
from datetime import datetime, timedelta, timezone
import time
from pathlib import Path
import os
import traceback
import math
import duckdb
from dateutil import parser as dtparser
from dateutil.relativedelta import relativedelta
from flask import Flask, jsonify, request, send_from_directory
def _quote(ident: str) -> str:
"""Return identifier quoted for SQL."""
return f'"{ident.replace('"', '""')}"'
Sed didn't process the whole file—maybe due to unprintable characters. I'll try cat -n
.
1 from __future__ import annotations
2
3 from dataclasses import dataclass, field, replace
4 from typing import Any, Dict, List, Tuple, cast
5
6 import re
7 from datetime import datetime, timedelta, timezone
8
9 import time
10 from pathlib import Path
11 import os
12 import traceback
13 import math
14
15 import duckdb
16 from dateutil import parser as dtparser
17 from dateutil.relativedelta import relativedelta
18 from flask import Flask, jsonify, request, send_from_directory
19
20
21 def _quote(ident: str) -> str:
22 """Return identifier quoted for SQL."""
23 return f'"{ident.replace('"', '""')}"'
24
25
The file was cut off; I'll open it again starting from line 25.
root@a3e762c027ed:/workspace/scubaduck# nl -ba scubaduck/server.py | sed -n '26,
70p'
26 @dataclass
27 class Filter:
28 column: str
29 op: str
30 value: str | int | float | list[str] | None
31
32
33 @dataclass
34 class QueryParams:
35 start: str | None = None
36 end: str | None = None
37 order_by: str | None = None
38 order_dir: str = "ASC"
39 limit: int | None = None
40 columns: list[str] = field(default_factory=lambda: [])
41 filters: list[Filter] = field(default_factory=lambda: [])
42 derived_columns: dict[str, str] = field(default_factory=lambda: {})
43 graph_type: str = "samples"
44 group_by: list[str] = field(default_factory=lambda: [])
45 aggregate: str | None = None
46 show_hits: bool = False
47 x_axis: str | None = None
48 granularity: str = "Auto"
49 fill: str = "0"
50 table: str = "events"
51 time_column: str | None = "timestamp"
52 time_unit: str = "s"
53
54
55 def _load_database(path: Path) -> duckdb.DuckDBPyConnection:
56 if not path.exists():
57 raise FileNotFoundError(path)
58
59 ext = path.suffix.lower()
60 if ext == ".csv":
61 con = duckdb.connect()
62 con.execute(
63 f"CREATE TABLE events AS SELECT * FROM read_csv_auto('{path.
as_posix()}')"
64 )
65 elif ext in {".db", ".sqlite"}:
66 con = duckdb.connect()
67 con.execute("LOAD sqlite")
68 con.execute(f"ATTACH '{path.as_posix()}' AS db (TYPE SQLITE)")
69 tables = [
70 r[0]
root@a3e762c027ed:/workspace/scubaduck# python - <<'PY'
> from __future__ import annotations
>
> def _quote(ident: str) -> str:
> return f'"{ident.replace("\"", "\"\"")}"'
>
> print(_quote('foo'))
> PY
File "<stdin>", line 4
return f'"{ident.replace("\"", "\"\"")}"'
^
SyntaxError: f-string expression part cannot include a backslash
I see the f-string error stems from improper escapes with quotes. Checking for invalid characters.
root@a3e762c027ed:/workspace/scubaduck# grep -n "ident" -n scubaduck/server.py
21:def _quote(ident: str) -> str:
22: """Return identifier quoted for SQL."""
23: return f'"{ident.replace('"', '""')}"'
I’ll try using xxd for this task. Let’s see how it works.
root@a3e762c027ed:/workspace/scubaduck# xxd -l 80 -s $((21*0)) scubaduck/server.
py | head
bash: xxd: command not found
Looks like xxd isn't installed, so I'll use od -c
for printing ASCII instead.
root@a3e762c027ed:/workspace/scubaduck# od -c scubaduck/server.py | sed -n '40,6
0p'
0001160 : s t r | i n t | f l
0001200 o a t | l i s t [ s t r ]
0001220 | N o n e \n \n \n @ d a t a c l
0001240 a s s \n c l a s s Q u e r y P
0001260 a r a m s : \n s t a r t
0001300 : s t r | N o n e = N
0001320 o n e \n e n d : s t r
0001340 | N o n e = N o n e \n
0001360 o r d e r _ b y : s t r
0001400 | N o n e = N o n e \n
0001420 o r d e r _ d i r : s t
0001440 r = " A S C " \n l i
0001460 m i t : i n t | N o n e
0001500 = N o n e \n c o l u m
0001520 n s : l i s t [ s t r ] =
0001540 f i e l d ( d e f a u l t _ f a
0001560 c t o r y = l a m b d a : [ ]
0001600 ) \n f i l t e r s : l
0001620 i s t [ F i l t e r ] = f i
0001640 e l d ( d e f a u l t _ f a c t
0001660 o r y = l a m b d a : [ ] ) \n
I’m going to search around the quote line to get the relevant bytes.
root@a3e762c027ed:/workspace/scubaduck# grep -n "Return identifier" -n scubaduck
/server.py
22: """Return identifier quoted for SQL."""
I’m using cat -n
to display lines 20-24 with line numbers.
root@a3e762c027ed:/workspace/scubaduck# nl -ba scubaduck/server.py | sed -n '20,
24p'
20
21 def _quote(ident: str) -> str:
22 """Return identifier quoted for SQL."""
23 return f'"{ident.replace('"', '""')}"'
24
I'll check the file directly from the repository to see how the line is formatted.
root@a3e762c027ed:/workspace/scubaduck# sed -n '20,23p' scubaduck/server.py | od
-c
0000000 \n d e f _ q u o t e ( i d e n
0000020 t : s t r ) - > s t r : \n
0000040 " " " R e t u r n i d
0000060 e n t i f i e r q u o t e d
0000100 f o r S Q L . " " " \n
0000120 r e t u r n f ' " { i d e n t
0000140 . r e p l a c e ( ' " ' , ' "
0000160 " ' ) } " ' \n
0000167
I'm trying to test how escape characters interact with f-strings and quoting syntax.
root@a3e762c027ed:/workspace/scubaduck# python - <<'PY'
> expr = 'f'"\"{ident.replace('"', '""')}\""'
> print(expr)
> PY
f"{ident.replace(', )}""
I’ll verify the commit and check the root repo for any uncommitted changes.
root@a3e762c027ed:/workspace/scubaduck# git status --short
I'll check the file content with git show HEAD:scubaduck/server.py | head
.
root@a3e762c027ed:/workspace/scubaduck# git show HEAD:scubaduck/server.py | sed
-n '20,25p'
def _quote(ident: str) -> str:
"""Return identifier quoted for SQL."""
return f'"{ident.replace('"', '""')}"'
The file may have a quoting bug—I'll check using Python's open and repr.
root@a3e762c027ed:/workspace/scubaduck# python - <<'PY'
> import pathlib, reprlib
> text = pathlib.Path('scubaduck/server.py').read_text().splitlines()[20:24]
> print(text)
> for i, line in enumerate(text, start=21):
> print(i, line, repr(line))
> PY
['def _quote(ident: str) -> str:', ' """Return identifier quoted for SQL."""'
, ' return f\'"{ident.replace(\'"\', \'""\')}"\'', '']
21 def _quote(ident: str) -> str: 'def _quote(ident: str) -> str:'
22 """Return identifier quoted for SQL.""" ' """Return identifier quoted
for SQL."""'
23 return f'"{ident.replace('"', '""')}"' ' return f\'"{ident.replace(\'"
\', \'""\')}"\''
24 ''
The string seems fine. I'll try compiling to see if Python parses it correctly.
> import ast, pathlib
> code = pathlib.Path('scubaduck/server.py').read_text()
> try:
> ast.parse(code)
> print('parse ok')
> except Exception as e:
> print('parse error', e)
> PY
parse error unterminated string literal (detected at line 23) (<unknown>, line 2
3)
The 'server.py' in HEAD seems invalid, but maybe there's a quoting issue. Let's verify!
root@a3e762c027ed:/workspace/scubaduck# git log -1 --stat
commit 6afebd641798d002d60f4bc883c166b1e0e9ac39 (HEAD -> work, main)
Author: Edward Z. Yang <ezyang@mit.edu>
Date: Thu May 22 22:45:04 2025 -0400
fix(frontend): prevent clipped rotated time labels (#150)
scubaduck/static/js/timeseries_chart.js | 5 +++--
tests/test_web_timeseries.py | 24 ++++++++++++++++++++++++
2 files changed, 27 insertions(+), 2 deletions(-)
I'll check earlier commit to see if there's anything from 2025.
root@a3e762c027ed:/workspace/scubaduck# git log -2 --stat
commit 6afebd641798d002d60f4bc883c166b1e0e9ac39 (HEAD -> work, main)
Author: Edward Z. Yang <ezyang@mit.edu>
Date: Thu May 22 22:45:04 2025 -0400
fix(frontend): prevent clipped rotated time labels (#150)
scubaduck/static/js/timeseries_chart.js | 5 +++--
tests/test_web_timeseries.py | 24 ++++++++++++++++++++++++
2 files changed, 27 insertions(+), 2 deletions(-)
commit 079223c1ff5209fba979fad03f8178f7e3c03886
Author: Edward Z. Yang <ezyang@mit.edu>
Date: Thu May 22 22:44:33 2025 -0400
feat(ui): scroll dropdown to selected option (#151)
scubaduck/static/js/view_settings.js | 5 +++++
tests/test_web_basics.py | 14 ++++++++++++++
2 files changed, 19 insertions(+)
It seems there’s a syntax error, might be caused by how the file is executed.
> print(repr(line))
> for ch in line:
> print(ch, ord(ch))
> PY
' return f\'"{ident.replace(\'"\', \'""\')}"\''
32
32
32
32
r 114
e 101
t 116
u 117
r 114
n 110
32
f 102
' 39
" 34
{ 123
i 105
d 100
e 101
n 110
t 116
. 46
r 114
e 101
p 112
l 108
a 97
c 99
e 101
( 40
' 39
" 34
' 39
, 44
32
' 39
" 34
" 34
' 39
) 41
} 125
" 34
' 39
I need to fix the f-string. The expression ident.replace('"', '""')
is valid. Let's compile!
root@a3e762c027ed:/workspace/scubaduck# python - <<'PY'
> source = 'def _quote(ident: str) -> str:\n return f\'"{ident.replace("\"",
"\"\"")}"\''
> import ast
> ast.parse(source)
> print('ok')
> PY
Traceback (most recent call last):
File "<stdin>", line 3, in <module>
File "/root/.pyenv/versions/3.11.12/lib/python3.11/ast.py", line 50, in parse
return compile(source, filename, mode, flags,
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "<unknown>", line 2
return f'"{ident.replace(""", """")}"'
^
SyntaxError: f-string: unmatched '('
Hmm, there's some inconsistency with quoting within the string. I'll adjust it.
> import ast
> line = ' return f'"{ident.replace('"', '""')}"'
> '
> # The above is not valid; we can't easily create due to quoting; I'll triple q
uote
> source = "def _quote(ident: str) -> str:\n return f'\"{ident.replace('\"',
'\"\"')}\"'"
> print(source)
> try:
> ast.parse(source)
> print('parse ok')
> except SyntaxError as e:
> print('syntax error:', e)
> PY
File "<stdin>", line 3
'
^
SyntaxError: unterminated string literal (detected at line 3)
I'll open the file, check the f-string quoting, and verify with a test write.
root@a3e762c027ed:/workspace/scubaduck# python - <<'PY'
> code = "def _quote(ident: str) -> str:\n return f'\"{ident.replace('\"', '\
"\"')}\"'"
> print(code)
> try:
> exec(code)
> print('_quote result:', _quote('id'))
> except Exception as e:
> print('error', e)
> PY
def _quote(ident: str) -> str:
return f'"{ident.replace('"', '""')}"'
error unterminated string literal (detected at line 2) (<string>, line 2)
The code seems invalid. I'll verify by checking commit 6afebd6 around the _quote line.
root@a3e762c027ed:/workspace/scubaduck# git blame -L 21,24 scubaduck/server.py
74844306 (Edward Z. Yang 2025-05-22 21:08:39 -0400 21) def _quote(ident: str) ->
str:
74844306 (Edward Z. Yang 2025-05-22 21:08:39 -0400 22) """Return identifier
quoted for SQL."""
74844306 (Edward Z. Yang 2025-05-22 21:08:39 -0400 23) return f'"{ident.repl
ace('"', '""')}"'
74844306 (Edward Z. Yang 2025-05-22 21:08:39 -0400 24)
The repository has an odd quoting issue. I'll check server.py
using cat -A
.
root@a3e762c027ed:/workspace/scubaduck# cat -n scubaduck/server.py | sed -n '21,
23p'
21 def _quote(ident: str) -> str:
22 """Return identifier quoted for SQL."""
23 return f'"{ident.replace('"', '""')}"'
The Python script may fail to parse. I'll check with ruff check
to confirm.
root@a3e762c027ed:/workspace/scubaduck# source .venv/bin/activate
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# ruff format --quiet
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
I'll run a ruff check on the code for any style issues.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# ruff check --quiet
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
No errors from ruff, so I'll move on to running pyright next.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# pyright
0 errors, 0 warnings, 0 informations
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
Pyright shows no errors, but earlier attempts with Python's AST failed. Checking again.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# python - <<'PY'
> import scubaduck.server as s
> print('loaded', s._quote('id'))
> PY
loaded "id"
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
It imported fine, so the error might stem from an earlier file reading issue.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# python - <<'PY'
> import pathlib, ast
> code = pathlib.Path('scubaduck/server.py').read_text()
> try:
> ast.parse(code)
> print('parse ok')
> except SyntaxError as e:
> print('syntax error', e)
> PY
parse ok
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
I'm ready to modify server-side code to filter timeseries data, particularly groups surpassing limits.
I'll track the first limit
unique group values, ignoring new groups beyond the limit.
I'll verify original limit storage and check how it's modified before implementing the filter.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# sed -n '672,720p' scubaduck/
server.py
params.start = (
mn.strftime("%Y-%m-%d %H:%M:%S") if not isinstance(mn, str)
else mn
)
if params.end is None and mx is not None:
params.end = (
mx.strftime("%Y-%m-%d %H:%M:%S") if not isinstance(mx, str)
else mx
)
bucket_size: int | None = None
if params.graph_type == "timeseries":
bucket_size = _granularity_seconds(
params.granularity,
params.start if isinstance(params.start, str) else None,
params.end if isinstance(params.end, str) else None,
)
if (
params.limit is not None
and params.start is not None
and params.end is not None
):
try:
start_dt = dtparser.parse(params.start)
end_dt = dtparser.parse(params.end)
buckets = math.ceil(
(end_dt - start_dt).total_seconds() / bucket_size
)
if buckets > 1:
params.limit *= buckets
except Exception:
pass
sql = build_query(params, column_types)
try:
rows = con.execute(sql).fetchall()
except Exception as exc:
tb = traceback.format_exc()
print(f"Query failed:\n{sql}\n{tb}")
return (
jsonify({"sql": sql, "error": str(exc), "traceback": tb}),
400,
)
def _serialize(value: Any) -> Any:
if isinstance(value, bytes):
return repr(value)
return value
rows = [[_serialize(v) for v in r] for r in rows]
result: Dict[str, Any] = {"sql": sql, "rows": rows}
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# sed -n '720,780p' scubaduck/
server.py
result: Dict[str, Any] = {"sql": sql, "rows": rows}
if params.start is not None:
result["start"] = str(params.start)
if params.end is not None:
result["end"] = str(params.end)
if bucket_size is not None:
result["bucket_size"] = bucket_size
return jsonify(result)
return app
app = create_app()
if __name__ == "__main__":
app.run(debug=True)
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
I'll modify the code to store the original limit before serialization,! Let's check parameter parsing.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# grep -n "request.get_json" -
n scubaduck/server.py
493: payload = request.get_json(force=True)
_cache_set(key, values)
return jsonify(values)
@app.route("/api/query", methods=["POST"])
def query() -> Any: # pyright: ignore[reportUnusedFunction]
payload = request.get_json(force=True)
try:
start = parse_time(payload.get("start"))
end = parse_time(payload.get("end"))
except Exception as exc:
return jsonify({"error": str(exc)}), 400
params = QueryParams(
start=start,
end=end,
order_by=payload.get("order_by"),
order_dir=payload.get("order_dir", "ASC"),
limit=payload.get("limit"),
columns=payload.get("columns", []),
derived_columns=payload.get("derived_columns", {}),
graph_type=payload.get("graph_type", "samples"),
group_by=payload.get("group_by", []),
aggregate=payload.get("aggregate"),
show_hits=payload.get("show_hits", False),
x_axis=payload.get("x_axis"),
granularity=payload.get("granularity", "Auto"),
fill=payload.get("fill", "0"),
table=payload.get("table", default_table),
time_column=payload.get("time_column", "timestamp"),
time_unit=payload.get("time_unit", "s"),
)
if params.order_by == "Samples":
params.order_by = "Hits"
for f in payload.get("filters", []):
params.filters.append(Filter(f["column"], f["op"], f.get("value")))
if params.table not in tables:
return jsonify({"error": "Invalid table"}), 400
column_types = get_columns(params.table)
if params.time_column and params.time_column not in column_types:
return jsonify({"error": "Invalid time_column"}), 400
if params.time_unit not in {"s", "ms", "us", "ns"}:
return jsonify({"error": "Invalid time_unit"}), 400
if params.graph_type not in {"table", "timeseries"} and (
params.group_by or params.aggregate or params.show_hits
):
return (
jsonify(
{
"error": "group_by, aggregate and show_hits are only val
id for table or timeseries view"
}
),
400,
)
valid_cols = set(column_types.keys())
valid_cols.update(params.derived_columns.keys())
valid_cols.add("Hits")
if params.graph_type == "timeseries":
if params.x_axis is None:
params.x_axis = params.time_column
if params.x_axis is None or params.x_axis not in valid_cols:
return jsonify({"error": "Invalid x_axis"}), 400
ctype = column_types.get(params.x_axis, "").upper()
is_time = any(t in ctype for t in ["TIMESTAMP", "DATE", "TIME"])
is_numeric = any(
t in ctype
for t in [
"INT",
"DECIMAL",
"REAL",
"DOUBLE",
"FLOAT",
"NUMERIC",
"HUGEINT",
]
)
if not (is_time or is_numeric):
return jsonify({"error": "x_axis must be a time column"}), 400
for col in params.columns:
if col not in valid_cols:
return jsonify({"error": f"Unknown column: {col}"}), 400
for col in params.group_by:
if col not in valid_cols:
return jsonify({"error": f"Unknown column: {col}"}), 400
if params.order_by and params.order_by not in valid_cols:
return jsonify({"error": f"Unknown column: {params.order_by}"}), 400
if params.group_by or params.graph_type == "timeseries":
agg = (params.aggregate or "count").lower()
if agg.startswith("p") or agg == "sum":
need_numeric = True
allow_time = False
elif agg == "avg" or agg in {"min", "max"}:
need_numeric = False
allow_time = True
else:
need_numeric = False
allow_time = False
if need_numeric or allow_time:
for c in params.columns:
if c in params.group_by or c == params.x_axis:
continue
if c not in column_types:
continue
ctype = column_types.get(c, "").upper()
is_numeric = "BOOL" in ctype or any(
t in ctype
for t in [
"INT",
"DECIMAL",
"REAL",
"DOUBLE",
"FLOAT",
"NUMERIC",
"HUGEINT",
]
)
is_time = "TIMESTAMP" in ctype or "DATE" in ctype or "TIME"
in ctype
if need_numeric and not is_numeric:
return (
jsonify(
{
"error": f"Aggregate {agg} cannot be applied
to column {c}",
}
),
400,
)
if allow_time and not (is_numeric or is_time):
return (
jsonify(
{
"error": f"Aggregate {agg} cannot be applied
to column {c}",
}
),
400,
)
if (params.start is None or params.end is None) and (
params.x_axis or params.time_column
):
axis = params.x_axis or params.time_column
assert axis is not None
row = cast(
tuple[datetime | None, datetime | None],
con.execute(
f'SELECT min({_quote(axis)}), max({_quote(axis)}) FROM "{par
ams.table}"'
).fetchall()[0],
)
mn, mx = row
if isinstance(mn, (int, float)):
try:
mn = _numeric_to_datetime(mn, params.time_unit)
except Exception:
return (
jsonify(
{
"error": (
f"Invalid time value {mn} for column {axis}"
f" with time_unit {params.time_unit}"
)
}
),
400,
)
if isinstance(mx, (int, float)):
try:
mx = _numeric_to_datetime(mx, params.time_unit)
except Exception:
return (
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
Scrolling further to check until I reach 656 lines.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# sed -n '660,740p' scubaduck/
server.py
return (
jsonify(
{
"error": (
f"Invalid time value {mx} for column {axis}"
f" with time_unit {params.time_unit}"
)
}
),
400,
)
if params.start is None and mn is not None:
params.start = (
mn.strftime("%Y-%m-%d %H:%M:%S") if not isinstance(mn, str)
else mn
)
if params.end is None and mx is not None:
params.end = (
mx.strftime("%Y-%m-%d %H:%M:%S") if not isinstance(mx, str)
else mx
)
bucket_size: int | None = None
if params.graph_type == "timeseries":
bucket_size = _granularity_seconds(
params.granularity,
params.start if isinstance(params.start, str) else None,
params.end if isinstance(params.end, str) else None,
)
if (
params.limit is not None
and params.start is not None
and params.end is not None
):
try:
start_dt = dtparser.parse(params.start)
end_dt = dtparser.parse(params.end)
buckets = math.ceil(
(end_dt - start_dt).total_seconds() / bucket_size
)
if buckets > 1:
params.limit *= buckets
except Exception:
pass
sql = build_query(params, column_types)
try:
rows = con.execute(sql).fetchall()
except Exception as exc:
tb = traceback.format_exc()
print(f"Query failed:\n{sql}\n{tb}")
return (
jsonify({"sql": sql, "error": str(exc), "traceback": tb}),
400,
)
def _serialize(value: Any) -> Any:
if isinstance(value, bytes):
return repr(value)
return value
rows = [[_serialize(v) for v in r] for r in rows]
result: Dict[str, Any] = {"sql": sql, "rows": rows}
if params.start is not None:
result["start"] = str(params.start)
if params.end is not None:
result["end"] = str(params.end)
if bucket_size is not None:
result["bucket_size"] = bucket_size
return jsonify(result)
return app
app = create_app()
if __name__ == "__main__":
app.run(debug=True)
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
I'll adjust series limit before bucketing. For timeseries, limit filtering will happen after retrieval.
After filtering, I'll update result["rows"]
and ensure the correct buckets are computed.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# head -n 20 scubaduck/sample.
csv
timestamp,event,value,user
2024-01-01 00:00:00,login,10,alice
2024-01-01 01:00:00,logout,20,bob
2024-01-02 00:00:00,login,30,alice
2024-01-02 03:00:00,login,40,charlie
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
The dataset has only three groups. Bucket size might affect the group limits.
After filtering, it's expected to get 3 rows, not 4, due to group limits.
> from scubaduck import server
> app = server.app
> client = app.test_client()
>
> payload = {
> "table": "events",
> "start": "2024-01-01 00:00:00",
> "end": "2024-01-03 00:00:00",
> "graph_type": "timeseries",
> "limit": 2,
> "group_by": ["user"],
> "columns": ["value"],
> "x_axis": "timestamp",
> "granularity": "1 day",
> }
> rv = client.post("/api/query", data=json.dumps(payload), content_type="applica
tion/json")
> print(rv.status_code)
> print(rv.get_json())
> PY
200
{'bucket_size': 86400, 'end': '2024-01-03 00:00:00', 'rows': [['Mon, 01 Jan 2024
00:00:00 GMT', 'alice', 1, 1], ['Mon, 01 Jan 2024 00:00:00 GMT', 'bob', 1, 1],
['Tue, 02 Jan 2024 00:00:00 GMT', 'charlie', 1, 1], ['Tue, 02 Jan 2024 00:00:00
GMT', 'alice', 1, 1]], 'sql': 'SELECT TIMESTAMP \'2024-01-01 00:00:00\' + INTERV
AL \'86400 second\' * CAST(floor((epoch("timestamp") - epoch(TIMESTAMP \'2024-01
-01 00:00:00\'))/86400) AS BIGINT) AS bucket, "user", count(*) AS Hits, count(*)
AS Count\nFROM "events"\nWHERE "timestamp" >= \'2024-01-01 00:00:00\' AND "time
stamp" <= \'2024-01-03 00:00:00\'\nGROUP BY "bucket", "user"\nORDER BY bucket\nL
IMIT 4', 'start': '2024-01-01 00:00:00'}
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
Looks like 'charlie' unexpectedly appears before 'alice' in bucket 2. I'll keep that in mind while filtering rows to the first two unique users, 'alice' and 'bob'. I'll then add a test for this case to tests/test_server_timeseries.py
.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# grep -n "limit_applies_to_se
ries" -n -n tests/test_server_timeseries.py
132:def test_timeseries_limit_applies_to_series() -> None:
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
I'll start by opening this section to take a closer look.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# sed -n '120,144p' tests/test
_server_timeseries.py
rv = client.post(
"/api/query", data=json.dumps(payload), content_type="application/json"
)
data = rv.get_json()
assert rv.status_code == 200
rows = data["rows"]
assert len(rows) == 2
assert rows[0][1] == 2
assert rows[1][1] == 2
assert len(rows[0]) == 3
def test_timeseries_limit_applies_to_series() -> None:
app = server.app
client = app.test_client()
payload: dict[str, Any] = {
"table": "events",
"start": "2024-01-01 00:00:00",
"end": "2024-01-03 00:00:00",
"graph_type": "timeseries",
"limit": 1,
"order_by": "user",
"group_by": ["user"],
"aggregate": "Count",
"columns": ["value"],
_server_timeseries.py
"columns": ["value"],
"x_axis": "timestamp",
"granularity": "1 day",
}
rv = client.post(
"/api/query", data=json.dumps(payload), content_type="application/json"
)
data = rv.get_json()
assert rv.status_code == 200
assert len(data["rows"]) == 2
assert all(r[1] == "alice" for r in data["rows"])
def test_timeseries_auto_and_fine_buckets() -> None:
app = server.app
client = app.test_client()
def run(gran: str) -> None:
payload = {
"start": "2024-01-01 00:00:00",
"end": "2024-01-02 03:00:00",
"graph_type": "timeseries",
"columns": ["value"],
"x_axis": "timestamp",
"granularity": gran,
}
rv = client.post(
"/api/query", data=json.dumps(payload), content_type="application/js
on"
)
data = rv.get_json()
assert rv.status_code == 200
from dateutil import parser
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
I'll add a test for filtering after bucket_size scaling and check the file further.
start = parser.parse(cast(str, payload["start"])).replace(tzinfo=None)
buckets = [
parser.parse(cast(str, r[0])).replace(tzinfo=None) for r in data["ro
ws"]
]
assert buckets[0] == start
if len(buckets) > 1:
step = (buckets[1] - buckets[0]).total_seconds()
assert step % data["bucket_size"] == 0
assert any(r[1] != 0 for r in data["rows"])
run("Auto")
run("Fine")
def test_timeseries_string_column_error() -> None:
app = server.app
client = app.test_client()
payload = {
"table": "events",
"start": "2024-01-01 00:00:00",
"end": "2024-01-03 00:00:00",
"graph_type": "timeseries",
"limit": 7,
"columns": ["timestamp", "event", "value", "user"],
"x_axis": "timestamp",
"granularity": "1 hour",
}
rv = client.post(
"/api/query", data=json.dumps(payload), content_type="application/json"
)
assert rv.status_code == 200
def test_derived_column_basic() -> None:
app = server.app
client = app.test_client()
payload = {
"table": "events",
"start": "2024-01-01 00:00:00",
"end": "2024-01-03 00:00:00",
"limit": 10,
"columns": ["timestamp"],
"derived_columns": {"val2": "value * 2"},
"filters": [],
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
I'll add the new test, test_timeseries_limit_sparse_buckets
, and modify server.py for it.
> *** Begin Patch
> *** Update File: scubaduck/server.py
> @@
> - bucket_size: int | None = None
> - if params.graph_type == "timeseries":
> - bucket_size = _granularity_seconds(
> - params.granularity,
> - params.start if isinstance(params.start, str) else None,
> - params.end if isinstance(params.end, str) else None,
> - )
> - if (
> - params.limit is not None
> - and params.start is not None
> - and params.end is not None
> - ):
> - try:
> - start_dt = dtparser.parse(params.start)
> - end_dt = dtparser.parse(params.end)
> - buckets = math.ceil(
> - (end_dt - start_dt).total_seconds() / bucket_size
> - )
> - if buckets > 1:
> - params.limit *= buckets
> - except Exception:
> - pass
> + bucket_size: int | None = None
> + series_limit = params.limit
> + if params.graph_type == "timeseries":
> + bucket_size = _granularity_seconds(
> + params.granularity,
> + params.start if isinstance(params.start, str) else None,
> + params.end if isinstance(params.end, str) else None,
> + )
> + if (
> + params.limit is not None
> + and params.start is not None
> + and params.end is not None
> + ):
> + try:
> + start_dt = dtparser.parse(params.start)
> + end_dt = dtparser.parse(params.end)
> + buckets = math.ceil(
> + (end_dt - start_dt).total_seconds() / bucket_size
> + )
> + if buckets > 1:
> + params.limit *= buckets
> + except Exception:
> + pass
> *** End Patch
> PATCH
Success. Updated the following files:
M scubaduck/server.py
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
I just added the series_limit
variable. Now, I’ll add the filtering step.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# grep -n "_serialize" -n scub
aduck/server.py
715: def _serialize(value: Any) -> Any:
720: rows = [[_serialize(v) for v in r] for r in rows]
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# sed -n '710,740p' scubaduck/
server.py
return (
jsonify({"sql": sql, "error": str(exc), "traceback": tb}),
400,
)
def _serialize(value: Any) -> Any:
if isinstance(value, bytes):
return repr(value)
return value
rows = [[_serialize(v) for v in r] for r in rows]
result: Dict[str, Any] = {"sql": sql, "rows": rows}
if params.start is not None:
result["start"] = str(params.start)
if params.end is not None:
result["end"] = str(params.end)
if bucket_size is not None:
result["bucket_size"] = bucket_size
return jsonify(result)
return app
app = create_app()
if __name__ == "__main__":
app.run(debug=True)
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
I'll place the filter just before the result
is constructed, after serializing rows.
> *** Update File: scubaduck/server.py
> @@
> - rows = [[_serialize(v) for v in r] for r in rows]
> - result: Dict[str, Any] = {"sql": sql, "rows": rows}
> + rows = [[_serialize(v) for v in r] for r in rows]
> +
> + if (
> + params.graph_type == "timeseries"
> + and params.group_by
> + and series_limit is not None
> + ):
> + keep_keys: list[tuple[Any, ...]] = []
> + keep_set: set[tuple[Any, ...]] = set()
> + filtered: list[list[Any]] = []
> + key_slice = slice(1, 1 + len(params.group_by))
> + for row in rows:
> + key = tuple(row[key_slice])
> + if key not in keep_set:
> + if len(keep_set) >= series_limit:
> + continue
> + keep_set.add(key)
> + keep_keys.append(key)
> + filtered.append(row)
> + rows = filtered
> +
> + result: Dict[str, Any] = {"sql": sql, "rows": rows}
> *** End Patch
> PATCH
Success. Updated the following files:
M scubaduck/server.py
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
I’ll remove the keep_keys variable since it's not actually being used in the patch.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# grep -n "keep_keys" -n scuba
duck/server.py
727: keep_keys: list[tuple[Any, ...]] = []
737: keep_keys.append(key)
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
I'll remove any unnecessary variables from the code.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# apply_patch<<'PATCH'
> *** Begin Patch
> *** Update File: scubaduck/server.py
> @@
> - keep_keys: list[tuple[Any, ...]] = []
> - keep_set: set[tuple[Any, ...]] = set()
> + keep_set: set[tuple[Any, ...]] = set()
> @@
> - keep_set.add(key)
> - keep_keys.append(key)
> + keep_set.add(key)
> *** End Patch
> PATCH
Success. Updated the following files:
M scubaduck/server.py
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
I'll run ruff to check the formatting.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# ruff format scubaduck/server
.py --quiet
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# ruff check scubaduck/server.
py --quiet
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# pyright >/tmp/pyright.log &&
tail -n 20 /tmp/pyright.log
0 errors, 0 warnings, 0 informations
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
I'll apply ruff formatting to the entire repository now.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# ruff format --quiet
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
I'll run ruff for a check across the whole repository now.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# ruff check --quiet
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
I'm adding a new test after test_timeseries_limit_applies_to_series
to check for sparse buckets.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# sed -n '132,168p' tests/test
_server_timeseries.py
def test_timeseries_limit_applies_to_series() -> None:
app = server.app
client = app.test_client()
payload: dict[str, Any] = {
"table": "events",
"start": "2024-01-01 00:00:00",
"end": "2024-01-03 00:00:00",
"graph_type": "timeseries",
"limit": 1,
"order_by": "user",
"group_by": ["user"],
"aggregate": "Count",
"columns": ["value"],
"x_axis": "timestamp",
"granularity": "1 day",
}
rv = client.post(
"/api/query", data=json.dumps(payload), content_type="application/json"
)
data = rv.get_json()
assert rv.status_code == 200
assert len(data["rows"]) == 2
assert all(r[1] == "alice" for r in data["rows"])
def test_timeseries_auto_and_fine_buckets() -> None:
app = server.app
client = app.test_client()
def run(gran: str) -> None:
payload = {
"start": "2024-01-01 00:00:00",
"end": "2024-01-02 03:00:00",
"graph_type": "timeseries",
"columns": ["value"],
"x_axis": "timestamp",
"granularity": gran,
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
I'll add a test to check row count assertion, with len(data["rows"]) == 3
.
> *** Update File: tests/test_server_timeseries.py
> @@
> def test_timeseries_limit_applies_to_series() -> None:
> @@
> assert all(r[1] == "alice" for r in data["rows"])
> +
> +
> +def test_timeseries_sparse_limit_filtering() -> None:
> + app = server.app
> + client = app.test_client()
> + payload: dict[str, Any] = {
> + "table": "events",
> + "start": "2024-01-01 00:00:00",
> + "end": "2024-01-03 00:00:00",
> + "graph_type": "timeseries",
> + "limit": 2,
> + "group_by": ["user"],
> + "columns": ["value"],
> + "x_axis": "timestamp",
> + "granularity": "1 day",
> + }
> + rv = client.post(
> + "/api/query", data=json.dumps(payload), content_type="application/jso
n"
> + )
> + data = rv.get_json()
> + assert rv.status_code == 200
> + assert len(data["rows"]) == 3
> + users = {r[1] for r in data["rows"]}
> + assert users == {"alice", "bob"}
> *** End Patch
> PATCH
Success. Updated the following files:
M tests/test_server_timeseries.py
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# ruff format tests/test_serve
r_timeseries.py --quiet
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# ruff check tests/test_server
_timeseries.py --quiet
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
I’ll run the ruff check on the repo again to make sure things are clean.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# ruff check --quiet
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
I'll attempt to run pyright once more to check for type issues.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# pyright >/tmp/pyright.log &&
tail -n 20 /tmp/pyright.log
0 errors, 0 warnings, 0 informations
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
I'll start running the tests now to check everything works as expected.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# pytest -q >/tmp/pytest.log &
& tail -n 20 /tmp/pytest.log
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# tail -n 20 /tmp/pytest.log
response = self.full_dispatch_request()
^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/flask/app.py", l
ine 919, in full_dispatch_request
rv = self.handle_user_exception(e)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/flask/app.py", l
ine 917, in full_dispatch_request
rv = self.dispatch_request()
^^^^^^^^^^^^^^^^^^^^^^^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/flask/app.py", l
ine 902, in dispatch_request
return self.ensure_sync(self.view_functions[rule.endpoint])(**view_args) #
type: ignore[no-any-return]
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/workspace/scubaduck/scubaduck/server.py", line 447, in columns
rows = con.execute(f'PRAGMA table_info("{table}")').fetchall()
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
duckdb.duckdb.CatalogException: Catalog Error: Table with name t25 does not exis
t!
Did you mean "pg_tables"?
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:52:17] "GET /api
/columns?table=t25 HTTP/1.1" 500 -
=========================== short test summary info ============================
FAILED tests/test_web_basics.py::test_dropdown_scroll_to_selected[chromium]
1 failed, 125 passed in 18.15s
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
The test fails due to a missing table in the database. I'll check logs.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# grep -n "t25" -n tests/test_
web_basics.py
108: "() => { const sel=document.getElementById('table'); for(let i=0;i<3
0;i++){const o=document.createElement('option'); o.value='t'+i; o.textContent='T
able '+i; sel.appendChild(o);} setSelectValue(sel,'t25'); }"
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
I'll focus on the section where that test is located.
)
assert page.query_selector("#table + .dropdown-display + .dropdown-menu inpu
t")
def test_dropdown_scroll_to_selected(page: Any, server_url: str) -> None:
page.goto(server_url)
page.wait_for_selector("#table option", state="attached")
page.evaluate(
"() => { const sel=document.getElementById('table'); for(let i=0;i<30;i+
+){const o=document.createElement('option'); o.value='t'+i; o.textContent='Table
'+i; sel.appendChild(o);} setSelectValue(sel,'t25'); }"
)
page.click("#table + .dropdown-display")
page.wait_for_selector("#table + .dropdown-display + .dropdown-menu div.sele
cted")
scroll_top = page.evaluate(
"document.querySelector('#table + .dropdown-display + .dropdown-menu').s
crollTop"
)
assert scroll_top > 0
def test_x_axis_default_entry(page: Any, server_url: str) -> None:
page.goto(server_url)
page.wait_for_selector("#graph_type", state="attached")
select_value(page, "#graph_type", "timeseries")
page.wait_for_selector("#x_axis option", state="attached")
options = page.locator("#x_axis option").all_inner_texts()
assert "(default)" in options
assert page.input_value("#x_axis") == ""
def test_simple_filter(page: Any, server_url: str) -> None:
page.goto(server_url)
page.wait_for_selector("#order_by option", state="attached")
page.click("text=Add Filter")
filter_el = page.query_selector("#filters .filter:last-child")
assert filter_el
page.evaluate(
"arg => setSelectValue(arg.el.querySelector('.f-col'), arg.val)",
{"el": filter_el, "val": "user"},
)
val_input = filter_el.query_selector(".f-val")
val_input.click()
page.keyboard.type("alice")
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
The test triggers a 500 error when calling columns for non-existing tables. I'll check the test.
assert "ms" in opts
assert page.input_value("#time_unit") == "s"
def test_time_unit_hidden_when_no_time_column(page: Any, server_url: str) -> Non
e:
page.goto(server_url)
page.wait_for_selector("#time_column option", state="attached")
select_value(page, "#time_column", "")
assert page.is_hidden("#time_unit")
def test_table_selector_dropdown(page: Any, server_url: str) -> None:
page.goto(server_url)
page.wait_for_selector("#table option", state="attached")
disp = page.query_selector("#table + .dropdown-display")
assert disp
assert (
page.evaluate("getComputedStyle(document.querySelector('#table')).displa
y")
== "none"
)
assert page.query_selector("#table + .dropdown-display + .dropdown-menu inpu
t")
def test_dropdown_scroll_to_selected(page: Any, server_url: str) -> None:
page.goto(server_url)
page.wait_for_selector("#table option", state="attached")
page.evaluate(
"() => { const sel=document.getElementById('table'); for(let i=0;i<30;i+
+){const o=document.createElement('option'); o.value='t'+i; o.textContent='Table
'+i; sel.appendChild(o);} setSelectValue(sel,'t25'); }"
)
page.click("#table + .dropdown-display")
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
I need to scroll more to find the rest of the relevant content.
_web_basics.py
page.click("#table + .dropdown-display")
page.wait_for_selector("#table + .dropdown-display + .dropdown-menu div.sele
cted")
scroll_top = page.evaluate(
"document.querySelector('#table + .dropdown-display + .dropdown-menu').s
crollTop"
)
assert scroll_top > 0
def test_x_axis_default_entry(page: Any, server_url: str) -> None:
page.goto(server_url)
page.wait_for_selector("#graph_type", state="attached")
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
It seems like the server executed the query instead of our custom check. I'll review the columns
route.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# grep -n "@app.route(" -n scu
baduck/server.py | head
429: @app.route("/")
434: @app.route("/js/<path:filename>")
440: @app.route("/api/tables")
444: @app.route("/api/columns")
467: @app.route("/api/samples")
491: @app.route("/api/query", methods=["POST"])
server.py
@app.route("/api/tables")
def tables_endpoint() -> Any: # pyright: ignore[reportUnusedFunction]
return jsonify(tables)
@app.route("/api/columns")
def columns() -> Any: # pyright: ignore[reportUnusedFunction]
table = request.args.get("table", default_table)
rows = con.execute(f'PRAGMA table_info("{table}")').fetchall()
return jsonify([{"name": r[1], "type": r[2]} for r in rows])
def _cache_get(key: Tuple[str, str, str]) -> List[str] | None:
item = sample_cache.get(key)
if item is None:
return None
vals, ts = item
if time.time() - ts > CACHE_TTL:
del sample_cache[key]
return None
sample_cache[key] = (vals, time.time())
return vals
def _cache_set(key: Tuple[str, str, str], vals: List[str]) -> None:
sample_cache[key] = (vals, time.time())
if len(sample_cache) > CACHE_LIMIT:
oldest = min(sample_cache.items(), key=lambda kv: kv[1][1])[0]
del sample_cache[oldest]
@app.route("/api/samples")
def sample_values() -> Any: # pyright: ignore[reportUnusedFunction]
table = request.args.get("table", default_table)
column = request.args.get("column")
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
The columns route doesn't handle invalid tables; It triggers an error for nonexistent tables. The test fails due to changes in the server, but these aren't related to the new functionality. I'll compare the previous version of the columns route to confirm the modification.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# python - <<'PY'
> import duckdb
> con = duckdb.connect()
> con.execute("create table t(x int)")
> print(con.execute('pragma table_info("t")').fetchall())
> print(con.execute('pragma table_info("nonexist")').fetchall())
> PY
[(0, 'x', 'INTEGER', False, None, False)]
Traceback (most recent call last):
File "<stdin>", line 5, in <module>
duckdb.duckdb.CatalogException: Catalog Error: Table with name nonexist does not
exist!
Did you mean "pg_indexes"?
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
The test fails due to a 500 error because the columns endpoint doesn't handle invalid tables.
The test is failing after the server change. I'll check the server_url fixture.
sics.py
from __future__ import annotations
from typing import Any
from tests.web_utils import run_query, select_value
def test_range_filters(page: Any, server_url: str) -> None:
data = run_query(
page,
server_url,
start="2024-01-02 00:00:00",
end="2024-01-02 04:00:00",
order_by="user",
limit=100,
)
assert len(data["rows"]) == 2
from dateutil import parser
timestamps = [parser.parse(row[0]).replace(tzinfo=None) for row in data["row
s"]]
assert timestamps == [
parser.parse("2024-01-02 00:00:00"),
parser.parse("2024-01-02 03:00:00"),
]
def test_order_by(page: Any, server_url: str) -> None:
data = run_query(
page,
server_url,
start="2024-01-01 00:00:00",
end="2024-01-03 00:00:00",
order_by="value",
order_dir="DESC",
limit=100,
)
values = [row[2] for row in data["rows"]]
assert values == sorted(values, reverse=True)
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# grep -n "test_dropdown_scrol
l_to_selected" -n tests/test_web_basics.py
104:def test_dropdown_scroll_to_selected(page: Any, server_url: str) -> None:
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
I'll grab the relevant lines between 100 and 116.
page.evaluate("getComputedStyle(document.querySelector('#table')).displa
y")
== "none"
)
assert page.query_selector("#table + .dropdown-display + .dropdown-menu inpu
t")
def test_dropdown_scroll_to_selected(page: Any, server_url: str) -> None:
page.goto(server_url)
page.wait_for_selector("#table option", state="attached")
page.evaluate(
"() => { const sel=document.getElementById('table'); for(let i=0;i<30;i+
+){const o=document.createElement('option'); o.value='t'+i; o.textContent='Table
'+i; sel.appendChild(o);} setSelectValue(sel,'t25'); }"
)
page.click("#table + .dropdown-display")
page.wait_for_selector("#table + .dropdown-display + .dropdown-menu div.sele
cted")
scroll_top = page.evaluate(
"document.querySelector('#table + .dropdown-display + .dropdown-menu').s
crollTop"
)
assert scroll_top > 0
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
I’ll examine the run_query
in tests/web_utils
to confirm the behavior.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# grep -n "updateColumns" -n s
cubaduck/static/js/*.js
scubaduck/static/js/view_settings.js:437:function updateColumnsTabCount() {
scubaduck/static/js/view_settings.js:474: updateColumnsTabCount();
baduck/static/js
scubaduck/static/js/view_settings.js:203: return fetch('/api/columns?table=' +
encodeURIComponent(table)).then(r => r.json()).then(cols => {
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# sed -n '196,210p' scubaduck/
static/js/view_settings.js
});
updateOrderDirButton();
graphTypeSel.addEventListener('change', updateDisplayTypeUI);
document.getElementById('time_column').addEventListener('change', updateTimeFiel
dVisibility);
updateTimeFieldVisibility();
function loadColumns(table) {
return fetch('/api/columns?table=' + encodeURIComponent(table)).then(r => r.js
on()).then(cols => {
const orderSelect = document.getElementById('order_by');
const xAxisSelect = document.getElementById('x_axis');
const groupsEl = document.getElementById('column_groups');
const timeColumnSelect = document.getElementById('time_column');
orderSelect.innerHTML = '';
const orderDef = document.createElement('option');
orderDef.value = '';
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
I need to move down a bit more to capture everything I need.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# sed -n '210,250p' scubaduck/
static/js/view_settings.js
orderDef.value = '';
orderDef.textContent = '(default)';
orderSelect.appendChild(orderDef);
const samplesOpt = document.createElement('option');
samplesOpt.value = 'Samples';
samplesOpt.textContent = 'Samples';
orderSelect.appendChild(samplesOpt);
xAxisSelect.innerHTML = '';
const defOpt = document.createElement('option');
defOpt.value = '';
defOpt.textContent = '(default)';
xAxisSelect.appendChild(defOpt);
timeColumnSelect.innerHTML = '';
const noneOpt = document.createElement('option');
noneOpt.value = '';
noneOpt.textContent = '(none)';
timeColumnSelect.appendChild(noneOpt);
groupsEl.innerHTML = '';
allColumns.length = 0;
stringColumns.length = 0;
integerColumns.length = 0;
timeColumns.length = 0;
timeColumnOptions.length = 0;
baseColumns.length = 0;
baseStringColumns.length = 0;
baseIntegerColumns.length = 0;
baseTimeColumns.length = 0;
baseTimeColumnOptions.length = 0;
for (const k in columnTypes) delete columnTypes[k];
const groups = {
time: {name: 'Time', cols: [], ul: null},
integer: {name: 'Integers', cols: [], ul: null},
string: {name: 'Strings', cols: [], ul: null},
};
cols.forEach(c => {
const t = c.type.toUpperCase();
columnTypes[c.name] = c.type;
allColumns.push(c.name);
baseColumns.push(c.name);
let g = 'string';
const isNumeric = t.includes('INT') || t.includes('DECIMAL') || t.includes
('NUMERIC') || t.includes('REAL') || t.includes('DOUBLE') || t.includes('FLOAT')
|| t.includes('HUGEINT');
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
It seems the 500 server error is causing the script to fail, which impacts the test.
og
bringing up nodes...
bringing up nodes...
.F...................................................................... [ 57%]
...................................................... [100%]
=================================== FAILURES ===================================
__________________ test_dropdown_scroll_to_selected[chromium] __________________
[gw2] linux -- Python 3.12.3 /workspace/scubaduck/.venv/bin/python
Traceback (most recent call last):
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/_pytest/runner.p
y", line 341, in from_call
result: TResult | None = func()
^^^^^^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/_pytest/runner.p
y", line 242, in <lambda>
lambda: runtest_hook(item=item, **kwds), when=when, reraise=reraise
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/pluggy/_hooks.py
", line 512, in __call__
return self._hookexec(self.name, self._hookimpls.copy(), kwargs, firstresult
)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/pluggy/_manager.
py", line 120, in _hookexec
return self._inner_hookexec(hook_name, methods, kwargs, firstresult)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/pluggy/_callers.
py", line 167, in _multicall
raise exception
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/pluggy/_callers.
py", line 139, in _multicall
teardown.throw(exception)
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/_pytest/threadex
ception.py", line 92, in pytest_runtest_call
yield from thread_exception_runtest_hook()
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/_pytest/threadex
ception.py", line 68, in thread_exception_runtest_hook
yield
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/pluggy/_callers.
py", line 139, in _multicall
teardown.throw(exception)
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/_pytest/unraisab
leexception.py", line 95, in pytest_runtest_call
yield from unraisable_exception_runtest_hook()
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/_pytest/unraisab
leexception.py", line 70, in unraisable_exception_runtest_hook
yield
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/pluggy/_callers.
py", line 139, in _multicall
teardown.throw(exception)
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/_pytest/logging.
py", line 846, in pytest_runtest_call
yield from self._runtest_for(item, "call")
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/_pytest/logging.
py", line 829, in _runtest_for
yield
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/pluggy/_callers.
py", line 139, in _multicall
teardown.throw(exception)
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/_pytest/capture.
py", line 898, in pytest_runtest_call
return (yield)
^^^^^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/pluggy/_callers.
py", line 139, in _multicall
teardown.throw(exception)
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/_pytest/skipping
.py", line 257, in pytest_runtest_call
return (yield)
^^^^^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/pluggy/_callers.
py", line 121, in _multicall
res = hook_impl.function(*args)
^^^^^^^^^^^^^^^^^^^^^^^^^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/_pytest/runner.p
y", line 174, in pytest_runtest_call
item.runtest()
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/_pytest/python.p
y", line 1627, in runtest
self.ihook.pytest_pyfunc_call(pyfuncitem=self)
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/pluggy/_hooks.py
", line 512, in __call__
return self._hookexec(self.name, self._hookimpls.copy(), kwargs, firstresult
)
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
I'm continuing to scroll to capture the rest of the information I need.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# sed -n '60,120p' /tmp/pytest
.log
return self._hookexec(self.name, self._hookimpls.copy(), kwargs, firstresult
)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/pluggy/_manager.
py", line 120, in _hookexec
return self._inner_hookexec(hook_name, methods, kwargs, firstresult)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/pluggy/_callers.
py", line 167, in _multicall
raise exception
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/pluggy/_callers.
py", line 121, in _multicall
res = hook_impl.function(*args)
^^^^^^^^^^^^^^^^^^^^^^^^^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/_pytest/python.p
y", line 159, in pytest_pyfunc_call
result = testfunction(**testargs)
^^^^^^^^^^^^^^^^^^^^^^^^
File "/workspace/scubaduck/tests/test_web_basics.py", line 115, in test_dropdo
wn_scroll_to_selected
assert scroll_top > 0
AssertionError: assert 0 > 0
------------------------------ Captured log call -------------------------------
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:52:17] "GET / HT
TP/1.1" 200 -
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:52:17] "GET /js/
chip_input.js HTTP/1.1" 200 -
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:52:17] "GET /js/
timeseries_chart.js HTTP/1.1" 200 -
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:52:17] "GET /js/
time_column.js HTTP/1.1" 200 -
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:52:17] "GET /js/
sidebar.js HTTP/1.1" 200 -
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:52:17] "GET /js/
table_view.js HTTP/1.1" 200 -
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:52:17] "GET /js/
view_settings.js HTTP/1.1" 200 -
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:52:17] "GET /api
/tables HTTP/1.1" 200 -
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:52:17] "GET /api
/columns?table=events HTTP/1.1" 200 -
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:52:17] "POST /ap
i/query HTTP/1.1" 200 -
ERROR scubaduck.server:app.py:875 Exception on /api/columns [GET]
Traceback (most recent call last):
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/flask/app.py", l
ine 1511, in wsgi_app
response = self.full_dispatch_request()
^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/flask/app.py", l
ine 919, in full_dispatch_request
rv = self.handle_user_exception(e)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/flask/app.py", l
ine 917, in full_dispatch_request
rv = self.dispatch_request()
^^^^^^^^^^^^^^^^^^^^^^^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/flask/app.py", l
ine 902, in dispatch_request
return self.ensure_sync(self.view_functions[rule.endpoint])(**view_args) #
type: ignore[no-any-return]
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/workspace/scubaduck/scubaduck/server.py", line 447, in columns
rows = con.execute(f'PRAGMA table_info("{table}")').fetchall()
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
duckdb.duckdb.CatalogException: Catalog Error: Table with name t25 does not exis
t!
Did you mean "pg_tables"?
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:52:17] "GET /api
/columns?table=t25 HTTP/1.1" 500 -
=========================== short test summary info ============================
FAILED tests/test_web_basics.py::test_dropdown_scroll_to_selected[chromium]
1 failed, 125 passed in 18.15s
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
The issue is with the columns
endpoint returning 500. Tests might not expect this.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# git show 6afebd641798d002d60
f4bc883c166b1e0e9ac39^:scubaduck/server.py | sed -n '438,460p'
return send_from_directory(folder, filename)
@app.route("/api/tables")
def tables_endpoint() -> Any: # pyright: ignore[reportUnusedFunction]
return jsonify(tables)
@app.route("/api/columns")
def columns() -> Any: # pyright: ignore[reportUnusedFunction]
table = request.args.get("table", default_table)
rows = con.execute(f'PRAGMA table_info("{table}")').fetchall()
return jsonify([{"name": r[1], "type": r[2]} for r in rows])
def _cache_get(key: Tuple[str, str, str]) -> List[str] | None:
item = sample_cache.get(key)
if item is None:
return None
vals, ts = item
if time.time() - ts > CACHE_TTL:
del sample_cache[key]
return None
sample_cache[key] = (vals, time.time())
return vals
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
The failing test might be due to ephemeral environment changes or timing issues. Let's test interactively.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# pytest tests/test_web_basics
.py::test_dropdown_scroll_to_selected -q -vv >/tmp/testone.log && tail -n 20 /tm
p/testone.log
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# cat /tmp/testone.log
============================= test session starts ==============================
platform linux -- Python 3.12.3, pytest-8.3.5, pluggy-1.6.0 -- /workspace/scubad
uck/.venv/bin/python
cachedir: .pytest_cache
rootdir: /workspace/scubaduck
configfile: pyproject.toml
plugins: xdist-3.6.1, base-url-2.1.0, playwright-0.7.0
created: 5/5 workers
5 workers [1 item]
scheduling tests via LoadScheduling
tests/test_web_basics.py::test_dropdown_scroll_to_selected[chromium]
[gw0] [100%] FAILED tests/test_web_basics.py::test_dropdown_scroll_to_selected[c
hromium]
=================================== FAILURES ===================================
__________________ test_dropdown_scroll_to_selected[chromium] __________________
[gw0] linux -- Python 3.12.3 /workspace/scubaduck/.venv/bin/python
Traceback (most recent call last):
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/_pytest/runner.p
y", line 341, in from_call
result: TResult | None = func()
^^^^^^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/_pytest/runner.p
y", line 242, in <lambda>
lambda: runtest_hook(item=item, **kwds), when=when, reraise=reraise
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/pluggy/_hooks.py
", line 512, in __call__
return self._hookexec(self.name, self._hookimpls.copy(), kwargs, firstresult
)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/pluggy/_manager.
py", line 120, in _hookexec
return self._inner_hookexec(hook_name, methods, kwargs, firstresult)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/pluggy/_callers.
py", line 167, in _multicall
raise exception
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/pluggy/_callers.
py", line 139, in _multicall
teardown.throw(exception)
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/_pytest/threadex
ception.py", line 92, in pytest_runtest_call
yield from thread_exception_runtest_hook()
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/_pytest/threadex
ception.py", line 68, in thread_exception_runtest_hook
yield
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/pluggy/_callers.
py", line 139, in _multicall
teardown.throw(exception)
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/_pytest/unraisab
leexception.py", line 95, in pytest_runtest_call
yield from unraisable_exception_runtest_hook()
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/_pytest/unraisab
leexception.py", line 70, in unraisable_exception_runtest_hook
yield
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/pluggy/_callers.
py", line 139, in _multicall
teardown.throw(exception)
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/_pytest/logging.
py", line 846, in pytest_runtest_call
yield from self._runtest_for(item, "call")
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/_pytest/logging.
py", line 829, in _runtest_for
yield
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/pluggy/_callers.
py", line 139, in _multicall
teardown.throw(exception)
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/_pytest/capture.
py", line 898, in pytest_runtest_call
return (yield)
^^^^^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/pluggy/_callers.
py", line 139, in _multicall
teardown.throw(exception)
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/_pytest/skipping
.py", line 257, in pytest_runtest_call
return (yield)
^^^^^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/pluggy/_callers.
py", line 121, in _multicall
res = hook_impl.function(*args)
^^^^^^^^^^^^^^^^^^^^^^^^^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/_pytest/runner.p
y", line 174, in pytest_runtest_call
item.runtest()
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/_pytest/python.p
y", line 1627, in runtest
self.ihook.pytest_pyfunc_call(pyfuncitem=self)
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/pluggy/_hooks.py
", line 512, in __call__
return self._hookexec(self.name, self._hookimpls.copy(), kwargs, firstresult
)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/pluggy/_manager.
py", line 120, in _hookexec
return self._inner_hookexec(hook_name, methods, kwargs, firstresult)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/pluggy/_callers.
py", line 167, in _multicall
raise exception
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/pluggy/_callers.
py", line 121, in _multicall
res = hook_impl.function(*args)
^^^^^^^^^^^^^^^^^^^^^^^^^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/_pytest/python.p
y", line 159, in pytest_pyfunc_call
result = testfunction(**testargs)
^^^^^^^^^^^^^^^^^^^^^^^^
File "/workspace/scubaduck/tests/test_web_basics.py", line 115, in test_dropdo
wn_scroll_to_selected
assert scroll_top > 0
AssertionError: assert 0 > 0
------------------------------ Captured log call -------------------------------
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:53:14] "GET / HT
TP/1.1" 200 -
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:53:14] "GET /js/
chip_input.js HTTP/1.1" 200 -
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:53:14] "GET /js/
timeseries_chart.js HTTP/1.1" 200 -
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:53:14] "GET /js/
time_column.js HTTP/1.1" 200 -
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:53:14] "GET /js/
sidebar.js HTTP/1.1" 200 -
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:53:14] "GET /js/
table_view.js HTTP/1.1" 200 -
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:53:14] "GET /js/
view_settings.js HTTP/1.1" 200 -
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:53:14] "GET /api
/tables HTTP/1.1" 200 -
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:53:14] "GET /api
/columns?table=events HTTP/1.1" 200 -
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:53:14] "POST /ap
i/query HTTP/1.1" 200 -
ERROR scubaduck.server:app.py:875 Exception on /api/columns [GET]
Traceback (most recent call last):
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/flask/app.py", l
ine 1511, in wsgi_app
response = self.full_dispatch_request()
^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/flask/app.py", l
ine 919, in full_dispatch_request
rv = self.handle_user_exception(e)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/flask/app.py", l
ine 917, in full_dispatch_request
rv = self.dispatch_request()
^^^^^^^^^^^^^^^^^^^^^^^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/flask/app.py", l
ine 902, in dispatch_request
return self.ensure_sync(self.view_functions[rule.endpoint])(**view_args) #
type: ignore[no-any-return]
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/workspace/scubaduck/scubaduck/server.py", line 447, in columns
rows = con.execute(f'PRAGMA table_info("{table}")').fetchall()
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
duckdb.duckdb.CatalogException: Catalog Error: Table with name t25 does not exis
t!
Did you mean "pg_tables"?
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:53:14] "GET /api
/columns?table=t25 HTTP/1.1" 500 -
=========================== short test summary info ============================
FAILED tests/test_web_basics.py::test_dropdown_scroll_to_selected[chromium]
============================== 1 failed in 2.18s ===============================
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
The scroll isn't working due to a request failure. I'll test with the previous commit.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# git rev-parse HEAD
6afebd641798d002d60f4bc883c166b1e0e9ac39
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
HEAD is still at the previous commit. I'll stash changes and check the test results.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# git show HEAD:scubaduck/serv
er.py | sed -n '444,452p'
@app.route("/api/columns")
def columns() -> Any: # pyright: ignore[reportUnusedFunction]
table = request.args.get("table", default_table)
rows = con.execute(f'PRAGMA table_info("{table}")').fetchall()
return jsonify([{"name": r[1], "type": r[2]} for r in rows])
def _cache_get(key: Tuple[str, str, str]) -> List[str] | None:
item = sample_cache.get(key)
if item is None:
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
It seems like setSelectValue modifies the value and triggers a change event to load columns.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# grep -n "setSelectValue" -n
scubaduck/static/js/view_settings.js
920:function setSelectValue(selector, value) {
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# sed -n '920,940p' scubaduck/
static/js/view_settings.js
function setSelectValue(selector, value) {
const el = typeof selector === 'string' ? document.querySelector(selector) : s
elector;
if (el) {
const select = el.tagName === 'SELECT' ? el : el.querySelector('select');
if (select) {
select.value = value;
select.dispatchEvent(new Event('change'));
}
}
}
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
Server returned 500 due to non-existent table. I think it's timing with event listeners.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# grep -n "loadColumns" -n scu
baduck/static/js/view_settings.js
202:function loadColumns(table) {
389: loadColumns(table).then(() => {
396: loadColumns(tableSel.value).then(() => {
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# sed -n '376,408p' scubaduck/
static/js/view_settings.js
document.body.appendChild(measure);
let maxWidth = 0;
tables.forEach(t => {
measure.textContent = t;
const w = measure.getBoundingClientRect().width;
if (w > maxWidth) maxWidth = w;
});
measure.remove();
const disp = tableSel.parentElement.querySelector('.dropdown-display');
if (disp) disp.style.minWidth = maxWidth + 30 + 'px';
const table = parseSearch().table || tables[0];
tableSel.value = table;
tableSel.dispatchEvent(new Event('change'));
loadColumns(table).then(() => {
updateDisplayTypeUI();
addFilter();
initFromUrl();
columnsInitialized = true;
});
tableSel.addEventListener('change', () => {
loadColumns(tableSel.value).then(() => {
if (columnsInitialized) {
resetViewSettings();
applyParams({table: tableSel.value});
}
});
});
});
document.querySelectorAll('#tabs .tab').forEach(btn => {
btn.addEventListener('click', () => {
document.querySelectorAll('#tabs .tab').forEach(t => t.classList.remove('act
ive'));
document.querySelectorAll('.tab-content').forEach(c => c.classList.remove('a
ctive'));
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
The fetch for columns triggered by the change event needs error handling for non-existent tables.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# grep -n "def columns" -n scu
baduck/server.py
445: def columns() -> Any: # pyright: ignore[reportUnusedFunction]
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# sed -n '440,452p' scubaduck/
server.py
@app.route("/api/tables")
def tables_endpoint() -> Any: # pyright: ignore[reportUnusedFunction]
return jsonify(tables)
@app.route("/api/columns")
def columns() -> Any: # pyright: ignore[reportUnusedFunction]
table = request.args.get("table", default_table)
rows = con.execute(f'PRAGMA table_info("{table}")').fetchall()
return jsonify([{"name": r[1], "type": r[2]} for r in rows])
def _cache_get(key: Tuple[str, str, str]) -> List[str] | None:
item = sample_cache.get(key)
if item is None:
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# apply_patch<<'PATCH'
> *** Begin Patch
> *** Update File: scubaduck/server.py
> @@
> @app.route("/api/columns")
> def columns() -> Any: # pyright: ignore[reportUnusedFunction]
> table = request.args.get("table", default_table)
> - rows = con.execute(f'PRAGMA table_info("{table}")').fetchall()
> + try:
> + rows = con.execute(f'PRAGMA table_info("{table}")').fetchall()
> + except duckdb.CatalogException:
> + rows = []
> return jsonify([{"name": r[1], "type": r[2]} for r in rows])
> *** End Patch
> PATCH
Success. Updated the following files:
M scubaduck/server.py
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# ruff format scubaduck/server
.py --quiet
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# ruff check scubaduck/server.
py --quiet
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
I'll try reformatting the test file once more.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# ruff format tests/test_serve
r_timeseries.py --quiet
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# ruff check tests/test_server
_timeseries.py --quiet
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
I'll quickly review the entire repo to make sure everything looks good.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# ruff check --quiet
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
I'll run pyright to check for any type-related issues in the code.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# pyright >/tmp/pyright.log &&
tail -n 20 /tmp/pyright.log
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
I missed the pyro result; I'll go ahead and run it again.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# cat /tmp/pyright.log
/workspace/scubaduck/scubaduck/server.py
/workspace/scubaduck/scubaduck/server.py:449:16 - error: Type of "CatalogExcep
tion" is unknown (reportUnknownMemberType)
/workspace/scubaduck/scubaduck/server.py:449:23 - error: "CatalogException" is
not a known attribute of module "duckdb" (reportAttributeAccessIssue)
2 errors, 0 warnings, 0 informations
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
I'll check the stubs for duckdb since Pyright flags CatalogException
as unknown.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# grep -n "CatalogException" -
r stubs || true
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
To bypass pyright errors, I'll annotate with Any
or duckdb.CatalogException
and patch it.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# sed -n '444,454p' scubaduck/
server.py
@app.route("/api/columns")
def columns() -> Any: # pyright: ignore[reportUnusedFunction]
table = request.args.get("table", default_table)
try:
rows = con.execute(f'PRAGMA table_info("{table}")').fetchall()
except duckdb.CatalogException:
rows = []
return jsonify([{"name": r[1], "type": r[2]} for r in rows])
def _cache_get(key: Tuple[str, str, str]) -> List[str] | None:
item = sample_cache.get(key)
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
I’ll modify the code to catch Exception
and add # pyright: ignore
comments.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# apply_patch<<'PATCH'
> *** Begin Patch
> *** Update File: scubaduck/server.py
> @@
> - try:
> - rows = con.execute(f'PRAGMA table_info("{table}")').fetchall()
> - except duckdb.CatalogException:
> - rows = []
> + try:
> + rows = con.execute(f'PRAGMA table_info("{table}")').fetchall()
> + except Exception:
> + rows = []
> *** End Patch
> PATCH
Success. Updated the following files:
M scubaduck/server.py
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# ruff format scubaduck/server
.py --quiet
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# ruff check scubaduck/server.
py --quiet
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# pyright >/tmp/pyright.log &&
tail -n 20 /tmp/pyright.log
0 errors, 0 warnings, 0 informations
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# ruff check --quiet
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
I'll run the tests once more to see if the issue is resolved.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# pytest -q >/tmp/pytest.log &
& tail -n 20 /tmp/pytest.log
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# tail -n 20 /tmp/pytest.log
result = testfunction(**testargs)
^^^^^^^^^^^^^^^^^^^^^^^^
File "/workspace/scubaduck/tests/test_web_basics.py", line 115, in test_dropdo
wn_scroll_to_selected
assert scroll_top > 0
AssertionError: assert 0 > 0
------------------------------ Captured log call -------------------------------
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:54:07] "GET / HT
TP/1.1" 200 -
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:54:07] "GET /js/
chip_input.js HTTP/1.1" 200 -
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:54:07] "GET /js/
timeseries_chart.js HTTP/1.1" 200 -
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:54:07] "GET /js/
time_column.js HTTP/1.1" 200 -
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:54:07] "GET /js/
sidebar.js HTTP/1.1" 200 -
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:54:07] "GET /js/
table_view.js HTTP/1.1" 200 -
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:54:07] "GET /js/
view_settings.js HTTP/1.1" 200 -
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:54:07] "GET /api
/tables HTTP/1.1" 200 -
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:54:07] "GET /api
/columns?table=events HTTP/1.1" 200 -
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:54:07] "POST /ap
i/query HTTP/1.1" 200 -
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:54:07] "GET /api
/columns?table=t25 HTTP/1.1" 200 -
=========================== short test summary info ============================
FAILED tests/test_web_basics.py::test_dropdown_scroll_to_selected[chromium]
1 failed, 125 passed in 17.64s
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
The server returns 200, but scroll_top
remains 0. Maybe a patch or async call isn't complete.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# pytest tests/test_web_basics
.py::test_dropdown_scroll_to_selected -vv -s >/tmp/manual.log && tail -n 20 /tmp
/manual.log
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# cat /tmp/manual.log
============================= test session starts ==============================
platform linux -- Python 3.12.3, pytest-8.3.5, pluggy-1.6.0 -- /workspace/scubad
uck/.venv/bin/python
cachedir: .pytest_cache
rootdir: /workspace/scubaduck
configfile: pyproject.toml
plugins: xdist-3.6.1, base-url-2.1.0, playwright-0.7.0
created: 5/5 workers
5 workers [1 item]
scheduling tests via LoadScheduling
tests/test_web_basics.py::test_dropdown_scroll_to_selected[chromium]
[gw0] FAILED tests/test_web_basics.py::test_dropdown_scroll_to_selected[chromium
]
=================================== FAILURES ===================================
__________________ test_dropdown_scroll_to_selected[chromium] __________________
[gw0] linux -- Python 3.12.3 /workspace/scubaduck/.venv/bin/python
Traceback (most recent call last):
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/_pytest/runner.p
y", line 341, in from_call
result: TResult | None = func()
^^^^^^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/_pytest/runner.p
y", line 242, in <lambda>
lambda: runtest_hook(item=item, **kwds), when=when, reraise=reraise
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/pluggy/_hooks.py
", line 512, in __call__
return self._hookexec(self.name, self._hookimpls.copy(), kwargs, firstresult
)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/pluggy/_manager.
py", line 120, in _hookexec
return self._inner_hookexec(hook_name, methods, kwargs, firstresult)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/pluggy/_callers.
py", line 167, in _multicall
raise exception
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/pluggy/_callers.
py", line 139, in _multicall
teardown.throw(exception)
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/_pytest/threadex
ception.py", line 92, in pytest_runtest_call
yield from thread_exception_runtest_hook()
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/_pytest/threadex
ception.py", line 68, in thread_exception_runtest_hook
yield
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/pluggy/_callers.
py", line 139, in _multicall
teardown.throw(exception)
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/_pytest/unraisab
leexception.py", line 95, in pytest_runtest_call
yield from unraisable_exception_runtest_hook()
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/_pytest/unraisab
leexception.py", line 70, in unraisable_exception_runtest_hook
yield
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/pluggy/_callers.
py", line 139, in _multicall
teardown.throw(exception)
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/_pytest/logging.
py", line 846, in pytest_runtest_call
yield from self._runtest_for(item, "call")
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/_pytest/logging.
py", line 829, in _runtest_for
yield
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/pluggy/_callers.
py", line 139, in _multicall
teardown.throw(exception)
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/_pytest/capture.
py", line 898, in pytest_runtest_call
return (yield)
^^^^^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/pluggy/_callers.
py", line 139, in _multicall
teardown.throw(exception)
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/_pytest/skipping
.py", line 257, in pytest_runtest_call
return (yield)
^^^^^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/pluggy/_callers.
py", line 121, in _multicall
res = hook_impl.function(*args)
^^^^^^^^^^^^^^^^^^^^^^^^^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/_pytest/runner.p
y", line 174, in pytest_runtest_call
item.runtest()
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/_pytest/python.p
y", line 1627, in runtest
self.ihook.pytest_pyfunc_call(pyfuncitem=self)
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/pluggy/_hooks.py
", line 512, in __call__
return self._hookexec(self.name, self._hookimpls.copy(), kwargs, firstresult
)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/pluggy/_manager.
py", line 120, in _hookexec
return self._inner_hookexec(hook_name, methods, kwargs, firstresult)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/pluggy/_callers.
py", line 167, in _multicall
raise exception
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/pluggy/_callers.
py", line 121, in _multicall
res = hook_impl.function(*args)
^^^^^^^^^^^^^^^^^^^^^^^^^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/_pytest/python.p
y", line 159, in pytest_pyfunc_call
result = testfunction(**testargs)
^^^^^^^^^^^^^^^^^^^^^^^^
File "/workspace/scubaduck/tests/test_web_basics.py", line 115, in test_dropdo
wn_scroll_to_selected
assert scroll_top > 0
AssertionError: assert 0 > 0
------------------------------ Captured log call -------------------------------
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:54:29] "GET / HT
TP/1.1" 200 -
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:54:29] "GET /js/
chip_input.js HTTP/1.1" 200 -
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:54:29] "GET /js/
timeseries_chart.js HTTP/1.1" 200 -
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:54:29] "GET /js/
time_column.js HTTP/1.1" 200 -
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:54:29] "GET /js/
sidebar.js HTTP/1.1" 200 -
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:54:29] "GET /js/
table_view.js HTTP/1.1" 200 -
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:54:29] "GET /js/
view_settings.js HTTP/1.1" 200 -
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:54:29] "GET /api
/tables HTTP/1.1" 200 -
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:54:29] "GET /api
/columns?table=events HTTP/1.1" 200 -
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:54:29] "POST /ap
i/query HTTP/1.1" 200 -
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:54:29] "GET /api
/columns?table=t25 HTTP/1.1" 200 -
=========================== short test summary info ============================
FAILED tests/test_web_basics.py::test_dropdown_scroll_to_selected[chromium] - as
sert 0 > 0
============================== 1 failed in 2.06s ===============================
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
The scroll failure may not be due to our patch, but I'll check test expectations on 200 response. Server changes might impact DOM updates, but the test expects the selected option to scroll into view regardless.
I'll update the columns route to return a 400 error for invalid table names, matching the baseline behavior.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# apply_patch<<'PATCH'
> *** Begin Patch
> *** Update File: scubaduck/server.py
> @@
> - try:
> - rows = con.execute(f'PRAGMA table_info("{table}")').fetchall()
> - except Exception:
> - rows = []
> - return jsonify([{"name": r[1], "type": r[2]} for r in rows])
> + try:
> + rows = con.execute(f'PRAGMA table_info("{table}")').fetchall()
> + except Exception:
> + return jsonify({"error": "Invalid table"}), 400
> + return jsonify([{"name": r[1], "type": r[2]} for r in rows])
> *** End Patch
> PATCH
Success. Updated the following files:
M scubaduck/server.py
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
I'll run the formatting and linting checks again to ensure everything looks good.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# ruff format scubaduck/server
.py --quiet
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# ruff check scubaduck/server.
py --quiet
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# pyright >/tmp/pyright.log &&
tail -n 20 /tmp/pyright.log
0 errors, 0 warnings, 0 informations
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
Time for another ruff check on the repository. Let’s see what comes up!
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# ruff check --quiet
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# pytest -q >/tmp/pytest.log &
& tail -n 20 /tmp/pytest.log
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# tail -n 20 /tmp/pytest.log
result = testfunction(**testargs)
^^^^^^^^^^^^^^^^^^^^^^^^
File "/workspace/scubaduck/tests/test_web_basics.py", line 115, in test_dropdo
wn_scroll_to_selected
assert scroll_top > 0
AssertionError: assert 0 > 0
------------------------------ Captured log call -------------------------------
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:54:54] "GET / HT
TP/1.1" 200 -
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:54:54] "GET /js/
chip_input.js HTTP/1.1" 200 -
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:54:54] "GET /js/
timeseries_chart.js HTTP/1.1" 200 -
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:54:54] "GET /js/
time_column.js HTTP/1.1" 200 -
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:54:54] "GET /js/
sidebar.js HTTP/1.1" 200 -
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:54:54] "GET /js/
table_view.js HTTP/1.1" 200 -
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:54:54] "GET /js/
view_settings.js HTTP/1.1" 200 -
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:54:54] "GET /api
/tables HTTP/1.1" 200 -
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:54:54] "GET /api
/columns?table=events HTTP/1.1" 200 -
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:54:54] "POST /ap
i/query HTTP/1.1" 200 -
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:54:54] "GET /api
/columns?table=t25 HTTP/1.1" 400 -
=========================== short test summary info ============================
FAILED tests/test_web_basics.py::test_dropdown_scroll_to_selected[chromium]
1 failed, 125 passed in 17.55s
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
The test might fail due to network or global server state changes. I'll verify database constraints and scroll behavior.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# grep -n "scrollTop" -n scuba
duck/static/js -n
grep: scubaduck/static/js: Is a directory
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# grep -n "scrollTop" scubaduc
k/static/js/*.js
scubaduck/static/js/view_settings.js:83: menu.scrollTop = offset > 0 ? offs
et : 0;
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# sed -n '70,90p' scubaduck/st
atic/js/view_settings.js
menu.appendChild(list);
wrapper.appendChild(menu);
function close() {
menu.style.display = 'none';
}
function open() {
renderOptions();
menu.style.display = 'block';
const selected = list.querySelector('.selected');
if (selected) {
const offset = selected.offsetTop - search.offsetHeight - 4;
menu.scrollTop = offset > 0 ? offset : 0;
}
search.focus();
}
disp.addEventListener('click', () => {
if (menu.style.display === 'block') {
close();
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
I’ll avoid reverting completely and instead revert the patch for column routes to pass tests.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# git checkout -- scubaduck/se
rver.py
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
Looks like I lost the changes in server.py. Time to reapply patches, but skip columns route.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# git status --short
M tests/test_server_timeseries.py
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
Uh-oh, I lost server modifications after checkout. I'll restore the patch and apply it again.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# git diff scubaduck/server.py
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
I'll reapply the modifications: added series_limit
and filtering after retrieving rows.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# grep -n "series_limit" -n sc
ubaduck/server.py
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
Looks like modifications were lost, so it's time to reapply the patch!
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# apply_patch<<'PATCH'
> *** Begin Patch
> *** Update File: scubaduck/server.py
> @@
> - bucket_size: int | None = None
> - if params.graph_type == "timeseries":
> - bucket_size = _granularity_seconds(
> - params.granularity,
> - params.start if isinstance(params.start, str) else None,
> - params.end if isinstance(params.end, str) else None,
> - )
> - if (
> - params.limit is not None
> - and params.start is not None
> - and params.end is not None
> - ):
> - try:
> - start_dt = dtparser.parse(params.start)
> - end_dt = dtparser.parse(params.end)
> - buckets = math.ceil(
> - (end_dt - start_dt).total_seconds() / bucket_size
> - )
> - if buckets > 1:
> - params.limit *= buckets
> - except Exception:
> - pass
> + bucket_size: int | None = None
> + series_limit = params.limit
> + if params.graph_type == "timeseries":
> + bucket_size = _granularity_seconds(
> + params.granularity,
> + params.start if isinstance(params.start, str) else None,
> + params.end if isinstance(params.end, str) else None,
> + )
> + if (
> + params.limit is not None
> + and params.start is not None
> + and params.end is not None
> + ):
> + try:
> + start_dt = dtparser.parse(params.start)
> + end_dt = dtparser.parse(params.end)
> + buckets = math.ceil(
> + (end_dt - start_dt).total_seconds() / bucket_size
> + )
> + if buckets > 1:
> + params.limit *= buckets
> + except Exception:
> + pass
> *** End Patch
> PATCH
Success. Updated the following files:
M scubaduck/server.py
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
I'll add filtering after fetching the rows to adjust the data correctly.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# grep -n "filtered" -n scubad
uck/server.py
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
Since I reverted, I'll go ahead and apply the patch once more.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# sed -n '718,734p' scubaduck/
server.py
return value
rows = [[_serialize(v) for v in r] for r in rows]
result: Dict[str, Any] = {"sql": sql, "rows": rows}
if params.start is not None:
result["start"] = str(params.start)
if params.end is not None:
result["end"] = str(params.end)
if bucket_size is not None:
result["bucket_size"] = bucket_size
return jsonify(result)
return app
app = create_app()
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
I’ll add filtering code before constructing the result. Time to patch it up!
> *** Begin Patch
> *** Update File: scubaduck/server.py
> @@
> - rows = [[_serialize(v) for v in r] for r in rows]
> - result: Dict[str, Any] = {"sql": sql, "rows": rows}
> + rows = [[_serialize(v) for v in r] for r in rows]
> +
> + if (
> + params.graph_type == "timeseries"
> + and params.group_by
> + and series_limit is not None
> + ):
> + key_slice = slice(1, 1 + len(params.group_by))
> + kept: set[tuple[Any, ...]] = set()
> + filtered: list[list[Any]] = []
> + for row in rows:
> + key = tuple(row[key_slice])
> + if key not in kept:
> + if len(kept) >= series_limit:
> + continue
> + kept.add(key)
> + filtered.append(row)
> + rows = filtered
> +
> + result: Dict[str, Any] = {"sql": sql, "rows": rows}
> *** End Patch
> PATCH
Success. Updated the following files:
M scubaduck/server.py
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# ruff format scubaduck/server
.py --quiet
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# ruff check scubaduck/server.
py --quiet
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# pyright >/tmp/pyright.log &&
tail -n 20 /tmp/pyright.log
0 errors, 0 warnings, 0 informations
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# pytest -q >/tmp/pytest.log &
& tail -n 20 /tmp/pytest.log
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# tail -n 20 /tmp/pytest.log
response = self.full_dispatch_request()
^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/flask/app.py", l
ine 919, in full_dispatch_request
rv = self.handle_user_exception(e)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/flask/app.py", l
ine 917, in full_dispatch_request
rv = self.dispatch_request()
^^^^^^^^^^^^^^^^^^^^^^^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/flask/app.py", l
ine 902, in dispatch_request
return self.ensure_sync(self.view_functions[rule.endpoint])(**view_args) #
type: ignore[no-any-return]
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/workspace/scubaduck/scubaduck/server.py", line 447, in columns
rows = con.execute(f'PRAGMA table_info("{table}")').fetchall()
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
duckdb.duckdb.CatalogException: Catalog Error: Table with name t25 does not exis
t!
Did you mean "pg_tables"?
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:55:58] "GET /api
/columns?table=t25 HTTP/1.1" 500 -
=========================== short test summary info ============================
FAILED tests/test_web_basics.py::test_dropdown_scroll_to_selected[chromium]
1 failed, 125 passed in 17.58s
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
I'll reset the repo to HEAD and re-run the test to check the baseline.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# git checkout 6afebd641798d00
2d60f4bc883c166b1e0e9ac39 -- tests/test_server_timeseries.py scubaduck/server.py
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
I'm checking out from the commit to restore the files to previous versions for testing.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# pytest tests/test_web_basics
.py::test_dropdown_scroll_to_selected -q >/tmp/baseline.log && tail -n 20 /tmp/b
aseline.log
bringing up nodes...
bringing up nodes...
F [100%]
=================================== FAILURES ===================================
__________________ test_dropdown_scroll_to_selected[chromium] __________________
[gw0] linux -- Python 3.12.3 /workspace/scubaduck/.venv/bin/python
Traceback (most recent call last):
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/_pytest/runner.p
y", line 341, in from_call
result: TResult | None = func()
^^^^^^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/_pytest/runner.p
y", line 242, in <lambda>
lambda: runtest_hook(item=item, **kwds), when=when, reraise=reraise
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/pluggy/_hooks.py
", line 512, in __call__
return self._hookexec(self.name, self._hookimpls.copy(), kwargs, firstresult
)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/pluggy/_manager.
py", line 120, in _hookexec
return self._inner_hookexec(hook_name, methods, kwargs, firstresult)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/pluggy/_callers.
py", line 167, in _multicall
raise exception
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/pluggy/_callers.
py", line 139, in _multicall
teardown.throw(exception)
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/_pytest/threadex
ception.py", line 92, in pytest_runtest_call
yield from thread_exception_runtest_hook()
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/_pytest/threadex
ception.py", line 68, in thread_exception_runtest_hook
yield
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/pluggy/_callers.
py", line 139, in _multicall
teardown.throw(exception)
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/_pytest/unraisab
leexception.py", line 95, in pytest_runtest_call
yield from unraisable_exception_runtest_hook()
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/_pytest/unraisab
leexception.py", line 70, in unraisable_exception_runtest_hook
yield
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/pluggy/_callers.
py", line 139, in _multicall
teardown.throw(exception)
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/_pytest/logging.
py", line 846, in pytest_runtest_call
yield from self._runtest_for(item, "call")
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/_pytest/logging.
py", line 829, in _runtest_for
yield
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/pluggy/_callers.
py", line 139, in _multicall
teardown.throw(exception)
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/_pytest/capture.
py", line 898, in pytest_runtest_call
return (yield)
^^^^^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/pluggy/_callers.
py", line 139, in _multicall
teardown.throw(exception)
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/_pytest/skipping
.py", line 257, in pytest_runtest_call
return (yield)
^^^^^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/pluggy/_callers.
py", line 121, in _multicall
res = hook_impl.function(*args)
^^^^^^^^^^^^^^^^^^^^^^^^^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/_pytest/runner.p
y", line 174, in pytest_runtest_call
item.runtest()
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/_pytest/python.p
y", line 1627, in runtest
self.ihook.pytest_pyfunc_call(pyfuncitem=self)
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/pluggy/_hooks.py
", line 512, in __call__
return self._hookexec(self.name, self._hookimpls.copy(), kwargs, firstresult
)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/pluggy/_manager.
py", line 120, in _hookexec
return self._inner_hookexec(hook_name, methods, kwargs, firstresult)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/pluggy/_callers.
py", line 167, in _multicall
raise exception
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/pluggy/_callers.
py", line 121, in _multicall
res = hook_impl.function(*args)
^^^^^^^^^^^^^^^^^^^^^^^^^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/_pytest/python.p
y", line 159, in pytest_pyfunc_call
result = testfunction(**testargs)
^^^^^^^^^^^^^^^^^^^^^^^^
File "/workspace/scubaduck/tests/test_web_basics.py", line 115, in test_dropdo
wn_scroll_to_selected
assert scroll_top > 0
AssertionError: assert 0 > 0
------------------------------ Captured log call -------------------------------
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:56:22] "GET / HT
TP/1.1" 200 -
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:56:22] "GET /js/
chip_input.js HTTP/1.1" 200 -
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:56:22] "GET /js/
timeseries_chart.js HTTP/1.1" 200 -
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:56:22] "GET /js/
time_column.js HTTP/1.1" 200 -
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:56:22] "GET /js/
sidebar.js HTTP/1.1" 200 -
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:56:22] "GET /js/
table_view.js HTTP/1.1" 200 -
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:56:22] "GET /js/
view_settings.js HTTP/1.1" 200 -
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:56:22] "GET /api
/tables HTTP/1.1" 200 -
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:56:22] "GET /api
/columns?table=events HTTP/1.1" 200 -
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:56:22] "POST /ap
i/query HTTP/1.1" 200 -
ERROR scubaduck.server:app.py:875 Exception on /api/columns [GET]
Traceback (most recent call last):
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/flask/app.py", l
ine 1511, in wsgi_app
response = self.full_dispatch_request()
^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/flask/app.py", l
ine 919, in full_dispatch_request
rv = self.handle_user_exception(e)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/flask/app.py", l
ine 917, in full_dispatch_request
rv = self.dispatch_request()
^^^^^^^^^^^^^^^^^^^^^^^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/flask/app.py", l
ine 902, in dispatch_request
return self.ensure_sync(self.view_functions[rule.endpoint])(**view_args) #
type: ignore[no-any-return]
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/workspace/scubaduck/scubaduck/server.py", line 447, in columns
rows = con.execute(f'PRAGMA table_info("{table}")').fetchall()
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
duckdb.duckdb.CatalogException: Catalog Error: Table with name t25 does not exis
t!
Did you mean "pg_tables"?
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:56:22] "GET /api
/columns?table=t25 HTTP/1.1" 500 -
=========================== short test summary info ============================
FAILED tests/test_web_basics.py::test_dropdown_scroll_to_selected[chromium]
1 failed in 2.21s
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
The test failure could be due to the ephemeral environment; let’s retest after patching.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# git status --short
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
There were no changes after reverting. I’ll reapply the patch and rerun tests.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# git reset --hard 6afebd64179
8d002d60f4bc883c166b1e0e9ac39
HEAD is now at 6afebd6 fix(frontend): prevent clipped rotated time labels (#150)
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
I’m rolling back to the HEAD commit to reapply the server patch.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# apply_patch<<'PATCH'
> *** Begin Patch
> *** Update File: scubaduck/server.py
> @@
> - bucket_size: int | None = None
> - if params.graph_type == "timeseries":
> - bucket_size = _granularity_seconds(
> - params.granularity,
> - params.start if isinstance(params.start, str) else None,
> - params.end if isinstance(params.end, str) else None,
> - )
> - if (
> - params.limit is not None
> - and params.start is not None
> - and params.end is not None
> - ):
> - try:
> - start_dt = dtparser.parse(params.start)
> - end_dt = dtparser.parse(params.end)
> - buckets = math.ceil(
> - (end_dt - start_dt).total_seconds() / bucket_size
> - )
> - if buckets > 1:
> - params.limit *= buckets
> - except Exception:
> - pass
> + bucket_size: int | None = None
> + series_limit = params.limit
> + if params.graph_type == "timeseries":
> + bucket_size = _granularity_seconds(
> + params.granularity,
> + params.start if isinstance(params.start, str) else None,
> + params.end if isinstance(params.end, str) else None,
> + )
> + if (
> + params.limit is not None
> + and params.start is not None
> + and params.end is not None
> + ):
> + try:
> + start_dt = dtparser.parse(params.start)
> + end_dt = dtparser.parse(params.end)
> + buckets = math.ceil(
> + (end_dt - start_dt).total_seconds() / bucket_size
> + )
> + if buckets > 1:
> + params.limit *= buckets
> + except Exception:
> + pass
> *** End Patch
> PATCH
Success. Updated the following files:
M scubaduck/server.py
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
I’ll apply the patch for handling filtered rows.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# apply_patch<<'PATCH'
> *** Begin Patch
> *** Update File: scubaduck/server.py
> @@
> - rows = [[_serialize(v) for v in r] for r in rows]
> - result: Dict[str, Any] = {"sql": sql, "rows": rows}
> + rows = [[_serialize(v) for v in r] for r in rows]
> +
> + if (
> + params.graph_type == "timeseries"
> + and params.group_by
> + and series_limit is not None
> + ):
> + key_slice = slice(1, 1 + len(params.group_by))
> + kept: set[tuple[Any, ...]] = set()
> + filtered: list[list[Any]] = []
> + for row in rows:
> + key = tuple(row[key_slice])
> + if key not in kept:
> + if len(kept) >= series_limit:
> + continue
> + kept.add(key)
> + filtered.append(row)
> + rows = filtered
> +
> + result: Dict[str, Any] = {"sql": sql, "rows": rows}
> *** End Patch
> PATCH
Success. Updated the following files:
M scubaduck/server.py
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
I'll update tests/test_server_timeseries.py to add the new test, just like before.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# grep -n "test_timeseries_spa
rse_limit_filtering" -n tests/test_server_timeseries.py
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
I need to create a new test for the file since it's still original.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# grep -n "limit_applies_to_se
ries" -n tests/test_server_timeseries.py
132:def test_timeseries_limit_applies_to_series() -> None:
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# sed -n '130,150p' tests/test
_server_timeseries.py
def test_timeseries_limit_applies_to_series() -> None:
app = server.app
client = app.test_client()
payload: dict[str, Any] = {
"table": "events",
"start": "2024-01-01 00:00:00",
"end": "2024-01-03 00:00:00",
"graph_type": "timeseries",
"limit": 1,
"order_by": "user",
"group_by": ["user"],
"aggregate": "Count",
"columns": ["value"],
"x_axis": "timestamp",
"granularity": "1 day",
}
rv = client.post(
"/api/query", data=json.dumps(payload), content_type="application/json"
)
_server_timeseries.py
)
data = rv.get_json()
assert rv.status_code == 200
assert len(data["rows"]) == 2
assert all(r[1] == "alice" for r in data["rows"])
def test_timeseries_auto_and_fine_buckets() -> None:
app = server.app
client = app.test_client()
def run(gran: str) -> None:
payload = {
"start": "2024-01-01 00:00:00",
"end": "2024-01-02 03:00:00",
"graph_type": "timeseries",
"columns": ["value"],
"x_axis": "timestamp",
"granularity": gran,
}
rv = client.post(
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
I’ll go ahead and add the patch to include the new test.
> *** Update File: tests/test_server_timeseries.py
> @@
> def test_timeseries_limit_applies_to_series() -> None:
> @@
> assert len(data["rows"]) == 2
> assert all(r[1] == "alice" for r in data["rows"])
> +
> +
> +def test_timeseries_sparse_limit_filtering() -> None:
> + app = server.app
> + client = app.test_client()
> + payload: dict[str, Any] = {
> + "table": "events",
> + "start": "2024-01-01 00:00:00",
> + "end": "2024-01-03 00:00:00",
> + "graph_type": "timeseries",
> + "limit": 2,
> + "group_by": ["user"],
> + "columns": ["value"],
> + "x_axis": "timestamp",
> + "granularity": "1 day",
> + }
> + rv = client.post(
> + "/api/query", data=json.dumps(payload), content_type="application/jso
n"
> + )
> + data = rv.get_json()
> + assert rv.status_code == 200
> + assert len(data["rows"]) == 3
> + users = {r[1] for r in data["rows"]}
> + assert users == {"alice", "bob"}
> *** End Patch
> PATCH
Success. Updated the following files:
M tests/test_server_timeseries.py
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# ruff format tests/test_serve
r_timeseries.py --quiet
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# ruff check tests/test_server
_timeseries.py --quiet
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# ruff format scubaduck/server
.py --quiet
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# ruff check scubaduck/server.
py --quiet
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
I'm running a ruff check across the repo to spot any issues.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# ruff check --quiet
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# pyright >/tmp/pyright.log &&
tail -n 20 /tmp/pyright.log
0 errors, 0 warnings, 0 informations
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
Time to run all the tests to make sure everything's working perfectly.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# pytest -q >/tmp/pytest.log &
& tail -n 20 /tmp/pytest.log
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# tail -n 20 /tmp/pytest.log
response = self.full_dispatch_request()
^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/flask/app.py", l
ine 919, in full_dispatch_request
rv = self.handle_user_exception(e)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/flask/app.py", l
ine 917, in full_dispatch_request
rv = self.dispatch_request()
^^^^^^^^^^^^^^^^^^^^^^^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/flask/app.py", l
ine 902, in dispatch_request
return self.ensure_sync(self.view_functions[rule.endpoint])(**view_args) #
type: ignore[no-any-return]
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/workspace/scubaduck/scubaduck/server.py", line 447, in columns
rows = con.execute(f'PRAGMA table_info("{table}")').fetchall()
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
duckdb.duckdb.CatalogException: Catalog Error: Table with name t25 does not exis
t!
Did you mean "pg_tables"?
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:57:07] "GET /api
/columns?table=t25 HTTP/1.1" 500 -
=========================== short test summary info ============================
FAILED tests/test_web_basics.py::test_dropdown_scroll_to_selected[chromium]
1 failed, 125 passed in 17.81s
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
The test fails consistently, likely due to environment issues. I'll note the failure.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# pytest -n 1 -k dropdown_scro
ll_to_selected -vv >/tmp/singletest.log && tail -n 20 /tmp/singletest.log
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# cat /tmp/singletest.log
============================= test session starts ==============================
platform linux -- Python 3.12.3, pytest-8.3.5, pluggy-1.6.0 -- /workspace/scubad
uck/.venv/bin/python
cachedir: .pytest_cache
rootdir: /workspace/scubaduck
configfile: pyproject.toml
plugins: xdist-3.6.1, base-url-2.1.0, playwright-0.7.0
created: 1/1 worker
1 worker [1 item]
scheduling tests via LoadScheduling
tests/test_web_basics.py::test_dropdown_scroll_to_selected[chromium]
[gw0] [100%] FAILED tests/test_web_basics.py::test_dropdown_scroll_to_selected[c
hromium]
=================================== FAILURES ===================================
__________________ test_dropdown_scroll_to_selected[chromium] __________________
[gw0] linux -- Python 3.12.3 /workspace/scubaduck/.venv/bin/python
Traceback (most recent call last):
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/_pytest/runner.p
y", line 341, in from_call
result: TResult | None = func()
^^^^^^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/_pytest/runner.p
y", line 242, in <lambda>
lambda: runtest_hook(item=item, **kwds), when=when, reraise=reraise
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/pluggy/_hooks.py
", line 512, in __call__
return self._hookexec(self.name, self._hookimpls.copy(), kwargs, firstresult
)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/pluggy/_manager.
py", line 120, in _hookexec
return self._inner_hookexec(hook_name, methods, kwargs, firstresult)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/pluggy/_callers.
py", line 167, in _multicall
raise exception
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/pluggy/_callers.
py", line 139, in _multicall
teardown.throw(exception)
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/_pytest/threadex
ception.py", line 92, in pytest_runtest_call
yield from thread_exception_runtest_hook()
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/_pytest/threadex
ception.py", line 68, in thread_exception_runtest_hook
yield
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/pluggy/_callers.
py", line 139, in _multicall
teardown.throw(exception)
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/_pytest/unraisab
leexception.py", line 95, in pytest_runtest_call
yield from unraisable_exception_runtest_hook()
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/_pytest/unraisab
leexception.py", line 70, in unraisable_exception_runtest_hook
yield
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/pluggy/_callers.
py", line 139, in _multicall
teardown.throw(exception)
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/_pytest/logging.
py", line 846, in pytest_runtest_call
yield from self._runtest_for(item, "call")
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/_pytest/logging.
py", line 829, in _runtest_for
yield
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/pluggy/_callers.
py", line 139, in _multicall
teardown.throw(exception)
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/_pytest/capture.
py", line 898, in pytest_runtest_call
return (yield)
^^^^^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/pluggy/_callers.
py", line 139, in _multicall
teardown.throw(exception)
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/_pytest/skipping
.py", line 257, in pytest_runtest_call
return (yield)
^^^^^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/pluggy/_callers.
py", line 121, in _multicall
res = hook_impl.function(*args)
^^^^^^^^^^^^^^^^^^^^^^^^^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/_pytest/runner.p
y", line 174, in pytest_runtest_call
item.runtest()
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/_pytest/python.p
y", line 1627, in runtest
self.ihook.pytest_pyfunc_call(pyfuncitem=self)
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/pluggy/_hooks.py
", line 512, in __call__
return self._hookexec(self.name, self._hookimpls.copy(), kwargs, firstresult
)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/pluggy/_manager.
py", line 120, in _hookexec
return self._inner_hookexec(hook_name, methods, kwargs, firstresult)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/pluggy/_callers.
py", line 167, in _multicall
raise exception
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/pluggy/_callers.
py", line 121, in _multicall
res = hook_impl.function(*args)
^^^^^^^^^^^^^^^^^^^^^^^^^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/_pytest/python.p
y", line 159, in pytest_pyfunc_call
result = testfunction(**testargs)
^^^^^^^^^^^^^^^^^^^^^^^^
File "/workspace/scubaduck/tests/test_web_basics.py", line 115, in test_dropdo
wn_scroll_to_selected
assert scroll_top > 0
AssertionError: assert 0 > 0
------------------------------ Captured log call -------------------------------
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:57:31] "GET / HT
TP/1.1" 200 -
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:57:31] "GET /js/
chip_input.js HTTP/1.1" 200 -
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:57:31] "GET /js/
timeseries_chart.js HTTP/1.1" 200 -
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:57:31] "GET /js/
time_column.js HTTP/1.1" 200 -
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:57:31] "GET /js/
sidebar.js HTTP/1.1" 200 -
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:57:31] "GET /js/
table_view.js HTTP/1.1" 200 -
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:57:31] "GET /js/
view_settings.js HTTP/1.1" 200 -
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:57:31] "GET /api
/tables HTTP/1.1" 200 -
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:57:31] "GET /api
/columns?table=events HTTP/1.1" 200 -
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:57:31] "POST /ap
i/query HTTP/1.1" 200 -
ERROR scubaduck.server:app.py:875 Exception on /api/columns [GET]
Traceback (most recent call last):
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/flask/app.py", l
ine 1511, in wsgi_app
response = self.full_dispatch_request()
^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/flask/app.py", l
ine 919, in full_dispatch_request
rv = self.handle_user_exception(e)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/flask/app.py", l
ine 917, in full_dispatch_request
rv = self.dispatch_request()
^^^^^^^^^^^^^^^^^^^^^^^
File "/workspace/scubaduck/.venv/lib/python3.12/site-packages/flask/app.py", l
ine 902, in dispatch_request
return self.ensure_sync(self.view_functions[rule.endpoint])(**view_args) #
type: ignore[no-any-return]
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/workspace/scubaduck/scubaduck/server.py", line 447, in columns
rows = con.execute(f'PRAGMA table_info("{table}")').fetchall()
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
duckdb.duckdb.CatalogException: Catalog Error: Table with name t25 does not exis
t!
Did you mean "pg_tables"?
INFO werkzeug:_internal.py:97 127.0.0.1 - - [23/May/2025 02:57:31] "GET /api
/columns?table=t25 HTTP/1.1" 500 -
=========================== short test summary info ============================
FAILED tests/test_web_basics.py::test_dropdown_scroll_to_selected[chromium] - as
sert 0 > 0
============================== 1 failed in 1.92s ===============================
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
Tests are failing, but I'll commit changes to server.py and note the issue for now.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# git status --short
M scubaduck/server.py
M tests/test_server_timeseries.py
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# git add scubaduck/server.py
tests/test_server_timeseries.py
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
I'll run git diff to display the changes made in the code.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# git diff --staged | head
diff --git a/scubaduck/server.py b/scubaduck/server.py
index af7c77f..4afd155 100644
--- a/scubaduck/server.py
+++ b/scubaduck/server.py
@@ -678,6 +678,7 @@ def create_app(db_file: str | Path | None = None) -> Flask:
)
bucket_size: int | None = None
+ series_limit = params.limit
if params.graph_type == "timeseries":
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# git diff --staged | sed -n '
678,740p'
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
The patch was cut off; I'll rerun it to include the full changes.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# git diff --staged | sed -n '
680,745p'
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
The diff wasn't displayed because of restrictions, so I'll display the whole thing now.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# git diff --staged | sed -n '
676,760p'
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
I think the patch didn't hit exactly at 678, so I'll show the full diff.
diff --git a/scubaduck/server.py b/scubaduck/server.py
index af7c77f..4afd155 100644
--- a/scubaduck/server.py
+++ b/scubaduck/server.py
@@ -678,6 +678,7 @@ def create_app(db_file: str | Path | None = None) -> Flask:
)
bucket_size: int | None = None
+ series_limit = params.limit
if params.graph_type == "timeseries":
bucket_size = _granularity_seconds(
params.granularity,
@@ -717,6 +718,24 @@ def create_app(db_file: str | Path | None = None) -> Flask:
return value
rows = [[_serialize(v) for v in r] for r in rows]
+
+ if (
+ params.graph_type == "timeseries"
+ and params.group_by
+ and series_limit is not None
+ ):
+ key_slice = slice(1, 1 + len(params.group_by))
+ kept: set[tuple[Any, ...]] = set()
+ filtered: list[list[Any]] = []
+ for row in rows:
+ key = tuple(row[key_slice])
+ if key not in kept:
+ if len(kept) >= series_limit:
+ continue
+ kept.add(key)
+ filtered.append(row)
+ rows = filtered
+
result: Dict[str, Any] = {"sql": sql, "rows": rows}
if params.start is not None:
result["start"] = str(params.start)
diff --git a/tests/test_server_timeseries.py b/tests/test_server_timeseries.py
index 205fe7b..9d81e7f 100644
--- a/tests/test_server_timeseries.py
+++ b/tests/test_server_timeseries.py
@@ -154,6 +154,30 @@ def test_timeseries_limit_applies_to_series() -> None:
assert all(r[1] == "alice" for r in data["rows"])
+def test_timeseries_sparse_limit_filtering() -> None:
+ app = server.app
+ client = app.test_client()
+ payload: dict[str, Any] = {
+ "table": "events",
+ "start": "2024-01-01 00:00:00",
+ "end": "2024-01-03 00:00:00",
+ "graph_type": "timeseries",
+ "limit": 2,
+ "group_by": ["user"],
+ "columns": ["value"],
+ "x_axis": "timestamp",
+ "granularity": "1 day",
+ }
+ rv = client.post(
+ "/api/query", data=json.dumps(payload), content_type="application/json"
+ )
+ data = rv.get_json()
+ assert rv.status_code == 200
+ assert len(data["rows"]) == 3
+ users = {r[1] for r in data["rows"]}
+ assert users == {"alice", "bob"}
+
+
def test_timeseries_auto_and_fine_buckets() -> None:
app = server.app
client = app.test_client()
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
All code is in—time to go ahead and commit!
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# git commit -m "fix(server):
enforce series limit in sparse timeseries" && git status --short
[work 77c5f4d] fix(server): enforce series limit in sparse timeseries
2 files changed, 43 insertions(+)
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
I didn't run git status
after the commit, so let's do that now.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# git status --short
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
Time to capture the snippet of server patch lines and test using the command.
sed -n '678,740p'
678 )
679
680 bucket_size: int | None = None
681 series_limit = params.limit
682 if params.graph_type == "timeseries":
683 bucket_size = _granularity_seconds(
684 params.granularity,
685 params.start if isinstance(params.start, str) else None,
686 params.end if isinstance(params.end, str) else None,
687 )
688 if (
689 params.limit is not None
690 and params.start is not None
691 and params.end is not None
692 ):
693 try:
694 start_dt = dtparser.parse(params.start)
695 end_dt = dtparser.parse(params.end)
696 buckets = math.ceil(
697 (end_dt - start_dt).total_seconds() / bucket_siz
e
698 )
699 if buckets > 1:
700 params.limit *= buckets
701 except Exception:
702 pass
703
704 sql = build_query(params, column_types)
705 try:
706 rows = con.execute(sql).fetchall()
707 except Exception as exc:
708 tb = traceback.format_exc()
709 print(f"Query failed:\n{sql}\n{tb}")
710 return (
711 jsonify({"sql": sql, "error": str(exc), "traceback": tb}
),
712 400,
713 )
714
715 def _serialize(value: Any) -> Any:
716 if isinstance(value, bytes):
717 return repr(value)
718 return value
719
720 rows = [[_serialize(v) for v in r] for r in rows]
721
722 if (
723 params.graph_type == "timeseries"
724 and params.group_by
725 and series_limit is not None
726 ):
727 key_slice = slice(1, 1 + len(params.group_by))
728 kept: set[tuple[Any, ...]] = set()
729 filtered: list[list[Any]] = []
730 for row in rows:
731 key = tuple(row[key_slice])
732 if key not in kept:
733 if len(kept) >= series_limit:
734 continue
735 kept.add(key)
736 filtered.append(row)
737 rows = filtered
738
739 result: Dict[str, Any] = {"sql": sql, "rows": rows}
740 if params.start is not None:
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
I’ll grab the relevant snippet from the tests.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# nl -ba tests/test_server_tim
eseries.py | sed -n '150,190p'
150 )
151 data = rv.get_json()
152 assert rv.status_code == 200
153 assert len(data["rows"]) == 2
154 assert all(r[1] == "alice" for r in data["rows"])
155
156
157 def test_timeseries_sparse_limit_filtering() -> None:
158 app = server.app
159 client = app.test_client()
160 payload: dict[str, Any] = {
161 "table": "events",
162 "start": "2024-01-01 00:00:00",
163 "end": "2024-01-03 00:00:00",
164 "graph_type": "timeseries",
165 "limit": 2,
166 "group_by": ["user"],
167 "columns": ["value"],
168 "x_axis": "timestamp",
169 "granularity": "1 day",
170 }
171 rv = client.post(
172 "/api/query", data=json.dumps(payload), content_type="applicatio
n/json"
173 )
174 data = rv.get_json()
175 assert rv.status_code == 200
176 assert len(data["rows"]) == 3
177 users = {r[1] for r in data["rows"]}
178 assert users == {"alice", "bob"}
179
180
181 def test_timeseries_auto_and_fine_buckets() -> None:
182 app = server.app
183 client = app.test_client()
184
185 def run(gran: str) -> None:
186 payload = {
187 "start": "2024-01-01 00:00:00",
188 "end": "2024-01-02 03:00:00",
189 "graph_type": "timeseries",
190 "columns": ["value"],
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
I'll check the latest git log with git log -1
.
(scubaduck) root@a3e762c027ed:/workspace/scubaduck# git log -1 --stat
commit 77c5f4d35a91de3a21f5c79bfe0884efa8ae0152 (HEAD -> work)
Author: Codex <codex@openai.com>
Date: Fri May 23 02:57:47 2025 +0000
fix(server): enforce series limit in sparse timeseries
scubaduck/server.py | 19 +++++++++++++++++++
tests/test_server_timeseries.py | 24 ++++++++++++++++++++++++
2 files changed, 43 insertions(+)
(scubaduck) root@a3e762c027ed:/workspace/scubaduck#
I'll summarize the changes and use container.make_pr to finalize the PR.