tasklite-engine 2.2.0__tar.gz → 2.2.1__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (69) hide show
  1. {tasklite_engine-2.2.0/tasklite_engine.egg-info → tasklite_engine-2.2.1}/PKG-INFO +2 -1
  2. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/pyproject.toml +1 -1
  3. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/tasklite/__init__.py +1 -1
  4. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/tasklite/engine/admission.py +8 -5
  5. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/tasklite/engine/completion.py +4 -3
  6. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/tasklite/engine/dispatch.py +12 -7
  7. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/tasklite/engine/governor.py +7 -2
  8. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/tasklite/engine/recovery.py +2 -2
  9. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/tasklite/engine/resource.py +5 -2
  10. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/tasklite/models/context.py +2 -1
  11. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/tasklite/utils/ipc.py +1 -1
  12. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/tasklite/wrappers/discovery.py +1 -1
  13. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1/tasklite_engine.egg-info}/PKG-INFO +2 -1
  14. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/tasklite_engine.egg-info/requires.txt +1 -0
  15. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/tests/test_packaging.py +1 -1
  16. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/LICENSE +0 -0
  17. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/README.md +0 -0
  18. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/setup.cfg +0 -0
  19. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/tasklite/backend/__init__.py +0 -0
  20. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/tasklite/backend/base.py +0 -0
  21. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/tasklite/backend/memory.py +0 -0
  22. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/tasklite/backend/sqlite_backend.py +0 -0
  23. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/tasklite/contrib/__init__.py +0 -0
  24. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/tasklite/engine/__init__.py +0 -0
  25. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/tasklite/engine/channel.py +0 -0
  26. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/tasklite/engine/config.py +0 -0
  27. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/tasklite/engine/errorclass.py +0 -0
  28. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/tasklite/engine/in_flight.py +0 -0
  29. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/tasklite/engine/ops.py +0 -0
  30. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/tasklite/engine/runtime.py +0 -0
  31. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/tasklite/engine/scheduler.py +0 -0
  32. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/tasklite/engine/selection.py +0 -0
  33. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/tasklite/engine/session.py +0 -0
  34. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/tasklite/engine/store.py +0 -0
  35. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/tasklite/engine/types.py +0 -0
  36. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/tasklite/engine/wait.py +0 -0
  37. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/tasklite/exceptions.py +0 -0
  38. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/tasklite/hooks.py +0 -0
  39. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/tasklite/models/__init__.py +0 -0
  40. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/tasklite/models/artifact.py +0 -0
  41. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/tasklite/models/attempt.py +0 -0
  42. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/tasklite/models/job.py +0 -0
  43. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/tasklite/models/state.py +0 -0
  44. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/tasklite/models/task.py +0 -0
  45. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/tasklite/models/trigger.py +0 -0
  46. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/tasklite/pipeline.py +0 -0
  47. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/tasklite/py.typed +0 -0
  48. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/tasklite/selection.py +0 -0
  49. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/tasklite/testing.py +0 -0
  50. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/tasklite/triggers.py +0 -0
  51. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/tasklite/utils/__init__.py +0 -0
  52. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/tasklite/utils/artifact.py +0 -0
  53. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/tasklite/utils/clock.py +0 -0
  54. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/tasklite/utils/encoding.py +0 -0
  55. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/tasklite/utils/jsonutil.py +0 -0
  56. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/tasklite/utils/lockfile.py +0 -0
  57. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/tasklite/wrappers/__init__.py +0 -0
  58. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/tasklite/wrappers/http.py +0 -0
  59. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/tasklite_engine.egg-info/SOURCES.txt +0 -0
  60. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/tasklite_engine.egg-info/dependency_links.txt +0 -0
  61. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/tasklite_engine.egg-info/top_level.txt +0 -0
  62. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/tests/test_encoding.py +0 -0
  63. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/tests/test_exceptions.py +0 -0
  64. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/tests/test_hooks.py +0 -0
  65. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/tests/test_jsonutil.py +0 -0
  66. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/tests/test_package_surface.py +0 -0
  67. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/tests/test_pipeline.py +0 -0
  68. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/tests/test_testing.py +0 -0
  69. {tasklite_engine-2.2.0 → tasklite_engine-2.2.1}/tests/test_trigger_contract.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: tasklite-engine
3
- Version: 2.2.0
3
+ Version: 2.2.1
4
4
  Summary: A lightweight task orchestration engine with zero external dependencies, process isolation, and ACID persistence
5
5
  License-Expression: MIT
6
6
  Project-URL: Homepage, https://github.com/CaptainLi321/tasklite
@@ -25,6 +25,7 @@ Requires-Dist: mutmut>=3.0; extra == "dev"
25
25
  Requires-Dist: pytest-timeout>=2.0; extra == "dev"
26
26
  Requires-Dist: pytest-cov>=4.0; extra == "dev"
27
27
  Requires-Dist: requests>=2.28; extra == "dev"
28
+ Requires-Dist: mypy>=1.0; extra == "dev"
28
29
  Dynamic: license-file
29
30
 
30
31
  # ⚡ TaskLite — 零依赖、进程隔离的轻量任务编排引擎
@@ -30,7 +30,7 @@ Homepage = "https://github.com/CaptainLi321/tasklite"
30
30
  Repository = "https://github.com/CaptainLi321/tasklite"
31
31
 
32
32
  [project.optional-dependencies]
33
- dev = ["pytest", "hypothesis>=6.0", "mutmut>=3.0", "pytest-timeout>=2.0", "pytest-cov>=4.0", "requests>=2.28"]
33
+ dev = ["pytest", "hypothesis>=6.0", "mutmut>=3.0", "pytest-timeout>=2.0", "pytest-cov>=4.0", "requests>=2.28", "mypy>=1.0"]
34
34
 
35
35
  [tool.setuptools.packages.find]
36
36
  include = ["tasklite", "tasklite.*"]
@@ -22,7 +22,7 @@
22
22
  """
23
23
  from __future__ import annotations
24
24
 
25
- __version__ = "2.2.0"
25
+ __version__ = "2.2.1"
26
26
 
27
27
  # ── 门面(六步调用契约的唯一入口)────────────────────────────────────
28
28
  from .pipeline import TaskLite
@@ -81,8 +81,11 @@ class TriggerRegistry:
81
81
  def normalize_job_snapshot(self, job_snapshot: dict, task_type: str) -> bool:
82
82
  """摄入时落实 Task 五项规格,显式资源键覆盖模板默认。"""
83
83
  task = self.tasks.get(task_type) if self.tasks is not None else None
84
- defaults = {
85
- "resources": dict(task.resources) if task else {},
84
+ merged_resources: dict[str, float] = (
85
+ dict(task.resources) if task and task.resources else {}
86
+ )
87
+ defaults: dict[str, Any] = {
88
+ "resources": merged_resources,
86
89
  "max_retries": task.max_retries if task else 3,
87
90
  "timeout_seconds": task.timeout_seconds if task else 3600,
88
91
  "timeout_is_transient": task.timeout_is_transient if task else False,
@@ -91,10 +94,10 @@ class TriggerRegistry:
91
94
  changed = False
92
95
  for key, value in defaults.items():
93
96
  if key == "resources":
94
- value.update(job_snapshot.get(key) or {})
95
- if value != job_snapshot.get(key):
97
+ merged_resources.update(job_snapshot.get(key) or {})
98
+ if merged_resources != job_snapshot.get(key):
96
99
  changed = True
97
- job_snapshot[key] = value
100
+ job_snapshot[key] = merged_resources
98
101
  elif job_snapshot.get(key) is None:
99
102
  job_snapshot[key] = value
100
103
  changed = True
@@ -213,10 +213,11 @@ class CompletionMachine:
213
213
  transient_kind = result.transient_kind
214
214
  is_transient = transient_kind is not None
215
215
  retry_error = result.retry_error
216
+ max_retries = job.max_retries if job.max_retries is not None else 3
216
217
 
217
- if not is_transient and job.attempt_no > job.max_retries:
218
+ if not is_transient and job.attempt_no > max_retries:
218
219
  logger.error(
219
- f"FAIL: {uid} exceeded max retries ({job.max_retries}). "
220
+ f"FAIL: {uid} exceeded max retries ({max_retries}). "
220
221
  f"Sent to failure archive."
221
222
  )
222
223
  failure_metadata: dict[str, Any] = {"error_message": ERR_MAX_RETRIES}
@@ -236,7 +237,7 @@ class CompletionMachine:
236
237
  job, job_snapshot, retry_error=retry_error, is_transient=is_transient
237
238
  )
238
239
  next_attempt = job.attempt_no if is_transient else job.attempt_no + 1
239
- logger.info(f"RETRY: {uid} (attempt {next_attempt}/{job.max_retries + 1})")
240
+ logger.info(f"RETRY: {uid} (attempt {next_attempt}/{max_retries + 1})")
240
241
  self._store.apply_retry(
241
242
  uid,
242
243
  job_snapshot,
@@ -217,7 +217,7 @@ class DispatchMachine:
217
217
  )
218
218
  if not should_run:
219
219
  job_snapshot = store.state.pop_job(sched.runnable_idx)
220
- attempt_id: int | None = None
220
+ attempt_id = None
221
221
  try:
222
222
  attempt_id, _ = self._open_attempt(job)
223
223
  except Exception as e:
@@ -239,7 +239,7 @@ class DispatchMachine:
239
239
  else:
240
240
  job_snapshot = store.state.pop_job(sched.runnable_idx)
241
241
 
242
- attempt_id: int | None = None
242
+ attempt_id = None
243
243
  try:
244
244
  attempt_id, execution_id = self._open_attempt(job)
245
245
  except Exception as e:
@@ -279,11 +279,14 @@ class DispatchMachine:
279
279
  # 原样穿透交运行循环崩溃网统一收尾。
280
280
  raise
281
281
  except KeyboardInterrupt:
282
- return self._handle_interrupt(job_uid, job_snapshot)
282
+ self._handle_interrupt(job_uid, job_snapshot)
283
+ return None
283
284
  except RateLimitUnavailable as e:
284
- return self._handle_rate_limit_defer(job_uid, job_snapshot, attempt_id, e)
285
+ self._handle_rate_limit_defer(job_uid, job_snapshot, attempt_id, e)
286
+ return None
285
287
  except Exception as e:
286
- return self._handle_dispatch_failure(job_uid, job_snapshot, attempt_id, e)
288
+ self._handle_dispatch_failure(job_uid, job_snapshot, attempt_id, e)
289
+ return None
287
290
 
288
291
  # ── 预检关卡 ──────────────────────────────────────────────────────
289
292
 
@@ -291,7 +294,7 @@ class DispatchMachine:
291
294
  self,
292
295
  job_uid: str,
293
296
  job_snapshot: dict,
294
- pending_dep_failure: str,
297
+ pending_dep_failure: str | None,
295
298
  *,
296
299
  attempt_id: int | None = None,
297
300
  ) -> bool:
@@ -437,7 +440,9 @@ class DispatchMachine:
437
440
  job_context=ctx,
438
441
  execution_id=execution_id,
439
442
  ipc_dir=self._ipc_dir,
440
- timeout_seconds=job.timeout_seconds,
443
+ timeout_seconds=float(
444
+ job.timeout_seconds if job.timeout_seconds is not None else 3600.0
445
+ ),
441
446
  ))
442
447
  lease.claim()
443
448
 
@@ -47,8 +47,11 @@ class ScanCache(Protocol):
47
47
  class BulkFailureOutcome(Protocol):
48
48
  """批量失败转移结果的鸭子形状(失败与级联 UID 列表)。"""
49
49
 
50
- failed_uids: list[str]
51
- cascaded_uids: list[str]
50
+ @property
51
+ def failed_uids(self) -> list[str]: ...
52
+
53
+ @property
54
+ def cascaded_uids(self) -> list[str]: ...
52
55
 
53
56
 
54
57
  class ArbitrationStore(Protocol):
@@ -234,6 +237,7 @@ class DeadlockGovernor:
234
237
  if uid in missing_uids:
235
238
  continue
236
239
  try:
240
+ job: JobFacts | Job
237
241
  if scheduler is not None:
238
242
  job = scheduler.cached_job(jd)
239
243
  else:
@@ -345,6 +349,7 @@ class DeadlockGovernor:
345
349
  )
346
350
 
347
351
  if facts.waiting_for_dependency and store.state is not None:
352
+ cycle_uids: Sequence[str]
348
353
  if selection_active:
349
354
  cycle_uids = (
350
355
  selection_standstill.cycle_uids
@@ -37,7 +37,7 @@ if TYPE_CHECKING:
37
37
  """恢复编排消费的状态仓库契约(StateStore 自动满足)。
38
38
 
39
39
  ``backend`` 是持久化后端活引用(加载/修复/差量落盘不经 facade
40
- 中转);``queue`` 为内存队列视图(崩溃安全保存的合并侧);
40
+ 中转);``state`` 为内存运行态(崩溃安全保存的队列合并侧);
41
41
  ``set_state`` 为装载修复结果的落位口。
42
42
  """
43
43
 
@@ -45,7 +45,7 @@ if TYPE_CHECKING:
45
45
  def backend(self) -> AbstractStateBackend: ...
46
46
 
47
47
  @property
48
- def queue(self) -> list[dict[str, Any]]: ...
48
+ def state(self) -> PipelineState: ...
49
49
 
50
50
  def set_state(self, state: PipelineState | None) -> None: ...
51
51
 
@@ -16,6 +16,7 @@ from enum import Enum
16
16
  from typing import Any
17
17
 
18
18
  from ..models.job import WORKER_RESOURCE
19
+ from ..models.task import TaskRegistry
19
20
  from ..utils.jsonutil import dumps
20
21
 
21
22
  logger = logging.getLogger("tasklite")
@@ -416,14 +417,16 @@ class ResourceManager(MutableMapping[str, Resource]):
416
417
  def __init__(
417
418
  self,
418
419
  resources: Mapping[str, Resource] | None = None,
419
- tasks: Mapping[str, Any] | None = None,
420
+ tasks: TaskRegistry | Mapping[str, Any] | None = None,
420
421
  ) -> None:
421
422
  self._resources: dict[str, Resource] = (
422
423
  dict(resources) if resources is not None else {}
423
424
  )
424
425
  # task_type → Task 规格映射(duck-typing 读 resources;
425
426
  # 规格校验单点在 models/task.py 的 Task 构造期)
426
- self.tasks: Mapping[str, Any] = tasks if tasks is not None else {}
427
+ self.tasks: TaskRegistry | Mapping[str, Any] = (
428
+ tasks if tasks is not None else {}
429
+ )
427
430
 
428
431
  def __getitem__(self, key: str) -> Resource:
429
432
  return self._resources[key]
@@ -12,6 +12,7 @@ import logging
12
12
  import math
13
13
  import os
14
14
  import stat
15
+ from collections.abc import Sequence
15
16
  from pathlib import Path
16
17
 
17
18
  from ..exceptions import _ArtifactIOError
@@ -32,7 +33,7 @@ class JobContext:
32
33
  success_job_uids: set | frozenset,
33
34
  failed_job_uids: set | frozenset,
34
35
  cursors: dict[str, str],
35
- output_roots: Path | None = None,
36
+ output_roots: str | Path | Sequence[str | Path] | None = None,
36
37
  ipc_dir: str | None = None,
37
38
  transient_registry: tuple[type[BaseException], ...] = (),
38
39
  fatal_exceptions: tuple[type[BaseException], ...] | None = None,
@@ -469,7 +469,7 @@ class ArtifactJournal:
469
469
  @staticmethod
470
470
  def resolve_and_validate_path(
471
471
  raw_path: str | Path,
472
- output_roots: Path | Sequence[Path] | None = None,
472
+ output_roots: str | Path | Sequence[str | Path] | None = None,
473
473
  *,
474
474
  sandbox: bool = True,
475
475
  ) -> str:
@@ -495,7 +495,7 @@ class DiscoveryHandler:
495
495
  f"Discovery full scan: {len(missing)} previously-seen "
496
496
  f"content(s) not found this run (deleted on source?)."
497
497
  )
498
- self.on_missing(job, ctx, missing)
498
+ on_missing(job, ctx, missing)
499
499
  except Exception as e:
500
500
  logger.error(f"Discovery: on_missing callback failed: {e}")
501
501
 
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: tasklite-engine
3
- Version: 2.2.0
3
+ Version: 2.2.1
4
4
  Summary: A lightweight task orchestration engine with zero external dependencies, process isolation, and ACID persistence
5
5
  License-Expression: MIT
6
6
  Project-URL: Homepage, https://github.com/CaptainLi321/tasklite
@@ -25,6 +25,7 @@ Requires-Dist: mutmut>=3.0; extra == "dev"
25
25
  Requires-Dist: pytest-timeout>=2.0; extra == "dev"
26
26
  Requires-Dist: pytest-cov>=4.0; extra == "dev"
27
27
  Requires-Dist: requests>=2.28; extra == "dev"
28
+ Requires-Dist: mypy>=1.0; extra == "dev"
28
29
  Dynamic: license-file
29
30
 
30
31
  # ⚡ TaskLite — 零依赖、进程隔离的轻量任务编排引擎
@@ -6,3 +6,4 @@ mutmut>=3.0
6
6
  pytest-timeout>=2.0
7
7
  pytest-cov>=4.0
8
8
  requests>=2.28
9
+ mypy>=1.0
@@ -36,7 +36,7 @@ def test_license_expression_excludes_license_classifier():
36
36
  def test_runtime_version_matches_naming_contract():
37
37
  import tasklite
38
38
 
39
- assert tasklite.__version__ == "2.2.0"
39
+ assert tasklite.__version__ == "2.2.1"
40
40
  assert _load_pyproject()["tool"]["setuptools"]["dynamic"]["version"] == {
41
41
  "attr": "tasklite.__version__"
42
42
  }
File without changes