Normalize strings before converting to protobuf enum values (#848)

Allow normalizing strings before converting them to a protobuf
enum value. By default, the string is converted to lowercase.

This means that all capitalizations of the string will be accepted,
for example "SI", "Si", "si" will all be accepted in the unit system
parameter.

Closes #793.

Author: greschd

src/ansys/acp/core/_tree_objects/_grpc_helpers/enum_wrapper.py

@@ -43,6 +43,7 @@ def wrap_to_string_enum(
     doc: str,
     explicit_value_list: tuple[int, ...] | None = None,
     extra_aliases: Mapping[str, tuple[str, str]] = types.MappingProxyType({}),
+    normalization_function: Callable[[str], str] = lambda val: val.lower(),
 ) -> tuple[_StrEnumT, Callable[[_StrEnumT], int], Callable[[int], _StrEnumT]]:
     """Create a string Enum with the same keys as the given protobuf Enum.
 
@@ -64,6 +65,10 @@ def wrap_to_string_enum(
         and the alias field value.
         Note that the alias will not be used when converting from the protobuf value to the string
         enum: the primary field name will be used instead.
+    normalization_function :
+        A callable which is applied to strings before converting them to protobuf. This means that
+        any string which will result in an enum value will be accepted, for example if it has the
+        wrong capitalization.
 
     Returns
     -------
@@ -93,6 +98,7 @@ def wrap_to_string_enum(
     res_enum.__doc__ = doc
 
     def to_pb_conversion_func(val: _StrEnumT) -> int:
+        val = normalization_function(val)
         val = res_enum(val)  # generates a nicer error if 'val' is not a valid enum value
         return to_pb_conversion_dict[val]
 

tests/unittests/test_acp_instance.py

@@ -29,6 +29,8 @@
 
 import pytest
 
+import ansys.acp.core as pyacp
+
 
 def test_server_version(acp_instance):
     version = acp_instance.server_version
@@ -88,6 +90,35 @@ def test_import_inexistent(acp_instance):
     assert filename in str(exc.value)
 
 
+@pytest.mark.parametrize(
+    "input_unit_system,expected_unit_system",
+    [
+        ("SI", pyacp.UnitSystemType.SI),
+        ("Si", pyacp.UnitSystemType.SI),
+        ("si", pyacp.UnitSystemType.SI),
+        (pyacp.UnitSystemType.SI, pyacp.UnitSystemType.SI),
+        ("uMKS", pyacp.UnitSystemType.uMKS),
+    ],
+)
+def test_import_unit_system(acp_instance, model_data_dir, input_unit_system, expected_unit_system):
+    model = acp_instance.import_model(
+        model_data_dir / "class40.cdb",
+        unit_system=input_unit_system,
+        format="ansys:cdb",
+    )
+    assert model.unit_system == expected_unit_system
+
+
+@pytest.mark.parametrize("format", ["ansys:cdb", "AnSYS:cDB", pyacp.FeFormat.ANSYS_CDB])
+def test_format_capitalization(acp_instance, model_data_dir, format):
+    """Test that the format is case insensitive."""
+    acp_instance.import_model(
+        model_data_dir / "class40.cdb",
+        unit_system="SI",
+        format=format,
+    )
+
+
 def test_restart_wait(acp_instance, load_model_from_tempfile):
     """Test that the server is accessible after restart.