datashare-python 0.4.0__tar.gz → 0.5.0__tar.gz

{datashare_python-0.4.0 → datashare_python-0.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datashare-python
-Version: 0.4.0
+Version: 0.5.0
 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/

{datashare_python-0.4.0 → datashare_python-0.5.0}/datashare_python/cli/worker.py

@@ -24,7 +24,6 @@ _LIST_ACTIVITY_NAMES_HELP = "activity names filters (supports regexes)"
 _START_WORKER_WORKFLOWS_HELP = "workflow names run by the worker (supports regexes)"
 _START_WORKER_ACTIVITIES_HELP = "activity names run by the worker (supports regexes)"
 _START_WORKER_DEPS_HELP = "worker lifetime dependencies name in the registry"
-_START_WORKER_CONFIG_HELP = "worker config class key the worker configs registry"
 _START_WORKER_WORKER_ID_PREFIX_HELP = "worker ID prefix"
 _START_WORKER_CONFIG_PATH_HELP = (
     "path to a worker config YAML file,"
@@ -86,9 +85,6 @@ async def start(
     dependencies: Annotated[
         str | None, typer.Option(help=_START_WORKER_DEPS_HELP)
     ] = None,
-    worker_config_name: Annotated[
-        str | None, typer.Option(help=_START_WORKER_CONFIG_HELP)
-    ] = None,
     config_path: Annotated[
         Path | None,
         typer.Option(
@@ -107,10 +103,7 @@ async def start(
     ] = None,
 ) -> None:
     registered_wfs, registered_acts, registered_deps, worker_config_cls = discover(
-        workflows,
-        act_names=activities,
-        deps_name=dependencies,
-        worker_config_name=worker_config_name,
+        workflows, act_names=activities, deps_name=dependencies
     )
     if config_path is not None:
         with config_path.open() as f:

{datashare_python-0.4.0 → datashare_python-0.5.0}/datashare_python/discovery.py

@@ -13,11 +13,11 @@ logger = logging.getLogger(__name__)
 Activity = ActivityWithProgress | Callable | type
 
 _DEPENDENCIES = "dependencies"
-_WORKER_CONFIGS = "worker_configs"
+_WORKER_CONFIG_CLS = "worker_config_cls"
 _WORKFLOW_GROUP = "datashare.workflows"
 _ACTIVITIES_GROUP = "datashare.activities"
 _DEPENDENCIES_GROUP = "datashare.dependencies"
-_WORKER_CONFIGS_GROUP = "datashare.worker_configs"
+_WORKER_CONFIG_CLS_GROUP = "datashare.worker_config_cls"
 
 _RegisteredWorkflow = tuple[str, type]
 _RegisteredActivity = tuple[str, Activity]
@@ -31,11 +31,7 @@ _Discovery = tuple[
 
 
 def discover(
-    wf_names: list[str] | None,
-    *,
-    act_names: list[str] | None,
-    deps_name: str | None,
-    worker_config_name: str | None,
+    wf_names: list[str] | None, *, act_names: list[str] | None, deps_name: str | None
 ) -> _Discovery:
     discovered = ""
     wfs = None
@@ -82,11 +78,8 @@ def discover(
             f"- {n_deps} dependenc{'ies' if n_deps > 1 else 'y'}:"
             f" {', '.join(deps_names)}"
         )
-    if worker_config_name is not None:
-        worker_config_cls = discover_worker_configs(worker_config_name)
-        discovered += f"- worker config class: {worker_config_cls}"
-    else:
-        worker_config_cls = WorkerConfig
+    worker_config_cls = discover_worker_config_cls()
+    discovered += f"- worker config class: {worker_config_cls}"
     logger.info("discovered:\n%s", discovered)
     return wfs, acts, deps, worker_config_cls
 
@@ -147,28 +140,15 @@ def discover_dependencies(name: str) -> _Dependencies:
         raise LookupError(msg) from e
 
 
-def discover_worker_configs(name: str) -> type[WorkerConfig]:
-    impls = entry_points(name=_WORKER_CONFIGS, group=_WORKER_CONFIGS_GROUP)
+def discover_worker_config_cls() -> type[WorkerConfig]:
+    impls = entry_points(name=_WORKER_CONFIG_CLS, group=_WORKER_CONFIG_CLS_GROUP)
     if not impls:
-        available_impls = entry_points(group=_WORKER_CONFIGS_GROUP)
-        msg = (
-            f'failed to find worker config: "{name}", '
-            f"available dependencies: {available_impls}"
-        )
-        raise LookupError(msg)
+        return WorkerConfig
     if len(impls) > 1:
-        msg = f'found multiple worker configs for name "{name}": {impls}'
+        msg = f'found multiple registered worker configs classes": {impls}'
         raise ValueError(msg)
-    deps_registry = impls[_WORKER_CONFIGS].load()
-    try:
-        return deps_registry[name]
-    except KeyError as e:
-        available = list(deps_registry)
-        msg = (
-            f'failed to find worker config for name "{name}", available worker '
-            f"configs: {available}"
-        )
-        raise LookupError(msg) from e
+    deps_registry = impls[_WORKER_CONFIG_CLS].load()
+    return deps_registry
 
 
 def _parse_wf_name(wf_type: type) -> str:

{datashare_python-0.4.0 → datashare_python-0.5.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "datashare-python"
-version = "0.4.0"
+version = "0.5.0"
 description = "Manage Pythoœn tasks and local resources in Datashare"
 authors = [
   { name = "Clément Doumouro", email = "cdoumouro@icij.org" },