fractal-task-tools 0.0.2__tar.gz → 0.0.3__tar.gz

{fractal_task_tools-0.0.2/src/fractal_task_tools.egg-info → fractal_task_tools-0.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: fractal-task-tools
-Version: 0.0.2
+Version: 0.0.3
 Summary: Shared tools for Fractal tasks
 Author-email: Tommaso Comparin <tommaso.comparin@exact-lab.it>
 License: BSD-3-Clause

{fractal_task_tools-0.0.2 → fractal_task_tools-0.0.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fractal-task-tools"
-version = "0.0.2"
+version = "0.0.3"
 description = "Shared tools for Fractal tasks"
 authors = [
     {name="Tommaso Comparin", email="tommaso.comparin@exact-lab.it"},
@@ -34,7 +34,7 @@ build-backend = "setuptools.build_meta"
 fractal-manifest = "fractal_task_tools._cli:main"
 
 [tool.bumpver]
-current_version = "0.0.2"
+current_version = "0.0.3"
 version_pattern = "MAJOR.MINOR.PATCH[PYTAGNUM]"
 commit_message = "bump version {old_version} -> {new_version}"
 commit = true

{fractal_task_tools-0.0.2 → fractal_task_tools-0.0.3}/src/fractal_task_tools/__init__.py

@@ -2,4 +2,4 @@ import logging
 
 logging.basicConfig(level=logging.INFO)
 
-__VERSION__ = "0.0.2"
+__VERSION__ = "0.0.3"

{fractal_task_tools-0.0.2 → fractal_task_tools-0.0.3}/src/fractal_task_tools/_cli.py

@@ -1,7 +1,7 @@
 import argparse as ap
 import sys
 
-from fractal_task_tools._create_manifest import check_manifest_unchanged
+from fractal_task_tools._create_manifest import check_manifest
 from fractal_task_tools._create_manifest import create_manifest
 from fractal_task_tools._create_manifest import write_manifest_to_file
 
@@ -66,7 +66,7 @@ def main():
             raw_package_name=args.package,
             task_list_path=args.task_list_path,
         )
-        check_manifest_unchanged(
+        check_manifest(
             raw_package_name=args.package,
             manifest=manifest,
         )

{fractal_task_tools-0.0.2 → fractal_task_tools-0.0.3}/src/fractal_task_tools/_create_manifest.py

@@ -3,6 +3,8 @@ Generate JSON schemas for task arguments and combine them into a manifest.
 """
 import json
 import logging
+import os
+import sys
 from importlib import import_module
 from pathlib import Path
 from typing import Any
@@ -157,17 +159,26 @@ def write_manifest_to_file(
         raw_package_name:
         manifest: The manifest object
     """
+    logging.info("[write_manifest_to_file] START")
+
     package_name = normalize_package_name(raw_package_name)
+    logging.info(f"[write_manifest_to_file] {package_name=}")
+
     imported_package = import_module(package_name)
     package_root_dir = Path(imported_package.__file__).parent
-    manifest_path = package_root_dir / MANIFEST_FILENAME
-    with manifest_path.open("w") as f:
+    manifest_path = (package_root_dir / MANIFEST_FILENAME).as_posix()
+    logging.info(f"[write_manifest_to_file] {os.getcwd()=}")
+    logging.info(f"[write_manifest_to_file] {package_root_dir=}")
+    logging.info(f"[write_manifest_to_file] {manifest_path=}")
+
+    with open(manifest_path, "w") as f:
         json.dump(manifest, f, indent=2)
         f.write("\n")
-    logging.info(f"Manifest stored in {manifest_path.as_posix()}")
+
+    logging.info("[write_manifest_to_file] END")
 
 
-def check_manifest_unchanged(
+def check_manifest(
     *,
     raw_package_name: str,
     manifest: str,
@@ -179,12 +190,25 @@ def check_manifest_unchanged(
         raw_package_name:
         manifest: The manifest object
     """
+
     package_name = normalize_package_name(raw_package_name)
+    logging.info(f"[check_manifest] {package_name=}")
+
     imported_package = import_module(package_name)
     package_root_dir = Path(imported_package.__file__).parent
-    manifest_path = package_root_dir / MANIFEST_FILENAME
-    with manifest_path.open("f") as f:
+    manifest_path = (package_root_dir / MANIFEST_FILENAME).as_posix()
+    logging.info(f"[check_manifest] {os.getcwd()=}")
+    logging.info(f"[check_manifest] {package_root_dir=}")
+    logging.info(f"[check_manifest] {manifest_path=}")
+
+    with open(manifest_path, "r") as f:
         old_manifest = json.load(f)
-    logging.info(f"Manifest read from {manifest_path.as_posix()}")
-    if manifest != old_manifest:
-        raise ValueError("New/old manifests differ")
+    if manifest == old_manifest:
+        logging.info("[check_manifest] On-disk manifest is up to date.")
+    else:
+        logging.error("[check_manifest] On-disk manifest is not up to date.")
+        print(json.dumps(old_manifest, indent=2))
+        print(json.dumps(manifest, indent=2))
+        sys.exit("New/old manifests differ")
+
+    logging.info("[check_manifest] END")

{fractal_task_tools-0.0.2 → fractal_task_tools-0.0.3}/src/fractal_task_tools/_signature_constraints.py

@@ -3,7 +3,6 @@ import logging
 from importlib import import_module
 from inspect import signature
 from pathlib import Path
-from typing import Callable
 
 from pydantic.v1.decorator import ALT_V_ARGS
 from pydantic.v1.decorator import ALT_V_KWARGS
@@ -25,7 +24,7 @@ def _extract_function(
     function_name: str,
     package_name: str,
     verbose: bool = False,
-) -> Callable:
+) -> callable:
     """
     Extract function from a module with the same name.
 
@@ -58,7 +57,7 @@ def _extract_function(
     return task_function
 
 
-def _validate_function_signature(function: Callable):
+def _validate_function_signature(function: callable):
     """
     Validate the function signature.
 

{fractal_task_tools-0.0.2 → fractal_task_tools-0.0.3/src/fractal_task_tools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: fractal-task-tools
-Version: 0.0.2
+Version: 0.0.3
 Summary: Shared tools for Fractal tasks
 Author-email: Tommaso Comparin <tommaso.comparin@exact-lab.it>
 License: BSD-3-Clause

fractal_task_tools-0.0.3/tests/test_extract_function.py

@@ -0,0 +1,43 @@
+import pytest
+from fractal_task_tools._signature_constraints import _extract_function
+
+
+def test_extract_function():
+    for verbose in (True, False):
+        function = _extract_function(
+            module_relative_path="_create_manifest.py",
+            package_name="fractal_task_tools",
+            function_name="create_manifest",
+            verbose=verbose,
+        )
+        assert function.__name__ == "create_manifest"
+
+    with pytest.raises(
+        ValueError,
+        match="must end with '.py'",
+    ):
+        _extract_function(
+            module_relative_path="_create_manifest",
+            package_name="fractal_task_tools",
+            function_name="missing_function",
+            verbose=True,
+        )
+    with pytest.raises(
+        AttributeError,
+        match="has no attribute 'missing_function'",
+    ):
+        _extract_function(
+            module_relative_path="_create_manifest.py",
+            package_name="fractal_task_tools",
+            function_name="missing_function",
+        )
+
+    with pytest.raises(
+        ModuleNotFoundError,
+        match="No module named 'fractal_task_tools.missing_module'",
+    ):
+        _extract_function(
+            module_relative_path="missing_module.py",
+            package_name="fractal_task_tools",
+            function_name="missing_function",
+        )

fractal_task_tools-0.0.2/tests/test_extract_function.py

@@ -1,26 +0,0 @@
-import pytest
-from devtools import debug
-from fractal_task_tools._signature_constraints import _extract_function
-
-
-@pytest.mark.xfail(reason="FIXME: depends on fractal-tasks-core")
-def test_extract_function():
-    """
-    This test showcases the use of `_extract_function`.
-    """
-
-    fun1 = _extract_function(
-        module_relative_path="zarr_utils.py",
-        package_name="fractal_tasks_core.ngff",
-        function_name="load_NgffImageMeta",
-        verbose=True,
-    )
-    debug(fun1)
-
-    fun2 = _extract_function(
-        module_relative_path="ngff.zarr_utils.py",
-        package_name="fractal_tasks_core",
-        function_name="load_NgffImageMeta",
-        verbose=True,
-    )
-    debug(fun2)