revert: some of the broken updates

examples/00-fluent/DOE_ML.py

@@ -1,6 +1,6 @@
 # /// script
 # dependencies = [
-#   "pyfluent",
+#   "ansys-fluent-core",
 #   "matplotlib",
 #   "numpy",
 #   "pandas",

examples/00-fluent/ahmed_body_workflow.py

@@ -1,6 +1,6 @@
 # /// script
 # dependencies = [
-#   "pyfluent",
+#   "ansys-fluent-core",
 #   "ansys-fluent-visualization",
 # ]
 # ///
@@ -66,7 +66,6 @@
 
 import ansys.fluent.core as pyfluent
 from ansys.fluent.core import examples
-from ansys.fluent.core.session_solver import Solver
 from ansys.fluent.visualization import Contour, GraphicsWindow
 
 #######################################################################################
@@ -221,7 +220,7 @@
 #######################################################################################
 # Switch to the Solver Mode
 # =====================================================================================
-session: Solver = session.switch_to_solver()
+session = session.switch_to_solver()
 
 #######################################################################################
 # Mesh Visualization

examples/00-fluent/brake.py

@@ -1,6 +1,6 @@
 # /// script
 # dependencies = [
-#   "pyfluent",
+#   "ansys-fluent-core",
 #   "ansys-fluent-visualization",
 #   "matplotlib",
 # ]

examples/00-fluent/conjugate_heat_transfer.py

@@ -1,6 +1,6 @@
 # /// script
 # dependencies = [
-#   "pyfluent",
+#   "ansys-fluent-core",
 #   "ansys-fluent-visualization",
 #   "matplotlib",
 #   "pyvista",

examples/00-fluent/exhaust_system_settings_api.py

@@ -1,6 +1,6 @@
 # /// script
 # dependencies = [
-#   "pyfluent",
+#   "ansys-fluent-core",
 # ]
 # ///
 

examples/00-fluent/external_compressible_flow.py

@@ -1,6 +1,6 @@
 # /// script
 # dependencies = [
-#   "pyfluent",
+#   "ansys-fluent-core",
 # ]
 # ///
 

examples/00-fluent/frozen_rotor_workflow.py

@@ -1,6 +1,6 @@
 # /// script
 # dependencies = [
-#   "pyfluent",
+#   "ansys-fluent-core",
 # ]
 # ///
 

examples/00-fluent/lunar_lander_thermal.py

@@ -1,6 +1,6 @@
 # /// script
 # dependencies = [
-#   "pyfluent",
+#   "ansys-fluent-core",
 #   "matplotlib",
 #   "numpy",
 #   "pandas",

examples/00-fluent/mixing_elbow_settings_api.py

@@ -1,6 +1,6 @@
 # /// script
 # dependencies = [
-#   "pyfluent",
+#   "ansys-fluent-core",
 # ]
 # ///
 

examples/00-fluent/mixing_tank_workflow.py

@@ -1,6 +1,6 @@
 # /// script
 # dependencies = [
-#   "pyfluent",
+#   "ansys-fluent-core",
 # ]
 # ///
 

examples/00-fluent/modeling_ablation.py

@@ -1,6 +1,6 @@
 # /// script
 # dependencies = [
-#   "pyfluent",
+#   "ansys-fluent-core",
 #   "ansys-fluent-visualization",
 # ]
 # ///

examples/00-fluent/modeling_cavitation.py

@@ -1,6 +1,6 @@
 # /// script
 # dependencies = [
-#   "pyfluent",
+#   "ansys-fluent-core",
 # ]
 # ///
 

examples/00-fluent/parametric_static_mixer_1.py

@@ -1,6 +1,6 @@
 # /// script
 # dependencies = [
-#   "pyfluent",
+#   "ansys-fluent-core",
 # ]
 # ///
 

examples/00-fluent/radiation_headlamp.py

@@ -1,6 +1,6 @@
 # /// script
 # dependencies = [
-#   "pyfluent",
+#   "ansys-fluent-core",
 # ]
 # ///
 

examples/00-fluent/single_battery_cell_workflow.py

@@ -1,6 +1,6 @@
 # /// script
 # dependencies = [
-#   "pyfluent",
+#   "ansys-fluent-core",
 # ]
 # ///
 

examples/00-fluent/species_transport.py

@@ -1,6 +1,6 @@
 # /// script
 # dependencies = [
-#   "pyfluent",
+#   "ansys-fluent-core",
 # ]
 # ///
 

examples/00-fluent/steady_vortex.py

@@ -1,7 +1,7 @@
 # /// script
 # dependencies = [
 #   "imageio",
-#   "pyfluent",
+#   "ansys-fluent-core",
 # ]
 # ///
 

examples/00-fluent/tyler_sofrin_modes.py

@@ -2,7 +2,7 @@
 # dependencies = [
 #   "matplotlib",
 #   "numpy",
-#   "pyfluent",
+#   "ansys-fluent-core",
 # ]
 # ///
 
@@ -212,7 +212,7 @@
             An[n_ind][angle_ind] = mag
             Bn[n_ind][angle_ind] = 0
         else:
-            session.settings.solution.report_definitions.surface["mag-report"] = {
+            session.solution.report_definitions.surface["mag-report"] = {
                 "report_type": "surface-vertexavg",
                 "surface_names": ["point-" + str(angle)],
                 "field": str(variable) + "-mag",

src/ansys/fluent/core/search.py

@@ -630,13 +630,13 @@ def search(
     >>> pyfluent.search("font", match_whole_word=True)
     >>> pyfluent.search("Font")
     >>> pyfluent.search("local*", api_path="<solver_session>.setup")
-    <solver_session>.setupdynamic_mesh.methods.smoothing.radial_settings.local_smoothing (Parameter)
-    <solver_session>.setupmesh_interfaces.interface["<name>"].local_absolute_mapped_tolerance (Parameter)
-    <solver_session>.setupmesh_interfaces.interface["<name>"].local_relative_mapped_tolerance (Parameter)
+    <solver_session>.setup.dynamic_mesh.methods.smoothing.radial_settings.local_smoothing (Parameter)
+    <solver_session>.setup.mesh_interfaces.interface["<name>"].local_absolute_mapped_tolerance (Parameter)
+    <solver_session>.setup.mesh_interfaces.interface["<name>"].local_relative_mapped_tolerance (Parameter)
     >>> pyfluent.search("读", language="cmn")   # search 'read' in Chinese
-    <solver_session>.fileread (Command)
-    <solver_session>.fileimport_.read (Command)
-    <solver_session>.meshsurface_mesh.read (Command)
+    <solver_session>.file.ead (Command)
+    <solver_session>.file.mport_.read (Command)
+    <solver_session>.mesh.surface_mesh.read (Command)
     <solver_session>.tui.display.display_states.read (Command)
     <meshing_session>.tui.display.display_states.read (Command)
     """

tests/test_flobject.py

@@ -721,7 +721,7 @@ def test_accessor_methods_on_settings_object(static_mixer_settings_session):
         ].turbulence.turbulent_viscosity_ratio
 
         if solver.get_fluent_version() >= FluentVersion.v251:
-            path = '<session>.setupboundary_conditions.velocity_inlet["inlet1"].turbulence.turbulent_viscosity_ratio'
+            path = '<session>.settings.setup.boundary_conditions.velocity_inlet["inlet1"].turbulence.turbulent_viscosity_ratio'
         else:
             path = '<session>.setup.boundary_conditions.velocity_inlet["inlet1"].turbulence.turbulent_viscosity_ratio'
         name = "turbulent_viscosity_ratio"

tests/test_search.py

@@ -152,7 +152,7 @@ def test_search_wildcard(capsys):
     )
     lines = capsys.readouterr().out.splitlines()
     assert (
-        "<solver_session>.solutionrun_calculation.cfl_based_adaptive_time_stepping.max_fixed_time_step (Parameter)"
+        "<solver_session>.solution.run_calculation.cfl_based_adaptive_time_stepping.max_fixed_time_step (Parameter)"
         in lines
     )
 
@@ -161,7 +161,7 @@ def test_search_wildcard(capsys):
         api_tree_data=api_tree_data,
     )
     lines = capsys.readouterr().out.splitlines()
-    assert "<solver_session>.solutioncontrols.limits.min_des_tke (Parameter)" in lines
+    assert "<solver_session>.solution.controls.limits.min_des_tke (Parameter)" in lines
 
 
 @pytest.mark.fluent_version("==24.2")
@@ -186,7 +186,7 @@ def test_search_whole_word(capsys):
     )
     lines = capsys.readouterr().out.splitlines()
     assert (
-        "<solver_session>.setupmodels.battery.tool_kits.standalone_echem_model.k0_sei (Parameter)"
+        "<solver_session>.setup.models.battery.tool_kits.standalone_echem_model.k0_sei (Parameter)"
         in lines
     )
 
@@ -198,7 +198,8 @@ def test_search_semantic(capsys):
     _search_semantic("读", language="cmn", api_tree_data=api_tree_data)
     lines = capsys.readouterr().out.splitlines()
     assert (
-        "<solver_session>.fileread_surface_mesh (Command) (similarity: 100.0%)" in lines
+        "<solver_session>.file.read_surface_mesh (Command) (similarity: 100.0%)"
+        in lines
     )
 
     _search_semantic("フォント", language="jpn", api_tree_data=api_tree_data)
@@ -264,7 +265,7 @@ def test_wildcard_search(capsys):
     pyfluent.search("local*")
     lines = capsys.readouterr().out.splitlines()
     assert (
-        '<solver_session>.setupmesh_interfaces.interface["<name>"].local_absolute_mapped_tolerance (Parameter)'
+        '<solver_session>.setup.mesh_interfaces.interface["<name>"].local_absolute_mapped_tolerance (Parameter)'
         in lines
     )
 
@@ -274,11 +275,11 @@ def test_wildcard_search(capsys):
 def test_chinese_semantic_search(capsys):
     pyfluent.search("读", language="cmn")
     lines = capsys.readouterr().out.splitlines()
-    assert "<solver_session>.fileread_case (Command) (similarity: 100.0%)" in lines
+    assert "<solver_session>.file.read_case (Command) (similarity: 100.0%)" in lines
 
     pyfluent.search("写", language="cmn")
     lines = capsys.readouterr().out.splitlines()
-    assert "<solver_session>.filewrite_case (Command) (similarity: 100.0%)" in lines
+    assert "<solver_session>.file.write_case (Command) (similarity: 100.0%)" in lines
 
 
 @pytest.mark.fluent_version("==24.2")
@@ -333,7 +334,7 @@ def test_solver_api_path():
     pyfluent.config.print_search_results = False
     results = pyfluent.search(search_string="faces_zones", api_path="<solver_session>")
     assert "<meshing_session>" not in results
-    assert "<solver_session>.meshmodify_zones.project_face_zones (Command)" in results
+    assert "<solver_session>.mesh.modify_zones.project_face_zones (Command)" in results
     assert (
         "<solver_session>.tui.mesh.modify_zones.project_face_zones (Command)" in results
     )
@@ -360,7 +361,7 @@ def test_solver_specific_api_path():
     results = pyfluent.search(search_string="font", api_path="contour")
     assert "<meshing_session>" not in results
     assert (
-        '<solver_session>.resultsgraphics.contour["<name>"].color_map.font_automatic (Parameter) (similarity: 98.31%)'
+        '<solver_session>.results.graphics.contour["<name>"].color_map.font_automatic (Parameter) (similarity: 98.31%)'
         in results
     )
 
@@ -387,10 +388,10 @@ def test_wildcard_with_api_path():
     import ansys.fluent.core as pyfluent
 
     pyfluent.config.print_search_results = False
-    results = pyfluent.search("local*", api_path="<solver_session>.setup")
+    results = pyfluent.search("local*", api_path="<solver_session>.setup.")
     assert "<meshing_session>" not in results
     assert (
-        '<solver_session>.setupmesh_interfaces.interface["<name>"].local_absolute_mapped_tolerance (Parameter)'
+        '<solver_session>.setup.mesh_interfaces.interface["<name>"].local_absolute_mapped_tolerance (Parameter)'
         in results
     )
 
@@ -404,7 +405,7 @@ def test_wildcard_with_api_object():
     results = pyfluent.search("local*", api_path="mesh_interfaces")
     assert "<meshing_session>" not in results
     assert (
-        '<solver_session>.setupmesh_interfaces.interface["<name>"].local_absolute_mapped_tolerance (Parameter)'
+        '<solver_session>.setup.mesh_interfaces.interface["<name>"].local_absolute_mapped_tolerance (Parameter)'
         in results
     )
 
@@ -435,7 +436,7 @@ def test_semantic_search_read():
     for result in results:
         assert "thread" not in result
     assert (
-        "<solver_session>.fileconvert_hanging_nodes_during_read (Parameter) (similarity: 100.0%)"
+        "<solver_session>.file.convert_hanging_nodes_during_read (Parameter) (similarity: 100.0%)"
         in results
     )
 

tests/test_settings_api.py

@@ -241,7 +241,7 @@ def test_api_upgrade(new_solver_session, capsys):
     case_path = download_file("Static_Mixer_main.cas.h5", "pyfluent/static_mixer")
     solver.tui.file.read_case(case_path)
     timeout_loop(
-        lambda: "<solver_session>.fileread_case" in capsys.readouterr().out,
+        lambda: "<solver_session>.file.read_case" in capsys.readouterr().out,
         timeout=5,
     )
 
@@ -642,7 +642,7 @@ def test_deprecated_command_arguments(mixing_elbow_case_data_session):
     with pytest.warns(
         PyFluentUserWarning,
         match=(
-            "Unknown keyword 'all_boundary_zones' for command '<session>.resultsreport.fluxes.mass_flow'. "
+            "Unknown keyword 'all_boundary_zones' for command '<session>.results.report.fluxes.mass_flow'. "
             "It will be ignored."
         ),
     ):

tests/test_tui_api.py

@@ -66,9 +66,9 @@ def test_api_upgrade_message(new_solver_session):
         solver.tui.file.read_case(case_name)
     s = f.getvalue()
     if solver.get_fluent_version() >= FluentVersion.v251:
-        assert s.split("\n")[-2].split("(")[0] == r"<solver_session>.fileread_case"
+        assert s.split("\n")[-2].split("(")[0] == r"<solver_session>.file.read_case"
     else:
-        assert s.split("\n")[-2].split("(")[0] == r"<solver_session>.fileread_case"
+        assert s.split("\n")[-2].split("(")[0] == r"<solver_session>.file.read_case"
 
 
 def test_exit_not_in_meshing_tui(new_meshing_session):