ansys-fluent-core 0.30.2__py3-none-any.whl → 0.30.4__py3-none-any.whl

ansys/fluent/core/__init__.py

@@ -62,9 +62,9 @@ from ansys.fluent.core.utils import fldoc, get_examples_download_dir
 from ansys.fluent.core.utils.fluent_version import FluentVersion  # noqa: F401
 from ansys.fluent.core.utils.setup_for_fluent import setup_for_fluent  # noqa: F401
 
-__version__ = "0.30.2"
+__version__ = "0.30.4"
 
-_VERSION_INFO = "Build date: March 18, 2025 18:36 UTC ShaID: d676e17"
+_VERSION_INFO = "Build date: April 24, 2025 19:32 UTC ShaID: f49abf3"
 """
 Global variable indicating the version info of the PyFluent package.
 Build timestamp and commit hash are added to this variable during packaging.

ansys/fluent/core/filereader/case_file.py

@@ -45,12 +45,13 @@ from os.path import dirname
 from pathlib import Path
 from typing import Dict, List
 
-from defusedxml.ElementTree import parse
+import defusedxml.ElementTree as ET
 import numpy as np
 
 from ansys.fluent.core.solver.error_message import allowed_name_error_message
 
 from . import lispy
+from .pre_processor import remove_unsupported_xml_chars
 
 try:
     import h5py
@@ -731,15 +732,17 @@ def _get_processed_string(input_string: bytes) -> str:
 
 
 def _get_case_file_name_from_flprj(flprj_file):
-    tree = parse(flprj_file)
-    root = tree.getroot()
-    folder_name = root.find("Metadata").find("CurrentSimulation").get("value")[5:-1]
-    # If the project file name begins with a digit then the node to find will be prepended
-    # with "_". Rather than making any assumptions that this is a hard rule, or what
-    # the scope of the rule is, simply retry with the name prepended:
-    folder_obj = (
-        root.find(folder_name)
-        if root.find(folder_name) and len(root.find(folder_name)) > 0
-        else root.find("_" + folder_name)
-    )
-    return folder_obj.find("Input").find("Case").find("Target").get("value")
+    with open(flprj_file, "r") as file:
+        content = file.read()
+        content = remove_unsupported_xml_chars(content)
+        root = ET.fromstring(content)
+        folder_name = root.find("Metadata").find("CurrentSimulation").get("value")[5:-1]
+        # If the project file name begins with a digit then the node to find will be prepended
+        # with "_". Rather than making any assumptions that this is a hard rule, or what
+        # the scope of the rule is, simply retry with the name prepended:
+        folder_obj = (
+            root.find(folder_name)
+            if root.find(folder_name) and len(root.find(folder_name)) > 0
+            else root.find("_" + folder_name)
+        )
+        return folder_obj.find("Input").find("Case").find("Target").get("value")

ansys/fluent/core/filereader/data_file.py

@@ -39,10 +39,11 @@ import os
 from os.path import dirname
 from pathlib import Path
 
-from defusedxml.ElementTree import parse
+import defusedxml.ElementTree as ET
 import numpy as np
 
 from . import lispy
+from .pre_processor import remove_unsupported_xml_chars
 
 try:
     import h5py
@@ -224,7 +225,15 @@ class DataFile:
 
 
 def _get_data_file_name_from_flprj(flprj_file):
-    tree = parse(flprj_file)
-    root = tree.getroot()
-    folder_name = root.find("Metadata").find("CurrentSimulation").get("value")[5:-1]
-    return root.find(folder_name).find("Input").find("Case").find("Target").get("value")
+    with open(flprj_file, "r") as file:
+        content = file.read()
+        content = remove_unsupported_xml_chars(content)
+        root = ET.fromstring(content)
+        folder_name = root.find("Metadata").find("CurrentSimulation").get("value")[5:-1]
+        return (
+            root.find(folder_name)
+            .find("Input")
+            .find("Case")
+            .find("Target")
+            .get("value")
+        )

ansys/fluent/core/filereader/pre_processor.py

@@ -0,0 +1,35 @@
+# Copyright (C) 2021 - 2025 ANSYS, Inc. and/or its affiliates.
+# SPDX-License-Identifier: MIT
+#
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+"""
+Pre-processor for XML content from Fluent project files.
+"""
+
+import re
+
+
+def remove_unsupported_xml_chars(content: str):
+    """Remove unsupported XML characters from the content."""
+    # Replace double colons in tag names with double underscores
+    content = re.sub(r"</?([^> ]+)::", r"<\1__", content)
+
+    return content