Merge branch 'main' into wp1-byhand-api
# Conflicts: # app/models.py # app/storage/schema.py # app/storage/store.py # app/web/api.py # tests/test_storage.py # tests/test_web.py
This commit is contained in:
commit
1a2689e08d
17 files changed
+565
-109
No files matched your search
+52
-26
@@ -69,7 +69,7 @@ def test_schema_creates_on_an_empty_file(tmp_path: Path) -> None:
|
||||
"application_events", "agents", "scores", "state"} <= tables
|
||||
assert "idx_roles_cluster" in indexes
|
||||
assert store.migrations_applied == []
|
||||
assert LATEST == 15
|
||||
assert LATEST == 16
|
||||
# A second open finds it current and applies nothing.
|
||||
assert Store(path).migrations_applied == []
|
||||
|
||||
@@ -88,18 +88,26 @@ def _columns(path: Path, table: str) -> list[tuple[str, str, int, str]]:
|
||||
return [(r[1], r[2], r[3], r[4]) for r in conn.execute(f"PRAGMA table_info({table})")]
|
||||
|
||||
|
||||
def _undo_v15(conn: sqlite3.Connection) -> None:
|
||||
"""A fresh file put back to the v14 shape, without the by-hand columns of
|
||||
a company, and then to the v13 one by `_undo_v14`. Every downgrade below
|
||||
starts here, since v15 is the last migration."""
|
||||
def _undo_v16(conn: sqlite3.Connection) -> None:
|
||||
"""A fresh file put back to the v15 shape: no by-hand reason on a
|
||||
company."""
|
||||
conn.execute("ALTER TABLE companies DROP COLUMN hand_reason")
|
||||
conn.execute("ALTER TABLE companies DROP COLUMN checked_at")
|
||||
_undo_v14(conn)
|
||||
|
||||
|
||||
def _undo_v15(conn: sqlite3.Connection) -> None:
|
||||
"""A fresh file put back to the v14 shape: no Watchlist columns on a
|
||||
company."""
|
||||
_undo_v16(conn)
|
||||
conn.execute("ALTER TABLE companies DROP COLUMN watch")
|
||||
conn.execute("ALTER TABLE companies DROP COLUMN careers_opened_at")
|
||||
|
||||
|
||||
def _undo_v14(conn: sqlite3.Connection) -> None:
|
||||
"""A fresh file put back to the v13 shape: an agent's intent and its
|
||||
cached vector on the agent row, no prompts, no prompt on a score."""
|
||||
cached vector on the agent row, no prompts, no prompt on a score. Every
|
||||
downgrade below starts here, after `_undo_v15`, since v16 is the last
|
||||
migration."""
|
||||
_undo_v15(conn)
|
||||
conn.execute("DROP TABLE agent_prompts")
|
||||
conn.execute("ALTER TABLE scores DROP COLUMN prompt")
|
||||
conn.execute("ALTER TABLE agents ADD COLUMN intent TEXT NOT NULL DEFAULT ''")
|
||||
@@ -112,7 +120,7 @@ def test_a_v1_file_migrates_to_the_shape_a_new_file_has(tmp_path: Path) -> None:
|
||||
Store(fresh)
|
||||
Store(old)
|
||||
with sqlite3.connect(old) as conn:
|
||||
_undo_v15(conn)
|
||||
_undo_v14(conn)
|
||||
conn.execute("DROP INDEX idx_roles_posted") # v9: indexes posted_at
|
||||
for column in ("permit", "languages", "extract_tries", "summary", "summarised_at",
|
||||
"article_text", "article_at", "read_at", "posted_at", "salary_text"):
|
||||
@@ -135,11 +143,28 @@ def test_a_v1_file_migrates_to_the_shape_a_new_file_has(tmp_path: Path) -> None:
|
||||
assert sorted(_columns(old, table)) == sorted(_columns(fresh, table))
|
||||
|
||||
|
||||
def test_a_v14_file_gains_the_watchlist_columns_and_leaves_companies_unrated(
|
||||
tmp_path: Path) -> None:
|
||||
path = tmp_path / "v14.db"
|
||||
Store(path).add_company("Acme", ats="teamtailor", country="DK", careers_url="https://a.example")
|
||||
with sqlite3.connect(path) as conn:
|
||||
_undo_v15(conn)
|
||||
conn.execute("PRAGMA user_version = 14")
|
||||
|
||||
migrated = Store(path)
|
||||
|
||||
assert migrated.migrations_applied == [15, 16]
|
||||
acme = migrated.company("acme")
|
||||
assert acme is not None
|
||||
assert (acme.ats, acme.careers_url) == ("teamtailor", "https://a.example")
|
||||
assert (acme.watch, acme.careers_opened_at) == (None, "")
|
||||
|
||||
|
||||
def test_a_v8_file_gains_ats_slug_and_keeps_its_companies(tmp_path: Path) -> None:
|
||||
path = tmp_path / "v8.db"
|
||||
Store(path).add_company("Acme", ats="teamtailor", country="DK")
|
||||
with sqlite3.connect(path) as conn:
|
||||
_undo_v15(conn)
|
||||
_undo_v14(conn)
|
||||
conn.execute("ALTER TABLE companies DROP COLUMN ats_slug")
|
||||
conn.execute("DROP INDEX idx_roles_posted") # v10, which follows
|
||||
conn.execute("ALTER TABLE roles DROP COLUMN posted_at")
|
||||
@@ -158,7 +183,7 @@ def _downgrade_to_v4(path: Path) -> None:
|
||||
"""A fresh file put back to the v4 shape: votes on the role, affinity on
|
||||
the company, no read state, no tags, no per-agent tables."""
|
||||
with sqlite3.connect(path) as conn:
|
||||
_undo_v15(conn)
|
||||
_undo_v14(conn)
|
||||
conn.execute("ALTER TABLE roles DROP COLUMN read_at")
|
||||
conn.execute("DROP INDEX idx_roles_posted") # v9: indexes posted_at
|
||||
conn.execute("ALTER TABLE roles DROP COLUMN posted_at") # v9
|
||||
@@ -270,7 +295,7 @@ def test_v10_backfills_posted_at_by_the_same_rule_upsert_uses(
|
||||
assert before_trusted is not None and before_untrusted is not None
|
||||
|
||||
with sqlite3.connect(path) as conn:
|
||||
_undo_v15(conn)
|
||||
_undo_v14(conn)
|
||||
conn.execute("DROP INDEX idx_roles_posted")
|
||||
conn.execute("ALTER TABLE roles DROP COLUMN posted_at")
|
||||
conn.execute("ALTER TABLE roles DROP COLUMN salary_text") # v12
|
||||
@@ -298,7 +323,7 @@ def test_v13_recomputes_country_from_place_unless_the_board_or_extract_set_it(
|
||||
for item in (wrong, several, given, extracted):
|
||||
store.upsert_role(item)
|
||||
with sqlite3.connect(path) as conn:
|
||||
_undo_v15(conn)
|
||||
_undo_v14(conn)
|
||||
conn.execute("UPDATE roles SET country = 'US' WHERE place = 'Bogota, CO'")
|
||||
conn.execute("UPDATE roles SET country = '' WHERE uid = ?", (several.uid,))
|
||||
conn.execute("UPDATE roles SET extracted_at = '2026-09-23' WHERE uid = ?",
|
||||
@@ -325,7 +350,7 @@ def test_v14_makes_each_intent_the_agents_one_prompt_with_its_vector(tmp_path: P
|
||||
store.replace_scores(backend.id, [(uid, 0.7, "")])
|
||||
vec = np.asarray([0.6, 0.8], dtype=np.float32)
|
||||
with sqlite3.connect(path) as conn:
|
||||
_undo_v15(conn)
|
||||
_undo_v14(conn)
|
||||
conn.execute("UPDATE agents SET intent = 'python backend', intent_key = 'k', "
|
||||
"intent_vec = ? WHERE id = ?", (pack(vec), backend.id))
|
||||
conn.execute("UPDATE agents SET intent = ' \n ' WHERE id = ?", (blank.id,))
|
||||
@@ -333,7 +358,7 @@ def test_v14_makes_each_intent_the_agents_one_prompt_with_its_vector(tmp_path: P
|
||||
|
||||
migrated = Store(path)
|
||||
|
||||
assert migrated.migrations_applied == [14, 15]
|
||||
assert migrated.migrations_applied == [14, 15, 16]
|
||||
assert migrated.agent(backend.id).prompts == [ # type: ignore[union-attr]
|
||||
Prompt(name="Backend", text="python backend")]
|
||||
assert migrated.agent(blank.id).prompts == [] # type: ignore[union-attr]
|
||||
@@ -347,22 +372,21 @@ def test_v14_makes_each_intent_the_agents_one_prompt_with_its_vector(tmp_path: P
|
||||
assert not {"intent", "intent_key", "intent_vec"} & columns
|
||||
|
||||
|
||||
def test_v15_gives_a_company_no_reason_and_no_check_and_keeps_its_row(tmp_path: Path) -> None:
|
||||
fresh, path = tmp_path / "fresh.db", tmp_path / "v14.db"
|
||||
def test_v16_gives_a_company_no_reason_and_keeps_its_row(tmp_path: Path) -> None:
|
||||
fresh, path = tmp_path / "fresh.db", tmp_path / "v15.db"
|
||||
Store(fresh)
|
||||
Store(path).add_company("Acme", careers_url="https://acme.example/jobs", notes="met them")
|
||||
with sqlite3.connect(path) as conn:
|
||||
conn.execute("ALTER TABLE companies DROP COLUMN hand_reason")
|
||||
conn.execute("ALTER TABLE companies DROP COLUMN checked_at")
|
||||
conn.execute("PRAGMA user_version = 14")
|
||||
_undo_v16(conn)
|
||||
conn.execute("PRAGMA user_version = 15")
|
||||
|
||||
migrated = Store(path)
|
||||
|
||||
assert migrated.migrations_applied == [15]
|
||||
assert migrated.migrations_applied == [16]
|
||||
acme = migrated.company("acme")
|
||||
assert acme is not None
|
||||
assert (acme.careers_url, acme.notes, acme.hand_reason, acme.checked_at) == (
|
||||
"https://acme.example/jobs", "met them", "", "")
|
||||
assert (acme.careers_url, acme.notes, acme.hand_reason) == (
|
||||
"https://acme.example/jobs", "met them", "")
|
||||
assert sorted(_columns(path, "companies")) == sorted(_columns(fresh, "companies"))
|
||||
|
||||
|
||||
@@ -695,6 +719,9 @@ def test_roles_filters_q_function_remote_and_days(store: Store, clock: Clock) ->
|
||||
function="sales"))
|
||||
assert [r.source_id for r in store.roles(q="senior engineer")] == ["2", "1"]
|
||||
assert [r.source_id for r in store.roles(q="backend nonsense")] == []
|
||||
# A word may match the company instead of the title, each on its own.
|
||||
assert [r.source_id for r in store.roles(q="acme engineer")] == ["2", "1"]
|
||||
assert [r.source_id for r in store.roles(q="acme nonsense")] == []
|
||||
assert [r.source_id for r in store.roles(function="engineering")] == ["1"]
|
||||
assert [r.source_id for r in store.roles(remote="remote")] == ["1"]
|
||||
assert [r.source_id for r in store.roles(company="ac")] == ["2", "1"]
|
||||
@@ -1009,9 +1036,8 @@ def test_companies_crud(store: Store) -> None:
|
||||
assert store.company("acme") is None
|
||||
|
||||
|
||||
def test_a_company_takes_a_reason_from_the_vocabulary_and_a_check_date(store: Store) -> None:
|
||||
acme = store.add_company("Acme", hand_reason="robots", checked_at="2026-09-01T00:00:00+00:00")
|
||||
assert (acme.hand_reason, acme.checked_at) == ("robots", "2026-09-01T00:00:00+00:00")
|
||||
def test_a_company_takes_a_reason_from_the_vocabulary(store: Store) -> None:
|
||||
assert store.add_company("Acme", hand_reason="robots").hand_reason == "robots"
|
||||
assert store.add_company("Plain").hand_reason == ""
|
||||
with pytest.raises(ValueError, match="hand_reason is one of"):
|
||||
store.add_company("Odd", hand_reason="lazy")
|
||||
|
||||
Reference in new issue
Block a user