From 6e5e565ae5df7e2bd58c87f8ca6487608d0d6acd Mon Sep 17 00:00:00 2001 From: hpohekar Date: Mon, 4 Aug 2025 13:10:24 +0530 Subject: [PATCH 1/7] chore: Extract allowed values --- src/ansys/fluent/core/codegen/settingsgen.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/ansys/fluent/core/codegen/settingsgen.py b/src/ansys/fluent/core/codegen/settingsgen.py index e4f9f8361069..bb0d992bd746 100644 --- a/src/ansys/fluent/core/codegen/settingsgen.py +++ b/src/ansys/fluent/core/codegen/settingsgen.py @@ -316,6 +316,8 @@ def _write_data(cls_name: str, python_name: str, data: dict, f: IO, f_stub: IO | s_stub.write( f" {to_constant_name(allowed_value)}: Final[str] = {allowed_value!r}\n" ) + s.write(f" _allowed_values = {data['allowed_values']!r}\n") + s_stub.write(" _allowed_values: list\n") s.write("\n") s_stub.write("\n") for name, (python_name, data, hash_, should_write_stub) in classes_to_write.items(): From d9c0095f97dd766f2d07ea6003e3a2396c7c2fda Mon Sep 17 00:00:00 2001 From: pyansys-ci-bot <92810346+pyansys-ci-bot@users.noreply.github.com> Date: Mon, 4 Aug 2025 07:44:43 +0000 Subject: [PATCH 2/7] chore: adding changelog file 4342.maintenance.md [dependabot-skip] --- doc/changelog.d/4342.maintenance.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/changelog.d/4342.maintenance.md diff --git a/doc/changelog.d/4342.maintenance.md b/doc/changelog.d/4342.maintenance.md new file mode 100644 index 000000000000..d3afc30aa415 --- /dev/null +++ b/doc/changelog.d/4342.maintenance.md @@ -0,0 +1 @@ +Extract allowed values \ No newline at end of file From c16ca79b1ea788e7e83e81dec52ddf8290cc9dee Mon Sep 17 00:00:00 2001 From: hpohekar Date: Wed, 6 Aug 2025 15:28:48 +0530 Subject: [PATCH 3/7] add test --- tests/test_codegen.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/tests/test_codegen.py b/tests/test_codegen.py index 968821526c57..bb88548edaae 100644 --- a/tests/test_codegen.py +++ b/tests/test_codegen.py @@ -56,6 +56,22 @@ def test_allapigen_files(new_solver_session): importlib.import_module(f"ansys.fluent.core.generated.solver.settings_{version}") +@pytest.mark.codegen_required +def test_settings_allowed_values(new_solver_session): + version = get_version_for_file_name(session=new_solver_session) + module = importlib.import_module( + f"ansys.fluent.core.generated.solver.settings_{version}" + ) + + file_type_1 = getattr(module, "file_type_1") + assert set(file_type_1._allowed_values) == set( + ["case", "case-data", "data", "mesh"] + ) + + unit = getattr(module, "unit") + assert set(unit._allowed_values) == set(["m", "cm", "mm", "in", "ft"]) + + def test_codegen_with_no_static_info(monkeypatch): codegen_outdir = Path(tempfile.mkdtemp()) monkeypatch.setattr(pyfluent.config, "codegen_outdir", codegen_outdir) From 4040cd08e54be8fc63a565ba8cd1d89ab8eb624b Mon Sep 17 00:00:00 2001 From: hpohekar Date: Wed, 6 Aug 2025 17:48:16 +0530 Subject: [PATCH 4/7] add test 1 --- tests/test_codegen.py | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/tests/test_codegen.py b/tests/test_codegen.py index bb88548edaae..6d824539a2d4 100644 --- a/tests/test_codegen.py +++ b/tests/test_codegen.py @@ -532,6 +532,7 @@ class P3(Integer): _version = '251' fluent_name = 'P3' _python_name = 'P3' + _allowed_values = [] class G2(Group): """ @@ -544,6 +545,7 @@ class G2(Group): _child_classes = dict( P3=P3, ) + _allowed_values = [] class P2(Real): """ @@ -552,6 +554,7 @@ class P2(Real): _version = '251' fluent_name = 'P2' _python_name = 'P2' + _allowed_values = [] class A2(Real): """ @@ -560,6 +563,7 @@ class A2(Real): _version = '251' fluent_name = 'A2' _python_name = 'A2' + _allowed_values = [] class C2(Command): """ @@ -577,6 +581,7 @@ class C2(Command): _child_classes = dict( A2=A2, ) + _allowed_values = [] class Q2(Query): """ @@ -594,6 +599,7 @@ class Q2(Query): _child_classes = dict( A2=A2, ) + _allowed_values = [] class G1(Group): """ @@ -611,6 +617,7 @@ class G1(Group): C2=C2, Q2=Q2, ) + _allowed_values = [] class P1(String): """ @@ -619,6 +626,7 @@ class P1(String): _version = '251' fluent_name = 'P1' _python_name = 'P1' + _allowed_values = [] class P4(String): """ @@ -627,6 +635,7 @@ class P4(String): _version = '251' fluent_name = 'P4' _python_name = 'P4' + _allowed_values = [] class N1_child(Group): """ @@ -635,6 +644,7 @@ class N1_child(Group): _version = '251' fluent_name = 'child-object-type' _python_name = 'N1_child' + _allowed_values = [] class N1(NamedObject[N1_child], _NonCreatableNamedObjectMixin[N1_child]): """ @@ -648,6 +658,7 @@ class N1(NamedObject[N1_child], _NonCreatableNamedObjectMixin[N1_child]): P4=P4, ) child_object_type = N1_child + _allowed_values = [] class A1(String): """ @@ -656,6 +667,7 @@ class A1(String): _version = '251' fluent_name = 'A1' _python_name = 'A1' + _allowed_values = [] class C1(Command): """ @@ -673,6 +685,7 @@ class C1(Command): _child_classes = dict( A1=A1, ) + _allowed_values = [] class Q1(Query): """ @@ -690,6 +703,7 @@ class Q1(Query): _child_classes = dict( A1=A1, ) + _allowed_values = [] class root(Group): """ @@ -707,7 +721,8 @@ class root(Group): N1=N1, C1=C1, Q1=Q1, - )''' # noqa: W293 + ) + _allowed_values = []''' # noqa: W293 def test_codegen_with_settings_static_info(monkeypatch): From d2d2423646d7a4d7c19e898702bc01d53a3be43a Mon Sep 17 00:00:00 2001 From: pyansys-ci-bot <92810346+pyansys-ci-bot@users.noreply.github.com> Date: Thu, 7 Aug 2025 10:38:28 +0000 Subject: [PATCH 5/7] chore: adding changelog file 4342.maintenance.md [dependabot-skip] --- doc/changelog.d/4342.maintenance.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/changelog.d/4342.maintenance.md b/doc/changelog.d/4342.maintenance.md index d3afc30aa415..6bc1576549dc 100644 --- a/doc/changelog.d/4342.maintenance.md +++ b/doc/changelog.d/4342.maintenance.md @@ -1 +1 @@ -Extract allowed values \ No newline at end of file +Extract allowed values From ddc7994f1e90bb0d364c4239d22870fd77d55278 Mon Sep 17 00:00:00 2001 From: hpohekar Date: Tue, 12 Aug 2025 12:42:01 +0530 Subject: [PATCH 6/7] fix: extract only if available --- src/ansys/fluent/core/codegen/settingsgen.py | 5 +++-- tests/test_codegen.py | 17 +---------------- 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/src/ansys/fluent/core/codegen/settingsgen.py b/src/ansys/fluent/core/codegen/settingsgen.py index bb0d992bd746..a8d2596edd09 100644 --- a/src/ansys/fluent/core/codegen/settingsgen.py +++ b/src/ansys/fluent/core/codegen/settingsgen.py @@ -316,8 +316,9 @@ def _write_data(cls_name: str, python_name: str, data: dict, f: IO, f_stub: IO | s_stub.write( f" {to_constant_name(allowed_value)}: Final[str] = {allowed_value!r}\n" ) - s.write(f" _allowed_values = {data['allowed_values']!r}\n") - s_stub.write(" _allowed_values: list\n") + if data["allowed_values"]: + s.write(f" _allowed_values = {data['allowed_values']!r}\n") + s_stub.write(" _allowed_values: list[str]\n") s.write("\n") s_stub.write("\n") for name, (python_name, data, hash_, should_write_stub) in classes_to_write.items(): diff --git a/tests/test_codegen.py b/tests/test_codegen.py index 6d824539a2d4..bb88548edaae 100644 --- a/tests/test_codegen.py +++ b/tests/test_codegen.py @@ -532,7 +532,6 @@ class P3(Integer): _version = '251' fluent_name = 'P3' _python_name = 'P3' - _allowed_values = [] class G2(Group): """ @@ -545,7 +544,6 @@ class G2(Group): _child_classes = dict( P3=P3, ) - _allowed_values = [] class P2(Real): """ @@ -554,7 +552,6 @@ class P2(Real): _version = '251' fluent_name = 'P2' _python_name = 'P2' - _allowed_values = [] class A2(Real): """ @@ -563,7 +560,6 @@ class A2(Real): _version = '251' fluent_name = 'A2' _python_name = 'A2' - _allowed_values = [] class C2(Command): """ @@ -581,7 +577,6 @@ class C2(Command): _child_classes = dict( A2=A2, ) - _allowed_values = [] class Q2(Query): """ @@ -599,7 +594,6 @@ class Q2(Query): _child_classes = dict( A2=A2, ) - _allowed_values = [] class G1(Group): """ @@ -617,7 +611,6 @@ class G1(Group): C2=C2, Q2=Q2, ) - _allowed_values = [] class P1(String): """ @@ -626,7 +619,6 @@ class P1(String): _version = '251' fluent_name = 'P1' _python_name = 'P1' - _allowed_values = [] class P4(String): """ @@ -635,7 +627,6 @@ class P4(String): _version = '251' fluent_name = 'P4' _python_name = 'P4' - _allowed_values = [] class N1_child(Group): """ @@ -644,7 +635,6 @@ class N1_child(Group): _version = '251' fluent_name = 'child-object-type' _python_name = 'N1_child' - _allowed_values = [] class N1(NamedObject[N1_child], _NonCreatableNamedObjectMixin[N1_child]): """ @@ -658,7 +648,6 @@ class N1(NamedObject[N1_child], _NonCreatableNamedObjectMixin[N1_child]): P4=P4, ) child_object_type = N1_child - _allowed_values = [] class A1(String): """ @@ -667,7 +656,6 @@ class A1(String): _version = '251' fluent_name = 'A1' _python_name = 'A1' - _allowed_values = [] class C1(Command): """ @@ -685,7 +673,6 @@ class C1(Command): _child_classes = dict( A1=A1, ) - _allowed_values = [] class Q1(Query): """ @@ -703,7 +690,6 @@ class Q1(Query): _child_classes = dict( A1=A1, ) - _allowed_values = [] class root(Group): """ @@ -721,8 +707,7 @@ class root(Group): N1=N1, C1=C1, Q1=Q1, - ) - _allowed_values = []''' # noqa: W293 + )''' # noqa: W293 def test_codegen_with_settings_static_info(monkeypatch): From c32ed44d848685055001960cfbbc5200846ebc70 Mon Sep 17 00:00:00 2001 From: hpohekar Date: Tue, 19 Aug 2025 09:38:50 +0530 Subject: [PATCH 7/7] update test --- tests/test_codegen.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/test_codegen.py b/tests/test_codegen.py index bb88548edaae..b112958eb39d 100644 --- a/tests/test_codegen.py +++ b/tests/test_codegen.py @@ -56,6 +56,7 @@ def test_allapigen_files(new_solver_session): importlib.import_module(f"ansys.fluent.core.generated.solver.settings_{version}") +@pytest.mark.fluent_version(">=26.1") @pytest.mark.codegen_required def test_settings_allowed_values(new_solver_session): version = get_version_for_file_name(session=new_solver_session)