ansys-pyensight-core 0.10.3__tar.gz → 0.10.5__tar.gz

{ansys_pyensight_core-0.10.3 → ansys_pyensight_core-0.10.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ansys-pyensight-core
-Version: 0.10.3
+Version: 0.10.5
 Summary: A python wrapper for Ansys EnSight
 Author-email: "ANSYS, Inc." <pyansys.core@ansys.com>
 Maintainer-email: "ANSYS, Inc." <pyansys.core@ansys.com>
@@ -17,7 +17,7 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 License-File: LICENSE
 Requires-Dist: importlib-metadata>=4.0; python_version<='3.8'
-Requires-Dist: ansys-api-pyensight==0.4.7
+Requires-Dist: ansys-api-pyensight==0.4.8
 Requires-Dist: requests>=2.28.2
 Requires-Dist: docker>=6.1.0
 Requires-Dist: urllib3<2.4.0

{ansys_pyensight_core-0.10.3 → ansys_pyensight_core-0.10.5}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "flit_core.buildapi"
 
 [project]
 name = "ansys-pyensight-core"
-version = "0.10.3"
+version = "0.10.5"
 description = "A python wrapper for Ansys EnSight"
 readme = "README.rst"
 requires-python = ">=3.10,<3.14"
@@ -27,7 +27,7 @@ classifiers = [
 
 dependencies = [
     "importlib-metadata>=4.0; python_version<='3.8'",
-    "ansys-api-pyensight==0.4.7",
+    "ansys-api-pyensight==0.4.8",
     "requests>=2.28.2",
     "docker>=6.1.0",
     "urllib3<2.4.0",

{ansys_pyensight_core-0.10.3 → ansys_pyensight_core-0.10.5}/src/ansys/pyensight/core/dockerlauncher.py

@@ -384,7 +384,8 @@ class DockerLauncher(Launcher):
 
     def launch_webui(self, container_env_str):
         # Run websocketserver
-        cmd = "cpython -m ansys.simba.plugin.post.simba_post"
+        cmd = f"/ansys_inc/v{self._ansys_version}/FluidsOne/server/linx64/fluidsone"
+        cmd += " --main-run-mode post"
         # websocket port - this needs to come first since we now have
         # --add_header as a optional arg that can take an arbitrary
         # number of optional headers.
@@ -393,10 +394,7 @@ class DockerLauncher(Launcher):
         http_port = self._service_host_port["http"][1]
         ws_port = self._service_host_port["ws"][1]
         cmd += f" --server-listen-port {webui_port}"
-        cmd += (
-            f" --server-web-roots /ansys_inc/v{self._ansys_version}/CEI/nexus{self._ansys_version}/"
-        )
-        cmd += f"ansys{self._ansys_version}/ensight/WebUI/web/ui/"
+        cmd += f" --server-web-roots /ansys_inc/v{self._ansys_version}/FluidsOne/web/ui"
         cmd += f" --ensight-grpc-port {grpc_port}"
         cmd += f" --ensight-html-port {http_port}"
         cmd += f" --ensight-ws-port {ws_port}"

{ansys_pyensight_core-0.10.3 → ansys_pyensight_core-0.10.5}/src/ansys/pyensight/core/locallauncher.py

@@ -102,23 +102,26 @@ class LocalLauncher(Launcher):
         """Type of app to launch. Options are ``ensight`` and ``envision``."""
         return self._application
 
-    def launch_webui(self, cpython, version, popen_common):
-        cmd = [cpython, "-m", "ansys.simba.plugin.post.simba_post"]
+    def launch_webui(self, version, popen_common):
+        if os.environ.get("PYENSIGHT_FLUIDSONE_PATH"):
+            fluids_one_path = os.environ["PYENSIGHT_FLUIDSONE_PATH"]
+        else:
+            awp_path = os.path.dirname(self._install_path)
+            platf = "winx64" if self._is_windows() else "linx64"
+            fluids_one_path = os.path.join(awp_path, "FluidsOne", "server", platf, "fluids_one")
+            if self._is_windows():
+                fluids_one_path += ".exe"
+        cmd = [fluids_one_path, "--main-run-mode", "post"]
         path_to_webui = self._install_path
         # Dev environment
         path_to_webui_internal = os.path.join(
             path_to_webui, f"nexus{version}", f"ansys{version}", "ensight", "WebUI", "web", "ui"
         )
         # Ansys environment
-        paths_to_webui_ansys = [
-            os.path.join(os.path.dirname(path_to_webui), "simcfd", "web", "ui"),
-            os.path.join(os.path.dirname(path_to_webui), "fluidsone", "web", "ui"),
-        ]
+        path_to_webui_ansys = os.path.join(os.path.dirname(path_to_webui), "FluidsOne", "web", "ui")
         path_to_webui = path_to_webui_internal
-        for path in paths_to_webui_ansys:
-            if os.path.exists(path):
-                path_to_webui = path
-                break
+        if os.path.exists(path_to_webui_ansys):
+            path_to_webui = path_to_webui_ansys
         cmd += ["--server-listen-port", str(self._ports[5])]
         cmd += ["--server-web-roots", path_to_webui]
         cmd += ["--ensight-grpc-port", str(self._ports[0])]
@@ -270,7 +273,6 @@ class LocalLauncher(Launcher):
             cmd = [os.path.join(self._install_path, "bin", "cpython"), websocket_script]
             if is_windows:
                 cmd[0] += ".bat"
-            ensight_python = cmd[0]
             cmd.extend(["--http_directory", self.session_directory])
             # http port
             cmd.extend(["--http_port", str(self._ports[2])])
@@ -317,7 +319,7 @@ class LocalLauncher(Launcher):
         self._sessions.append(session)
 
         if self._launch_webui:
-            self.launch_webui(ensight_python, version, popen_common)
+            self.launch_webui(version, popen_common)
         return session
 
     def stop(self) -> None:

{ansys_pyensight_core-0.10.3 → ansys_pyensight_core-0.10.5}/src/ansys/pyensight/core/utils/export.py

@@ -175,7 +175,7 @@ class Export:
         """
         if array is None:
             return None
-        return dict(shape=array.shape, dtype=array.dtype.str, data=array.tostring())
+        return dict(shape=array.shape, dtype=array.dtype.str, data=array.tobytes())
 
     @staticmethod
     def _numpy_from_dict(obj: Optional[dict]) -> Any:

{ansys_pyensight_core-0.10.3 → ansys_pyensight_core-0.10.5}/src/ansys/pyensight/core/utils/omniverse.py

@@ -18,6 +18,14 @@ if TYPE_CHECKING:
         from ansys.api.pyensight import ensight_api
 
 
+def _handle_fluids_one(install_path):
+    cei_path = install_path
+    interpreter = os.path.join(cei_path, "bin", "cpython")
+    if platform.system() == "Windows":
+        interpreter += ".bat"
+    return interpreter
+
+
 class OmniverseKitInstance:
     """Interface to an Omniverse application instance
 
@@ -212,8 +220,17 @@ def launch_kit_instance(
     return OmniverseKitInstance(p.pid)
 
 
-def find_app() -> Optional[str]:
+def find_app(ansys_installation: Optional[str] = None) -> Optional[str]:
     dirs_to_check = []
+    if ansys_installation:
+        # Given a different Ansys install
+        local_tp = os.path.join(os.path.join(ansys_installation, "tp", "omni_viewer"))
+        if os.path.exists(local_tp):
+            dirs_to_check.append(local_tp)
+        # Dev Folder
+        local_dev_omni = os.path.join(ansys_installation, "omni_build")
+        if os.path.exists(local_dev_omni):
+            dirs_to_check.append(local_dev_omni)
     if "PYENSIGHT_ANSYS_INSTALLATION" in os.environ:
         env_inst = os.environ["PYENSIGHT_ANSYS_INSTALLATION"]
         dirs_to_check.append(os.path.join(env_inst, "tp", "omni_viewer"))
@@ -243,6 +260,8 @@ def launch_app(
     log_file: Optional[str] = None,
     log_level: Optional[str] = "warn",
     cli_options: Optional[List[str]] = None,
+    ansys_installation: Optional[str] = None,
+    interpreter: Optional[str] = None,
 ) -> "OmniverseKitInstance":
     """Launch the Ansys Omniverse application
 
@@ -278,7 +297,9 @@ def launch_app(
 
     """
     cmd = [sys.executable]
-    app = find_app()
+    if interpreter:
+        cmd = [interpreter]
+    app = find_app(ansys_installation=ansys_installation)
     if not app:
         raise RuntimeError("Unable to find the Ansys Omniverse app")
     cmd.extend([app])
@@ -379,6 +400,8 @@ class Omniverse:
             pass
         # Using the python interpreter running this code
         self._interpreter = sys.executable
+        if "fluids_one" in self._interpreter:  # compiled simba-app
+            self._interpreter = _handle_fluids_one(self._ensight._session._install_path)
         if is_omni:
             kit_path = os.path.dirname(sys.executable)
             self._interpreter = os.path.join(kit_path, "python")