ansys-pyensight-core 0.9.9__tar.gz → 0.9.11__tar.gz

{ansys_pyensight_core-0.9.9 → ansys_pyensight_core-0.9.11}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: ansys-pyensight-core
-Version: 0.9.9
+Version: 0.9.11
 Summary: A python wrapper for Ansys EnSight
 Author-email: "ANSYS, Inc." <pyansys.core@ansys.com>
 Maintainer-email: "ANSYS, Inc." <pyansys.core@ansys.com>
@@ -15,8 +15,9 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+License-File: LICENSE
 Requires-Dist: importlib-metadata>=4.0; python_version<='3.8'
-Requires-Dist: ansys-api-pyensight==0.4.6
+Requires-Dist: ansys-api-pyensight==0.4.7
 Requires-Dist: requests>=2.28.2
 Requires-Dist: docker>=6.1.0
 Requires-Dist: urllib3<3.0.0
@@ -32,7 +33,7 @@ Requires-Dist: bump2version>=1.0.1 ; extra == "dev"
 Requires-Dist: ipdb>=0.9.4 ; extra == "dev"
 Requires-Dist: dill>=0.3.5.1 ; extra == "dev"
 Requires-Dist: pre-commit>=3.3.3 ; extra == "dev"
-Requires-Dist: Sphinx==8.0.2 ; extra == "doc"
+Requires-Dist: Sphinx==8.1.3 ; extra == "doc"
 Requires-Dist: numpydoc==1.8.0 ; extra == "doc"
 Requires-Dist: ansys-sphinx-theme==1.1.1 ; extra == "doc"
 Requires-Dist: sphinx-copybutton==0.5.2 ; extra == "doc"
@@ -47,11 +48,11 @@ Requires-Dist: coverage-badge==1.1.2 ; extra == "doc"
 Requires-Dist: sphinxcontrib-video==0.2.1 ; extra == "doc"
 Requires-Dist: usd-core>=24.8 ; extra == "doc"
 Requires-Dist: pygltflib>=1.16.2 ; extra == "doc"
-Requires-Dist: pytest==8.3.2 ; extra == "tests"
+Requires-Dist: pytest==8.3.5 ; extra == "tests"
 Requires-Dist: pytest-cov==5.0.0 ; extra == "tests"
 Requires-Dist: dill>=0.3.5.1 ; extra == "tests"
 Requires-Dist: pytest-mock==3.10.0 ; extra == "tests"
-Requires-Dist: urllib3==2.2.2 ; extra == "tests"
+Requires-Dist: urllib3==2.3.0 ; extra == "tests"
 Requires-Dist: requests>=2.28.2 ; extra == "tests"
 Requires-Dist: docker>=6.1.0 ; extra == "tests"
 Requires-Dist: pytest-xdist==3.6.1 ; extra == "tests"

{ansys_pyensight_core-0.9.9 → ansys_pyensight_core-0.9.11}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "flit_core.buildapi"
 
 [project]
 name = "ansys-pyensight-core"
-version = "0.9.9"
+version = "0.9.11"
 description = "A python wrapper for Ansys EnSight"
 readme = "README.rst"
 requires-python = ">=3.9,<4"
@@ -27,7 +27,7 @@ classifiers = [
 
 dependencies = [
     "importlib-metadata>=4.0; python_version<='3.8'",
-    "ansys-api-pyensight==0.4.6",
+    "ansys-api-pyensight==0.4.7",
     "requests>=2.28.2",
     "docker>=6.1.0",
     "urllib3<3.0.0",
@@ -49,18 +49,18 @@ dev = [
     "pre-commit>=3.3.3",
 ]
 tests = [
-    "pytest==8.3.2",
+    "pytest==8.3.5",
     "pytest-cov==5.0.0",
     "dill>=0.3.5.1",
     "pytest-mock==3.10.0",
-    "urllib3==2.2.2",
+    "urllib3==2.3.0",
     "requests>=2.28.2",
     "docker>=6.1.0",
     "pytest-xdist==3.6.1",
     "pytest-rerunfailures~=14.0",
 ]
 doc = [
-    "Sphinx==8.0.2",
+    "Sphinx==8.1.3",
     "numpydoc==1.8.0",
     "ansys-sphinx-theme==1.1.1",
     "sphinx-copybutton==0.5.2",

{ansys_pyensight_core-0.9.9 → ansys_pyensight_core-0.9.11}/src/ansys/pyensight/core/dockerlauncher.py

@@ -403,6 +403,7 @@ class DockerLauncher(Launcher):
         cmd += f" --ensight-ws-port {ws_port}"
         cmd += f" --ensight-session-directory {self._session_directory}"
         cmd += f" --ensight-secret-key {self._secret_key}"
+        cmd += "--main-show-gui 'False'"
         logging.debug(f"Starting WebUI: {cmd}\n")
         ret = self._enshell.start_other(cmd, extra_env=container_env_str)
         if ret[0] != 0:  # pragma: no cover
@@ -619,7 +620,7 @@ class DockerLauncher(Launcher):
                 pass
             try:
                 logging.debug("Removing the Docker Container.\n")
-                self._container.remove()
+                self._container.remove(force=True)
             except Exception:
                 pass
             self._container = None

{ansys_pyensight_core-0.9.9 → ansys_pyensight_core-0.9.11}/src/ansys/pyensight/core/locallauncher.py

@@ -107,9 +107,20 @@ class LocalLauncher(Launcher):
         cmd += [webui_script]
         version = re.findall(r"nexus(\d+)", webui_script)[0]
         path_to_webui = self._install_path
-        path_to_webui = os.path.join(
+        # 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 = path_to_webui_internal
+        for path in paths_to_webui_ansys:
+            if os.path.exists(path):
+                path_to_webui = path
+                break
         cmd += ["--server-listen-port", str(self._ports[5])]
         cmd += ["--server-web-roots", path_to_webui]
         cmd += ["--ensight-grpc-port", str(self._ports[0])]
@@ -117,6 +128,7 @@ class LocalLauncher(Launcher):
         cmd += ["--ensight-ws-port", str(self._ports[3])]
         cmd += ["--ensight-session-directory", self._session_directory]
         cmd += ["--ensight-secret-key", self._secret_key]
+        cmd += ["--main-show-gui", "'False'"]
         if "PYENSIGHT_DEBUG" in os.environ:
             try:
                 if int(os.environ["PYENSIGHT_DEBUG"]) > 0:

{ansys_pyensight_core-0.9.9 → ansys_pyensight_core-0.9.11}/src/ansys/pyensight/core/session.py

@@ -213,6 +213,7 @@ class Session:
         # Because this session can have allocated significant external resources
         # we very much want a chance to close it up cleanly. It is legal to
         # call close() twice on this class if needed.
+        self._already_closed = False
         atexit.register(self.close)
 
         # Speed up subtype lookups:
@@ -1050,17 +1051,19 @@ class Session:
         Close the current session and its gRPC connection.
         """
         # if version 242 or higher, free any objects we have cached there
-        if self.cei_suffix >= "242":
-            try:
-                self._release_remote_objects()
-            except RuntimeError:  # pragma: no cover
-                # handle some intermediate EnSight builds.
-                pass
-        if self._launcher and self._halt_ensight_on_close:
-            self._launcher.close(self)
-        else:
-            # lightweight shtudown, just close the gRC connection
-            self._grpc.shutdown(stop_ensight=False)
+        if not self._already_closed:
+            if self.cei_suffix >= "242":
+                try:
+                    self._release_remote_objects()
+                except RuntimeError:  # pragma: no cover
+                    # handle some intermediate EnSight builds.
+                    pass
+            if self._launcher and self._halt_ensight_on_close:
+                self._launcher.close(self)
+            else:
+                # lightweight shtudown, just close the gRC connection
+                self._grpc.shutdown(stop_ensight=False)
+            self._already_closed = True
         self._launcher = None
 
     def _build_utils_interface(self) -> None:

{ansys_pyensight_core-0.9.9 → ansys_pyensight_core-0.9.11}/src/ansys/pyensight/core/utils/omniverse_dsg_server.py

@@ -49,12 +49,14 @@ class OmniverseWrapper(object):
         self._stage = None
         self._destinationPath: str = ""
         self._old_stages: list = []
-        self._stagename = "dsg_scene.usd"
+        self._stagename: str = "dsg_scene.usd"
         self._live_edit: bool = live_edit
         if self._live_edit:
             self._stagename = "dsg_scene.live"
         # USD time slider will have 120 tick marks per second of animation time
-        self._time_codes_per_second = 120.0
+        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
 
         if destination:
             self.destination = destination
@@ -149,8 +151,7 @@ class OmniverseWrapper(object):
         # record the stage in the "_old_stages" list.
         self._old_stages.append(self.stage_url())
         UsdGeom.SetStageUpAxis(self._stage, UsdGeom.Tokens.y)
-        # in M
-        UsdGeom.SetStageMetersPerUnit(self._stage, 1.0)
+        UsdGeom.SetStageMetersPerUnit(self._stage, 1.0 / self._units_per_meter)
         logging.info(f"Created stage: {self.stage_url()}")
 
     def save_stage(self, comment: str = "") -> None:
@@ -288,6 +289,8 @@ 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.SetStageMetersPerUnit(part_stage, 1.0 / self._units_per_meter)
             self._old_stages.append(part_stage_url)
             xform = UsdGeom.Xform.Define(part_stage, "/" + partname)
             mesh = UsdGeom.Mesh.Define(part_stage, "/" + partname + "/Mesh")
@@ -362,6 +365,7 @@ class OmniverseWrapper(object):
         parent_prim,
         verts,
         tcoords,
+        width,
         matrix=[1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0],
         diffuse=[1.0, 1.0, 1.0, 1.0],
         variable=None,
@@ -369,20 +373,6 @@ class OmniverseWrapper(object):
         first_timestep=False,
         mat_info={},
     ):
-        # TODO: GLB extension maps to DSG PART attribute map
-        width = self.line_width
-        wireframe = width == 0.0
-        if width < 0.0:
-            tmp = verts.reshape(-1, 3)
-            mins = numpy.min(tmp, axis=0)
-            maxs = numpy.max(tmp, axis=0)
-            dx = maxs[0] - mins[0]
-            dy = maxs[1] - mins[1]
-            dz = maxs[2] - mins[2]
-            diagonal = math.sqrt(dx * dx + dy * dy + dz * dz)
-            width = diagonal * math.fabs(width)
-            self.line_width = width
-
         # include the line width in the hash
         part_hash.update(str(self.line_width).encode("utf-8"))
 
@@ -397,6 +387,8 @@ 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.SetStageMetersPerUnit(part_stage, 1.0 / self._units_per_meter)
             self._old_stages.append(part_stage_url)
             xform = UsdGeom.Xform.Define(part_stage, "/" + partname)
             lines = UsdGeom.BasisCurves.Define(part_stage, "/" + partname + "/Lines")
@@ -415,6 +407,7 @@ class OmniverseWrapper(object):
             endCaps.Set(2)  # Rounded = 2
 
             prim = lines.GetPrim()
+            wireframe = width == 0.0
             prim.CreateAttribute(
                 "omni:scene:visualization:drawWireframe", Sdf.ValueTypeNames.Bool
             ).Set(wireframe)
@@ -479,6 +472,8 @@ 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.SetStageMetersPerUnit(part_stage, 1.0 / self._units_per_meter)
             self._old_stages.append(part_stage_url)
             xform = UsdGeom.Xform.Define(part_stage, "/" + partname)
 
@@ -639,8 +634,8 @@ class OmniverseWrapper(object):
             cam = geom_cam.GetCamera()
             # LOL, not sure why is might be correct, but so far it seems to work???
             cam.focalLength = camera.fieldofview
-            dist = (target_pos - cam_pos).GetLength()
-            cam.clippingRange = Gf.Range1f(0.1 * dist, 10.0 * dist)
+            dist = (target_pos - cam_pos).GetLength() * self._units_per_meter
+            cam.clippingRange = Gf.Range1f(0.1 * dist, 1000.0 * dist)
             look_at = Gf.Matrix4d()
             look_at.SetLookAt(cam_pos, target_pos, up_vec)
             trans_row = look_at.GetRow(3)
@@ -724,7 +719,6 @@ class OmniverseUpdateHandler(UpdateHandler):
         self._group_prims: Dict[int, Any] = dict()
         self._root_prim = None
         self._sent_textures = False
-        self._updated_camera = False
 
     def add_group(self, id: int, view: bool = False) -> None:
         super().add_group(id, view)
@@ -745,7 +739,7 @@ class OmniverseUpdateHandler(UpdateHandler):
             matrix = group.matrix4x4
             # Is this a "case" group (it will contain part of the camera view in the matrix)
             if obj_type == "ENS_CASE":
-                if (not self.session.vrmode) and (not self._updated_camera):
+                if not self.session.vrmode:
                     # if in camera mode, we need to update the camera matrix so we can
                     # use the identity matrix on this group.  The camera should have been
                     # created in the "view" handler
@@ -757,7 +751,8 @@ class OmniverseUpdateHandler(UpdateHandler):
                     c = cam.transform
                     m = Gf.Matrix4d(*matrix).GetTranspose()
                     # move the model transform to the camera transform
-                    cam.transform = c * m.GetInverse()
+                    sc = Gf.Matrix4d(self._omni._units_per_meter)
+                    cam.transform = c * m.GetInverse() * sc
                     # set the updated camera
                     geom_cam.SetFromCamera(cam)
                     # apply the inverse cam transform to move the center of interest
@@ -771,8 +766,8 @@ class OmniverseUpdateHandler(UpdateHandler):
                         )
                         coi_attr.Set(
                             Gf.Vec3d(
-                                coi_cam[0] / coi_cam[3],
-                                coi_cam[1] / coi_cam[3],
+                                0,
+                                0,
                                 coi_cam[2] / coi_cam[3],
                             )
                         )
@@ -780,9 +775,6 @@ class OmniverseUpdateHandler(UpdateHandler):
                     self._omni._stage.GetRootLayer().customLayerData = {  # type: ignore
                         "cameraSettings": {"boundCamera": "/Root/Cam"}
                     }
-
-                    # We only want to do this once
-                    self._updated_camera = True
                 matrix = [
                     1.0,
                     0.0,
@@ -852,6 +844,7 @@ class OmniverseUpdateHandler(UpdateHandler):
         if part.cmd.render == part.cmd.CONNECTIVITY:
             has_triangles = False
             command, verts, conn, normals, tcoords, var_cmd = part.nodal_surface_rep()
+            verts = numpy.multiply(verts, self._omni._units_per_meter)
             if command is not None:
                 has_triangles = True
                 # Generate the mesh block
@@ -872,6 +865,7 @@ class OmniverseUpdateHandler(UpdateHandler):
                     mat_info=mat_info,
                 )
             command, verts, tcoords, var_cmd = part.line_rep()
+            verts = numpy.multiply(verts, self._omni._units_per_meter)
             if command is not None:
                 # If there are no triangle (ideally if these are not hidden line
                 # edges), then use the base color for the part.  If there are
@@ -885,9 +879,30 @@ class OmniverseUpdateHandler(UpdateHandler):
                         part.cmd.line_color[2] * part.cmd.diffuse,
                         part.cmd.line_color[3],
                     ]
-                # TODO: texture coordinates on lines are current invalid in OV
+                # TODO: texture coordinates on lines are currently invalid in Omniverse
                 var_cmd = None
                 tcoords = None
+                # line info can come from self or our parent group
+                width = self._omni.line_width
+                # Allow the group to override
+                group = self.session.find_group_pb(part.cmd.parent_id)
+                if group:
+                    try:
+                        width = float(group.attributes.get("ANSYS_linewidth", str(width)))
+                    except ValueError:
+                        pass
+                if width < 0.0:
+                    tmp = verts.reshape(-1, 3)
+                    mins = numpy.min(tmp, axis=0)
+                    maxs = numpy.max(tmp, axis=0)
+                    dx = maxs[0] - mins[0]
+                    dy = maxs[1] - mins[1]
+                    dz = maxs[2] - mins[2]
+                    diagonal = math.sqrt(dx * dx + dy * dy + dz * dz)
+                    width = diagonal * math.fabs(width) / self._omni._units_per_meter
+                    if self._omni.line_width < 0.0:
+                        self._omni.line_width = width
+                width = width * self._omni._units_per_meter
                 # Generate the lines
                 _ = self._omni.create_dsg_lines(
                     name,
@@ -896,6 +911,7 @@ class OmniverseUpdateHandler(UpdateHandler):
                     parent_prim,
                     verts,
                     tcoords,
+                    width,
                     matrix=matrix,
                     diffuse=line_color,
                     variable=var_cmd,
@@ -905,6 +921,10 @@ class OmniverseUpdateHandler(UpdateHandler):
 
         elif part.cmd.render == part.cmd.NODES:
             command, verts, sizes, colors, var_cmd = part.point_rep()
+            verts = numpy.multiply(verts, self._omni._units_per_meter)
+
+            if sizes is not None:
+                sizes = numpy.multiply(sizes, self._omni._units_per_meter)
             if command is not None:
                 _ = self._omni.create_dsg_points(
                     name,
@@ -915,7 +935,7 @@ class OmniverseUpdateHandler(UpdateHandler):
                     sizes,
                     colors,
                     matrix=matrix,
-                    default_size=part.cmd.node_size_default,
+                    default_size=part.cmd.node_size_default * self._omni._units_per_meter,
                     default_color=color,
                     timeline=self.session.cur_timeline,
                     first_timestep=(self.session.cur_timeline[0] == self.session.time_limits[0]),
@@ -942,8 +962,6 @@ class OmniverseUpdateHandler(UpdateHandler):
         # Upload a material to the Omniverse server
         self._omni.uploadMaterial()
         self._sent_textures = False
-        # We want to update the camera a single time within this update
-        self._updated_camera = False
 
     def end_update(self) -> None:
         super().end_update()