datashare-python 0.2.24__tar.gz → 0.2.26__tar.gz

{datashare_python-0.2.24 → datashare_python-0.2.26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datashare-python
-Version: 0.2.24
+Version: 0.2.26
 Summary: Manage Pythoœn tasks and local resources in Datashare
 Project-URL: Homepage, https://icij.github.io/datashare-python/
 Project-URL: Documentation, https://icij.github.io/datashare-python/
@@ -10,7 +10,6 @@ Author-email: Clément Doumouro <cdoumouro@icij.org>, Clément Doumouro <clement
 Requires-Python: <4,>=3.11
 Requires-Dist: aiohttp~=3.11.9
 Requires-Dist: alive-progress~=3.2.0
-Requires-Dist: datashare-worker-template[ml]~=0.1
 Requires-Dist: hatchling~=1.27.0
 Requires-Dist: icij-common[elasticsearch]~=0.8.2
 Requires-Dist: nest-asyncio~=1.6.0

{datashare_python-0.2.24 → datashare_python-0.2.26}/datashare_python/cli/worker.py

@@ -5,10 +5,9 @@ from typing import Annotated
 
 import typer
 import yaml
-from config import TemporalClientConfig
 from icij_common.pydantic_utils import safe_copy
 
-from datashare_python.config import WorkerConfig
+from datashare_python.config import TemporalClientConfig, WorkerConfig
 from datashare_python.discovery import discover, discover_activities, discover_workflows
 from datashare_python.worker import bootstrap_worker, create_worker_id
 
@@ -76,9 +75,13 @@ to the documentation to learn how to do so."""
 
 @worker_app.async_command(help=_START_WORKER_HELP)
 async def start(
-    workflows: Annotated[list[str], typer.Option(help=_START_WORKER_WORKFLOWS_HELP)],
-    activities: Annotated[list[str], typer.Option(help=_START_WORKER_ACTIVITIES_HELP)],
     queue: Annotated[str, typer.Option("--queue", "-q", help=_WORKER_QUEUE_HELP)],
+    workflows: Annotated[
+        list[str] | None, typer.Option(help=_START_WORKER_WORKFLOWS_HELP)
+    ] = None,
+    activities: Annotated[
+        list[str] | None, typer.Option(help=_START_WORKER_ACTIVITIES_HELP)
+    ] = None,
     dependencies: Annotated[
         str | None, typer.Option(help=_START_WORKER_DEPS_HELP)
     ] = None,
@@ -106,6 +109,9 @@ async def start(
             )
     else:
         bootstrap_config = WorkerConfig()
+    logger.info(
+        "starting worker with config: %s", bootstrap_config.model_dump_json(indent=2)
+    )
     temporal_override = dict()
     if temporal_address is not None:
         temporal_override["host"] = temporal_address

{datashare_python-0.2.24 → datashare_python-0.2.26}/datashare_python/discovery.py

@@ -54,8 +54,15 @@ def discover(
                     f" {', '.join(act_names)}"
                 )
     if not acts and not wfs:
-        raise ValueError("Couldn't find any registered activity or workflow.")
-    deps = discover_dependencies(deps_name)
+        msg = "Couldn't find any registered activity nor workflow matching "
+        if wf_names:
+            msg += "workflow patterns " + ", ".join(wf_names) + " "
+        if act_names:
+            msg = "activity patterns " + ", ".join(act_names)
+        raise ValueError(msg)
+    deps = None
+    if deps_name is not None:
+        deps = discover_dependencies(deps_name)
     if deps:
         n_deps = len(deps)
         discovered += "\n"
@@ -100,11 +107,9 @@ def discover_activities(names: list[str]) -> list[_RegisteredActivity]:
     return registered
 
 
-def discover_dependencies(name: str | None) -> _Dependencies | None:
+def discover_dependencies(name: str) -> _Dependencies:
     impls = entry_points(name=_DEPENDENCIES, group=_DEPENDENCIES_GROUPS)
     if not impls:
-        if name is None:
-            return None
         available_impls = entry_points(group=_DEPENDENCIES_GROUPS)
         msg = (
             f'failed to find dependency: "{name}", '
@@ -115,26 +120,15 @@ def discover_dependencies(name: str | None) -> _Dependencies | None:
         msg = f'found multiple dependencies for name "{name}": {impls}'
         raise ValueError(msg)
     deps_registry = impls[_DEPENDENCIES].load()
-    if name:
-        try:
-            return deps_registry[name]
-        except KeyError as e:
-            available = list(deps_registry)
-            msg = (
-                f'failed to find dependency for name "{name}", available dependencies: '
-                f"{available}"
-            )
-            raise LookupError(msg) from e
-    if not deps_registry:
-        raise ValueError("empty dependency registry !")
-    if len(deps_registry) > 1:
-        available = ", ".join('"' + d + '"' for d in deps_registry)
+    try:
+        return deps_registry[name]
+    except KeyError as e:
+        available = list(deps_registry)
         msg = (
-            f"dependency registry contains multiples entries {available},"
-            f" please select one by providing a name"
+            f'failed to find dependency for name "{name}", available dependencies: '
+            f"{available}"
         )
-        raise ValueError(msg)
-    return next(iter(deps_registry.values()))
+        raise LookupError(msg) from e
 
 
 def _parse_wf_name(wf_type: type) -> str:

{datashare_python-0.2.24 → datashare_python-0.2.26}/datashare_python/template.py

@@ -61,6 +61,7 @@ def init_project(name: str, path: Path) -> None:
     pyproject_toml = tomlkit.loads(pyproject_toml_path.read_text())
     pyproject_toml = _update_pyproject_toml(pyproject_toml, package_name=package_name)
     pyproject_toml_path.write_text(tomlkit.dumps(pyproject_toml))
+    raise NotImplementedError("implement entry point and dockerfile init")
 
 
 _BASE_DEPS = {"datashare-python", "icij-common", "temporalio"}

{datashare_python-0.2.24 → datashare_python-0.2.26}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "datashare-python"
-version = "0.2.24"
+version = "0.2.26"
 description = "Manage Pythoœn tasks and local resources in Datashare"
 authors = [
   { name = "Clément Doumouro", email = "cdoumouro@icij.org" },
@@ -17,7 +17,6 @@ dependencies = [
   "nest-asyncio~=1.6.0",
   "temporalio~=1.23.0",
   "typer~=0.15.4",
-  "datashare-worker-template[ml]~=0.1",
   "tomlkit~=0.14.0",
   "hatchling~=1.27.0",
   "pyyaml~=6.0",
@@ -58,6 +57,7 @@ datashare-worker-template = { path = "../worker-template", editable = true }
 
 [dependency-groups]
 dev = [
+  "datashare-worker-template[ml]~=0.1.5",
   "hatch-build~=0.5.0",
   "nest-asyncio~=1.6.0",
   "pre-commit~=4.5.1",