mirror of
https://github.com/openswarm-ai/openswarm.git
synced 2026-09-28 12:34:50 +02:00
* [eric] ci: gitleaks-ignore the known historical secrets so our branch stops failing on leaks it didnt add * [eric] workflows: restore scheduled-tasks on the workflow line (revert removal, keep windows fixes + 1.1.69) * [eric] workflows: re-apply uncommitted scheduling wip (schedule pill, calendar view, slice) * [eric] ops: gitignore dev-team local state files * [eric] ops: backlog item for download-tracking visibility * [eric] ci: allowlist the cdp-routes redaction-test token in gitleaks * [aidan] feat/scheduled-tasks: keep step labels in sync on edit and show chevron on every step * [aidan] fix: schedule time in chat * [aidan] ux/workflows: add workflow step removal (#91) * [aidan] feat/scheduled-tasks: remember workflow tool permissions across runs * [aidan] feat/task-scheduling: add hourly and minute (15-min minimum) schedule intervals (#93) * [aidan] feat/scheduled-tasks: calendar, rename, and edit workflows (#94) * [aidan] bug: fix schedule button * [aidan] fix/agent-errors: surface provider rate limits * [aidan] ux/cards: click-to-rename for chat and workflow titles Single-click a card's title to enter edit mode inline. Commit on Enter/blur, cancel on Escape. Rename persists via PATCH for workflows and sessions. * [aidan] feat/workflows: seed build prompt for zero-step workflows When a new workflow has no steps, seed the agent with a prompt asking the user to describe what the workflow should do, rather than starting blank. * [aidan] feat/workflows: add-to-schedule popover for unscheduled workflows Clicking the "+" on an unscheduled workflow row opens a popover with two options: - Keep this schedule: enables the workflow's existing cadence and moves it to Scheduled - Change schedule: opens the scheduling editor to pick a different time * [aidan] ux/workflows: wire add-to-schedule popover and simplify New button - Made the "+" icon on unscheduled workflow rows clickable, opening a popover to keep or change the schedule - Removed AddIcon from toolbar "New" button (now reads "New" instead of "+ New") * [aidan] fix/scheduled-tasks: open schedule calendar when Schedule pill clicked Fixed the Schedule pill click being swallowed by the toolbar's dismiss handler. Exempted the toolbar pills via data-toolbar-pills so their click handlers fire. * [aidan] ux/workflows: open New workflow in agent build chat instead of empty card When creating a new workflow from the hub, open it in edit_agent view (with the agent builder chat) instead of a preview card. The workflow is created on the backend first so the embedded session has a real ID. * [aidan] feat/workflow-edit: add draft testing save flow * [aidan] ux/chat: remove continue chat button * [aidan] ux/workflows: polish workflow card interactions * [aidan] fix/workflow-scheduling: save unscheduled workflows as drafts * aidan ui: schedule naming changes * [aidan] ui: tool calling desc/naming * [aidan] ui: calendar sidebar naming * [aidan] ui: fix stop viewing closing chat * [aidan] feat/workflows: auto-name workflows and polish the build flow (#95) * [aidan] feat/workflow-auto-naming: auto-generate workflow titles from steps Generate a title + description from a workflow's steps (one aux call, reused for step labels) whenever it is still auto_named, so a workflow built in the Edit Agent names itself on commit instead of staying "New workflow". A manual rename sets auto_named=False and is never overwritten. Stream the aux call (non-streaming drops content on some 9router lanes) and fall back to a step-derived title when the model is unavailable. * [aidan] feat/workflows: hide unsaved new workflows until first save A brand-new "+ New" workflow is created with unsaved=true and kept out of the hub's scheduled/unscheduled lists while the user is still building it in the Edit Agent. The first commit (Save) clears the flag and the workflow appears. Every other create path stays visible immediately. * [aidan] ux/workflows: remove redundant save workflow button The Edit Agent already has Discard/Save controls in its strip, so the header "Save Workflow" button was a duplicate save path. Remove it and its pulse/edit-session-id wiring; the model/time subtitle stays. * [aidan] ux/workflows: animate title on auto-rename Wrap the workflow card title in the same Typewriter the chat card uses, so when the auto-generated name replaces the placeholder after Save it retypes letter-by-letter. Gated on a real (non-placeholder) title so it never animates on mount or for already-named workflows. * [aidan] ux/workflows: animate sidebar title on auto-rename Wrap the calendar hub's sidebar row title in the same Typewriter the workflow card uses, so a title that auto-renames retypes letter-by-letter in the sidebar too. Extract the placeholder/isRealTitle guard into the shared workflowVisuals so the card and sidebar stay in sync. * [aidan] fix/workflows: connect watch tether, keep watched chat open, wire draft run/history * [aidan] ui: grey out chat pill when not selected * [aidan] ui: fix running agent display * [aidan] feat/history-popover: add chat history and scheduled tasks run log tabs (#96) * [aidan] ux/schedule: toast when calendar view already open on expand * [aidan] ui: fix popover descs * [aidan] feat/workflow-runs: add pause, resume, and stop controls for live runs * [aidan] feat/schedule-calendar: add calendar occurrences endpoint and concrete timezones * [aidan] feat/workflows: require at least one step to save a workflow * [aidan] ux/edit-agent: hide Discard for an unsaved new workflow * [aidan] ux/edit-agent: move fix-prefix card below the step list * [aidan] feat/workflows: toast when an unattended scheduled run starts * [aidan] fix/dashboard-tethers: anchor workflow-sidecar tethers to measured card rects * [aidan] feat/workflows: validate steps before scheduling and keep chat tool memory * [aidan] feat/mcp-suggestions: dismissable integration banner with per-session cooldown * [aidan] feat/workflows: add scheduled-run "running now" toast with click-to-view (#97) * [aidan] ux/workflows: surface paused state on card, sidebar, and calendar; tidy run history * [aidan] feat/mcp-suggestions: suggest both Google and Microsoft when provider is ambiguous * [aidan] fix/agent-tokens: friendly out-of-tokens card across all agent surfaces * [aidan] feat/workflow-model: persist edit-agent model on save with switch notice and fresh drafts * [aidan] fix/workflow-chat: force stop on watched run mirrors workflow card stop * [aidan] fix/workflow-cards: keep watched run tethered on finish to avoid duplicate chat * [aidan] feat/schedule-calendar: mark current time with a now line in week view * [aidan] refactor/private-names: rename error and schedule classifiers from _ to p_ * [aidan] feat/scheduled-tasks: agent workflow scheduling and in-chat convert (#98) * [aidan] feat/workflow-suggest: nudge user to convert repeatable chat to workflow Add SuggestConvertToWorkflow MCP tool that agents call at the end of a task when they've completed something worth repeating (daily report, weekly check, recurring data pull). Frontend detects the tool call and glows the "Convert to workflow" button 3 times to draw the eye. When user clicks it, the suggested cadence (e.g. "every weekday at 9am") is stored in the draft and seeded into the scheduling agent's first prompt, so the agent can act on the suggestion rather than asking the user again. Tool is never auto-called — agents decide when a task is genuinely repeatable (not debugging, creative work, one-off lookup). Tool description emphasizes sparse, high-confidence use only (once per session max). Files changed: - backend/apps/agents/schedule_mcp_server.py: add SuggestConvertToWorkflow tool - frontend/src/shared/mcpToolMeta.ts: add label for new tool - frontend/src/app/pages/Dashboard/cards/AgentCard.tsx: detect suggestion in session messages, show+glow "Convert to workflow" button, pass cadence to draft - frontend/src/shared/state/workflowsSlice.ts: add suggested_cadence field to Workflow interface - frontend/src/app/pages/Workflows/SchedulingView.tsx: seed scheduling agent prompt with suggested cadence hint * [aidan] feat/agent-scheduling: route recurring asks through native workflows, deny claude cron skill * [aidan] feat/workflow-convert: in-chat convert popup and auto-open scheduled workflow card * [aidan] ux/calendar-page: schedule calendar restyle + popover fixes (#99) * [aidan] fix/dashboard-delete: remove workflows calendar panel on delete key * [aidan] ux/workflows-calendar: restyle hub, fix today highlight, add toolbar toggle * [aidan] ux/schedule-popover: compact density, fix sticky header bleed, add header spacing * [aidan] ux/schedule-calendar: hollow ring dot for past fires in month view * [aidan] ux/schedule-calendar: clickable +N more opens day's full run list * [aidan] feat/run-log-filters: add success and skipped pills to scheduled task history * [aidan] fix/convert-button: stop drag capture so convert-to-workflow click fires * [aidan] ux/calendar-card: match border color and radius to chat and workflow cards * [aidan] fix/minimap: render missed-runs card on the minimap * [aidan] ux/run-sparkline: simplify tooltip to plain run tally * [aidan] ux/run-history: collapse expanded run view to one clickable line * [aidan] ux/calendar-card: match corner radius to browser cards * [aidan] feat/workflows: launch-time scheduling UX and workflow-card polish (#101) * [aidan] feat/schedule-list: lazy-load list view via scroll sentinel * [aidan] feat/missed-runs: launch toast with per-workflow counts and pan-to-card * [aidan] fix/dashboard-tethers: keep watching line anchored on canvas zoom * [aidan] feat/scheduled-tasks: review missed runs at launch instead of auto-firing on_missed * [aidan] refactor/workflow-cards: use radius and status design tokens, polish card chrome * [aidan] ux/agent-card: keep convert-to-workflow visible during runs with mid-turn toast * [aidan] ux/mcp-bubble: drop redundant verb label when a workflow label is shown * [aidan] chore/backend: remove stale explanatory comments * [aidan] fix/workflows-hub: load workflows on hub mount so calendar fills at launch * [aidan] feat/workflows: generate title, description, step labels at convert time * [aidan] fix/tidy-layout: include workflows hub in tidy and fit-to-view * [aidan] feat/schedule-list: window long list via measured-height virtualizer * [aidan] ux/workflows-hub: remove time-saved badge from calendar header * [aidan] fix/types: add missing semantic-type labels and drop stray fade arg * [aidan] feat/schedule: pin monthly day-of-month and honor repeat-every intervals * [aidan] feat/schedule: inherit source-session tool surface for scheduled runs * [aidan] ux/calendar: restack hour-cell events as bars with overflow affordance * [aidan] feat/calendar: open the run card when clicking a scheduled occurrence * [aidan] ux/missed-runs: add per-group select-all toggle and rename skip action * [aidan] feat: new scheduled task design ported * [aidan] ui: sidebar reorder, repeat controls on schedule card * [aidan] ui: sidebar, scheduling time * [aidan] feat/schedule: pin monthly last-day-of-month * [aidan] feat/steps: per-step enable toggle * [aidan] feat/workflows: per-workflow color swatch * [aidan] feat/trash: soft-delete workflows with restore and purge * [aidan] feat/run-monitor: live run monitor card on the canvas * [aidan] feat/run-context: attach a run as removable chat context * [aidan] feat/compose: new-workflow landing page and auto-commit build flow * [aidan] ui/workflows: dark mode and design-system cohesion * [aidan] ui/calendar: overflow popover, condensed week view, scroll fix * [aidan] feat/home: ongoing runs, missed review, and accurate Coming-up counts * [aidan] fix/run-status: sync ongoing runs and heal stuck/interrupted runs * [aidan] ux/schedule: last-day-of-month UI, Run-at time typing, interval input * [aidan] ux/workflows: default window size and toolbar icon * [aidan] fix/schedule: measure ran_late from start and anchor recurrences to created_at * [aidan] feat/calendar: render fire times from backend, drop JS recurrence reimpl * [aidan] chore/dashboard: drop dead configure/missed-run cards, refetch on reconnect * [aidan] chore/agent-card: remove unreachable convert-to-workflow action * [aidan] fix/workflows: don't bump updated_at on a no-op draft commit so viewing a workflow doesn't reorder the sidebar * [aidan] feat/schedule: warn when scheduling a workflow that has no steps * [aidan] fix/selection-tool: never select the workflows app, and exit the tool on Escape without dropping selections * [aidan] ux/compose: diversify new-workflow starter prompts across personas * [aidan] ux/run-monitor: spawn the run card a bit farther right of the workflows app * [aidan] fix/schedule: harden run recovery and storage writes against crashes * [aidan] ux/compose: restyle new-workflow starters as a clean pill cluster with rich prompts * [aidan] fix/workflows: optimistically apply edits so the schedule banner updates instantly * [aidan] ui/workflows: three-tone surface depth so the window lifts off the canvas in both themes * [aidan] ui/workflows: close buttons turn red on hover, matching the chat card * [aidan] test/schedule: cover executor pipeline, storage durability, and recurrence gaps * [aidan] fix: remove package-lock json * [aidan] fix/workflows-compose: keep compose view until edit agent replies * [aidan] feat/workflows: auto-generate workflow + step titles with typewriter animation * [eric] deps: restore frontend/package-lock.json (PR #105 deletion broke npm ci) --------- Co-authored-by: Eric <ciregenz@berkeley.edu> Co-authored-by: cire <134991075+ciregenz@users.noreply.github.com>
959 lines
30 KiB
Python
959 lines
30 KiB
Python
# pylint:disable-msg=E0611,I1101
|
|
"""Module bundling all functions needed to determine the date of HTML strings
|
|
or LXML trees.
|
|
"""
|
|
|
|
import logging
|
|
import re
|
|
|
|
from collections import Counter
|
|
from collections.abc import Callable
|
|
from copy import deepcopy
|
|
from datetime import datetime
|
|
from functools import lru_cache, partial
|
|
|
|
from lxml.html import HtmlElement, tostring
|
|
|
|
# own
|
|
from .extractors import (
|
|
discard_unwanted,
|
|
extract_url_date,
|
|
idiosyncrasies_search,
|
|
img_search,
|
|
json_search,
|
|
regex_parse,
|
|
pattern_search,
|
|
try_date_expr,
|
|
DATE_EXPRESSIONS,
|
|
FAST_PREPEND,
|
|
SLOW_PREPEND,
|
|
FREE_TEXT_EXPRESSIONS,
|
|
YEAR_PATTERN,
|
|
YMD_PATTERN,
|
|
COPYRIGHT_PATTERN,
|
|
TIMESTAMP_PATTERN,
|
|
THREE_PATTERN,
|
|
THREE_CATCH,
|
|
THREE_LOOSE_PATTERN,
|
|
THREE_LOOSE_CATCH,
|
|
SELECT_YMD_PATTERN,
|
|
SELECT_YMD_YEAR,
|
|
YMD_YEAR,
|
|
DATESTRINGS_PATTERN,
|
|
DATESTRINGS_CATCH,
|
|
SLASHES_PATTERN,
|
|
SLASHES_YEAR,
|
|
YYYYMM_PATTERN,
|
|
YYYYMM_CATCH,
|
|
MMYYYY_PATTERN,
|
|
MMYYYY_YEAR,
|
|
SIMPLE_PATTERN,
|
|
THREE_COMP_REGEX_A,
|
|
THREE_COMP_REGEX_B,
|
|
TWO_COMP_REGEX,
|
|
)
|
|
from .settings import (
|
|
CACHE_SIZE,
|
|
CLEANING_LIST,
|
|
MAX_POSSIBLE_CANDIDATES,
|
|
MAX_SEGMENT_LEN,
|
|
MIN_SEGMENT_LEN,
|
|
)
|
|
from .utils import Extractor, clean_html, load_html, trim_text
|
|
from .validators import (
|
|
check_extracted_reference,
|
|
compare_values,
|
|
correct_year,
|
|
filter_ymd_candidate,
|
|
get_min_date,
|
|
get_max_date,
|
|
is_valid_date,
|
|
is_valid_format,
|
|
plausible_year_filter,
|
|
validate_and_convert,
|
|
)
|
|
|
|
LOGGER = logging.getLogger(__name__)
|
|
|
|
|
|
def logstring(element: HtmlElement) -> str:
|
|
"""Format the element to be logged to a string."""
|
|
return tostring(element, pretty_print=False, encoding="unicode").strip()
|
|
|
|
|
|
DATE_ATTRIBUTES = {
|
|
"analyticsattributes.articledate",
|
|
"article.created",
|
|
"article_date_original",
|
|
"article:post_date",
|
|
"article.published",
|
|
"article:published",
|
|
"article:published_date",
|
|
"article:published_time",
|
|
"article:publicationdate",
|
|
"bt:pubdate",
|
|
"citation_date",
|
|
"citation_publication_date",
|
|
"content_create_date",
|
|
"created",
|
|
"cxenseparse:recs:publishtime",
|
|
"date",
|
|
"date_created",
|
|
"date_published",
|
|
"datecreated",
|
|
"dateposted",
|
|
"datepublished",
|
|
# Dublin Core: https://wiki.whatwg.org/wiki/MetaExtensions
|
|
"dc.date",
|
|
"dc.created",
|
|
"dc.date.created",
|
|
"dc.date.issued",
|
|
"dc.date.publication",
|
|
"dcsext.articlefirstpublished",
|
|
"dcterms.created",
|
|
"dcterms.date",
|
|
"dcterms.issued",
|
|
"dc:created",
|
|
"dc:date",
|
|
"displaydate",
|
|
"doc_date",
|
|
"field-name-post-date",
|
|
"gentime",
|
|
"mediator_published_time",
|
|
"meta", # too loose?
|
|
# Open Graph: https://opengraphprotocol.org/
|
|
"og:article:published",
|
|
"og:article:published_time",
|
|
"og:datepublished",
|
|
"og:pubdate",
|
|
"og:publish_date",
|
|
"og:published_time",
|
|
"og:question:published_time",
|
|
"og:regdate",
|
|
"originalpublicationdate",
|
|
"parsely-pub-date",
|
|
"pdate",
|
|
"ptime",
|
|
"pubdate",
|
|
"publishdate",
|
|
"publish_date",
|
|
"publish_time",
|
|
"publish-date",
|
|
"published-date",
|
|
"published_date",
|
|
"published_time",
|
|
"publisheddate",
|
|
"publication_date",
|
|
"rbpubdate",
|
|
"release_date",
|
|
"rnews:datepublished",
|
|
"sailthru.date",
|
|
"shareaholic:article_published_time",
|
|
"timestamp",
|
|
"twt-published-at",
|
|
"video:release_date",
|
|
"vr:published_time",
|
|
}
|
|
|
|
|
|
NAME_MODIFIED = {
|
|
"lastdate",
|
|
"lastmod",
|
|
"lastmodified",
|
|
"last-modified",
|
|
"modified",
|
|
"utime",
|
|
}
|
|
|
|
|
|
PROPERTY_MODIFIED = {
|
|
"article:modified",
|
|
"article:modified_date",
|
|
"article:modified_time",
|
|
"article:post_modified",
|
|
"bt:moddate",
|
|
"datemodified",
|
|
"dc.modified",
|
|
"dcterms.modified",
|
|
"lastmodified",
|
|
"modified_time",
|
|
"modificationdate",
|
|
"og:article:modified_time",
|
|
"og:modified_time",
|
|
"og:updated_time",
|
|
"release_date",
|
|
"revision_date",
|
|
"updated_time",
|
|
}
|
|
|
|
|
|
ITEMPROP_ATTRS_ORIGINAL = {"datecreated", "datepublished", "pubyear"}
|
|
ITEMPROP_ATTRS_MODIFIED = {"datemodified", "dateupdate"}
|
|
ITEMPROP_ATTRS = ITEMPROP_ATTRS_ORIGINAL.union(ITEMPROP_ATTRS_MODIFIED)
|
|
CLASS_ATTRS = {"date-published", "published", "time published"}
|
|
|
|
NON_DIGITS_REGEX = re.compile(r"\D+$")
|
|
|
|
THREE_COMP_PATTERNS = (
|
|
(THREE_PATTERN, THREE_CATCH),
|
|
(THREE_LOOSE_PATTERN, THREE_LOOSE_CATCH),
|
|
)
|
|
|
|
|
|
def examine_text(
|
|
text: str,
|
|
options: Extractor,
|
|
) -> str | None:
|
|
"Prepare text and try to extract a date."
|
|
text = trim_text(text)
|
|
|
|
if len(text) <= MIN_SEGMENT_LEN:
|
|
return None
|
|
|
|
text = NON_DIGITS_REGEX.sub("", text[:MAX_SEGMENT_LEN])
|
|
return try_date_expr(
|
|
text, options.format, options.extensive, options.min, options.max
|
|
)
|
|
|
|
|
|
def examine_date_elements(
|
|
tree: HtmlElement,
|
|
expression: str,
|
|
options: Extractor,
|
|
) -> str | None:
|
|
"""Check HTML elements one by one for date expressions"""
|
|
elements = tree.xpath(expression)
|
|
if not elements or len(elements) > MAX_POSSIBLE_CANDIDATES:
|
|
return None
|
|
|
|
for elem in elements:
|
|
# try element text and link title (Blogspot)
|
|
for text in [elem.text_content(), elem.get("title", "")]:
|
|
attempt = examine_text(text, options)
|
|
if attempt:
|
|
return attempt
|
|
|
|
return None
|
|
|
|
|
|
def examine_header(
|
|
tree: HtmlElement,
|
|
options: Extractor,
|
|
) -> str | None:
|
|
"""
|
|
Parse header elements to find date cues
|
|
|
|
:param tree:
|
|
LXML parsed tree object
|
|
:type tree: LXML tree
|
|
:param options:
|
|
Options for extraction
|
|
:type options: Extractor
|
|
:return: Returns a valid date expression as a string, or None
|
|
|
|
"""
|
|
headerdate, reserve = None, None
|
|
tryfunc = partial(
|
|
try_date_expr,
|
|
outputformat=options.format,
|
|
extensive_search=options.extensive,
|
|
min_date=options.min,
|
|
max_date=options.max,
|
|
)
|
|
# loop through all meta elements
|
|
for elem in tree.iterfind(".//meta"):
|
|
# safeguard
|
|
if (
|
|
not elem.attrib
|
|
or "content" not in elem.attrib
|
|
and "datetime" not in elem.attrib
|
|
):
|
|
continue
|
|
# name attribute, most frequent
|
|
if "name" in elem.attrib:
|
|
attribute = elem.get("name", "").lower()
|
|
# url
|
|
if attribute == "og:url":
|
|
reserve = extract_url_date(elem.get("content"), options)
|
|
# date
|
|
elif attribute in DATE_ATTRIBUTES:
|
|
LOGGER.debug("examining meta name: %s", logstring(elem))
|
|
headerdate = tryfunc(elem.get("content"))
|
|
# modified
|
|
elif attribute in NAME_MODIFIED:
|
|
LOGGER.debug("examining meta name: %s", logstring(elem))
|
|
if not options.original:
|
|
headerdate = tryfunc(elem.get("content"))
|
|
else:
|
|
reserve = tryfunc(elem.get("content"))
|
|
# property attribute
|
|
elif "property" in elem.attrib:
|
|
attribute = elem.get("property", "").lower()
|
|
if attribute in DATE_ATTRIBUTES or attribute in PROPERTY_MODIFIED:
|
|
LOGGER.debug("examining meta property: %s", logstring(elem))
|
|
attempt = tryfunc(elem.get("content"))
|
|
if attempt is not None:
|
|
if (attribute in DATE_ATTRIBUTES and options.original) or (
|
|
attribute in PROPERTY_MODIFIED and not options.original
|
|
):
|
|
headerdate = attempt
|
|
# hurts precision
|
|
else:
|
|
reserve = attempt
|
|
# itemprop
|
|
elif "itemprop" in elem.attrib:
|
|
attribute = elem.get("itemprop", "").lower()
|
|
# original: store / updated: override date
|
|
if attribute in ITEMPROP_ATTRS:
|
|
LOGGER.debug("examining meta itemprop: %s", logstring(elem))
|
|
attempt = tryfunc(elem.get("datetime") or elem.get("content"))
|
|
# store value
|
|
if attempt is not None:
|
|
if (attribute in ITEMPROP_ATTRS_ORIGINAL and options.original) or (
|
|
attribute in ITEMPROP_ATTRS_MODIFIED and not options.original
|
|
):
|
|
headerdate = attempt
|
|
# put on hold: hurts precision
|
|
# else:
|
|
# reserve = attempt
|
|
# reserve with copyrightyear
|
|
elif attribute == "copyrightyear":
|
|
LOGGER.debug("examining meta itemprop: %s", logstring(elem))
|
|
if "content" in elem.attrib:
|
|
attempt = "-".join([elem.get("content", ""), "01", "01"])
|
|
if is_valid_date(
|
|
attempt, "%Y-%m-%d", earliest=options.min, latest=options.max
|
|
):
|
|
reserve = attempt
|
|
# pubdate, relatively rare
|
|
elif "pubdate" in elem.attrib:
|
|
if elem.get("pubdate", "").lower() == "pubdate":
|
|
LOGGER.debug("examining meta pubdate: %s", logstring(elem))
|
|
headerdate = tryfunc(elem.get("content"))
|
|
# http-equiv, rare
|
|
elif "http-equiv" in elem.attrib:
|
|
attribute = elem.get("http-equiv", "").lower()
|
|
if attribute == "date":
|
|
LOGGER.debug("examining meta http-equiv: %s", logstring(elem))
|
|
if options.original:
|
|
headerdate = tryfunc(elem.get("content"))
|
|
else:
|
|
reserve = tryfunc(elem.get("content"))
|
|
elif attribute == "last-modified":
|
|
LOGGER.debug("examining meta http-equiv: %s", logstring(elem))
|
|
if not options.original:
|
|
headerdate = tryfunc(elem.get("content"))
|
|
else:
|
|
reserve = tryfunc(elem.get("content"))
|
|
# exit loop
|
|
if headerdate is not None:
|
|
break
|
|
# if nothing was found, look for lower granularity (so far: "copyright year")
|
|
if headerdate is None and reserve is not None:
|
|
LOGGER.debug("opting for reserve date with less granularity")
|
|
headerdate = reserve
|
|
# return value
|
|
return headerdate
|
|
|
|
|
|
def select_candidate(
|
|
occurrences: Counter[str],
|
|
catch: re.Pattern[str],
|
|
yearpat: re.Pattern[str],
|
|
options: Extractor,
|
|
) -> re.Match[str] | None:
|
|
"""Select a candidate among the most frequent matches"""
|
|
if not occurrences or len(occurrences) > MAX_POSSIBLE_CANDIDATES:
|
|
return None
|
|
|
|
if len(occurrences) == 1:
|
|
return catch.search(next(iter(occurrences)))
|
|
|
|
# select among most frequent: more than 10? more than 2 candidates?
|
|
firstselect = occurrences.most_common(10)
|
|
LOGGER.debug("firstselect: %s", firstselect)
|
|
# sort and find probable candidates
|
|
bestones = sorted(firstselect, reverse=not options.original)[:2]
|
|
LOGGER.debug("bestones: %s", bestones)
|
|
|
|
# plausibility heuristics
|
|
patterns, counts = zip(*bestones)
|
|
|
|
years = []
|
|
for pattern in patterns:
|
|
year_match = yearpat.search(pattern)
|
|
if year_match:
|
|
years.append(year_match[1])
|
|
|
|
min_year, max_year = options.min.year, options.max.year
|
|
validation = [min_year <= int(year) <= max_year for year in years]
|
|
|
|
# safety net: plausibility
|
|
if all(validation):
|
|
# same number of occurrences: always take top of the pile?
|
|
if counts[0] == counts[1]:
|
|
match = catch.search(patterns[0])
|
|
# safety net: newer date but up to 50% less frequent
|
|
elif years[1] != years[0] and counts[1] / counts[0] > 0.5:
|
|
match = catch.search(patterns[1])
|
|
# not newer or hopefully not significant
|
|
else:
|
|
match = catch.search(patterns[0])
|
|
elif any(validation):
|
|
match = catch.search(patterns[validation.index(True)])
|
|
else:
|
|
LOGGER.debug("no suitable candidate: %s %s", years[0], years[1])
|
|
match = None
|
|
return match
|
|
|
|
|
|
def search_pattern(
|
|
htmlstring: str,
|
|
pattern: re.Pattern[str],
|
|
catch: re.Pattern[str],
|
|
yearpat: re.Pattern[str],
|
|
options: Extractor,
|
|
) -> re.Match[str] | None:
|
|
"""Chained candidate filtering and selection"""
|
|
candidates = plausible_year_filter(
|
|
htmlstring,
|
|
pattern=pattern,
|
|
yearpat=yearpat,
|
|
earliest=options.min,
|
|
latest=options.max,
|
|
)
|
|
return select_candidate(candidates, catch, yearpat, options)
|
|
|
|
|
|
@lru_cache(maxsize=CACHE_SIZE)
|
|
def compare_reference(
|
|
reference: int,
|
|
expression: str,
|
|
options: Extractor,
|
|
) -> int:
|
|
"""Compare candidate to current date reference (includes date validation and older/newer test)"""
|
|
attempt = try_date_expr(
|
|
expression, options.format, options.extensive, options.min, options.max
|
|
)
|
|
if attempt is not None:
|
|
return compare_values(reference, attempt, options)
|
|
return reference
|
|
|
|
|
|
def examine_abbr_elements(
|
|
tree: HtmlElement,
|
|
options: Extractor,
|
|
) -> str | None:
|
|
"""Scan the page for abbr elements and check if their content contains an eligible date"""
|
|
elements = tree.findall(".//abbr")
|
|
if 0 < len(elements) < MAX_POSSIBLE_CANDIDATES:
|
|
reference = 0
|
|
for elem in elements:
|
|
# data-utime (mostly Facebook)
|
|
if "data-utime" in elem.attrib:
|
|
try:
|
|
candidate = int(elem.get("data-utime", ""))
|
|
except ValueError:
|
|
continue
|
|
LOGGER.debug("data-utime found: %s", candidate)
|
|
# look for original date
|
|
if options.original and (reference == 0 or candidate < reference):
|
|
reference = candidate
|
|
# look for newest (i.e. largest time delta)
|
|
elif not options.original and candidate > reference:
|
|
reference = candidate
|
|
# class
|
|
elif elem.get("class") in CLASS_ATTRS:
|
|
# other attributes
|
|
if "title" in elem.attrib:
|
|
trytext = elem.get("title")
|
|
LOGGER.debug("abbr published-title found: %s", trytext)
|
|
# shortcut
|
|
if options.original:
|
|
attempt = try_date_expr(
|
|
trytext,
|
|
options.format,
|
|
options.extensive,
|
|
options.min,
|
|
options.max,
|
|
)
|
|
if attempt is not None:
|
|
return attempt
|
|
else:
|
|
reference = compare_reference(reference, trytext, options)
|
|
# faster execution
|
|
if reference > 0:
|
|
break
|
|
# dates, not times of the day
|
|
elif elem.text and len(elem.text) > 10:
|
|
LOGGER.debug("abbr published found: %s", elem.text)
|
|
reference = compare_reference(reference, elem.text, options)
|
|
# return or try rescue in abbr content
|
|
return check_extracted_reference(reference, options) or examine_date_elements(
|
|
tree,
|
|
".//abbr",
|
|
options,
|
|
)
|
|
return None
|
|
|
|
|
|
def examine_time_elements(
|
|
tree: HtmlElement,
|
|
options: Extractor,
|
|
) -> str | None:
|
|
"""Scan the page for time elements and check if their content contains an eligible date"""
|
|
elements = tree.findall(".//time")
|
|
if 0 < len(elements) < MAX_POSSIBLE_CANDIDATES:
|
|
# scan all the tags and look for the newest one
|
|
reference = 0
|
|
for elem in elements:
|
|
shortcut_flag = False
|
|
datetime_attr = elem.get("datetime", "")
|
|
# go for datetime
|
|
if len(datetime_attr) > 6:
|
|
# shortcut: time pubdate
|
|
if (
|
|
"pubdate" in elem.attrib
|
|
and elem.get("pubdate") == "pubdate"
|
|
and options.original
|
|
):
|
|
shortcut_flag = True
|
|
LOGGER.debug("shortcut for time pubdate found: %s", datetime_attr)
|
|
# shortcuts: class attribute
|
|
elif "class" in elem.attrib:
|
|
class_attr = elem.get("class", "")
|
|
if options.original and (
|
|
class_attr.startswith("entry-date")
|
|
or class_attr.startswith("entry-time")
|
|
):
|
|
shortcut_flag = True
|
|
LOGGER.debug(
|
|
"shortcut for time/datetime found: %s", datetime_attr
|
|
)
|
|
# updated time
|
|
elif not options.original and class_attr == "updated":
|
|
shortcut_flag = True
|
|
LOGGER.debug(
|
|
"shortcut for updated time/datetime found: %s",
|
|
datetime_attr,
|
|
)
|
|
# datetime attribute
|
|
else:
|
|
LOGGER.debug("time/datetime found: %s", datetime_attr)
|
|
# analyze attribute
|
|
if shortcut_flag:
|
|
attempt = try_date_expr(
|
|
datetime_attr,
|
|
options.format,
|
|
options.extensive,
|
|
options.min,
|
|
options.max,
|
|
)
|
|
if attempt is not None:
|
|
return attempt
|
|
else:
|
|
reference = compare_reference(reference, datetime_attr, options)
|
|
# bare text in element
|
|
elif elem.text is not None and len(elem.text) > 6:
|
|
LOGGER.debug("time/datetime found in text: %s", elem.text)
|
|
reference = compare_reference(reference, elem.text, options)
|
|
# else...?
|
|
# return
|
|
return check_extracted_reference(reference, options)
|
|
return None
|
|
|
|
|
|
def normalize_match(match: re.Match[str] | None) -> str:
|
|
"""Normalize string output by adding "0" if necessary,
|
|
and optionally expand the year from two to four digits."""
|
|
day, month, year = (g.zfill(2) for g in match.groups() if g) # type: ignore[union-attr]
|
|
if len(year) == 2:
|
|
year = str(correct_year(int(year)))
|
|
return f"{year}-{month}-{day}"
|
|
|
|
|
|
def normalize_two_comp(item: str) -> str:
|
|
"""Normalize a MM-YYYY style match into a YYYY-MM-01 string."""
|
|
match = TWO_COMP_REGEX.match(item)
|
|
month = match[1].zfill(2) # type: ignore[index]
|
|
return "-".join([match[2], month, "01"]) # type: ignore[index]
|
|
|
|
|
|
def search_normalized(
|
|
htmlstring: str,
|
|
pattern: re.Pattern[str],
|
|
yearpat: re.Pattern[str],
|
|
normalizer: Callable[[str], str],
|
|
copyear: int,
|
|
options: Extractor,
|
|
*,
|
|
incomplete: bool = False,
|
|
) -> str | None:
|
|
"""Filter plausible years, normalize each candidate to the YMD format, then
|
|
select the best match and validate it (shared candidate-selection pipeline)."""
|
|
candidates = plausible_year_filter(
|
|
htmlstring,
|
|
pattern=pattern,
|
|
yearpat=yearpat,
|
|
earliest=options.min,
|
|
latest=options.max,
|
|
incomplete=incomplete,
|
|
)
|
|
# revert DD-MM-YYYY patterns before sorting
|
|
normalized = Counter(
|
|
{normalizer(item): count for item, count in candidates.items()}
|
|
)
|
|
bestmatch = select_candidate(normalized, YMD_PATTERN, YMD_YEAR, options)
|
|
return filter_ymd_candidate(
|
|
bestmatch, pattern, copyear, options.format, options.min, options.max
|
|
)
|
|
|
|
|
|
def search_page(htmlstring: str, options: Extractor) -> str | None:
|
|
"""
|
|
Opportunistically search the HTML text for common text patterns
|
|
|
|
:param htmlstring:
|
|
The HTML document in string format, potentially cleaned and stripped to
|
|
the core (much faster)
|
|
:type htmlstring: string
|
|
:param options:
|
|
Define extraction options
|
|
:type options: Extractor
|
|
:return: Returns a valid date expression as a string, or None
|
|
|
|
"""
|
|
|
|
# copyright symbol
|
|
LOGGER.debug("looking for copyright/footer information")
|
|
copyear = 0
|
|
bestmatch = search_pattern(
|
|
htmlstring,
|
|
COPYRIGHT_PATTERN,
|
|
YEAR_PATTERN,
|
|
YEAR_PATTERN,
|
|
options,
|
|
)
|
|
if bestmatch is not None:
|
|
year = int(bestmatch[0])
|
|
if is_valid_date(
|
|
datetime(year, 1, 1), "%Y", earliest=options.min, latest=options.max
|
|
):
|
|
LOGGER.debug("copyright year/footer pattern found: %s", year)
|
|
copyear = year
|
|
|
|
# 3 components
|
|
LOGGER.debug("3 components")
|
|
# target URL characteristics
|
|
# then more loosely structured data
|
|
for patterns in THREE_COMP_PATTERNS:
|
|
bestmatch = search_pattern(
|
|
htmlstring,
|
|
patterns[0],
|
|
patterns[1],
|
|
YEAR_PATTERN,
|
|
options,
|
|
)
|
|
result = filter_ymd_candidate(
|
|
bestmatch,
|
|
patterns[0],
|
|
copyear,
|
|
options.format,
|
|
options.min,
|
|
options.max,
|
|
)
|
|
if result is not None:
|
|
return result
|
|
|
|
# YYYY-MM-DD/DD-MM-YYYY
|
|
result = search_normalized(
|
|
htmlstring,
|
|
SELECT_YMD_PATTERN,
|
|
SELECT_YMD_YEAR,
|
|
lambda item: normalize_match(THREE_COMP_REGEX_A.match(item)),
|
|
copyear,
|
|
options,
|
|
)
|
|
if result is not None:
|
|
return result
|
|
|
|
# valid dates strings
|
|
bestmatch = search_pattern(
|
|
htmlstring,
|
|
DATESTRINGS_PATTERN,
|
|
DATESTRINGS_CATCH,
|
|
YEAR_PATTERN,
|
|
options,
|
|
)
|
|
result = filter_ymd_candidate(
|
|
bestmatch,
|
|
DATESTRINGS_PATTERN,
|
|
copyear,
|
|
options.format,
|
|
options.min,
|
|
options.max,
|
|
)
|
|
if result is not None:
|
|
return result
|
|
|
|
# DD?/MM?/YY
|
|
result = search_normalized(
|
|
htmlstring,
|
|
SLASHES_PATTERN,
|
|
SLASHES_YEAR,
|
|
lambda item: normalize_match(THREE_COMP_REGEX_B.match(item)),
|
|
copyear,
|
|
options,
|
|
incomplete=True,
|
|
)
|
|
if result is not None:
|
|
return result
|
|
|
|
# 2 components
|
|
LOGGER.debug("switching to two components")
|
|
# first option
|
|
bestmatch = search_pattern(
|
|
htmlstring,
|
|
YYYYMM_PATTERN,
|
|
YYYYMM_CATCH,
|
|
YEAR_PATTERN,
|
|
options,
|
|
)
|
|
if bestmatch is not None:
|
|
dateobject = datetime(int(bestmatch[1]), int(bestmatch[2]), 1)
|
|
if copyear == 0 or dateobject.year >= copyear:
|
|
result = validate_and_convert(
|
|
dateobject, options.format, earliest=options.min, latest=options.max
|
|
)
|
|
if result is not None:
|
|
LOGGER.debug(
|
|
'date found for pattern "%s": %s, %s',
|
|
YYYYMM_PATTERN,
|
|
bestmatch[1],
|
|
bestmatch[2],
|
|
)
|
|
return result
|
|
|
|
# 2 components, second option
|
|
result = search_normalized(
|
|
htmlstring,
|
|
MMYYYY_PATTERN,
|
|
MMYYYY_YEAR,
|
|
normalize_two_comp,
|
|
copyear,
|
|
options,
|
|
incomplete=options.original,
|
|
)
|
|
if result is not None:
|
|
return result
|
|
|
|
# try full-blown text regex on all HTML?
|
|
text_date = regex_parse(htmlstring)
|
|
# todo: find all candidates and disambiguate?
|
|
if copyear == 0 or (text_date and text_date.year >= copyear):
|
|
result = validate_and_convert(
|
|
text_date, options.format, earliest=options.min, latest=options.max
|
|
)
|
|
if result is not None:
|
|
return result
|
|
|
|
# catchall: copyright mention
|
|
if copyear != 0:
|
|
LOGGER.debug("using copyright year as default")
|
|
dateobject = datetime(int(copyear), 1, 1)
|
|
return dateobject.strftime(options.format)
|
|
|
|
# last resort: 1 component
|
|
LOGGER.debug("switching to one component")
|
|
bestmatch = search_pattern(
|
|
htmlstring,
|
|
SIMPLE_PATTERN,
|
|
YEAR_PATTERN,
|
|
YEAR_PATTERN,
|
|
options,
|
|
)
|
|
if bestmatch is not None:
|
|
dateobject = datetime(int(bestmatch[0]), 1, 1)
|
|
if (
|
|
is_valid_date(
|
|
dateobject, "%Y-%m-%d", earliest=options.min, latest=options.max
|
|
)
|
|
and dateobject.year >= copyear
|
|
):
|
|
LOGGER.debug(
|
|
'date found for pattern "%s": %s', SIMPLE_PATTERN, bestmatch[0]
|
|
)
|
|
return dateobject.strftime(options.format)
|
|
|
|
return None
|
|
|
|
|
|
def find_date(
|
|
htmlobject: bytes | str | HtmlElement,
|
|
extensive_search: bool = True,
|
|
original_date: bool = False,
|
|
outputformat: str = "%Y-%m-%d",
|
|
url: str | None = None,
|
|
verbose: bool = False,
|
|
min_date: datetime | str | None = None,
|
|
max_date: datetime | str | None = None,
|
|
deferred_url_extractor: bool = False,
|
|
) -> str | None:
|
|
"""
|
|
Extract dates from HTML documents using markup analysis and text patterns
|
|
|
|
:param htmlobject:
|
|
Two possibilities: 1. HTML document (e.g. body of HTTP request or .html-file) in text string
|
|
form or LXML parsed tree or 2. URL string (gets detected automatically)
|
|
:type htmlobject: string or lxml tree
|
|
:param extensive_search:
|
|
Activate pattern-based opportunistic text search
|
|
:type extensive_search: boolean
|
|
:param original_date:
|
|
Look for original date (e.g. publication date) instead of most recent
|
|
one (e.g. last modified, updated time)
|
|
:type original_date: boolean
|
|
:param outputformat:
|
|
Provide a valid datetime format for the returned string
|
|
(see datetime.strftime())
|
|
:type outputformat: string
|
|
:param url:
|
|
Provide an URL manually for pattern-searching in URL
|
|
(in some cases much faster)
|
|
:type url: string
|
|
:param verbose:
|
|
Set verbosity level for debugging
|
|
:type verbose: boolean
|
|
:param min_date:
|
|
Set the earliest acceptable date manually (ISO 8601 YMD format)
|
|
:type min_date: datetime, string
|
|
:param max_date:
|
|
Set the latest acceptable date manually (ISO 8601 YMD format)
|
|
:type max_date: datetime, string
|
|
:param deferred_url_extractor:
|
|
Use url extractor as backup only to prioritize full expressions,
|
|
e.g. of the type `%Y-%m-%d %H:%M:%S`
|
|
:type deferred_url_extractor: boolean
|
|
:return: Returns a valid date expression as a string, or None
|
|
"""
|
|
|
|
# init
|
|
if verbose:
|
|
logging.basicConfig(level=logging.DEBUG)
|
|
|
|
tree = load_html(htmlobject)
|
|
|
|
# safeguards
|
|
if tree is None:
|
|
return None
|
|
if outputformat != "%Y-%m-%d" and not is_valid_format(outputformat):
|
|
return None
|
|
|
|
# define options and time boundaries
|
|
options = Extractor(
|
|
extensive_search,
|
|
get_max_date(max_date),
|
|
get_min_date(min_date),
|
|
original_date,
|
|
outputformat,
|
|
)
|
|
|
|
# URL
|
|
if url is None:
|
|
# probe for canonical links
|
|
urlelem = tree.find('.//link[@rel="canonical"]')
|
|
if urlelem is not None:
|
|
url = urlelem.get("href")
|
|
|
|
# direct processing of URL info
|
|
url_result = extract_url_date(url, options)
|
|
if url_result is not None and not deferred_url_extractor:
|
|
return url_result
|
|
|
|
# first try header
|
|
# then try to use JSON data
|
|
result = examine_header(tree, options) or json_search(tree, options)
|
|
if result is not None:
|
|
return result
|
|
|
|
# deferred processing of URL info (may be moved even further down if necessary)
|
|
if deferred_url_extractor and url_result is not None:
|
|
return url_result
|
|
|
|
# try abbr elements
|
|
abbr_result = examine_abbr_elements(
|
|
tree,
|
|
options,
|
|
)
|
|
if abbr_result is not None:
|
|
return abbr_result
|
|
|
|
# first, prune tree
|
|
# only copy the tree if the caller passed one in: when we parsed it ourselves
|
|
# (string/bytes/URL input) we own it and can clean it in place, avoiding a
|
|
# costly deepcopy of the whole document
|
|
pruning_tree = deepcopy(tree) if isinstance(htmlobject, HtmlElement) else tree
|
|
try:
|
|
search_tree = discard_unwanted(clean_html(pruning_tree, CLEANING_LIST))
|
|
# rare LXML error: no NULL bytes or control characters
|
|
except ValueError: # pragma: no cover
|
|
search_tree = tree
|
|
LOGGER.error("lxml cleaner error")
|
|
|
|
# define expressions + text_content
|
|
if extensive_search:
|
|
date_expr = SLOW_PREPEND + DATE_EXPRESSIONS
|
|
else:
|
|
date_expr = FAST_PREPEND + DATE_EXPRESSIONS
|
|
|
|
# then look for expressions
|
|
# and try time elements
|
|
result = (
|
|
examine_date_elements(
|
|
search_tree,
|
|
date_expr,
|
|
options,
|
|
)
|
|
or examine_date_elements(
|
|
search_tree,
|
|
".//title|.//h1",
|
|
options,
|
|
)
|
|
or examine_time_elements(search_tree, options)
|
|
)
|
|
if result is not None:
|
|
return result
|
|
|
|
# robust conversion to string
|
|
try:
|
|
htmlstring = tostring(search_tree, pretty_print=False, encoding="unicode")
|
|
except UnicodeDecodeError:
|
|
htmlstring = tostring(search_tree, pretty_print=False).decode("utf-8", "ignore")
|
|
|
|
# date regex timestamp rescue
|
|
# try image elements
|
|
# precise patterns and idiosyncrasies
|
|
result = (
|
|
pattern_search(htmlstring, TIMESTAMP_PATTERN, options)
|
|
or img_search(search_tree, options)
|
|
or idiosyncrasies_search(htmlstring, options)
|
|
)
|
|
if result is not None:
|
|
return result
|
|
|
|
# last resort
|
|
if extensive_search:
|
|
LOGGER.debug("extensive search started")
|
|
# TODO: further tests & decide according to original_date
|
|
reference = 0
|
|
for segment in FREE_TEXT_EXPRESSIONS(search_tree):
|
|
segment = segment.strip()
|
|
if not MIN_SEGMENT_LEN < len(segment) < MAX_SEGMENT_LEN:
|
|
continue
|
|
reference = compare_reference(reference, segment, options)
|
|
converted = check_extracted_reference(reference, options)
|
|
# return or search page HTML
|
|
return converted or search_page(htmlstring, options)
|
|
|
|
return None
|