mirror of
https://github.com/openswarm-ai/openswarm.git
synced 2026-09-30 13: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>
444 lines
16 KiB
Cython
444 lines
16 KiB
Cython
# iterparse -- event-driven parsing
|
|
|
|
cdef class iterparse:
|
|
"""iterparse(self, source, events=("end",), tag=None, \
|
|
attribute_defaults=False, dtd_validation=False, \
|
|
load_dtd=False, no_network=True, remove_blank_text=False, \
|
|
compact=True, resolve_entities='internal', remove_comments=False, \
|
|
remove_pis=False, strip_cdata=True, encoding=None, \
|
|
html=False, recover=None, huge_tree=False, schema=None, \
|
|
chunk_size=32768)
|
|
|
|
Incremental parser.
|
|
|
|
Parses XML into a tree and generates tuples (event, element) in a
|
|
SAX-like fashion. ``event`` is any of 'start', 'end', 'start-ns',
|
|
'end-ns'.
|
|
|
|
For 'start' and 'end', ``element`` is the Element that the parser just
|
|
found opening or closing. For 'start-ns', it is a tuple (prefix, URI) of
|
|
a new namespace declaration. For 'end-ns', it is simply None. Note that
|
|
all start and end events are guaranteed to be properly nested.
|
|
|
|
The keyword argument ``events`` specifies a sequence of event type names
|
|
that should be generated. By default, only 'end' events will be
|
|
generated.
|
|
|
|
The additional ``tag`` argument restricts the 'start' and 'end' events to
|
|
those elements that match the given tag. The ``tag`` argument can also be
|
|
a sequence of tags to allow matching more than one tag. By default,
|
|
events are generated for all elements. Note that the 'start-ns' and
|
|
'end-ns' events are not impacted by this restriction.
|
|
|
|
The other keyword arguments in the constructor are mainly based on the
|
|
libxml2 parser configuration. A DTD will also be loaded if validation or
|
|
attribute default values are requested.
|
|
|
|
Available boolean keyword arguments:
|
|
- attribute_defaults: read default attributes from DTD
|
|
- dtd_validation: validate (if DTD is available)
|
|
- load_dtd: use DTD for parsing
|
|
- no_network: prevent network access for related files
|
|
- remove_blank_text: discard blank text nodes
|
|
- remove_comments: discard comments
|
|
- remove_pis: discard processing instructions
|
|
- strip_cdata: replace CDATA sections by normal text content (default:
|
|
True for XML, ignored otherwise)
|
|
- compact: safe memory for short text content (default: True)
|
|
- resolve_entities: replace entities by their text value
|
|
(default: 'internal' only; True before lxml 6.1)
|
|
- huge_tree: disable security restrictions and support very deep trees
|
|
and very long text content (only affects libxml2 2.7+)
|
|
- html: parse input as HTML (default: XML)
|
|
- recover: try hard to parse through broken input (default: True for HTML,
|
|
False otherwise)
|
|
|
|
Other keyword arguments:
|
|
- encoding: override the document encoding
|
|
- schema: an XMLSchema to validate against
|
|
- chunk_size: the number of bytes to read from the 'source' in one chunk
|
|
(default: 32768)
|
|
"""
|
|
cdef _FeedParser _parser
|
|
cdef object _tag
|
|
cdef object _events
|
|
cdef readonly object root
|
|
cdef object _source
|
|
cdef object _filename
|
|
cdef object _error
|
|
cdef object _chunk_size
|
|
cdef bint _close_source_after_read
|
|
|
|
def __init__(self, source, events=("end",), *, tag=None,
|
|
attribute_defaults=False, dtd_validation=False,
|
|
load_dtd=False, no_network=True, remove_blank_text=False,
|
|
compact=True, resolve_entities='internal', remove_comments=False,
|
|
remove_pis=False, strip_cdata=True, encoding=None,
|
|
html=False, recover=None, huge_tree=False, collect_ids=True,
|
|
XMLSchema schema=None, int chunk_size=32768):
|
|
if not hasattr(source, 'read'):
|
|
source = _getFSPathOrObject(source)
|
|
self._filename = source
|
|
self._source = open(source, 'rb')
|
|
self._close_source_after_read = True
|
|
else:
|
|
self._filename = _getFilenameForFile(source)
|
|
self._source = source
|
|
self._close_source_after_read = False
|
|
|
|
if recover is None:
|
|
recover = html
|
|
|
|
if html:
|
|
# make sure we're not looking for namespaces
|
|
events = [event for event in events
|
|
if event not in ('start-ns', 'end-ns')]
|
|
parser = HTMLPullParser(
|
|
events,
|
|
tag=tag,
|
|
recover=recover,
|
|
base_url=self._filename,
|
|
encoding=encoding,
|
|
remove_blank_text=remove_blank_text,
|
|
remove_comments=remove_comments,
|
|
remove_pis=remove_pis,
|
|
no_network=no_network,
|
|
target=None, # TODO
|
|
schema=schema,
|
|
compact=compact)
|
|
else:
|
|
parser = XMLPullParser(
|
|
events,
|
|
tag=tag,
|
|
recover=recover,
|
|
base_url=self._filename,
|
|
encoding=encoding,
|
|
attribute_defaults=attribute_defaults,
|
|
dtd_validation=dtd_validation,
|
|
load_dtd=load_dtd,
|
|
no_network=no_network,
|
|
schema=schema,
|
|
huge_tree=huge_tree,
|
|
remove_blank_text=remove_blank_text,
|
|
resolve_entities=resolve_entities,
|
|
remove_comments=remove_comments,
|
|
remove_pis=remove_pis,
|
|
strip_cdata=strip_cdata,
|
|
collect_ids=True,
|
|
target=None, # TODO
|
|
compact=compact)
|
|
|
|
self._chunk_size = chunk_size
|
|
self._events = parser.read_events()
|
|
self._parser = parser
|
|
|
|
@property
|
|
def error_log(self):
|
|
"""The error log of the last (or current) parser run.
|
|
"""
|
|
return self._parser.feed_error_log
|
|
|
|
@property
|
|
def resolvers(self):
|
|
"""The custom resolver registry of the last (or current) parser run.
|
|
"""
|
|
return self._parser.resolvers
|
|
|
|
@property
|
|
def version(self):
|
|
"""The version of the underlying XML parser."""
|
|
return self._parser.version
|
|
|
|
def set_element_class_lookup(self, ElementClassLookup lookup = None):
|
|
"""set_element_class_lookup(self, lookup = None)
|
|
|
|
Set a lookup scheme for element classes generated from this parser.
|
|
|
|
Reset it by passing None or nothing.
|
|
"""
|
|
self._parser.set_element_class_lookup(lookup)
|
|
|
|
def makeelement(self, _tag, attrib=None, nsmap=None, **_extra):
|
|
"""makeelement(self, _tag, attrib=None, nsmap=None, **_extra)
|
|
|
|
Creates a new element associated with this parser.
|
|
"""
|
|
self._parser.makeelement(
|
|
_tag, attrib=None, nsmap=None, **_extra)
|
|
|
|
@cython.final
|
|
cdef _close_source(self):
|
|
if self._source is None:
|
|
return
|
|
if not self._close_source_after_read:
|
|
self._source = None
|
|
return
|
|
try:
|
|
close = self._source.close
|
|
except AttributeError:
|
|
close = None
|
|
finally:
|
|
self._source = None
|
|
if close is not None:
|
|
close()
|
|
|
|
def __iter__(self):
|
|
return self
|
|
|
|
def __next__(self):
|
|
try:
|
|
return next(self._events)
|
|
except StopIteration:
|
|
pass
|
|
context = <_SaxParserContext>self._parser._getPushParserContext()
|
|
if self._source is not None:
|
|
done = False
|
|
while not done:
|
|
try:
|
|
done = self._read_more_events(context)
|
|
return next(self._events)
|
|
except StopIteration:
|
|
pass # no events yet
|
|
except Exception as e:
|
|
self._error = e
|
|
self._close_source()
|
|
try:
|
|
return next(self._events)
|
|
except StopIteration:
|
|
break
|
|
# nothing left to read or return
|
|
if self._error is not None:
|
|
error = self._error
|
|
self._error = None
|
|
raise error
|
|
if (context._validator is not None
|
|
and not context._validator.isvalid()):
|
|
_raiseParseError(context._c_ctxt, self._filename,
|
|
context._error_log)
|
|
# no errors => all done
|
|
raise StopIteration
|
|
|
|
@cython.final
|
|
cdef bint _read_more_events(self, _SaxParserContext context) except -123:
|
|
data = self._source.read(self._chunk_size)
|
|
if not isinstance(data, bytes):
|
|
self._close_source()
|
|
raise TypeError("reading file objects must return bytes objects")
|
|
if not data:
|
|
try:
|
|
self.root = self._parser.close()
|
|
finally:
|
|
self._close_source()
|
|
return True
|
|
self._parser.feed(data)
|
|
return False
|
|
|
|
|
|
cdef enum _IterwalkSkipStates:
|
|
IWSKIP_NEXT_IS_START
|
|
IWSKIP_SKIP_NEXT
|
|
IWSKIP_CAN_SKIP
|
|
IWSKIP_CANNOT_SKIP
|
|
|
|
|
|
cdef class iterwalk:
|
|
"""iterwalk(self, element_or_tree, events=("end",), tag=None)
|
|
|
|
A tree walker that generates events from an existing tree as if it
|
|
was parsing XML data with ``iterparse()``.
|
|
|
|
Just as for ``iterparse()``, the ``tag`` argument can be a single tag or a
|
|
sequence of tags.
|
|
|
|
After receiving a 'start' or 'start-ns' event, the children and
|
|
descendants of the current element can be excluded from iteration
|
|
by calling the ``skip_subtree()`` method.
|
|
"""
|
|
cdef _MultiTagMatcher _matcher
|
|
cdef list _node_stack
|
|
cdef list _events
|
|
cdef object _pop_event
|
|
cdef object _include_siblings
|
|
cdef int _index
|
|
cdef int _event_filter
|
|
cdef _IterwalkSkipStates _skip_state
|
|
|
|
def __init__(self, element_or_tree, events=("end",), tag=None):
|
|
cdef _Element root
|
|
cdef int ns_count
|
|
root = _rootNodeOrRaise(element_or_tree)
|
|
self._event_filter = _buildParseEventFilter(events)
|
|
if tag is None or tag == '*':
|
|
self._matcher = None
|
|
else:
|
|
self._matcher = _MultiTagMatcher.__new__(_MultiTagMatcher, tag)
|
|
self._node_stack = []
|
|
self._events = []
|
|
self._pop_event = self._events.pop
|
|
self._skip_state = IWSKIP_CANNOT_SKIP # ignore all skip requests by default
|
|
|
|
if self._event_filter:
|
|
self._index = 0
|
|
if self._matcher is not None and self._event_filter & PARSE_EVENT_FILTER_START:
|
|
self._matcher.cacheTags(root._doc)
|
|
|
|
# When processing an ElementTree, add events for the preceding comments/PIs.
|
|
if self._event_filter & (PARSE_EVENT_FILTER_COMMENT | PARSE_EVENT_FILTER_PI):
|
|
if isinstance(element_or_tree, _ElementTree):
|
|
self._include_siblings = root
|
|
for elem in list(root.itersiblings(preceding=True))[::-1]:
|
|
if self._event_filter & PARSE_EVENT_FILTER_COMMENT and elem.tag is Comment:
|
|
self._events.append(('comment', elem))
|
|
elif self._event_filter & PARSE_EVENT_FILTER_PI and elem.tag is PI:
|
|
self._events.append(('pi', elem))
|
|
|
|
ns_count = self._start_node(root)
|
|
self._node_stack.append( (root, ns_count) )
|
|
else:
|
|
self._index = -1
|
|
|
|
def __iter__(self):
|
|
return self
|
|
|
|
def __next__(self):
|
|
cdef xmlNode* c_child
|
|
cdef _Element node
|
|
cdef _Element next_node
|
|
cdef int ns_count = 0
|
|
if self._events:
|
|
return self._next_event()
|
|
if self._matcher is not None and self._index >= 0:
|
|
node = self._node_stack[self._index][0]
|
|
self._matcher.cacheTags(node._doc)
|
|
|
|
# find next node
|
|
while self._index >= 0:
|
|
node = self._node_stack[self._index][0]
|
|
|
|
if self._skip_state == IWSKIP_SKIP_NEXT:
|
|
c_child = NULL
|
|
else:
|
|
c_child = self._process_non_elements(
|
|
node._doc, _findChildForwards(node._c_node, 0))
|
|
self._skip_state = IWSKIP_CANNOT_SKIP
|
|
|
|
while c_child is NULL:
|
|
# back off through parents
|
|
self._index -= 1
|
|
node = self._end_node()
|
|
if self._index < 0:
|
|
break
|
|
c_child = self._process_non_elements(
|
|
node._doc, _nextElement(node._c_node))
|
|
|
|
if c_child is not NULL:
|
|
next_node = _elementFactory(node._doc, c_child)
|
|
if self._event_filter & (PARSE_EVENT_FILTER_START |
|
|
PARSE_EVENT_FILTER_START_NS):
|
|
ns_count = self._start_node(next_node)
|
|
elif self._event_filter & PARSE_EVENT_FILTER_END_NS:
|
|
ns_count = _countNsDefs(next_node._c_node)
|
|
self._node_stack.append( (next_node, ns_count) )
|
|
self._index += 1
|
|
if self._events:
|
|
return self._next_event()
|
|
|
|
if self._include_siblings is not None:
|
|
node, self._include_siblings = self._include_siblings, None
|
|
self._process_non_elements(node._doc, _nextElement(node._c_node))
|
|
if self._events:
|
|
return self._next_event()
|
|
|
|
raise StopIteration
|
|
|
|
@cython.final
|
|
cdef xmlNode* _process_non_elements(self, _Document doc, xmlNode* c_node):
|
|
while c_node is not NULL and c_node.type != tree.XML_ELEMENT_NODE:
|
|
if c_node.type == tree.XML_COMMENT_NODE:
|
|
if self._event_filter & PARSE_EVENT_FILTER_COMMENT:
|
|
self._events.append(
|
|
("comment", _elementFactory(doc, c_node)))
|
|
c_node = _nextElement(c_node)
|
|
elif c_node.type == tree.XML_PI_NODE:
|
|
if self._event_filter & PARSE_EVENT_FILTER_PI:
|
|
self._events.append(
|
|
("pi", _elementFactory(doc, c_node)))
|
|
c_node = _nextElement(c_node)
|
|
else:
|
|
break
|
|
return c_node
|
|
|
|
@cython.final
|
|
cdef _next_event(self):
|
|
if self._skip_state == IWSKIP_NEXT_IS_START:
|
|
if self._events[0][0] in ('start', 'start-ns'):
|
|
self._skip_state = IWSKIP_CAN_SKIP
|
|
return self._pop_event(0)
|
|
|
|
def skip_subtree(self):
|
|
"""Prevent descending into the current subtree.
|
|
Instead, the next returned event will be the 'end' event of the current element
|
|
(if included), ignoring any children or descendants.
|
|
|
|
This has no effect right after an 'end' or 'end-ns' event.
|
|
"""
|
|
if self._skip_state == IWSKIP_CAN_SKIP:
|
|
self._skip_state = IWSKIP_SKIP_NEXT
|
|
|
|
@cython.final
|
|
cdef int _start_node(self, _Element node) except -1:
|
|
cdef int ns_count
|
|
if self._event_filter & PARSE_EVENT_FILTER_START_NS:
|
|
ns_count = _appendStartNsEvents(node._c_node, self._events)
|
|
if self._events:
|
|
self._skip_state = IWSKIP_NEXT_IS_START
|
|
elif self._event_filter & PARSE_EVENT_FILTER_END_NS:
|
|
ns_count = _countNsDefs(node._c_node)
|
|
else:
|
|
ns_count = 0
|
|
if self._event_filter & PARSE_EVENT_FILTER_START:
|
|
if self._matcher is None or self._matcher.matches(node._c_node):
|
|
self._events.append( ("start", node) )
|
|
self._skip_state = IWSKIP_NEXT_IS_START
|
|
return ns_count
|
|
|
|
@cython.final
|
|
cdef _Element _end_node(self):
|
|
cdef _Element node
|
|
cdef int i, ns_count
|
|
node, ns_count = self._node_stack.pop()
|
|
if self._event_filter & PARSE_EVENT_FILTER_END:
|
|
if self._matcher is None or self._matcher.matches(node._c_node):
|
|
self._events.append( ("end", node) )
|
|
if self._event_filter & PARSE_EVENT_FILTER_END_NS and ns_count:
|
|
event = ("end-ns", None)
|
|
for i in range(ns_count):
|
|
self._events.append(event)
|
|
return node
|
|
|
|
|
|
cdef int _countNsDefs(xmlNode* c_node) noexcept:
|
|
cdef xmlNs* c_ns
|
|
cdef int count
|
|
count = 0
|
|
c_ns = c_node.nsDef
|
|
while c_ns is not NULL:
|
|
count += (c_ns.href is not NULL)
|
|
c_ns = c_ns.next
|
|
return count
|
|
|
|
|
|
cdef int _appendStartNsEvents(xmlNode* c_node, list event_list) except -1:
|
|
cdef xmlNs* c_ns
|
|
cdef int count
|
|
count = 0
|
|
c_ns = c_node.nsDef
|
|
while c_ns is not NULL:
|
|
if c_ns.href:
|
|
ns_tuple = (funicodeOrEmpty(c_ns.prefix),
|
|
funicode(c_ns.href))
|
|
event_list.append( ("start-ns", ns_tuple) )
|
|
count += 1
|
|
c_ns = c_ns.next
|
|
return count
|