ansys-pyensight-core 0.9.13__tar.gz → 0.9.16__tar.gz

{ansys_pyensight_core-0.9.13 → ansys_pyensight_core-0.9.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ansys-pyensight-core
-Version: 0.9.13
+Version: 0.9.16
 Summary: A python wrapper for Ansys EnSight
 Author-email: "ANSYS, Inc." <pyansys.core@ansys.com>
 Maintainer-email: "ANSYS, Inc." <pyansys.core@ansys.com>
@@ -19,7 +19,7 @@ Requires-Dist: importlib-metadata>=4.0; python_version<='3.8'
 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
+Requires-Dist: urllib3<2.4.0
 Requires-Dist: numpy>=1.21.0,<3
 Requires-Dist: Pillow>=9.3.0
 Requires-Dist: pypng>=0.0.20
@@ -55,7 +55,7 @@ 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"
-Requires-Dist: pytest-rerunfailures~=14.0 ; extra == "tests"
+Requires-Dist: pytest-rerunfailures>=14,<16 ; extra == "tests"
 Project-URL: Changelog, https://github.com/ansys/pyensight/blob/main/CHANGELOG.rst
 Project-URL: Documentation, https://ensight.docs.pyansys.com/
 Project-URL: Homepage, https://github.com/ansys/pyensight

{ansys_pyensight_core-0.9.13 → ansys_pyensight_core-0.9.16}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "flit_core.buildapi"
 
 [project]
 name = "ansys-pyensight-core"
-version = "0.9.13"
+version = "0.9.16"
 description = "A python wrapper for Ansys EnSight"
 readme = "README.rst"
 requires-python = ">=3.10,<3.14"
@@ -29,7 +29,7 @@ dependencies = [
     "ansys-api-pyensight==0.4.7",
     "requests>=2.28.2",
     "docker>=6.1.0",
-    "urllib3<3.0.0",
+    "urllib3<2.4.0",
     "numpy>=1.21.0,<3",
     "Pillow>=9.3.0",
     "pypng>=0.0.20",
@@ -56,7 +56,7 @@ tests = [
     "requests>=2.28.2",
     "docker>=6.1.0",
     "pytest-xdist==3.6.1",
-    "pytest-rerunfailures~=14.0",
+    "pytest-rerunfailures>=14,<16",
 ]
 doc = [
     "Sphinx==8.1.3",

{ansys_pyensight_core-0.9.13 → ansys_pyensight_core-0.9.16}/src/ansys/pyensight/core/dockerlauncher.py

@@ -384,8 +384,7 @@ class DockerLauncher(Launcher):
 
     def launch_webui(self, container_env_str):
         # Run websocketserver
-        cmd = f"cpython /ansys_inc/v{self._ansys_version}/CEI/"
-        cmd += f"nexus{self._ansys_version}/nexus_launcher/webui_launcher.py"
+        cmd = "cpython -m ansys.simba.plugin.post.simba_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.
@@ -403,7 +402,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'"
+        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

{ansys_pyensight_core-0.9.13 → ansys_pyensight_core-0.9.16}/src/ansys/pyensight/core/locallauncher.py

@@ -102,10 +102,8 @@ class LocalLauncher(Launcher):
         """Type of app to launch. Options are ``ensight`` and ``envision``."""
         return self._application
 
-    def launch_webui(self, cpython, webui_script, popen_common):
-        cmd = [cpython]
-        cmd += [webui_script]
-        version = re.findall(r"nexus(\d+)", webui_script)[0]
+    def launch_webui(self, cpython, version, popen_common):
+        cmd = [cpython, "-m", "ansys.simba.plugin.post.simba_post"]
         path_to_webui = self._install_path
         # Dev environment
         path_to_webui_internal = os.path.join(
@@ -267,7 +265,7 @@ class LocalLauncher(Launcher):
             except Exception:
                 pass
             websocket_script = found_scripts[idx]
-            webui_script = websocket_script.replace("websocketserver.py", "webui_launcher.py")
+            version = re.findall(r"nexus(\d+)", websocket_script)[0]
             # build the commandline
             cmd = [os.path.join(self._install_path, "bin", "cpython"), websocket_script]
             if is_windows:
@@ -319,7 +317,7 @@ class LocalLauncher(Launcher):
         self._sessions.append(session)
 
         if self._launch_webui:
-            self.launch_webui(ensight_python, webui_script, popen_common)
+            self.launch_webui(ensight_python, version, popen_common)
         return session
 
     def stop(self) -> None:

{ansys_pyensight_core-0.9.13 → ansys_pyensight_core-0.9.16}/src/ansys/pyensight/core/utils/dsg_server.py

@@ -1084,6 +1084,21 @@ class DSGSession(object):
         self._finish_part()
         self._part.reset(part_cmd)
 
+    def find_group_pb(self, group_id: int) -> Any:
+        """Return the group command protobuffer for a specific group id.
+
+        Parameters
+        ----------
+        group_id: int
+            The group DSG protocol entity id.
+
+        Returns
+        -------
+        any
+            The group command protobuffer or None.
+        """
+        return self._groups.get(group_id, None)
+
     def _handle_group(self, group: Any) -> None:
         """Handle a DSG UPDATE_GROUP command
 

{ansys_pyensight_core-0.9.13 → ansys_pyensight_core-0.9.16}/src/ansys/pyensight/core/utils/omniverse_glb_server.py

@@ -156,6 +156,7 @@ class GLBSession(dsg_server.DSGSession):
             cmd, part_pb = self._create_pb("PART", parent_id=parentid, name=part_name)
             if mode == pygltflib.POINTS:
                 part_pb.render = dynamic_scene_graph_pb2.UpdatePart.RenderingMode.NODES
+                # Size of the spheres
                 part_pb.node_size_default = line_width
             else:
                 part_pb.render = dynamic_scene_graph_pb2.UpdatePart.RenderingMode.CONNECTIVITY
@@ -404,10 +405,39 @@ class GLBSession(dsg_server.DSGSession):
         # GLB node -> DSG Group
         cmd, group_pb = self._create_pb("GROUP", parent_id=parentid, name=name)
         group_pb.matrix4x4.extend(matrix)
-        self._handle_update_command(cmd)
-
         if node.mesh is not None:
+            # This is a little ugly, but spheres have a size that is part of the PART
+            # protobuffer.  So, if the current mesh has the "ANSYS_linewidth" extension,
+            # we need to temporally change the line width.  However, if this is a lines
+            # object, then we need to set the ANSYS_linewidth attribute.  Unfortunately,
+            # this is only available on the GROUP protobuffer, thus we will try to set
+            # both here.
+            # Note: in the EnSight push, ANSYS_linewidth will only ever be set on the
+            # top level node. In the GLB case, we will scope it to the group.  Thus,
+            # every "mesh" protobuffer sequence will have an explicit line width in
+            # the group above the part.
+
+            # save/restore the current line_width
+            orig_width = self._callback_handler._omni.line_width
+            mesh = self._gltf.meshes[node.mesh]
+            try:
+                # check for line_width on the mesh object
+                width = float(mesh.extensions["ANSYS_linewidth"]["linewidth"])
+                # make sure spheres work
+                self._callback_handler._omni.line_width = width
+            except (KeyError, ValueError):
+                pass
+            # make sure lines work (via the group attributes map)
+            group_pb.attributes["ANSYS_linewidth"] = str(self._callback_handler._omni.line_width)
+            # send the group protobuffer
+            self._handle_update_command(cmd)
+            # Export the mesh
             self._parse_mesh(node.mesh, group_pb.id, name)
+            # restore the old line_width
+            self._callback_handler._omni.line_width = orig_width
+        else:
+            # send the group protobuffer
+            self._handle_update_command(cmd)
 
         # Handle node.rotation, node.translation, node.scale, node.matrix
         for child_id in node.children:
@@ -583,7 +613,7 @@ class GLBSession(dsg_server.DSGSession):
                         view_pb.fieldofview = camera.perspective.yfov
                         view_pb.aspectratio = camera.aspectratio.aspectRatio
                 self._handle_update_command(cmd)
-                # walk the scene nodes RJF
+                # walk the scene nodes
                 scene = self._gltf.scenes[scene_idx]
                 try:
                     if self._callback_handler._omni.line_width == 0.0:

{ansys_pyensight_core-0.9.13 → ansys_pyensight_core-0.9.16}/src/ansys/pyensight/core/utils/readers.py

@@ -68,6 +68,7 @@ class DVS:
         if monitor_new_timesteps:
             cmd += f'ensight.solution_time.monitor_for_new_steps("{monitor_new_timesteps}")\n'
         cmd += 'ensight.part.elt_representation("3D_feature_2D_full")\n'
+        cmd += 'ensight.data.format("DVS")\n'
         cmd += 'err = ensight.data.replace("notexisting.dvs")\n'
         return cmd
 
@@ -96,6 +97,7 @@ class DVS:
             cmd += f"{indent}dvsfile.write(f'SERVER_SECURITY_SECRET={secret_key}\\n')\n"
         cmd += f'ensight.solution_time.monitor_for_new_steps("{monitor_new_timesteps}")\n'
         cmd += 'ensight.part.elt_representation("3D_feature_2D_full")\n'
+        cmd += 'ensight.data.format("DVS")\n'
         cmd += "ensight.data.replace(path)\n"
         return cmd
 
@@ -154,6 +156,7 @@ class DVS:
                     raise RuntimeError(f"Couldn't write allocated DVS port to {filename}")
             ensight.part.elt_representation("3D_feature_2D_full")
             ensight.solution_time.monitor_for_new_steps(f"{monitor_new_timesteps}")
+            ensight.data.format("DVS")
             ensight.data.replace(path)
         else:
 
@@ -180,6 +183,7 @@ class DVS:
             ensight.objs.core.CURRENTCASE[0].client_command_callback(dvs_callback)
             ensight.solution_time.monitor_for_new_steps(f"{monitor_new_timesteps}")
             ensight.part.elt_representation("3D_feature_2D_full")
+            ensight.data.format("DVS")
             ensight.data.replace("notexisting.dvs")
 
     def launch_live_dvs(