ansys-pyensight-core 0.10.4__tar.gz → 0.10.6__tar.gz

{ansys_pyensight_core-0.10.4 → ansys_pyensight_core-0.10.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ansys-pyensight-core
-Version: 0.10.4
+Version: 0.10.6
 Summary: A python wrapper for Ansys EnSight
 Author-email: "ANSYS, Inc." <pyansys.core@ansys.com>
 Maintainer-email: "ANSYS, Inc." <pyansys.core@ansys.com>
@@ -27,6 +27,7 @@ Requires-Dist: pypng>=0.0.20
 Requires-Dist: psutil>=5.9.2
 Requires-Dist: usd-core==24.8; python_version < '3.13' and platform_machine != 'aarch64'
 Requires-Dist: pygltflib>=1.16.2
+Requires-Dist: grpcio<1.68.0
 Requires-Dist: build>=0.10.0 ; extra == "dev"
 Requires-Dist: bump2version>=1.0.1 ; extra == "dev"
 Requires-Dist: ipdb>=0.9.4 ; extra == "dev"

{ansys_pyensight_core-0.10.4 → ansys_pyensight_core-0.10.6}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "flit_core.buildapi"
 
 [project]
 name = "ansys-pyensight-core"
-version = "0.10.4"
+version = "0.10.6"
 description = "A python wrapper for Ansys EnSight"
 readme = "README.rst"
 requires-python = ">=3.10,<3.14"
@@ -36,7 +36,8 @@ dependencies = [
     "pypng>=0.0.20",
     "psutil>=5.9.2",
     "usd-core==24.8; python_version < '3.13' and platform_machine != 'aarch64'",
-    "pygltflib>=1.16.2"
+    "pygltflib>=1.16.2",
+    "grpcio<1.68.0",
 ]
 
 [project.optional-dependencies]

{ansys_pyensight_core-0.10.4 → ansys_pyensight_core-0.10.6}/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.4 → ansys_pyensight_core-0.10.6}/src/ansys/pyensight/core/locallauncher.py

@@ -102,8 +102,16 @@ 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(
@@ -265,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])])
@@ -312,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.4 → ansys_pyensight_core-0.10.6}/src/ansys/pyensight/core/utils/omniverse.py

@@ -5,6 +5,7 @@ import platform
 import subprocess
 import sys
 import tempfile
+import threading
 from types import ModuleType
 from typing import TYPE_CHECKING, List, Optional, Union
 import uuid
@@ -35,8 +36,15 @@ class OmniverseKitInstance:
         The process id of the launched instance
     """
 
-    def __init__(self, pid: int) -> None:
-        self._pid: Optional[int] = pid
+    def __init__(self, proc: subprocess.Popen) -> None:
+        self._proc: subprocess.Popen = proc
+        self._returncode: Optional[int] = None
+        self._rendering = False
+        self._lines_read = 0
+        self._scanner_thread = threading.Thread(
+            target=OmniverseKitInstance._scan_stdout, args=(self,)
+        )
+        self._scanner_thread.start()
 
     def __del__(self) -> None:
         """Close down the instance on delete"""
@@ -50,7 +58,7 @@ class OmniverseKitInstance:
         """
         if not self.is_running():
             return
-        proc = psutil.Process(self._pid)
+        proc = psutil.Process(self._proc.pid)
         for child in proc.children(recursive=True):
             if psutil.pid_exists(child.pid):
                 # This can be a race condition, so it is ok if the child is dead already
@@ -63,7 +71,29 @@ class OmniverseKitInstance:
             proc.terminate()
         except psutil.NoSuchProcess:
             pass
-        self._pid = None
+        self._scanner_thread.join()
+
+        # On a forced close, set a return code of 0
+        self._returncode = 0
+
+    @staticmethod
+    def _scan_stdout(oki: "OmniverseKitInstance"):
+        while oki._proc and oki._proc.poll() is None:
+            if oki._proc.stdout is not None:
+                output_line = oki._proc.stdout.readline().decode("utf-8")
+                oki._lines_read = oki._lines_read + 1
+                if "RTX ready" in output_line:
+                    oki._rendering = True
+
+    def is_rendering(self) -> bool:
+        """Check if the instance has finished launching and is ready to render
+
+        Returns
+        -------
+        bool
+            True if the instance is ready to render.
+        """
+        return self.is_running() and self._rendering
 
     def is_running(self) -> bool:
         """Check if the instance is still running
@@ -73,13 +103,27 @@ class OmniverseKitInstance:
         bool
             True if the instance is still running.
         """
-        if not self._pid:
+        if self._proc is None:
             return False
-        if psutil.pid_exists(self._pid):
+        if self._proc.poll() is None:
             return True
-        self._pid = None
         return False
 
+    def returncode(self) -> Optional[int]:
+        """Get the return code if the process has stopped, or None if still running
+
+        Returns
+        -------
+        int or None
+            Get the return code if the process has stopped, or None if still running
+        """
+        if self._returncode is not None:
+            return self._returncode
+        if self.is_running():
+            return None
+        self._returncode = self._proc.returncode
+        return self._returncode
+
 
 # Deprecated
 def find_kit_filename(fallback_directory: Optional[str] = None) -> Optional[str]:
@@ -216,8 +260,8 @@ def launch_kit_instance(
         cmd.append("--/log/enabled=true")
     # Launch the process
     env_vars = os.environ.copy()
-    p = subprocess.Popen(cmd, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, env=env_vars)
-    return OmniverseKitInstance(p.pid)
+    p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, env=env_vars)
+    return OmniverseKitInstance(p)
 
 
 def find_app(ansys_installation: Optional[str] = None) -> Optional[str]:
@@ -322,8 +366,8 @@ def launch_app(
 
     # Launch the process
     env_vars = os.environ.copy()
-    p = subprocess.Popen(cmd, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, env=env_vars)
-    return OmniverseKitInstance(p.pid)
+    p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, env=env_vars)
+    return OmniverseKitInstance(p)
 
 
 class Omniverse:

{ansys_pyensight_core-0.10.4 → ansys_pyensight_core-0.10.6}/src/ansys/pyensight/core/utils/omniverse_dsg_server.py

@@ -70,7 +70,7 @@ class OmniverseWrapper(object):
         self._time_codes_per_second: float = 120.0
         # Omniverse content currently only scales correctly for scenes in cm.  DJB, Feb 2025
         self._units_per_meter: float = 100.0
-
+        self._up_axis: str = UsdGeom.Tokens.y
         if destination:
             self.destination = destination
 
@@ -163,7 +163,7 @@ class OmniverseWrapper(object):
         self._stage = Usd.Stage.CreateNew(self.stage_url())
         # record the stage in the "_old_stages" list.
         self._old_stages.append(self.stage_url())
-        UsdGeom.SetStageUpAxis(self._stage, UsdGeom.Tokens.y)
+        UsdGeom.SetStageUpAxis(self._stage, self._up_axis)
         UsdGeom.SetStageMetersPerUnit(self._stage, 1.0 / self._units_per_meter)
         logging.info(f"Created stage: {self.stage_url()}")
 
@@ -302,7 +302,7 @@ class OmniverseWrapper(object):
 
         if not os.path.exists(part_stage_url):
             part_stage = Usd.Stage.CreateNew(part_stage_url)
-            UsdGeom.SetStageUpAxis(part_stage, UsdGeom.Tokens.y)
+            UsdGeom.SetStageUpAxis(part_stage, self._up_axis)
             UsdGeom.SetStageMetersPerUnit(part_stage, 1.0 / self._units_per_meter)
             self._old_stages.append(part_stage_url)
             xform = UsdGeom.Xform.Define(part_stage, "/" + partname)
@@ -400,7 +400,7 @@ class OmniverseWrapper(object):
 
         if not os.path.exists(part_stage_url):
             part_stage = Usd.Stage.CreateNew(part_stage_url)
-            UsdGeom.SetStageUpAxis(part_stage, UsdGeom.Tokens.y)
+            UsdGeom.SetStageUpAxis(part_stage, self._up_axis)
             UsdGeom.SetStageMetersPerUnit(part_stage, 1.0 / self._units_per_meter)
             self._old_stages.append(part_stage_url)
             xform = UsdGeom.Xform.Define(part_stage, "/" + partname)
@@ -485,7 +485,7 @@ class OmniverseWrapper(object):
 
         if not os.path.exists(part_stage_url):
             part_stage = Usd.Stage.CreateNew(part_stage_url)
-            UsdGeom.SetStageUpAxis(part_stage, UsdGeom.Tokens.y)
+            UsdGeom.SetStageUpAxis(part_stage, self._up_axis)
             UsdGeom.SetStageMetersPerUnit(part_stage, 1.0 / self._units_per_meter)
             self._old_stages.append(part_stage_url)
             xform = UsdGeom.Xform.Define(part_stage, "/" + partname)
@@ -766,6 +766,17 @@ class OmniverseUpdateHandler(UpdateHandler):
                     # move the model transform to the camera transform
                     sc = Gf.Matrix4d(self._omni._units_per_meter)
                     cam.transform = c * m.GetInverse() * sc
+
+                    # Determine if the camera is principally more Y, or Z up.  X up not supported.
+                    # Omniverse' built in navigator tries to keep this direction up
+                    # If the view is principally -Y, there is no good choice.  +Y is least bad.
+                    cam_upvec = Gf.Vec4d(0, 1, 0, 0) * cam.transform
+                    if abs(cam_upvec[1]) >= abs(cam_upvec[2]):
+                        self._up_axis = UsdGeom.Tokens.y
+                    else:
+                        self._up_axis = UsdGeom.Tokens.z
+                    UsdGeom.SetStageUpAxis(self._omni._stage, self._up_axis)
+
                     # set the updated camera
                     geom_cam.SetFromCamera(cam)
                     # apply the inverse cam transform to move the center of interest