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

hpcflow/tests/unit/test_input_value.py

@@ -1,81 +1,86 @@
+from __future__ import annotations
 import sys
+from pathlib import Path
+from typing import TYPE_CHECKING
 import pytest
 import requests
 
 from hpcflow.app import app as hf
-from hpcflow.sdk.core.errors import InputValueDuplicateSequenceAddress
 from hpcflow.sdk.core.test_utils import P1_parameter_cls as P1
 
+if TYPE_CHECKING:
+    from hpcflow.sdk.core.parameters import Parameter
+
 
 @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)
 
 
 @pytest.fixture
-def param_p1(null_config):
+def param_p1(null_config) -> Parameter:
     return hf.Parameter("p1")
 
 
-def test_fix_trailing_path_delimiter(param_p1):
+def test_fix_trailing_path_delimiter(param_p1: Parameter):
     iv1 = hf.InputValue(parameter=param_p1, value=101, path="a.")
     iv2 = hf.InputValue(parameter=param_p1, value=101, path="a")
     assert iv1.path == iv2.path
 
 
-def test_fix_single_path_delimiter(param_p1):
+def test_fix_single_path_delimiter(param_p1: Parameter):
     iv1 = hf.InputValue(parameter=param_p1, value=101, path=".")
     iv2 = hf.InputValue(parameter=param_p1, value=101)
     assert iv1.path == iv2.path
 
 
-def test_normalised_path_without_path(param_p1):
+def test_normalised_path_without_path(param_p1: Parameter):
     iv1 = hf.InputValue(parameter=param_p1, value=101)
     assert iv1.normalised_path == "inputs.p1"
 
 
-def test_normalised_path_with_single_element_path(param_p1):
+def test_normalised_path_with_single_element_path(param_p1: Parameter):
     iv1 = hf.InputValue(parameter=param_p1, value=101, path="a")
     assert iv1.normalised_path == "inputs.p1.a"
 
 
-def test_normalised_path_with_multi_element_path(param_p1):
+def test_normalised_path_with_multi_element_path(param_p1: Parameter):
     iv1 = hf.InputValue(parameter=param_p1, value=101, path="a.b")
     assert iv1.normalised_path == "inputs.p1.a.b"
 
 
-def test_normalised_path_with_empty_path(param_p1):
+def test_normalised_path_with_empty_path(param_p1: Parameter):
     iv1 = hf.InputValue(parameter=param_p1, value=101, path="")
     assert iv1.normalised_path == "inputs.p1"
 
 
-def test_resource_spec_get_param_path(null_config):
+def test_resource_spec_get_param_path(null_config) -> None:
     rs1 = hf.ResourceSpec()
     assert rs1.normalised_path == "resources.any"
 
 
-def test_resource_spec_get_param_path_scope_any_with_single_kwarg(null_config):
+def test_resource_spec_get_param_path_scope_any_with_single_kwarg(null_config) -> None:
     rs1 = hf.ResourceSpec(scratch="local")
     assert rs1.normalised_path == "resources.any"
 
 
-def test_resources_spec_get_param_path_scope_main(null_config):
+def test_resources_spec_get_param_path_scope_main(null_config) -> None:
     rs1 = hf.ResourceSpec(scope=hf.ActionScope.main())
     assert rs1.normalised_path == "resources.main"
 
 
-def test_resources_spec_get_param_path_scope_with_kwargs(null_config):
+def test_resources_spec_get_param_path_scope_with_kwargs(null_config) -> None:
     rs1 = hf.ResourceSpec(scope=hf.ActionScope.input_file_generator(file="file1"))
     assert rs1.normalised_path == "resources.input_file_generator[file=file1]"
 
 
-def test_resources_spec_get_param_path_scope_with_no_kwargs(null_config):
+def test_resources_spec_get_param_path_scope_with_no_kwargs(null_config) -> None:
     rs1 = hf.ResourceSpec(scope=hf.ActionScope.input_file_generator())
     assert rs1.normalised_path == "resources.input_file_generator"
 
 
-def test_input_value_from_json_like_class_method_attribute_is_set(null_config):
+def test_input_value_from_json_like_class_method_attribute_is_set(null_config) -> None:
     parameter_typ = "p1"
     cls_method = "from_data"
     json_like = {"parameter": f"{parameter_typ}::{cls_method}", "value": 101}
@@ -84,7 +89,7 @@ def test_input_value_from_json_like_class_method_attribute_is_set(null_config):
     assert inp_val.value_class_method == cls_method
 
 
-def test_value_sequence_from_json_like_class_method_attribute_is_set(null_config):
+def test_value_sequence_from_json_like_class_method_attribute_is_set(null_config) -> None:
     parameter_typ = "p1"
     cls_method = "from_data"
     json_like = {
@@ -99,28 +104,28 @@ def test_value_sequence_from_json_like_class_method_attribute_is_set(null_config
     assert val_seq.value_class_method == cls_method
 
 
-def test_path_attributes(null_config):
+def test_path_attributes(null_config) -> None:
     inp = hf.InputValue(parameter="p1", value=101, path="a.b")
     assert inp.labelled_type == "p1"
     assert inp.normalised_path == "inputs.p1.a.b"
     assert inp.normalised_inputs_path == "p1.a.b"
 
 
-def test_path_attributes_with_label_arg(null_config):
+def test_path_attributes_with_label_arg(null_config) -> None:
     inp = hf.InputValue(parameter="p1", value=101, path="a.b", label="1")
     assert inp.labelled_type == "p1[1]"
     assert inp.normalised_path == "inputs.p1[1].a.b"
     assert inp.normalised_inputs_path == "p1[1].a.b"
 
 
-def test_path_attributes_with_label_arg_cast(null_config):
+def test_path_attributes_with_label_arg_cast(null_config) -> None:
     inp = hf.InputValue(parameter="p1", value=101, path="a.b", label=1)
     assert inp.labelled_type == "p1[1]"
     assert inp.normalised_path == "inputs.p1[1].a.b"
     assert inp.normalised_inputs_path == "p1[1].a.b"
 
 
-def test_from_json_like(null_config):
+def test_from_json_like(null_config) -> None:
     inp = hf.InputValue.from_json_like(
         json_like={"parameter": "p1", "value": 101},
         shared_data=hf.template_components,
@@ -130,7 +135,7 @@ def test_from_json_like(null_config):
     assert inp.label == ""
 
 
-def test_from_json_like_with_label(null_config):
+def test_from_json_like_with_label(null_config) -> None:
     inp = hf.InputValue.from_json_like(
         json_like={"parameter": "p1[1]", "value": 101},
         shared_data=hf.template_components,
@@ -140,12 +145,12 @@ def test_from_json_like_with_label(null_config):
     assert inp.label == "1"
 
 
-def test_value_is_dict_check_success(null_config):
+def test_value_is_dict_check_success(null_config) -> None:
     # Parameter("p1c") has an associated `ParameterValue` class, so data should be a dict:
     hf.InputValue("p1c", {"a": 101})
 
 
-def test_value_is_dict_check_raise(null_config):
+def test_value_is_dict_check_raise(null_config) -> None:
     # Parameter("p1c") has an associated `ParameterValue` class so data should be a dict:
     with pytest.raises(ValueError):
         hf.InputValue("p1c", 101)
@@ -165,7 +170,7 @@ def test_value_is_dict_check_no_raise_if_sub_parameter(null_config):
         "retrieving demo data from GitHub."
     ),
 )
-def test_demo_data_value(null_config):
+def test_demo_data_value(null_config) -> None:
     name = "text_file.txt"
     assert hf.InputValue("p1", value=f"<<demo_data_file:{name}>>").value == str(
         hf.demo_data_cache_dir.joinpath(name)

hpcflow/tests/unit/test_json_like.py

@@ -1,7 +1,9 @@
+# mypy: disable-error-code="annotation-unchecked"
+from __future__ import annotations
 from dataclasses import dataclass
 import enum
 from types import SimpleNamespace
-from typing import Optional, Any
+from typing import Any
 
 import pytest
 
@@ -9,6 +11,10 @@ from hpcflow.app import app as hf
 from hpcflow.sdk.core.json_like import BaseJSONLike, ChildObjectSpec
 from hpcflow.sdk.core.object_list import ObjectList
 
+# BE AWARE THAT MYPY CANNOT CORRECTLY TYPE-CHECK THIS FILE AT ALL.
+# It fails massively due to all the classes inside functions being passed to other functions.
+# Omitting the types makes it ignore them all, which us for the best.
+
 
 @pytest.fixture
 def null_config(tmp_path):
@@ -87,16 +93,17 @@ def test_BaseJSONLike_child_object_class_namespace_via_obj(null_config):
 
 
 def test_BaseJSONLike_child_object_class_namespace_via_name_and_dict_namespace(
-    BaseJSONLikeSubClass,
+    BaseJSONLikeSubClass: type[BaseJSONLike],
 ):
     """Child object class passed as a name and namespace passed as a dict."""
+    T: type = BaseJSONLikeSubClass  # Workaround for python/mypy#14458
 
     @dataclass
-    class ObjB(BaseJSONLikeSubClass):
+    class ObjB(T):
         c: int
 
     @dataclass
-    class ObjA(BaseJSONLikeSubClass):
+    class ObjA(T):
         _child_objects = (
             ChildObjectSpec(
                 name="b",
@@ -118,16 +125,17 @@ def test_BaseJSONLike_child_object_class_namespace_via_name_and_dict_namespace(
 
 
 def test_BaseJSONLike_child_object_class_namespace_via_name_and_func_locals(
-    BaseJSONLikeSubClass,
+    BaseJSONLikeSubClass: type[BaseJSONLike],
 ):
     """Child object class passed as a name and namespace passed as function locals."""
+    T: type = BaseJSONLikeSubClass  # Workaround for python/mypy#14458
 
     @dataclass
-    class ObjB(BaseJSONLikeSubClass):
+    class ObjB(T):
         c: int
 
     @dataclass
-    class ObjA(BaseJSONLikeSubClass):
+    class ObjA(T):
         _child_objects = (
             ChildObjectSpec(
                 name="b",
@@ -149,16 +157,17 @@ def test_BaseJSONLike_child_object_class_namespace_via_name_and_func_locals(
 
 
 def test_BaseJSONLike_child_object_class_namespace_via_name_and_SimpleNamespace(
-    BaseJSONLikeSubClass,
+    BaseJSONLikeSubClass: type[BaseJSONLike],
 ):
     """Child object class passed as a name and namespace passed as a SimpleNamespace."""
+    T: type = BaseJSONLikeSubClass  # Workaround for python/mypy#14458
 
     @dataclass
-    class ObjB(BaseJSONLikeSubClass):
+    class ObjB(T):
         c: int
 
     @dataclass
-    class ObjA(BaseJSONLikeSubClass):
+    class ObjA(T):
         _child_objects = (
             ChildObjectSpec(
                 name="b",
@@ -549,12 +558,12 @@ def test_from_json_like_with_parent_ref(null_config):
     class ObjB(BaseJSONLike):
         name: str
         c: int
-        obj_A: Optional[Any] = None
+        obj_A: Any = None
 
         def __eq__(self, other):
-            if self.name == other.name and self.c == other.c:
-                return True
-            return False
+            if not isinstance(other, self.__class__):
+                return False
+            return self.name == other.name and self.c == other.c
 
     @dataclass
     class ObjA(BaseJSONLike):
@@ -572,14 +581,14 @@ def test_from_json_like_with_parent_ref(null_config):
             self._set_parent_refs()
 
         def __eq__(self, other):
-            if (
+            if not isinstance(other, self.__class__):
+                return False
+            return (
                 self.a == other.a
                 and self.b == other.b
                 and self.b.obj_A is self
                 and other.b.obj_A is other
-            ):
-                return True
-            return False
+            )
 
     js_1 = {
         "a": 1,
@@ -600,12 +609,12 @@ def test_json_like_round_trip_with_parent_ref(null_config):
     class ObjB(BaseJSONLike):
         name: str
         c: int
-        obj_A: Optional[Any] = None
+        obj_A: Any = None
 
         def __eq__(self, other):
-            if self.name == other.name and self.c == other.c:
-                return True
-            return False
+            if not isinstance(other, self.__class__):
+                return False
+            return self.name == other.name and self.c == other.c
 
     @dataclass
     class ObjA(BaseJSONLike):
@@ -620,14 +629,14 @@ def test_json_like_round_trip_with_parent_ref(null_config):
         b: float
 
         def __eq__(self, other):
-            if (
+            if not isinstance(other, self.__class__):
+                return False
+            return (
                 self.a == other.a
                 and self.b == other.b
                 and self.b.obj_A is self
                 and other.b.obj_A is other
-            ):
-                return True
-            return False
+            )
 
     js_1 = {
         "a": 1,
@@ -658,7 +667,7 @@ def test_from_json_like_optional_attr(null_config):
             ),
         )
         a: int
-        b: Optional[Any] = None
+        b: Any = None
 
     js_in = {"a": 9, "b": None}
     objA = ObjA.from_json_like(js_in)
@@ -683,7 +692,7 @@ def test_from_json_like_optional_attr_with_is_multiple_both_none(null_config):
             ),
         )
         a: int
-        b: Optional[Any] = None
+        b: Any = None
 
     js_in = {
         "a": 9,
@@ -711,7 +720,7 @@ def test_from_json_like_optional_attr_with_is_multiple_one_none(null_config):
             ),
         )
         a: int
-        b: Optional[Any] = None
+        b: Any = None
 
     js_in = {
         "a": 9,
@@ -743,7 +752,7 @@ def test_from_json_like_optional_attr_with_is_multiple_one_none_and_shared_data_
             ),
         )
         a: int
-        b: Optional[Any] = None
+        b: Any = None
 
     dcts = [
         {"name": "c1", "c": 2},
@@ -782,7 +791,7 @@ def test_from_json_like_optional_attr_with_is_multiple_all_none_and_shared_data_
             ),
         )
         a: int
-        b: Optional[Any] = None
+        b: Any = None
 
     dcts = [
         {"name": "c1", "c": 2},
@@ -819,7 +828,7 @@ def test_from_json_like_optional_attr_with_shared_data_name(null_config):
             ),
         )
         a: int
-        b: Optional[Any] = None
+        b: Any = None
 
     dcts = [
         {"name": "c1", "c": 2},
@@ -848,7 +857,7 @@ def test_from_json_like_optional_attr_with_enum(null_config):
     class ObjA(BaseJSONLikeSubClass):
         _child_objects = (ChildObjectSpec(name="b", class_obj=MyEnum, is_enum=True),)
         a: int
-        b: Optional[Any] = None
+        b: Any = None
 
     js_in = {
         "a": 9,
@@ -1079,7 +1088,7 @@ def test_from_json_like_with_is_multiple_and_shared_data_dict_lookup(null_config
     class ObjB(BaseJSONLikeSubClass):
         name: str
         c: int
-        _hash_value: Optional[str] = None
+        _hash_value: str | None = None
 
     @dataclass
     class ObjA(BaseJSONLikeSubClass):
@@ -1205,7 +1214,7 @@ def test_to_json_like_with_child_ref(null_config):
     class ObjB(BaseJSONLike):
         name: str
         c: int
-        obj_A: Optional[Any] = None
+        obj_A: Any = None
 
     @dataclass
     class ObjA(BaseJSONLike):