mirror of
https://github.com/openswarm-ai/openswarm.git
synced 2026-09-22 09:34:53 +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>
417 lines
13 KiB
Python
417 lines
13 KiB
Python
# -*- coding: utf-8 -*-
|
|
"""
|
|
This module offers a parser for ISO-8601 strings
|
|
|
|
It is intended to support all valid date, time and datetime formats per the
|
|
ISO-8601 specification.
|
|
|
|
..versionadded:: 2.7.0
|
|
"""
|
|
from datetime import datetime, timedelta, time, date
|
|
import calendar
|
|
from dateutil import tz
|
|
|
|
from functools import wraps
|
|
|
|
import re
|
|
import six
|
|
|
|
__all__ = ["isoparse", "isoparser"]
|
|
|
|
|
|
def _takes_ascii(f):
|
|
@wraps(f)
|
|
def func(self, str_in, *args, **kwargs):
|
|
# If it's a stream, read the whole thing
|
|
str_in = getattr(str_in, 'read', lambda: str_in)()
|
|
|
|
# If it's unicode, turn it into bytes, since ISO-8601 only covers ASCII
|
|
if isinstance(str_in, six.text_type):
|
|
# ASCII is the same in UTF-8
|
|
try:
|
|
str_in = str_in.encode('ascii')
|
|
except UnicodeEncodeError as e:
|
|
msg = 'ISO-8601 strings should contain only ASCII characters'
|
|
six.raise_from(ValueError(msg), e)
|
|
|
|
return f(self, str_in, *args, **kwargs)
|
|
|
|
return func
|
|
|
|
|
|
class isoparser(object):
|
|
def __init__(self, sep=None):
|
|
"""
|
|
:param sep:
|
|
A single character that separates date and time portions. If
|
|
``None``, the parser will accept any single character.
|
|
For strict ISO-8601 adherence, pass ``'T'``.
|
|
"""
|
|
if sep is not None:
|
|
if (len(sep) != 1 or ord(sep) >= 128 or sep in '0123456789'):
|
|
raise ValueError('Separator must be a single, non-numeric ' +
|
|
'ASCII character')
|
|
|
|
sep = sep.encode('ascii')
|
|
|
|
self._sep = sep
|
|
|
|
@_takes_ascii
|
|
def isoparse(self, dt_str):
|
|
"""
|
|
Parse an ISO-8601 datetime string into a :class:`datetime.datetime`.
|
|
|
|
An ISO-8601 datetime string consists of a date portion, followed
|
|
optionally by a time portion - the date and time portions are separated
|
|
by a single character separator, which is ``T`` in the official
|
|
standard. Incomplete date formats (such as ``YYYY-MM``) may *not* be
|
|
combined with a time portion.
|
|
|
|
Supported date formats are:
|
|
|
|
Common:
|
|
|
|
- ``YYYY``
|
|
- ``YYYY-MM``
|
|
- ``YYYY-MM-DD`` or ``YYYYMMDD``
|
|
|
|
Uncommon:
|
|
|
|
- ``YYYY-Www`` or ``YYYYWww`` - ISO week (day defaults to 0)
|
|
- ``YYYY-Www-D`` or ``YYYYWwwD`` - ISO week and day
|
|
|
|
The ISO week and day numbering follows the same logic as
|
|
:func:`datetime.date.isocalendar`.
|
|
|
|
Supported time formats are:
|
|
|
|
- ``hh``
|
|
- ``hh:mm`` or ``hhmm``
|
|
- ``hh:mm:ss`` or ``hhmmss``
|
|
- ``hh:mm:ss.ssssss`` (Up to 6 sub-second digits)
|
|
|
|
Midnight is a special case for `hh`, as the standard supports both
|
|
00:00 and 24:00 as a representation. The decimal separator can be
|
|
either a dot or a comma.
|
|
|
|
|
|
.. caution::
|
|
|
|
Support for fractional components other than seconds is part of the
|
|
ISO-8601 standard, but is not currently implemented in this parser.
|
|
|
|
Supported time zone offset formats are:
|
|
|
|
- `Z` (UTC)
|
|
- `±HH:MM`
|
|
- `±HHMM`
|
|
- `±HH`
|
|
|
|
Offsets will be represented as :class:`dateutil.tz.tzoffset` objects,
|
|
with the exception of UTC, which will be represented as
|
|
:class:`dateutil.tz.tzutc`. Time zone offsets equivalent to UTC (such
|
|
as `+00:00`) will also be represented as :class:`dateutil.tz.tzutc`.
|
|
|
|
:param dt_str:
|
|
A string or stream containing only an ISO-8601 datetime string
|
|
|
|
:return:
|
|
Returns a :class:`datetime.datetime` representing the string.
|
|
Unspecified components default to their lowest value.
|
|
|
|
.. warning::
|
|
|
|
As of version 2.7.0, the strictness of the parser should not be
|
|
considered a stable part of the contract. Any valid ISO-8601 string
|
|
that parses correctly with the default settings will continue to
|
|
parse correctly in future versions, but invalid strings that
|
|
currently fail (e.g. ``2017-01-01T00:00+00:00:00``) are not
|
|
guaranteed to continue failing in future versions if they encode
|
|
a valid date.
|
|
|
|
.. versionadded:: 2.7.0
|
|
"""
|
|
components, pos = self._parse_isodate(dt_str)
|
|
|
|
if len(dt_str) > pos:
|
|
if self._sep is None or dt_str[pos:pos + 1] == self._sep:
|
|
components += self._parse_isotime(dt_str[pos + 1:])
|
|
else:
|
|
raise ValueError('String contains unknown ISO components')
|
|
|
|
if len(components) > 3 and components[3] == 24:
|
|
components[3] = 0
|
|
return datetime(*components) + timedelta(days=1)
|
|
|
|
return datetime(*components)
|
|
|
|
@_takes_ascii
|
|
def parse_isodate(self, datestr):
|
|
"""
|
|
Parse the date portion of an ISO string.
|
|
|
|
:param datestr:
|
|
The string portion of an ISO string, without a separator
|
|
|
|
:return:
|
|
Returns a :class:`datetime.date` object
|
|
"""
|
|
components, pos = self._parse_isodate(datestr)
|
|
if pos < len(datestr):
|
|
raise ValueError('String contains unknown ISO ' +
|
|
'components: {!r}'.format(datestr.decode('ascii')))
|
|
return date(*components)
|
|
|
|
@_takes_ascii
|
|
def parse_isotime(self, timestr):
|
|
"""
|
|
Parse the time portion of an ISO string.
|
|
|
|
:param timestr:
|
|
The time portion of an ISO string, without a separator
|
|
|
|
:return:
|
|
Returns a :class:`datetime.time` object
|
|
"""
|
|
components = self._parse_isotime(timestr)
|
|
if components[0] == 24:
|
|
components[0] = 0
|
|
return time(*components)
|
|
|
|
@_takes_ascii
|
|
def parse_tzstr(self, tzstr, zero_as_utc=True):
|
|
"""
|
|
Parse a valid ISO time zone string.
|
|
|
|
See :func:`isoparser.isoparse` for details on supported formats.
|
|
|
|
:param tzstr:
|
|
A string representing an ISO time zone offset
|
|
|
|
:param zero_as_utc:
|
|
Whether to return :class:`dateutil.tz.tzutc` for zero-offset zones
|
|
|
|
:return:
|
|
Returns :class:`dateutil.tz.tzoffset` for offsets and
|
|
:class:`dateutil.tz.tzutc` for ``Z`` and (if ``zero_as_utc`` is
|
|
specified) offsets equivalent to UTC.
|
|
"""
|
|
return self._parse_tzstr(tzstr, zero_as_utc=zero_as_utc)
|
|
|
|
# Constants
|
|
_DATE_SEP = b'-'
|
|
_TIME_SEP = b':'
|
|
_FRACTION_REGEX = re.compile(b'[\\.,]([0-9]+)')
|
|
|
|
def _parse_isodate(self, dt_str):
|
|
try:
|
|
return self._parse_isodate_common(dt_str)
|
|
except ValueError:
|
|
return self._parse_isodate_uncommon(dt_str)
|
|
|
|
def _parse_isodate_common(self, dt_str):
|
|
len_str = len(dt_str)
|
|
components = [1, 1, 1]
|
|
|
|
if len_str < 4:
|
|
raise ValueError('ISO string too short')
|
|
|
|
# Year
|
|
components[0] = int(dt_str[0:4])
|
|
pos = 4
|
|
if pos >= len_str:
|
|
return components, pos
|
|
|
|
has_sep = dt_str[pos:pos + 1] == self._DATE_SEP
|
|
if has_sep:
|
|
pos += 1
|
|
|
|
# Month
|
|
if len_str - pos < 2:
|
|
raise ValueError('Invalid common month')
|
|
|
|
components[1] = int(dt_str[pos:pos + 2])
|
|
pos += 2
|
|
|
|
if pos >= len_str:
|
|
if has_sep:
|
|
return components, pos
|
|
else:
|
|
raise ValueError('Invalid ISO format')
|
|
|
|
if has_sep:
|
|
if dt_str[pos:pos + 1] != self._DATE_SEP:
|
|
raise ValueError('Invalid separator in ISO string')
|
|
pos += 1
|
|
|
|
# Day
|
|
if len_str - pos < 2:
|
|
raise ValueError('Invalid common day')
|
|
components[2] = int(dt_str[pos:pos + 2])
|
|
return components, pos + 2
|
|
|
|
def _parse_isodate_uncommon(self, dt_str):
|
|
if len(dt_str) < 4:
|
|
raise ValueError('ISO string too short')
|
|
|
|
# All ISO formats start with the year
|
|
year = int(dt_str[0:4])
|
|
|
|
has_sep = dt_str[4:5] == self._DATE_SEP
|
|
|
|
pos = 4 + has_sep # Skip '-' if it's there
|
|
if dt_str[pos:pos + 1] == b'W':
|
|
# YYYY-?Www-?D?
|
|
pos += 1
|
|
weekno = int(dt_str[pos:pos + 2])
|
|
pos += 2
|
|
|
|
dayno = 1
|
|
if len(dt_str) > pos:
|
|
if (dt_str[pos:pos + 1] == self._DATE_SEP) != has_sep:
|
|
raise ValueError('Inconsistent use of dash separator')
|
|
|
|
pos += has_sep
|
|
|
|
dayno = int(dt_str[pos:pos + 1])
|
|
pos += 1
|
|
|
|
base_date = self._calculate_weekdate(year, weekno, dayno)
|
|
else:
|
|
# YYYYDDD or YYYY-DDD
|
|
if len(dt_str) - pos < 3:
|
|
raise ValueError('Invalid ordinal day')
|
|
|
|
ordinal_day = int(dt_str[pos:pos + 3])
|
|
pos += 3
|
|
|
|
if ordinal_day < 1 or ordinal_day > (365 + calendar.isleap(year)):
|
|
raise ValueError('Invalid ordinal day' +
|
|
' {} for year {}'.format(ordinal_day, year))
|
|
|
|
base_date = date(year, 1, 1) + timedelta(days=ordinal_day - 1)
|
|
|
|
components = [base_date.year, base_date.month, base_date.day]
|
|
return components, pos
|
|
|
|
def _calculate_weekdate(self, year, week, day):
|
|
"""
|
|
Calculate the day of corresponding to the ISO year-week-day calendar.
|
|
|
|
This function is effectively the inverse of
|
|
:func:`datetime.date.isocalendar`.
|
|
|
|
:param year:
|
|
The year in the ISO calendar
|
|
|
|
:param week:
|
|
The week in the ISO calendar - range is [1, 53]
|
|
|
|
:param day:
|
|
The day in the ISO calendar - range is [1 (MON), 7 (SUN)]
|
|
|
|
:return:
|
|
Returns a :class:`datetime.date`
|
|
"""
|
|
if not 0 < week < 54:
|
|
raise ValueError('Invalid week: {}'.format(week))
|
|
|
|
if not 0 < day < 8: # Range is 1-7
|
|
raise ValueError('Invalid weekday: {}'.format(day))
|
|
|
|
# Get week 1 for the specific year:
|
|
jan_4 = date(year, 1, 4) # Week 1 always has January 4th in it
|
|
week_1 = jan_4 - timedelta(days=jan_4.isocalendar()[2] - 1)
|
|
|
|
# Now add the specific number of weeks and days to get what we want
|
|
week_offset = (week - 1) * 7 + (day - 1)
|
|
return week_1 + timedelta(days=week_offset)
|
|
|
|
def _parse_isotime(self, timestr):
|
|
len_str = len(timestr)
|
|
components = [0, 0, 0, 0, None]
|
|
pos = 0
|
|
comp = -1
|
|
|
|
if len_str < 2:
|
|
raise ValueError('ISO time too short')
|
|
|
|
has_sep = False
|
|
|
|
while pos < len_str and comp < 5:
|
|
comp += 1
|
|
|
|
if timestr[pos:pos + 1] in b'-+Zz':
|
|
# Detect time zone boundary
|
|
components[-1] = self._parse_tzstr(timestr[pos:])
|
|
pos = len_str
|
|
break
|
|
|
|
if comp == 1 and timestr[pos:pos+1] == self._TIME_SEP:
|
|
has_sep = True
|
|
pos += 1
|
|
elif comp == 2 and has_sep:
|
|
if timestr[pos:pos+1] != self._TIME_SEP:
|
|
raise ValueError('Inconsistent use of colon separator')
|
|
pos += 1
|
|
|
|
if comp < 3:
|
|
# Hour, minute, second
|
|
components[comp] = int(timestr[pos:pos + 2])
|
|
pos += 2
|
|
|
|
if comp == 3:
|
|
# Fraction of a second
|
|
frac = self._FRACTION_REGEX.match(timestr[pos:])
|
|
if not frac:
|
|
continue
|
|
|
|
us_str = frac.group(1)[:6] # Truncate to microseconds
|
|
components[comp] = int(us_str) * 10**(6 - len(us_str))
|
|
pos += len(frac.group())
|
|
|
|
if pos < len_str:
|
|
raise ValueError('Unused components in ISO string')
|
|
|
|
if components[0] == 24:
|
|
# Standard supports 00:00 and 24:00 as representations of midnight
|
|
if any(component != 0 for component in components[1:4]):
|
|
raise ValueError('Hour may only be 24 at 24:00:00.000')
|
|
|
|
return components
|
|
|
|
def _parse_tzstr(self, tzstr, zero_as_utc=True):
|
|
if tzstr == b'Z' or tzstr == b'z':
|
|
return tz.UTC
|
|
|
|
if len(tzstr) not in {3, 5, 6}:
|
|
raise ValueError('Time zone offset must be 1, 3, 5 or 6 characters')
|
|
|
|
if tzstr[0:1] == b'-':
|
|
mult = -1
|
|
elif tzstr[0:1] == b'+':
|
|
mult = 1
|
|
else:
|
|
raise ValueError('Time zone offset requires sign')
|
|
|
|
hours = int(tzstr[1:3])
|
|
if len(tzstr) == 3:
|
|
minutes = 0
|
|
else:
|
|
minutes = int(tzstr[(4 if tzstr[3:4] == self._TIME_SEP else 3):])
|
|
|
|
if zero_as_utc and hours == 0 and minutes == 0:
|
|
return tz.UTC
|
|
else:
|
|
if minutes > 59:
|
|
raise ValueError('Invalid minutes in time zone offset')
|
|
|
|
if hours > 23:
|
|
raise ValueError('Invalid hours in time zone offset')
|
|
|
|
return tz.tzoffset(None, mult * (hours * 60 + minutes) * 60)
|
|
|
|
|
|
DEFAULT_ISOPARSER = isoparser()
|
|
isoparse = DEFAULT_ISOPARSER.isoparse
|