Keep a typed careers link, seed the by-hand reason and add the by-hand commands to app companies
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
a466ea52b7
commit
b3cb93d5aa
3 files changed
+472
-15
No files matched your search
+120
-5
@@ -15,9 +15,10 @@ import json
|
||||
import os
|
||||
from pathlib import Path
|
||||
from typing import TYPE_CHECKING, Any
|
||||
from urllib.parse import urlsplit
|
||||
|
||||
from app.config import Config
|
||||
from app.models import Subscription, company_key
|
||||
from app.models import HAND_REASONS, Company, Subscription, company_key
|
||||
from app.storage import Store
|
||||
from app.jobs.pull import FAILING, search_target
|
||||
|
||||
@@ -150,12 +151,116 @@ def add_discovered(store: Store, name: str, domain: str,
|
||||
if sub is not None and sub.show:
|
||||
raise ValueError(f"{name} is read from {sub.target} and discovery found no "
|
||||
"readable board; nothing changed")
|
||||
# A link somebody typed is kept: discovery's is only a guess at the page.
|
||||
store.update_company(key, ats=found.ats, ats_slug=found.ats_slug,
|
||||
careers_url=found.careers_url or company.careers_url,
|
||||
careers_url=company.careers_url or found.careers_url,
|
||||
**({"domain": domain} if not company.domain else {}))
|
||||
return key, 0
|
||||
|
||||
|
||||
def known_from_search_only(company: Company, ever_boarded: set[str]) -> bool:
|
||||
"""A row that exists only because a search listed its roles and somebody
|
||||
judged it (`Store.set_affinity`): no board, not even a detached one
|
||||
(`ever_boarded`, the keys of every `ats` subscription), and none of the
|
||||
facts every way of following a company or listing it by hand writes."""
|
||||
return not (company.key in ever_boarded or company.ats or company.careers_url
|
||||
or company.domain or company.hand_reason)
|
||||
|
||||
|
||||
def by_hand(store: Store) -> list[Company]:
|
||||
"""The list checked by hand: companies with no board shown that are not
|
||||
known from a search only. Never checked first, then the longest ago; the
|
||||
name breaks a tie."""
|
||||
boards = store.company_boards()
|
||||
ever_boarded = {company_key(s.company) for s in store.subscriptions(source="ats")}
|
||||
rows = [c for c in store.companies()
|
||||
if c.key not in boards and not known_from_search_only(c, ever_boarded)]
|
||||
return sorted(rows, key=lambda c: (c.checked_at, c.name.casefold()))
|
||||
|
||||
|
||||
class Conflict(ValueError):
|
||||
"""A change refused because of what the company already is, not because of
|
||||
what was asked for: the pages answer it with 409, not 422."""
|
||||
|
||||
|
||||
def check_careers_url(url: str) -> str:
|
||||
"""`url` stripped; ValueError unless it is empty or an http(s) link. The
|
||||
page puts it in an `href`, where `javascript:` would run."""
|
||||
url = url.strip()
|
||||
if url:
|
||||
parts = urlsplit(url)
|
||||
if parts.scheme not in ("http", "https") or not parts.netloc:
|
||||
raise ValueError("The careers link must start with http:// or https://.")
|
||||
return url
|
||||
|
||||
|
||||
def add_by_hand(store: Store, name: str, *, careers_url: str = "", notes: str = "",
|
||||
hand_reason: str = "added") -> Company:
|
||||
"""A company with no board, put on the list checked by hand. Raises
|
||||
Conflict when the key its name folds to is taken, ValueError for a name
|
||||
with no letters, a link that is no http(s) URL or a reason outside
|
||||
`HAND_REASONS`."""
|
||||
link = check_careers_url(careers_url)
|
||||
key = company_key(name)
|
||||
if key and store.company(key) is not None:
|
||||
raise Conflict(f"{name.strip()} is on the list already as {key}.")
|
||||
return store.add_company(name, key=key, careers_url=link, notes=notes,
|
||||
hand_reason=hand_reason)
|
||||
|
||||
|
||||
def edit_company(store: Store, key: str, **fields: str) -> Company:
|
||||
"""Change a company's `name`, `careers_url`, `notes` or `hand_reason`; the
|
||||
key never changes. A new name is Conflict for a company with a board
|
||||
subscription, shown or not, since the subscription is found by the key
|
||||
its company name folds to and would be lost. Raises KeyError for an
|
||||
unknown company and ValueError for a blank name, a link that is no http(s)
|
||||
URL or a reason outside `HAND_REASONS`."""
|
||||
unknown = set(fields) - {"name", "careers_url", "notes", "hand_reason"}
|
||||
if unknown:
|
||||
raise ValueError(f"not a field to edit: {', '.join(sorted(unknown))}")
|
||||
company = store.company(key)
|
||||
if company is None:
|
||||
raise KeyError(key)
|
||||
if "careers_url" in fields:
|
||||
fields["careers_url"] = check_careers_url(fields["careers_url"])
|
||||
if "name" in fields:
|
||||
fields["name"] = fields["name"].strip()
|
||||
if not fields["name"]:
|
||||
raise ValueError("A company needs a name.")
|
||||
if fields["name"] != company.name and store.company_subscription(key) is not None:
|
||||
raise Conflict(f"{company.name} has a board, which is found by its name; "
|
||||
"detach the board first.")
|
||||
return store.update_company(key, **fields)
|
||||
|
||||
|
||||
def remove_company(store: Store, key: str) -> None:
|
||||
"""Delete company `key` and every agent's stance on it. Raises KeyError
|
||||
for an unknown company and Conflict for one still read: a company with
|
||||
a board on (`show`, as `detach_board` decides) or with open roles, which
|
||||
would otherwise vanish from the list with nothing said. A detached board
|
||||
is no board, since nothing reads it and its roles are closed; its
|
||||
subscription row stays, and follows the company if it comes back."""
|
||||
if store.company(key) is None:
|
||||
raise KeyError(key)
|
||||
sub = store.company_subscription(key)
|
||||
if sub is not None and sub.show:
|
||||
raise Conflict(f"{key} is read from {sub.target}; detach the board first")
|
||||
if store.open_role_counts().get(key):
|
||||
raise Conflict(f"{key} has open roles; detach its board first")
|
||||
store.remove_company(key)
|
||||
|
||||
|
||||
def _fill_empty(store: Store, key: str, **facts: str) -> None:
|
||||
"""Write each of `facts` to company `key` where the stored value is
|
||||
empty: what a seed may add to a row that exists, since a person's link or
|
||||
reason is never overwritten."""
|
||||
company = store.company(key)
|
||||
assert company is not None
|
||||
fill = {f: v for f, v in facts.items() if v and not getattr(company, f)}
|
||||
if fill:
|
||||
store.update_company(key, **fill)
|
||||
|
||||
|
||||
def seed_companies(store: Store, path: str | Path) -> dict[str, Any]:
|
||||
"""Import `seed/companies.json`: one `companies` row per entry, and its
|
||||
`board` through `set_board` where the entry names one. An entry without
|
||||
@@ -167,8 +272,10 @@ def seed_companies(store: Store, path: str | Path) -> dict[str, Any]:
|
||||
existing row that never had a board gets the one the seed now names, so a
|
||||
seed update that gains boards reaches a database made before it. A row's
|
||||
board, once it has one (detached counts), and its affinity, notes and
|
||||
status are never touched. The seed's boards are not fetched again: they
|
||||
were read once when the seed was written, and `app companies check`
|
||||
status are never touched; its `careers_url` and `hand_reason` are filled
|
||||
where empty, so the seed can hand a row its link and its reason but never
|
||||
overwrite the one a person set. The seed's boards are not fetched again:
|
||||
they were read once when the seed was written, and `app companies check`
|
||||
finds the dead ones. Returns counts, and `problems`, one line per entry
|
||||
that could not land whole."""
|
||||
from plugins.ats import is_known_target
|
||||
@@ -186,8 +293,15 @@ def seed_companies(store: Store, path: str | Path) -> dict[str, Any]:
|
||||
board = ""
|
||||
facts = {f: str(row.get(f) or "") for f in ("domain", "country", "city",
|
||||
"careers_url", "ats", "ats_slug")}
|
||||
reason = str(row.get("hand_reason") or "")
|
||||
if reason not in HAND_REASONS:
|
||||
problems.append(f"{key}: {reason!r} is not a hand_reason; kept without it")
|
||||
reason = ""
|
||||
exists = store.company(key) is not None
|
||||
if exists:
|
||||
_fill_empty(store, key, hand_reason=reason)
|
||||
if exists and (not board or store.company_subscription(key) is not None):
|
||||
_fill_empty(store, key, careers_url=facts["careers_url"])
|
||||
skipped += 1
|
||||
continue
|
||||
if board:
|
||||
@@ -200,13 +314,14 @@ def seed_companies(store: Store, path: str | Path) -> dict[str, Any]:
|
||||
except ValueError as exc:
|
||||
problems.append(f"{key}: {exc}")
|
||||
if exists:
|
||||
_fill_empty(store, key, careers_url=facts["careers_url"])
|
||||
skipped += 1
|
||||
continue
|
||||
# No board, or one that clashed: the company is still a row, and a
|
||||
# clashing board's host and slug are what discovery found.
|
||||
if board:
|
||||
facts["ats"], _, facts["ats_slug"] = board.partition(":")
|
||||
store.add_company(name, key=key, **facts)
|
||||
store.add_company(name, key=key, hand_reason=reason, **facts)
|
||||
added += 1
|
||||
return {"added": added, "boards": boards, "skipped": skipped, "total": len(entries),
|
||||
"problems": problems}
|
||||
|
||||
Reference in new issue
Block a user