explosion/spaCy
1
1
Fork 0
mirror of https://github.com/explosion/spaCy.git synced 2025-08-13 08:34:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Mypy corrections

Browse Source
This commit is contained in:
richardpaulhudson 2022-05-09 19:03:57 +02:00
parent 12e86004c8
commit e3b4ee7b15
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spacy/cli/project/pull.py
View File

@ -1,3 +1,4 @@
import multiprocessing
from pathlib import Path from pathlib import Path
from wasabi import msg from wasabi import msg
from .remote_storage import RemoteStorage from .remote_storage import RemoteStorage
@ -37,6 +38,7 @@ def project_pull(project_dir: Path, remote: str, *, verbose: bool = False):
# We use a while loop here because we don't know how the commands # We use a while loop here because we don't know how the commands
# will be ordered. A command might need dependencies from one that's later # will be ordered. A command might need dependencies from one that's later
# in the list. # in the list.
mult_group_mutex = multiprocessing.Lock()
while commands: while commands:
for i, cmd in enumerate(list(commands)): for i, cmd in enumerate(list(commands)):
logger.debug(f"CMD: {cmd['name']}.") logger.debug(f"CMD: {cmd['name']}.")
@ -52,7 +54,7 @@ def project_pull(project_dir: Path, remote: str, *, verbose: bool = False):
out_locs = [project_dir / out for out in cmd.get("outputs", [])] out_locs = [project_dir / out for out in cmd.get("outputs", [])]
if all(loc.exists() for loc in out_locs): if all(loc.exists() for loc in out_locs):
update_lockfile(project_dir, cmd) update_lockfile(project_dir, cmd, mult_group_mutex=mult_group_mutex)
# We remove the command from the list here, and break, so that # We remove the command from the list here, and break, so that
# we iterate over the loop again. # we iterate over the loop again.
commands.pop(i) commands.pop(i)

17
spacy/cli/project/run.py
View File

@ -1,6 +1,7 @@
from typing import Optional, List, Dict, Sequence, Any, Iterable, cast from typing import Optional, List, Dict, Sequence, Any, Iterable, cast
from pathlib import Path from pathlib import Path
from multiprocessing import Process, Lock from multiprocessing import Process, Lock
from multiprocessing.synchronize import Lock as Lock_t
from wasabi import msg from wasabi import msg
from wasabi.util import locale_escape from wasabi.util import locale_escape
import sys import sys
@ -51,7 +52,7 @@ def project_run(
force: bool = False, force: bool = False,
dry: bool = False, dry: bool = False,
capture: bool = False, capture: bool = False,
mult_group_mutex: Optional[Lock] = None, mult_group_mutex: Optional[Lock_t] = None,
) -> None: ) -> None:
"""Run a named script defined in the project.yml. If the script is part """Run a named script defined in the project.yml. If the script is part
of the default pipeline (defined in the "run" section), DVC is used to of the default pipeline (defined in the "run" section), DVC is used to
@ -89,7 +90,8 @@ def project_run(
mult_group_mutex=mult_group_mutex, mult_group_mutex=mult_group_mutex,
) )
else: else:
processes = [Process( processes = [
Process(
target=project_run, target=project_run,
args=(project_dir, cmd), args=(project_dir, cmd),
kwargs={ kwargs={
@ -98,7 +100,10 @@ def project_run(
"dry": dry, "dry": dry,
"capture": capture, "capture": capture,
"mult_group_mutex": mult_group_mutex, "mult_group_mutex": mult_group_mutex,
}) for cmd in cmdOrMultiprocessingGroup] },
)
for cmd in cmdOrMultiprocessingGroup
]
for process in processes: for process in processes:
process.start() process.start()
for process in processes: for process in processes:
@ -238,7 +243,7 @@ def check_rerun(
*, *,
check_spacy_version: bool = True, check_spacy_version: bool = True,
check_spacy_commit: bool = False, check_spacy_commit: bool = False,
mult_group_mutex: Lock, mult_group_mutex: Lock_t,
) -> bool: ) -> bool:
"""Check if a command should be rerun because its settings or inputs/outputs """Check if a command should be rerun because its settings or inputs/outputs
changed. changed.
@ -286,7 +291,9 @@ def check_rerun(
def update_lockfile( def update_lockfile(
project_dir: Path, command: Dict[str, Any], mult_group_mutex: Lock project_dir: Path,
command: Dict[str, Any],
mult_group_mutex: Lock_t,
) -> None: ) -> None:
"""Update the lockfile after running a command. Will create a lockfile if """Update the lockfile after running a command. Will create a lockfile if
it doesn't yet exist and will add an entry for the current command, its it doesn't yet exist and will add an entry for the current command, its