datashare-python 0.2.25__py3-none-any.whl → 0.2.27__py3-none-any.whl

datashare_python/cli/worker.py

@@ -75,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,
@@ -105,6 +109,13 @@ async def start(
             )
     else:
         bootstrap_config = WorkerConfig()
+    worker_id = create_worker_id(worker_id_prefix or "worker")
+    logger.info(
+        "starting worker %s on queue %s, with config: %s",
+        worker_id,
+        queue,
+        bootstrap_config.model_dump_json(indent=2),
+    )
     temporal_override = dict()
     if temporal_address is not None:
         temporal_override["host"] = temporal_address
@@ -117,7 +128,6 @@ async def start(
     registered_wfs, registered_acts, registered_deps = discover(
         workflows, act_names=activities, deps_name=dependencies
     )
-    worker_id = create_worker_id(worker_id_prefix or "worker")
     client = await bootstrap_config.to_temporal_client()
     event_loop = asyncio.get_event_loop()
     async with bootstrap_worker(

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.25.dist-info → datashare_python-0.2.27.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datashare-python
-Version: 0.2.25
+Version: 0.2.27
 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.25.dist-info → datashare_python-0.2.27.dist-info}/RECORD

@@ -5,7 +5,7 @@ datashare_python/config.py,sha256=u6iyOeSXzIO30Yja8Vj9LjM-cq8ESRBy3Kse6UadAMg,37
 datashare_python/conftest.py,sha256=BdRLjy9eJtxAKLDCcon1Nyhzn54CIw2z4s3ZOupNYGo,8256
 datashare_python/constants.py,sha256=e6Px11OUee9GSHwTgsgFMszGCMwpW-OznHSMgINvepc,338
 datashare_python/dependencies.py,sha256=Diu7alKGaFWyC_ajp0fKU-xp8u5f_8x1axAHVBlppD0,3707
-datashare_python/discovery.py,sha256=R0wws-_QgiK3GyTSf3p2UV41Ok-iuKeZauh6EJAdzGc,6401
+datashare_python/discovery.py,sha256=khWTm11NlMVkRyxPV1lJimcTTicuVdxWHOC4H6PfFwE,6128
 datashare_python/exceptions.py,sha256=bVHEAXxDPKfxeeMC0hJXEsrJkgsKO2ESAhxWU96GA4M,496
 datashare_python/local_client.py,sha256=GP9MTcHVQ1mcb2eO6TiQ7mzQdx199lZRhK8DRuJqJVQ,2359
 datashare_python/objects.py,sha256=GMi2hlKuWFbWWoC2r8ITQGQcMsobHHChGvm4ZfIjMl0,4537
@@ -13,15 +13,15 @@ datashare_python/task_client.py,sha256=oTmP8bvZW0UyhLNMi1AV3XIAx7hrdbxNRss2Mw2az
 datashare_python/template.py,sha256=RxKTYLXoS_EQ8Jc41JkBXppPdbCFqDWfP3BmC0gvB5o,4024
 datashare_python/types_.py,sha256=9Hk1XqpdXbM1TnEzwvJ5G9ABbaCZW9KgBTtiPBVn_7k,649
 datashare_python/utils.py,sha256=DQt-rBwC3Ok72u8VyerG3rqwUTx3ftLfPdMQ5cnRrgs,16801
-datashare_python/worker-template.tar.gz,sha256=CTokaLmqZZ6tJPGT4N7YG9aDsP66yS1HvJN-IzWhh0c,142348
+datashare_python/worker-template.tar.gz,sha256=JtdB_KpP_MB5eQpABnXydbgrtcofXISWkeHwiDLHgA0,142385
 datashare_python/worker.py,sha256=A4SnmDB4y0ck6Wp_UZWdsSOyTvW54Z2Bq76gxtp-_PE,6070
 datashare_python/cli/__init__.py,sha256=5MGSE_0SwlOiwbyPwsP8RIXlTBB2_GGP0zDg4l6UAIY,1479
 datashare_python/cli/local.py,sha256=S-7qMpSqzi0oMvu01TCFEb8tayEvpw4pXMdCszKEYtU,986
 datashare_python/cli/project.py,sha256=w32Gy9AOL5B00uDT4in7YUCt2g68FnNbvwg2M3a8G6o,946
 datashare_python/cli/task.py,sha256=9If5OC7loG4C4gWWl4iOeqPJ4GOLlCWXQfuNLUHORrQ,5860
 datashare_python/cli/utils.py,sha256=p69CQb0zfixuyBkiZprhdMCc_NuYwXyAn6vC9H1UzAw,911
-datashare_python/cli/worker.py,sha256=tJ2xj_TCyjZVh1Jlb_AknHEg8xn9Js90Vb39slew8t4,5160
-datashare_python-0.2.25.dist-info/METADATA,sha256=yIqCI2amsvCqNeKqnJ0RJtHUV1OnrUn7Lue5DgbYWk0,958
-datashare_python-0.2.25.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
-datashare_python-0.2.25.dist-info/entry_points.txt,sha256=ILE7auxabHWiu3GC-AunWnzjhOI_SbZp7D4GqZHlLw4,68
-datashare_python-0.2.25.dist-info/RECORD,,
+datashare_python/cli/worker.py,sha256=_LZFtv6O57Ez7XdRKmmwQ0b_5_8uFajPySv_jbzXbjI,5384
+datashare_python-0.2.27.dist-info/METADATA,sha256=yhzBQbwmSDmgutMuHiypZRAO8btctOO9LtzayCEs594,908
+datashare_python-0.2.27.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
+datashare_python-0.2.27.dist-info/entry_points.txt,sha256=ILE7auxabHWiu3GC-AunWnzjhOI_SbZp7D4GqZHlLw4,68
+datashare_python-0.2.27.dist-info/RECORD,,