ansys-pyensight-core 0.9.0__tar.gz → 0.9.1__tar.gz

{ansys_pyensight_core-0.9.0 → ansys_pyensight_core-0.9.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: ansys-pyensight-core
-Version: 0.9.0
+Version: 0.9.1
 Summary: A python wrapper for Ansys EnSight
 Author-email: "ANSYS, Inc." <pyansys.core@ansys.com>
 Maintainer-email: "ANSYS, Inc." <pyansys.core@ansys.com>
@@ -20,7 +20,7 @@ Requires-Dist: ansys-api-pyensight==0.4.2
 Requires-Dist: requests>=2.28.2
 Requires-Dist: docker>=6.1.0
 Requires-Dist: urllib3<3.0.0
-Requires-Dist: numpy>=1.21.0,<2
+Requires-Dist: numpy>=1.21.0,<3
 Requires-Dist: Pillow>=9.3.0
 Requires-Dist: pypng>=0.0.20
 Requires-Dist: psutil>=5.9.2

{ansys_pyensight_core-0.9.0 → ansys_pyensight_core-0.9.1}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "flit_core.buildapi"
 
 [project]
 name = "ansys-pyensight-core"
-version = "0.9.0"
+version = "0.9.1"
 description = "A python wrapper for Ansys EnSight"
 readme = "README.rst"
 requires-python = ">=3.9,<4"
@@ -31,7 +31,7 @@ dependencies = [
     "requests>=2.28.2",
     "docker>=6.1.0",
     "urllib3<3.0.0",
-    "numpy>=1.21.0,<2",
+    "numpy>=1.21.0,<3",
     "Pillow>=9.3.0",
     "pypng>=0.0.20",
     "psutil>=5.9.2",

{ansys_pyensight_core-0.9.0 → ansys_pyensight_core-0.9.1}/src/ansys/pyensight/core/renderable.py

@@ -557,7 +557,11 @@ class RenderableVNC(Renderable):
     """Generates an ansys-nexus-viewer component that can be used to connect to the EnSight VNC remote image renderer."""
 
     def __init__(self, *args, **kwargs) -> None:
+        ui = kwargs.get("ui")
+        if kwargs.get("ui"):
+            kwargs.pop("ui")
         super().__init__(*args, **kwargs)
+        self._ui = ui
         self._generate_url()
         self._rendertype = "remote"
         self.update()
@@ -585,6 +589,7 @@ class RenderableVNC(Renderable):
         """
         optional_query = self._get_query_parameters_str()
         version = _get_ansysnexus_version(self._session._cei_suffix)
+        ui = "simple" if not self._ui else self._ui
         if int(self._session._cei_suffix) < 242:  # pragma: no cover
             version = ""
             self._update_2023R2_or_less()  # pragma: no cover
@@ -604,7 +609,7 @@ class RenderableVNC(Renderable):
                 query_args = f', "extra_query_args":"{optional_query[1:]}"'  # pragma: no cover
 
             attributes = ' renderer="envnc"'
-            attributes += ' ui="simple"'
+            attributes += f" ui={ui}"
             attributes += ' active="true"'
             attributes += (
                 " renderer_options='"

{ansys_pyensight_core-0.9.0 → ansys_pyensight_core-0.9.1}/src/ansys/pyensight/core/session.py

@@ -838,6 +838,7 @@ class Session:
         aa: int = 4,
         fps: float = 30.0,
         num_frames: Optional[int] = None,
+        ui: Optional[str] = "simple",
     ) -> "renderable.Renderable":
         """Capture the current EnSight scene or otherwise make it available for
         display in a web browser.
@@ -898,7 +899,7 @@ class Session:
         if self._html_port is None:
             raise RuntimeError("No websocketserver has been associated with this Session")
 
-        kwargs = dict(
+        kwargs: Dict[str, Union[float, int, None, str]] = dict(
             height=height, width=width, temporal=temporal, aa=aa, fps=fps, num_frames=num_frames
         )
         if self._jupyter_notebook:  # pragma: no cover
@@ -924,6 +925,7 @@ class Session:
             else:
                 render = RenderableSGEO(self, **kwargs)
         elif what == "remote":
+            kwargs["ui"] = ui
             render = RenderableVNC(self, **kwargs)
         elif what == "remote_scene":
             render = RenderableEVSN(self, **kwargs)

{ansys_pyensight_core-0.9.0 → ansys_pyensight_core-0.9.1}/src/ansys/pyensight/core/utils/dsg_server.py

@@ -685,6 +685,9 @@ class DSGSession(object):
         self._dsg_queue: Optional[queue.SimpleQueue] = None  # Outgoing messages to EnSight
         self._shutdown = False
         self._dsg = None
+        # Prevent the protobuffer queue from growing w/o limits.  The payload chunking is
+        # around 4MB, so 200 buffers would be a bit less than 1GB.
+        self._max_dsg_queue_size = int(os.environ.get("ANSYS_OV_SERVER_MAX_GRPC_QUEUE_SIZE", "200"))
         self._normalize_geometry = normalize_geometry
         self._vrmode = vrmode
         self._time_scale = time_scale
@@ -711,6 +714,14 @@ class DSGSession(object):
     def mesh_block_count(self) -> int:
         return self._mesh_block_count
 
+    @property
+    def max_dsg_queue_size(self) -> int:
+        return self._max_dsg_queue_size
+
+    @max_dsg_queue_size.setter
+    def max_dsg_queue_size(self, value: int) -> None:
+        self._max_dsg_queue_size = value
+
     @property
     def vrmode(self) -> bool:
         return self._vrmode
@@ -891,6 +902,11 @@ class DSGSession(object):
         while not self._shutdown:
             try:
                 self._message_queue.put(next(self._dsg))  # type:ignore
+                # if the queue is getting too deep, wait a bit to avoid holding too
+                # many messages (filling up memory)
+                if self.max_dsg_queue_size:
+                    while self._message_queue.qsize() >= self.max_dsg_queue_size:
+                        time.sleep(0.001)
             except Exception:
                 self._shutdown = True
                 self.log("DSG connection broken, calling exit")

{ansys_pyensight_core-0.9.0 → ansys_pyensight_core-0.9.1}/src/ansys/pyensight/core/utils/omniverse.py

@@ -190,6 +190,7 @@ class Omniverse:
         live: bool = True,
         debug_filename: str = "",
         time_scale: float = 1.0,
+        line_width: float = 0.0,
         options: dict = {},
     ) -> None:
         """Ensure that an EnSight dsg -> omniverse server is running
@@ -224,6 +225,9 @@ class Omniverse:
             If the name of a file is provided, it will be used to save logging information on
             the connection between EnSight and Omniverse.  This option is no longer supported,
             but the API remains for backwards compatibility.
+        line_width : float
+            If set, line objects will be represented as "tubes" of the size specified by
+            this factor.  The default is 0.0 and causes lines not to be exported.
         options : dict
             Allows for a fallback for the grpc host/port and the security token.
         """
@@ -259,6 +263,8 @@ class Omniverse:
             cmd.extend(["--normalize_geometry", "true"])
         if time_scale != 1.0:
             cmd.extend(["--time_scale", str(time_scale)])
+        if line_width != 0.0:
+            cmd.extend(["--line_width", str(line_width)])
         if not live:
             cmd.extend(["--oneshot", "1"])
         cmd.extend(["--dsg_uri", dsg_uri])
@@ -336,7 +342,7 @@ class Omniverse:
         self._server_pid = None
         self._new_status_file(new=False)
 
-    def update(self, temporal: bool = False) -> None:
+    def update(self, temporal: bool = False, line_width: float = 0.0) -> None:
         """Update the geometry in Omniverse
 
         Export the current EnSight scene to the current Omniverse connection.
@@ -345,10 +351,20 @@ class Omniverse:
         ----------
         temporal : bool
             If True, export all timesteps.
+        line_width : float
+            If set to a non-zero value, lines will be exported with this thickness.
+            This feature is only available in 2025 R2 and later.
         """
         update_cmd = "dynamicscenegraph://localhost/client/update"
+        prefix = "?"
         if temporal:
-            update_cmd += "?timesteps=1"
+            update_cmd += f"{prefix}timesteps=1"
+            prefix = "&"
+        if line_width != 0.0:
+            # only in 2025 R2 and beyond
+            if self._ensight._session.ensight_version_check("2025 R2", exception=False):
+                update_cmd += f"{prefix}line_width={line_width}"
+                prefix = "&"
         self._check_modules()
         if not self.is_running_omniverse():
             raise RuntimeError("No Omniverse server connection is currently active.")

{ansys_pyensight_core-0.9.0 → ansys_pyensight_core-0.9.1}/src/ansys/pyensight/core/utils/omniverse_glb_server.py

@@ -132,40 +132,44 @@ class GLBSession(dsg_server.DSGSession):
         """
         mesh = self._gltf.meshes[meshid]
         for prim_idx, prim in enumerate(mesh.primitives):
-            # POINTS, LINES, LINE_LOOP, LINE_STRIP, TRIANGLES, TRIANGLE_STRIP, TRIANGLE_FAN
+            # TODO: line width/point size
+            # POINTS, LINES, TRIANGLES, LINE_LOOP, LINE_STRIP, TRIANGLE_STRIP, TRIANGLE_FAN
             mode = prim.mode
-            if mode not in (pygltflib.TRIANGLES, pygltflib.LINES, pygltflib.POINTS):
-                self.warn(
-                    f"Unhandled connectivity {mode}. Currently only TRIANGLE and LINE connectivity is supported."
-                )
+            if mode not in (
+                pygltflib.TRIANGLES,
+                pygltflib.LINES,
+                pygltflib.POINTS,
+                pygltflib.LINE_LOOP,
+                pygltflib.LINE_STRIP,
+                pygltflib.TRIANGLE_STRIP,
+                pygltflib.TRIANGLE_FAN,
+            ):
+                self.warn(f"Unhandled connectivity detected: {mode}.  Geometry skipped.")
                 continue
             glb_materialid = prim.material
 
+            line_width = self._callback_handler._omni.line_width
+            # TODO: override from scene extension: ANSYS_linewidth
+
             # GLB Prim -> DSG Part
             part_name = f"{parentname}_prim{prim_idx}_"
             cmd, part_pb = self._create_pb("PART", parent_id=parentid, name=part_name)
-            part_pb.render = dynamic_scene_graph_pb2.UpdatePart.RenderingMode.CONNECTIVITY
+            if mode == pygltflib.POINTS:
+                part_pb.render = dynamic_scene_graph_pb2.UpdatePart.RenderingMode.NODES
+                part_pb.node_size_default = line_width
+            else:
+                part_pb.render = dynamic_scene_graph_pb2.UpdatePart.RenderingMode.CONNECTIVITY
             part_pb.shading = dynamic_scene_graph_pb2.UpdatePart.ShadingMode.NODAL
             self._map_material(glb_materialid, part_pb)
             part_dsg_id = part_pb.id
             self._handle_update_command(cmd)
 
             # GLB Attributes -> DSG Geom
-            conn = self._get_data(prim.indices, 0)
-            cmd, conn_pb = self._create_pb("GEOM", parent_id=part_dsg_id)
-            if mode == pygltflib.TRIANGLES:
-                conn_pb.payload_type = dynamic_scene_graph_pb2.UpdateGeom.ArrayType.TRIANGLES
-            elif mode == pygltflib.LINES:
-                conn_pb.payload_type = dynamic_scene_graph_pb2.UpdateGeom.ArrayType.LINES
-            else:
-                conn_pb.payload_type = dynamic_scene_graph_pb2.UpdateGeom.ArrayType.POINTS
-            conn_pb.int_array.extend(conn)
-            conn_pb.chunk_offset = 0
-            conn_pb.total_array_size = len(conn)
-            self._handle_update_command(cmd)
-
+            # Verts
+            num_verts = 0
             if prim.attributes.POSITION is not None:
                 verts = self._get_data(prim.attributes.POSITION)
+                num_verts = len(verts) // 3
                 cmd, verts_pb = self._create_pb("GEOM", parent_id=part_dsg_id)
                 verts_pb.payload_type = dynamic_scene_graph_pb2.UpdateGeom.ArrayType.COORDINATES
                 verts_pb.flt_array.extend(verts)
@@ -173,6 +177,35 @@ class GLBSession(dsg_server.DSGSession):
                 verts_pb.total_array_size = len(verts)
                 self._handle_update_command(cmd)
 
+            # Connectivity
+            if num_verts and (mode != pygltflib.POINTS):
+                if prim.indices is not None:
+                    conn = self._get_data(prim.indices, 0)
+                else:
+                    conn = numpy.array(list(range(num_verts)), dtype=numpy.uint32)
+                cmd, conn_pb = self._create_pb("GEOM", parent_id=part_dsg_id)
+                if mode == pygltflib.TRIANGLES:
+                    conn_pb.payload_type = dynamic_scene_graph_pb2.UpdateGeom.ArrayType.TRIANGLES
+                elif mode == pygltflib.TRIANGLE_STRIP:
+                    conn_pb.payload_type = dynamic_scene_graph_pb2.UpdateGeom.ArrayType.TRIANGLES
+                    conn = self._tri_strip_to_tris(conn)
+                elif mode == pygltflib.TRIANGLE_FAN:
+                    conn_pb.payload_type = dynamic_scene_graph_pb2.UpdateGeom.ArrayType.TRIANGLES
+                    conn = self._tri_fan_to_tris(conn)
+                elif mode == pygltflib.LINES:
+                    conn_pb.payload_type = dynamic_scene_graph_pb2.UpdateGeom.ArrayType.LINES
+                elif mode == pygltflib.LINE_LOOP:
+                    conn_pb.payload_type = dynamic_scene_graph_pb2.UpdateGeom.ArrayType.LINES
+                    conn = self._line_loop_to_lines(conn)
+                elif mode == pygltflib.LINE_STRIP:
+                    conn_pb.payload_type = dynamic_scene_graph_pb2.UpdateGeom.ArrayType.LINES
+                    conn = self._line_strip_to_lines(conn)
+                conn_pb.int_array.extend(conn)
+                conn_pb.chunk_offset = 0
+                conn_pb.total_array_size = len(conn)
+                self._handle_update_command(cmd)
+
+            # Normals
             if prim.attributes.NORMAL is not None:
                 normals = self._get_data(prim.attributes.NORMAL)
                 cmd, normals_pb = self._create_pb("GEOM", parent_id=part_dsg_id)
@@ -182,6 +215,7 @@ class GLBSession(dsg_server.DSGSession):
                 normals_pb.total_array_size = len(normals)
                 self._handle_update_command(cmd)
 
+            # Texture coords
             if prim.attributes.TEXCOORD_0 is not None:
                 # Note: texture coords are stored as VEC2, so we get 2 components back
                 texcoords = self._get_data(prim.attributes.TEXCOORD_0, components=2)
@@ -199,6 +233,103 @@ class GLBSession(dsg_server.DSGSession):
                     texcoords_pb.variable_id = glb_varid
                 self._handle_update_command(cmd)
 
+    @staticmethod
+    def _tri_strip_to_tris(conn: numpy.ndarray) -> numpy.ndarray:
+        """
+        Convert GL_TRIANGLE_STRIP connectivity into GL_TRIANGLES
+
+        Parameters
+        ----------
+        conn: numpy.ndarray
+            The tri strip connectivity
+
+        Returns
+        -------
+        numpy.array:
+            Triangles connectivity
+        """
+        tris = []
+        swap = False
+        for i in range(len(conn) - 2):
+            tris.append(conn[i])
+            if swap:
+                tris.append(conn[i + 2])
+                tris.append(conn[i + 1])
+            else:
+                tris.append(conn[i + 1])
+                tris.append(conn[i + 2])
+            swap = not swap
+        return numpy.array(tris, dtype=conn.dtype)
+
+    @staticmethod
+    def _tri_fan_to_tris(conn: numpy.ndarray) -> numpy.ndarray:
+        """
+        Convert GL_TRIANGLE_FAN connectivity into GL_TRIANGLES
+
+        Parameters
+        ----------
+        conn: numpy.ndarray
+            The fan connectivity
+
+        Returns
+        -------
+        numpy.array:
+            Triangles connectivity
+        """
+        tris = []
+        for i in range(1, len(conn) - 1):
+            tris.append(conn[0])
+            tris.append(conn[i])
+            tris.append(conn[i + 1])
+        return numpy.array(tris, dtype=conn.dtype)
+
+    @staticmethod
+    def _line_strip_to_lines(conn) -> numpy.ndarray:
+        """
+        Convert GL_LINE_STRIP connectivity into GL_LINES
+
+        Parameters
+        ----------
+        conn: numpy.ndarray
+           The line strip connectivity
+
+        Returns
+        -------
+        numpy.array:
+           Lines connectivity
+        """
+        lines = []
+        num_nodes = len(conn)
+        for i in range(num_nodes - 1):
+            lines.append(conn[i])
+            lines.append(conn[i + 1])
+        return numpy.array(lines, dtype=conn.dtype)
+
+    @staticmethod
+    def _line_loop_to_lines(conn) -> numpy.ndarray:
+        """
+        Convert GL_LINE_LOOP connectivity into GL_LINES
+
+        Parameters
+        ----------
+        conn: numpy.ndarray
+           The line loop connectivity
+
+        Returns
+        -------
+        numpy.array:
+           Lines connectivity
+        """
+        lines = []
+        num_nodes = len(conn)
+        for i in range(num_nodes):
+            lines.append(conn[i])
+            if i + 1 == num_nodes:
+                lines.append(conn[0])
+            else:
+                lines.append(conn[i + 1])
+        return numpy.array(lines, dtype=conn.dtype)
+
     def _get_data(
         self,
         accessorid: int,