hpcflow-new2 0.2.0a189__py3-none-any.whl → 0.2.0a190__py3-none-any.whl

hpcflow/tests/unit/test_task_schema.py

@@ -1,3 +1,6 @@
+from __future__ import annotations
+from typing import TYPE_CHECKING
+from typing_extensions import TypedDict
 import pytest
 
 from hpcflow.app import app as hf
@@ -7,61 +10,71 @@ from hpcflow.sdk.core.errors import (
 )
 from hpcflow.sdk.core.test_utils import make_actions, make_parameters
 
+if TYPE_CHECKING:
+    from hpcflow.sdk.core.actions import Action, ActionEnvironment
+    from hpcflow.sdk.core.task import TaskObjective
+
 
 @pytest.fixture
-def act_env_1():
+def act_env_1() -> ActionEnvironment:
     return hf.ActionEnvironment("env_1")
 
 
 @pytest.fixture
-def action_a1(act_env_1):
+def action_a1(act_env_1: ActionEnvironment) -> Action:
     return hf.Action(commands=[hf.Command("ls")], environments=[act_env_1])
 
 
+class SchemaKwargs(TypedDict):
+    objective: TaskObjective
+    actions: list[Action]
+
+
 @pytest.fixture
-def schema_s1_kwargs(action_a1):
+def schema_s1_kwargs(action_a1: Action) -> SchemaKwargs:
     return {"objective": hf.TaskObjective("t1"), "actions": [action_a1]}
 
 
-def test_task_schema_equality():
+def test_task_schema_equality() -> None:
     t1a = hf.TaskSchema("t1", actions=[])
     t1b = hf.TaskSchema("t1", actions=[])
     assert t1a == t1b
 
 
-def test_init_with_str_objective(action_a1):
+def test_init_with_str_objective(action_a1: Action) -> None:
     obj_str = "t1"
     obj = hf.TaskObjective(obj_str)
-    common = {"actions": [action_a1]}
-    assert hf.TaskSchema(obj_str, **common) == hf.TaskSchema(obj, **common)
+    assert hf.TaskSchema(obj_str, actions=[action_a1]) == hf.TaskSchema(
+        obj, actions=[action_a1]
+    )
 
 
-def test_init_with_method_with_underscore(schema_s1_kwargs):
+def test_init_with_method_with_underscore(schema_s1_kwargs) -> None:
     hf.TaskSchema(method="my_method", **schema_s1_kwargs)
 
 
-def test_raise_on_invalid_method_digit(schema_s1_kwargs):
+def test_raise_on_invalid_method_digit(schema_s1_kwargs) -> None:
     with pytest.raises(InvalidIdentifier):
         hf.TaskSchema(method="9", **schema_s1_kwargs)
 
 
-def test_raise_on_invalid_method_space(schema_s1_kwargs):
+def test_raise_on_invalid_method_space(schema_s1_kwargs) -> None:
     with pytest.raises(InvalidIdentifier):
         hf.TaskSchema(method="my method", **schema_s1_kwargs)
 
 
-def test_raise_on_invalid_method_non_alpha_numeric(schema_s1_kwargs):
+def test_raise_on_invalid_method_non_alpha_numeric(schema_s1_kwargs) -> None:
     with pytest.raises(InvalidIdentifier):
         hf.TaskSchema(method="_mymethod", **schema_s1_kwargs)
 
 
-def test_schema_action_validate():
+def test_schema_action_validate() -> None:
     p1, p2, p3, p4 = make_parameters(4)
     act_1, act_2, act_3 = make_actions([("p1", "p5"), (("p2", "p5"), "p3"), ("p3", "p4")])
     hf.TaskSchema("t1", actions=[act_1, act_2, act_3], inputs=[p1, p2], outputs=[p3, p4])
 
 
-def test_schema_action_validate_raise_on_extra_schema_input():
+def test_schema_action_validate_raise_on_extra_schema_input() -> None:
     # assert raise ValueError
     p1, p2, p3, p4 = make_parameters(4)
     p7 = hf.Parameter("p7")
@@ -72,7 +85,7 @@ def test_schema_action_validate_raise_on_extra_schema_input():
         )
 
 
-def test_schema_action_validate_raise_on_extra_schema_output():
+def test_schema_action_validate_raise_on_extra_schema_output() -> None:
     p7 = hf.Parameter("p7")
     p1, p2, p3, p4 = make_parameters(4)
     act_1, act_2, act_3 = make_actions([("p1", "p5"), (("p2", "p5"), "p3"), ("p3", "p4")])
@@ -82,7 +95,7 @@ def test_schema_action_validate_raise_on_extra_schema_output():
         )
 
 
-def test_schema_action_validate_raise_on_extra_action_input():
+def test_schema_action_validate_raise_on_extra_action_input() -> None:
     p1, p2, p3, p4 = make_parameters(4)
     act_1, act_2, act_3 = make_actions(
         [(("p1", "p7"), "p5"), (("p2", "p5"), "p3"), ("p3", "p4")]
@@ -93,7 +106,7 @@ def test_schema_action_validate_raise_on_extra_action_input():
         )
 
 
-def test_schema_action_validate_raise_on_extra_action_output():
+def test_schema_action_validate_raise_on_extra_action_output() -> None:
     p1, p2, p3, p4 = make_parameters(4)
     act_1, act_2, act_3 = make_actions(
         [("p1", "p5"), (("p2", "p5"), "p3"), ("p3", "p4", "p7")]
@@ -104,7 +117,7 @@ def test_schema_action_validate_raise_on_extra_action_output():
         )
 
 
-def test_dot_access_object_list_raise_on_bad_access_attr_name():
+def test_dot_access_object_list_raise_on_bad_access_attr_name() -> None:
     """Check we can't name a DotAccessObjectList item with a name that collides with a
     method name."""
     ts = hf.TaskSchema("add_object", actions=[])
@@ -112,7 +125,7 @@ def test_dot_access_object_list_raise_on_bad_access_attr_name():
         hf.TaskSchemasList([ts])
 
 
-def test_env_preset():
+def test_env_preset() -> None:
     p1, p2 = make_parameters(2)
     (act_1,) = make_actions([("p1", "p2")], env="env1")
     hf.TaskSchema(
@@ -124,7 +137,7 @@ def test_env_preset():
     )
 
 
-def test_env_preset_raise_bad_env():
+def test_env_preset_raise_bad_env() -> None:
     p1, p2 = make_parameters(2)
     (act_1,) = make_actions([("p1", "p2")], env="env1")
     with pytest.raises(EnvironmentPresetUnknownEnvironmentError):
@@ -137,7 +150,7 @@ def test_env_preset_raise_bad_env():
         )
 
 
-def test_env_preset_raise_bad_env_no_actions():
+def test_env_preset_raise_bad_env_no_actions() -> None:
     with pytest.raises(EnvironmentPresetUnknownEnvironmentError):
         hf.TaskSchema(
             "t1",

hpcflow/tests/unit/test_utils.py

@@ -1,6 +1,6 @@
 from pathlib import Path
 import pytest
-import zarr
+import zarr  # type: ignore
 import numpy as np
 from numpy.typing import NDArray
 from hpcflow.sdk.core.errors import InvalidIdentifier, MissingVariableSubstitutionError
@@ -185,7 +185,7 @@ def zarr_column_array(tmp_path: Path):
         dtype=int,
         fill_value=fill_value,
     )
-    arr[:] = np.arange(np.product(arr.shape)).reshape(arr.shape)
+    arr[:] = np.arange(np.prod(arr.shape)).reshape(arr.shape)
     return arr, headers, fill_value
 
 
@@ -497,18 +497,13 @@ def test_substitute_string_vars_repeated_var():
     )
 
 
-def test_substitute_string_vars_no_vars():
-    assert (
-        substitute_string_vars(
-            "hello bob!",
-        )
-        == "hello bob!"
-    )
+def test_substitute_string_vars_empty_vars():
+    assert substitute_string_vars("hello bob!", variables={}) == "hello bob!"
 
 
 def test_substitute_string_vars_raise_no_vars():
     with pytest.raises(MissingVariableSubstitutionError):
-        substitute_string_vars("hello <<var:my_name>>")
+        substitute_string_vars("hello <<var:my_name>>", variables={})
 
 
 def test_substitute_string_vars_raise_missing():
@@ -521,7 +516,10 @@ def test_substitute_string_vars_non_str():
 
 
 def test_substitute_string_vars_default_value():
-    assert substitute_string_vars("hello <<var:my_name[default=bill]>>!") == "hello bill!"
+    assert (
+        substitute_string_vars("hello <<var:my_name[default=bill]>>!", variables={})
+        == "hello bill!"
+    )
 
 
 def test_substitute_string_vars_default_value_with_specified():

hpcflow/tests/unit/test_value_sequence.py

@@ -1,5 +1,6 @@
 import sys
 import numpy as np
+from pathlib import Path
 import pytest
 import requests
 
@@ -8,7 +9,7 @@ from hpcflow.sdk.core.test_utils import P1_parameter_cls as P1
 
 
 @pytest.fixture
-def null_config(tmp_path):
+def null_config(tmp_path: Path):
     if not hf.is_config_loaded:
         hf.load_config(config_dir=tmp_path)
 
@@ -124,7 +125,9 @@ def test_resources_value_sequence_path_attributes():
 
 
 @pytest.mark.parametrize("store", ["json", "zarr"])
-def test_value_sequence_object_values_during_workflow_init(null_config, tmp_path, store):
+def test_value_sequence_object_values_during_workflow_init(
+    null_config, tmp_path: Path, store: str
+):
     p1 = hf.Parameter("p1c")
     s1 = hf.TaskSchema(objective="t1", inputs=[hf.SchemaInput(parameter=p1)])
     obj = P1(a=101)
@@ -156,7 +159,7 @@ def test_value_sequence_object_values_during_workflow_init(null_config, tmp_path
 
 @pytest.mark.parametrize("store", ["json", "zarr"])
 def test_value_sequence_object_values_class_method_during_workflow_init(
-    null_config, tmp_path, store
+    null_config, tmp_path: Path, store: str
 ):
     p1 = hf.Parameter("p1c")
     s1 = hf.TaskSchema(objective="t1", inputs=[hf.SchemaInput(parameter=p1)])
@@ -189,7 +192,7 @@ def test_value_sequence_object_values_class_method_during_workflow_init(
 
 @pytest.mark.parametrize("store", ["json", "zarr"])
 def test_value_sequence_object_values_named_class_method_during_workflow_init(
-    null_config, tmp_path, store
+    null_config, tmp_path: Path, store: str
 ):
     p1 = hf.Parameter("p1c")
     s1 = hf.TaskSchema(objective="t1", inputs=[hf.SchemaInput(parameter=p1)])
@@ -222,7 +225,7 @@ def test_value_sequence_object_values_named_class_method_during_workflow_init(
     assert wk.tasks[0].template.element_sets[0].sequences[0].values == values_exp
 
 
-def test_nesting_order_two_seqs_parallel(null_config, tmp_path):
+def test_nesting_order_two_seqs_parallel(null_config, tmp_path: Path):
     ts = hf.TaskSchema(
         objective="test", inputs=[hf.SchemaInput("p1"), hf.SchemaInput("p2")]
     )
@@ -243,7 +246,7 @@ def test_nesting_order_two_seqs_parallel(null_config, tmp_path):
     assert wk.tasks.test.elements[1].get("inputs") == {"p1": "b", "p2": "d"}
 
 
-def test_nesting_order_two_seqs_parallel_decimal_equiv(null_config, tmp_path):
+def test_nesting_order_two_seqs_parallel_decimal_equiv(null_config, tmp_path: Path):
     ts = hf.TaskSchema(
         objective="test", inputs=[hf.SchemaInput("p1"), hf.SchemaInput("p2")]
     )
@@ -266,7 +269,7 @@ def test_nesting_order_two_seqs_parallel_decimal_equiv(null_config, tmp_path):
 
 def test_nesting_order_two_seqs_nested(
     null_config,
-    tmp_path,
+    tmp_path: Path,
 ):
     ts = hf.TaskSchema(
         objective="test", inputs=[hf.SchemaInput("p1"), hf.SchemaInput("p2")]
@@ -290,7 +293,7 @@ def test_nesting_order_two_seqs_nested(
     assert wk.tasks.test.elements[3].get("inputs") == {"p1": "b", "p2": "d"}
 
 
-def test_nesting_order_two_seqs_default_nesting_order(null_config, tmp_path):
+def test_nesting_order_two_seqs_default_nesting_order(null_config, tmp_path: Path):
     ts = hf.TaskSchema(
         objective="test", inputs=[hf.SchemaInput("p1"), hf.SchemaInput("p2")]
     )
@@ -311,7 +314,7 @@ def test_nesting_order_two_seqs_default_nesting_order(null_config, tmp_path):
     assert wk.tasks.test.elements[1].get("inputs") == {"p1": "b", "p2": "d"}
 
 
-def test_raise_nesting_order_two_seqs_default_nesting_order(null_config, tmp_path):
+def test_raise_nesting_order_two_seqs_default_nesting_order(null_config, tmp_path: Path):
     ts = hf.TaskSchema(
         objective="test", inputs=[hf.SchemaInput("p1"), hf.SchemaInput("p2")]
     )
@@ -331,7 +334,7 @@ def test_raise_nesting_order_two_seqs_default_nesting_order(null_config, tmp_pat
 
 
 def test_raise_nesting_order_two_seqs_default_nesting_order_decimal(
-    null_config, tmp_path
+    null_config, tmp_path: Path
 ):
     ts = hf.TaskSchema(
         objective="test", inputs=[hf.SchemaInput("p1"), hf.SchemaInput("p2")]
@@ -351,7 +354,7 @@ def test_raise_nesting_order_two_seqs_default_nesting_order_decimal(
         )
 
 
-def test_nesting_order_three_seqs_decimal(null_config, tmp_path):
+def test_nesting_order_three_seqs_decimal(null_config, tmp_path: Path):
     ts = hf.TaskSchema(
         objective="test",
         inputs=[hf.SchemaInput("p1"), hf.SchemaInput("p2"), hf.SchemaInput("p3")],
@@ -380,7 +383,7 @@ def test_nesting_order_three_seqs_decimal(null_config, tmp_path):
     assert wk.tasks.test.elements[5].get("inputs") == {"p1": "b", "p2": "e", "p3": "k"}
 
 
-def test_nesting_order_three_seqs_all_decimal(null_config, tmp_path):
+def test_nesting_order_three_seqs_all_decimal(null_config, tmp_path: Path):
     ts = hf.TaskSchema(
         objective="test",
         inputs=[hf.SchemaInput("p1"), hf.SchemaInput("p2"), hf.SchemaInput("p3")],