mirror of
https://github.com/openswarm-ai/openswarm.git
synced 2026-09-22 17:44: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>
469 lines
16 KiB
Python
469 lines
16 KiB
Python
# mypy: allow-untyped-defs
|
|
"""Add backward compatibility support for the legacy py path type."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import dataclasses
|
|
from pathlib import Path
|
|
import shlex
|
|
import subprocess
|
|
from typing import Final
|
|
from typing import final
|
|
from typing import TYPE_CHECKING
|
|
|
|
from iniconfig import SectionWrapper
|
|
|
|
from _pytest.cacheprovider import Cache
|
|
from _pytest.compat import LEGACY_PATH
|
|
from _pytest.compat import legacy_path
|
|
from _pytest.config import Config
|
|
from _pytest.config import hookimpl
|
|
from _pytest.config import PytestPluginManager
|
|
from _pytest.deprecated import check_ispytest
|
|
from _pytest.fixtures import fixture
|
|
from _pytest.fixtures import FixtureRequest
|
|
from _pytest.main import Session
|
|
from _pytest.monkeypatch import MonkeyPatch
|
|
from _pytest.nodes import Collector
|
|
from _pytest.nodes import Item
|
|
from _pytest.nodes import Node
|
|
from _pytest.pytester import HookRecorder
|
|
from _pytest.pytester import Pytester
|
|
from _pytest.pytester import RunResult
|
|
from _pytest.terminal import TerminalReporter
|
|
from _pytest.tmpdir import TempPathFactory
|
|
|
|
|
|
if TYPE_CHECKING:
|
|
import pexpect
|
|
|
|
|
|
@final
|
|
class Testdir:
|
|
"""
|
|
Similar to :class:`Pytester`, but this class works with legacy legacy_path objects instead.
|
|
|
|
All methods just forward to an internal :class:`Pytester` instance, converting results
|
|
to `legacy_path` objects as necessary.
|
|
"""
|
|
|
|
__test__ = False
|
|
|
|
CLOSE_STDIN: Final = Pytester.CLOSE_STDIN
|
|
TimeoutExpired: Final = Pytester.TimeoutExpired
|
|
|
|
def __init__(self, pytester: Pytester, *, _ispytest: bool = False) -> None:
|
|
check_ispytest(_ispytest)
|
|
self._pytester = pytester
|
|
|
|
@property
|
|
def tmpdir(self) -> LEGACY_PATH:
|
|
"""Temporary directory where tests are executed."""
|
|
return legacy_path(self._pytester.path)
|
|
|
|
@property
|
|
def test_tmproot(self) -> LEGACY_PATH:
|
|
return legacy_path(self._pytester._test_tmproot)
|
|
|
|
@property
|
|
def request(self):
|
|
return self._pytester._request
|
|
|
|
@property
|
|
def plugins(self):
|
|
return self._pytester.plugins
|
|
|
|
@plugins.setter
|
|
def plugins(self, plugins):
|
|
self._pytester.plugins = plugins
|
|
|
|
@property
|
|
def monkeypatch(self) -> MonkeyPatch:
|
|
return self._pytester._monkeypatch
|
|
|
|
def make_hook_recorder(self, pluginmanager) -> HookRecorder:
|
|
"""See :meth:`Pytester.make_hook_recorder`."""
|
|
return self._pytester.make_hook_recorder(pluginmanager)
|
|
|
|
def chdir(self) -> None:
|
|
"""See :meth:`Pytester.chdir`."""
|
|
return self._pytester.chdir()
|
|
|
|
def finalize(self) -> None:
|
|
return self._pytester._finalize()
|
|
|
|
def makefile(self, ext, *args, **kwargs) -> LEGACY_PATH:
|
|
"""See :meth:`Pytester.makefile`."""
|
|
if ext and not ext.startswith("."):
|
|
# pytester.makefile is going to throw a ValueError in a way that
|
|
# testdir.makefile did not, because
|
|
# pathlib.Path is stricter suffixes than py.path
|
|
# This ext arguments is likely user error, but since testdir has
|
|
# allowed this, we will prepend "." as a workaround to avoid breaking
|
|
# testdir usage that worked before
|
|
ext = "." + ext
|
|
return legacy_path(self._pytester.makefile(ext, *args, **kwargs))
|
|
|
|
def makeconftest(self, source) -> LEGACY_PATH:
|
|
"""See :meth:`Pytester.makeconftest`."""
|
|
return legacy_path(self._pytester.makeconftest(source))
|
|
|
|
def makeini(self, source) -> LEGACY_PATH:
|
|
"""See :meth:`Pytester.makeini`."""
|
|
return legacy_path(self._pytester.makeini(source))
|
|
|
|
def getinicfg(self, source: str) -> SectionWrapper:
|
|
"""See :meth:`Pytester.getinicfg`."""
|
|
return self._pytester.getinicfg(source)
|
|
|
|
def makepyprojecttoml(self, source) -> LEGACY_PATH:
|
|
"""See :meth:`Pytester.makepyprojecttoml`."""
|
|
return legacy_path(self._pytester.makepyprojecttoml(source))
|
|
|
|
def makepyfile(self, *args, **kwargs) -> LEGACY_PATH:
|
|
"""See :meth:`Pytester.makepyfile`."""
|
|
return legacy_path(self._pytester.makepyfile(*args, **kwargs))
|
|
|
|
def maketxtfile(self, *args, **kwargs) -> LEGACY_PATH:
|
|
"""See :meth:`Pytester.maketxtfile`."""
|
|
return legacy_path(self._pytester.maketxtfile(*args, **kwargs))
|
|
|
|
def syspathinsert(self, path=None) -> None:
|
|
"""See :meth:`Pytester.syspathinsert`."""
|
|
return self._pytester.syspathinsert(path)
|
|
|
|
def mkdir(self, name) -> LEGACY_PATH:
|
|
"""See :meth:`Pytester.mkdir`."""
|
|
return legacy_path(self._pytester.mkdir(name))
|
|
|
|
def mkpydir(self, name) -> LEGACY_PATH:
|
|
"""See :meth:`Pytester.mkpydir`."""
|
|
return legacy_path(self._pytester.mkpydir(name))
|
|
|
|
def copy_example(self, name=None) -> LEGACY_PATH:
|
|
"""See :meth:`Pytester.copy_example`."""
|
|
return legacy_path(self._pytester.copy_example(name))
|
|
|
|
def getnode(self, config: Config, arg) -> Item | Collector | None:
|
|
"""See :meth:`Pytester.getnode`."""
|
|
return self._pytester.getnode(config, arg)
|
|
|
|
def getpathnode(self, path):
|
|
"""See :meth:`Pytester.getpathnode`."""
|
|
return self._pytester.getpathnode(path)
|
|
|
|
def genitems(self, colitems: list[Item | Collector]) -> list[Item]:
|
|
"""See :meth:`Pytester.genitems`."""
|
|
return self._pytester.genitems(colitems)
|
|
|
|
def runitem(self, source):
|
|
"""See :meth:`Pytester.runitem`."""
|
|
return self._pytester.runitem(source)
|
|
|
|
def inline_runsource(self, source, *cmdlineargs):
|
|
"""See :meth:`Pytester.inline_runsource`."""
|
|
return self._pytester.inline_runsource(source, *cmdlineargs)
|
|
|
|
def inline_genitems(self, *args):
|
|
"""See :meth:`Pytester.inline_genitems`."""
|
|
return self._pytester.inline_genitems(*args)
|
|
|
|
def inline_run(self, *args, plugins=(), no_reraise_ctrlc: bool = False):
|
|
"""See :meth:`Pytester.inline_run`."""
|
|
return self._pytester.inline_run(
|
|
*args, plugins=plugins, no_reraise_ctrlc=no_reraise_ctrlc
|
|
)
|
|
|
|
def runpytest_inprocess(self, *args, **kwargs) -> RunResult:
|
|
"""See :meth:`Pytester.runpytest_inprocess`."""
|
|
return self._pytester.runpytest_inprocess(*args, **kwargs)
|
|
|
|
def runpytest(self, *args, **kwargs) -> RunResult:
|
|
"""See :meth:`Pytester.runpytest`."""
|
|
return self._pytester.runpytest(*args, **kwargs)
|
|
|
|
def parseconfig(self, *args) -> Config:
|
|
"""See :meth:`Pytester.parseconfig`."""
|
|
return self._pytester.parseconfig(*args)
|
|
|
|
def parseconfigure(self, *args) -> Config:
|
|
"""See :meth:`Pytester.parseconfigure`."""
|
|
return self._pytester.parseconfigure(*args)
|
|
|
|
def getitem(self, source, funcname="test_func"):
|
|
"""See :meth:`Pytester.getitem`."""
|
|
return self._pytester.getitem(source, funcname)
|
|
|
|
def getitems(self, source):
|
|
"""See :meth:`Pytester.getitems`."""
|
|
return self._pytester.getitems(source)
|
|
|
|
def getmodulecol(self, source, configargs=(), withinit=False):
|
|
"""See :meth:`Pytester.getmodulecol`."""
|
|
return self._pytester.getmodulecol(
|
|
source, configargs=configargs, withinit=withinit
|
|
)
|
|
|
|
def collect_by_name(self, modcol: Collector, name: str) -> Item | Collector | None:
|
|
"""See :meth:`Pytester.collect_by_name`."""
|
|
return self._pytester.collect_by_name(modcol, name)
|
|
|
|
def popen(
|
|
self,
|
|
cmdargs,
|
|
stdout=subprocess.PIPE,
|
|
stderr=subprocess.PIPE,
|
|
stdin=CLOSE_STDIN,
|
|
**kw,
|
|
):
|
|
"""See :meth:`Pytester.popen`."""
|
|
return self._pytester.popen(cmdargs, stdout, stderr, stdin, **kw)
|
|
|
|
def run(self, *cmdargs, timeout=None, stdin=CLOSE_STDIN) -> RunResult:
|
|
"""See :meth:`Pytester.run`."""
|
|
return self._pytester.run(*cmdargs, timeout=timeout, stdin=stdin)
|
|
|
|
def runpython(self, script) -> RunResult:
|
|
"""See :meth:`Pytester.runpython`."""
|
|
return self._pytester.runpython(script)
|
|
|
|
def runpython_c(self, command):
|
|
"""See :meth:`Pytester.runpython_c`."""
|
|
return self._pytester.runpython_c(command)
|
|
|
|
def runpytest_subprocess(self, *args, timeout=None) -> RunResult:
|
|
"""See :meth:`Pytester.runpytest_subprocess`."""
|
|
return self._pytester.runpytest_subprocess(*args, timeout=timeout)
|
|
|
|
def spawn_pytest(self, string: str, expect_timeout: float = 10.0) -> pexpect.spawn:
|
|
"""See :meth:`Pytester.spawn_pytest`."""
|
|
return self._pytester.spawn_pytest(string, expect_timeout=expect_timeout)
|
|
|
|
def spawn(self, cmd: str, expect_timeout: float = 10.0) -> pexpect.spawn:
|
|
"""See :meth:`Pytester.spawn`."""
|
|
return self._pytester.spawn(cmd, expect_timeout=expect_timeout)
|
|
|
|
def __repr__(self) -> str:
|
|
return f"<Testdir {self.tmpdir!r}>"
|
|
|
|
def __str__(self) -> str:
|
|
return str(self.tmpdir)
|
|
|
|
|
|
class LegacyTestdirPlugin:
|
|
@staticmethod
|
|
@fixture
|
|
def testdir(pytester: Pytester) -> Testdir:
|
|
"""
|
|
Identical to :fixture:`pytester`, and provides an instance whose methods return
|
|
legacy ``LEGACY_PATH`` objects instead when applicable.
|
|
|
|
New code should avoid using :fixture:`testdir` in favor of :fixture:`pytester`.
|
|
"""
|
|
return Testdir(pytester, _ispytest=True)
|
|
|
|
|
|
@final
|
|
@dataclasses.dataclass
|
|
class TempdirFactory:
|
|
"""Backward compatibility wrapper that implements ``py.path.local``
|
|
for :class:`TempPathFactory`.
|
|
|
|
.. note::
|
|
These days, it is preferred to use ``tmp_path_factory``.
|
|
|
|
:ref:`About the tmpdir and tmpdir_factory fixtures<tmpdir and tmpdir_factory>`.
|
|
|
|
"""
|
|
|
|
_tmppath_factory: TempPathFactory
|
|
|
|
def __init__(
|
|
self, tmppath_factory: TempPathFactory, *, _ispytest: bool = False
|
|
) -> None:
|
|
check_ispytest(_ispytest)
|
|
self._tmppath_factory = tmppath_factory
|
|
|
|
def mktemp(self, basename: str, numbered: bool = True) -> LEGACY_PATH:
|
|
"""Same as :meth:`TempPathFactory.mktemp`, but returns a ``py.path.local`` object."""
|
|
return legacy_path(self._tmppath_factory.mktemp(basename, numbered).resolve())
|
|
|
|
def getbasetemp(self) -> LEGACY_PATH:
|
|
"""Same as :meth:`TempPathFactory.getbasetemp`, but returns a ``py.path.local`` object."""
|
|
return legacy_path(self._tmppath_factory.getbasetemp().resolve())
|
|
|
|
|
|
class LegacyTmpdirPlugin:
|
|
@staticmethod
|
|
@fixture(scope="session")
|
|
def tmpdir_factory(request: FixtureRequest) -> TempdirFactory:
|
|
"""Return a :class:`pytest.TempdirFactory` instance for the test session."""
|
|
# Set dynamically by pytest_configure().
|
|
return request.config._tmpdirhandler # type: ignore
|
|
|
|
@staticmethod
|
|
@fixture
|
|
def tmpdir(tmp_path: Path) -> LEGACY_PATH:
|
|
"""Return a temporary directory (as `legacy_path`_ object)
|
|
which is unique to each test function invocation.
|
|
The temporary directory is created as a subdirectory
|
|
of the base temporary directory, with configurable retention,
|
|
as discussed in :ref:`temporary directory location and retention`.
|
|
|
|
.. note::
|
|
These days, it is preferred to use ``tmp_path``.
|
|
|
|
:ref:`About the tmpdir and tmpdir_factory fixtures<tmpdir and tmpdir_factory>`.
|
|
|
|
.. _legacy_path: https://py.readthedocs.io/en/latest/path.html
|
|
"""
|
|
return legacy_path(tmp_path)
|
|
|
|
|
|
def Cache_makedir(self: Cache, name: str) -> LEGACY_PATH:
|
|
"""Return a directory path object with the given name.
|
|
|
|
Same as :func:`mkdir`, but returns a legacy py path instance.
|
|
"""
|
|
return legacy_path(self.mkdir(name))
|
|
|
|
|
|
def FixtureRequest_fspath(self: FixtureRequest) -> LEGACY_PATH:
|
|
"""(deprecated) The file system path of the test module which collected this test."""
|
|
return legacy_path(self.path)
|
|
|
|
|
|
def TerminalReporter_startdir(self: TerminalReporter) -> LEGACY_PATH:
|
|
"""The directory from which pytest was invoked.
|
|
|
|
Prefer to use ``startpath`` which is a :class:`pathlib.Path`.
|
|
|
|
:type: LEGACY_PATH
|
|
"""
|
|
return legacy_path(self.startpath)
|
|
|
|
|
|
def Config_invocation_dir(self: Config) -> LEGACY_PATH:
|
|
"""The directory from which pytest was invoked.
|
|
|
|
Prefer to use :attr:`invocation_params.dir <InvocationParams.dir>`,
|
|
which is a :class:`pathlib.Path`.
|
|
|
|
:type: LEGACY_PATH
|
|
"""
|
|
return legacy_path(str(self.invocation_params.dir))
|
|
|
|
|
|
def Config_rootdir(self: Config) -> LEGACY_PATH:
|
|
"""The path to the :ref:`rootdir <rootdir>`.
|
|
|
|
Prefer to use :attr:`rootpath`, which is a :class:`pathlib.Path`.
|
|
|
|
:type: LEGACY_PATH
|
|
"""
|
|
return legacy_path(str(self.rootpath))
|
|
|
|
|
|
def Config_inifile(self: Config) -> LEGACY_PATH | None:
|
|
"""The path to the :ref:`configfile <configfiles>`.
|
|
|
|
Prefer to use :attr:`inipath`, which is a :class:`pathlib.Path`.
|
|
|
|
:type: Optional[LEGACY_PATH]
|
|
"""
|
|
return legacy_path(str(self.inipath)) if self.inipath else None
|
|
|
|
|
|
def Session_startdir(self: Session) -> LEGACY_PATH:
|
|
"""The path from which pytest was invoked.
|
|
|
|
Prefer to use ``startpath`` which is a :class:`pathlib.Path`.
|
|
|
|
:type: LEGACY_PATH
|
|
"""
|
|
return legacy_path(self.startpath)
|
|
|
|
|
|
def Config__getini_unknown_type(self, name: str, type: str, value: str | list[str]):
|
|
if type == "pathlist":
|
|
# TODO: This assert is probably not valid in all cases.
|
|
assert self.inipath is not None
|
|
dp = self.inipath.parent
|
|
input_values = shlex.split(value) if isinstance(value, str) else value
|
|
return [legacy_path(str(dp / x)) for x in input_values]
|
|
else:
|
|
raise ValueError(f"unknown configuration type: {type}", value)
|
|
|
|
|
|
def Node_fspath(self: Node) -> LEGACY_PATH:
|
|
"""(deprecated) returns a legacy_path copy of self.path"""
|
|
return legacy_path(self.path)
|
|
|
|
|
|
def Node_fspath_set(self: Node, value: LEGACY_PATH) -> None:
|
|
self.path = Path(value)
|
|
|
|
|
|
@hookimpl(tryfirst=True)
|
|
def pytest_load_initial_conftests(early_config: Config) -> None:
|
|
"""Monkeypatch legacy path attributes in several classes, as early as possible."""
|
|
mp = MonkeyPatch()
|
|
early_config.add_cleanup(mp.undo)
|
|
|
|
# Add Cache.makedir().
|
|
mp.setattr(Cache, "makedir", Cache_makedir, raising=False)
|
|
|
|
# Add FixtureRequest.fspath property.
|
|
mp.setattr(FixtureRequest, "fspath", property(FixtureRequest_fspath), raising=False)
|
|
|
|
# Add TerminalReporter.startdir property.
|
|
mp.setattr(
|
|
TerminalReporter, "startdir", property(TerminalReporter_startdir), raising=False
|
|
)
|
|
|
|
# Add Config.{invocation_dir,rootdir,inifile} properties.
|
|
mp.setattr(Config, "invocation_dir", property(Config_invocation_dir), raising=False)
|
|
mp.setattr(Config, "rootdir", property(Config_rootdir), raising=False)
|
|
mp.setattr(Config, "inifile", property(Config_inifile), raising=False)
|
|
|
|
# Add Session.startdir property.
|
|
mp.setattr(Session, "startdir", property(Session_startdir), raising=False)
|
|
|
|
# Add pathlist configuration type.
|
|
mp.setattr(Config, "_getini_unknown_type", Config__getini_unknown_type)
|
|
|
|
# Add Node.fspath property.
|
|
mp.setattr(Node, "fspath", property(Node_fspath, Node_fspath_set), raising=False)
|
|
|
|
|
|
@hookimpl
|
|
def pytest_configure(config: Config) -> None:
|
|
"""Installs the LegacyTmpdirPlugin if the ``tmpdir`` plugin is also installed."""
|
|
if config.pluginmanager.has_plugin("tmpdir"):
|
|
mp = MonkeyPatch()
|
|
config.add_cleanup(mp.undo)
|
|
# Create TmpdirFactory and attach it to the config object.
|
|
#
|
|
# This is to comply with existing plugins which expect the handler to be
|
|
# available at pytest_configure time, but ideally should be moved entirely
|
|
# to the tmpdir_factory session fixture.
|
|
try:
|
|
tmp_path_factory = config._tmp_path_factory # type: ignore[attr-defined]
|
|
except AttributeError:
|
|
# tmpdir plugin is blocked.
|
|
pass
|
|
else:
|
|
_tmpdirhandler = TempdirFactory(tmp_path_factory, _ispytest=True)
|
|
mp.setattr(config, "_tmpdirhandler", _tmpdirhandler, raising=False)
|
|
|
|
config.pluginmanager.register(LegacyTmpdirPlugin, "legacypath-tmpdir")
|
|
|
|
|
|
@hookimpl
|
|
def pytest_plugin_registered(plugin: object, manager: PytestPluginManager) -> None:
|
|
# pytester is not loaded by default and is commonly loaded from a conftest,
|
|
# so checking for it in `pytest_configure` is not enough.
|
|
is_pytester = plugin is manager.get_plugin("pytester")
|
|
if is_pytester and not manager.is_registered(LegacyTestdirPlugin):
|
|
manager.register(LegacyTestdirPlugin, "legacypath-pytester")
|