Merge pull request #1251 from Libensemble/refactor/pre1.2.1_smallfixes

Tiny pydantic version detemination fixes

Author: shuds13

libensemble/tests/unit_tests/test_ensemble.py

@@ -3,7 +3,7 @@
 import numpy as np
 
 import libensemble.tests.unit_tests.setup as setup
-from libensemble.utils.misc import pydanticV1, pydanticV2, specs_dump
+from libensemble.utils.misc import pydanticV1, specs_dump
 
 
 def test_ensemble_init():
@@ -132,7 +132,7 @@ def test_flakey_workflow():
     """Test initializing a workflow via Specs and Ensemble.run()"""
     if pydanticV1:
         from pydantic.error_wrappers import ValidationError
-    elif pydanticV2:
+    else:
         from pydantic import ValidationError
 
     from libensemble.ensemble import Ensemble

libensemble/tests/unit_tests/test_models.py

@@ -2,11 +2,11 @@
 
 import libensemble.tests.unit_tests.setup as setup
 from libensemble.specs import ExitCriteria, GenSpecs, LibeSpecs, SimSpecs, _EnsembleSpecs
-from libensemble.utils.misc import pydanticV1, pydanticV2, specs_dump
+from libensemble.utils.misc import pydanticV1, specs_dump
 
 if pydanticV1:
     from pydantic.error_wrappers import ValidationError
-elif pydanticV2:
+else:
     from pydantic import ValidationError
 
 
@@ -53,7 +53,7 @@ def test_sim_gen_alloc_exit_specs_invalid():
     try:
         if pydanticV1:
             SimSpecs.parse_obj(bad_specs)
-        elif pydanticV2:
+        else:
             SimSpecs.model_validate(bad_specs)
         flag = 0
     except ValidationError as e:
@@ -64,7 +64,7 @@ def test_sim_gen_alloc_exit_specs_invalid():
     try:
         if pydanticV1:
             GenSpecs.parse_obj(bad_specs)
-        elif pydanticV2:
+        else:
             GenSpecs.model_validate(bad_specs)
         flag = 0
     except ValidationError as e:
@@ -77,7 +77,7 @@ def test_sim_gen_alloc_exit_specs_invalid():
     try:
         if pydanticV1:
             ExitCriteria.parse_obj(bad_ec)
-        elif pydanticV2:
+        else:
             ExitCriteria.model_validate(bad_ec)
         flag = 0
     except ValidationError:
@@ -90,28 +90,28 @@ def test_libe_specs():
     libE_specs = {"mpi_comm": Fake_MPI(), "comms": "mpi"}
     if pydanticV1:
         ls = LibeSpecs.parse_obj(libE_specs)
-    elif pydanticV2:
+    else:
         ls = LibeSpecs.model_validate(libE_specs)
 
     libE_specs["sim_input_dir"] = "./simdir"
     libE_specs["sim_dir_copy_files"] = ["./simdir"]
     if pydanticV1:
         ls = LibeSpecs.parse_obj(libE_specs)
-    elif pydanticV2:
+    else:
         ls = LibeSpecs.model_validate(libE_specs)
 
     libE_specs = {"comms": "tcp", "nworkers": 4}
 
     if pydanticV1:
         ls = LibeSpecs.parse_obj(libE_specs)
-    elif pydanticV2:
+    else:
         ls = LibeSpecs.model_validate(libE_specs)
     assert ls.disable_resource_manager, "resource manager should be disabled when using tcp comms"
 
     libE_specs = {"comms": "tcp", "workers": ["hello.host"]}
     if pydanticV1:
         ls = LibeSpecs.parse_obj(libE_specs)
-    elif pydanticV2:
+    else:
         ls = LibeSpecs.model_validate(libE_specs)
 
 
@@ -121,7 +121,7 @@ def test_libe_specs_invalid():
     try:
         if pydanticV1:
             LibeSpecs.parse_obj(bad_specs)
-        elif pydanticV2:
+        else:
             LibeSpecs.model_validate(bad_specs)
         flag = 0
     except ValidationError:

libensemble/utils/misc.py

@@ -12,6 +12,9 @@
 pydanticV1 = pydantic_version == "1"
 pydanticV2 = pydantic_version == "2"
 
+if not pydanticV1 and not pydanticV2:
+    raise ModuleNotFoundError("Pydantic not installed or current version not supported. Install v1 or v2.")
+
 
 def extract_H_ranges(Work: dict) -> str:
     """Convert received H_rows into ranges for labeling"""
@@ -33,14 +36,14 @@ def extract_H_ranges(Work: dict) -> str:
 def specs_dump(specs, **kwargs):
     if pydanticV1:
         return specs.dict(**kwargs)
-    elif pydanticV2:
+    else:
         return specs.model_dump(**kwargs)
 
 
 def specs_checker_getattr(obj, key, default=None):
     if pydanticV1:  # dict
         return obj.get(key, default)
-    elif pydanticV2:  # actual obj
+    else:  # actual obj
         try:
             return getattr(obj, key)
         except AttributeError:
@@ -50,5 +53,5 @@ def specs_checker_getattr(obj, key, default=None):
 def specs_checker_setattr(obj, key, value):
     if pydanticV1:  # dict
         obj[key] = value
-    elif pydanticV2:  # actual obj
+    else:  # actual obj
         obj.__dict__[key] = value

libensemble/utils/pydantic_bindings.py

@@ -4,7 +4,7 @@
 
 from libensemble import specs
 from libensemble.resources import platforms
-from libensemble.utils.misc import pydanticV1, pydanticV2
+from libensemble.utils.misc import pydanticV1
 from libensemble.utils.validators import (
     _UFUNC_INVALID_ERR,
     _UNRECOGNIZED_ERR,
@@ -47,7 +47,7 @@ class Config:
     specs.LibeSpecs.Config = Config
     specs._EnsembleSpecs.Config = Config
 
-elif pydanticV2:
+else:
     from pydantic import ConfigDict
     from pydantic import validate_call as libE_wrapper  # noqa: F401
     from pydantic.fields import FieldInfo

libensemble/utils/validators.py

@@ -4,7 +4,7 @@
 import numpy as np
 
 from libensemble.resources.platforms import Platform
-from libensemble.utils.misc import pydanticV1, pydanticV2
+from libensemble.utils.misc import pydanticV1
 from libensemble.utils.specs_checkers import (
     _check_any_workers_and_disable_rm_if_tcp,
     _check_exit_criteria,
@@ -170,7 +170,7 @@ def genf_set_in_out_from_attrs(cls, values):
     def check_logical_cores(cls, values):
         return _check_logical_cores(values)
 
-elif pydanticV2:
+else:
     from pydantic import field_validator, model_validator
 
     # SPECS VALIDATORS #####