PyPI - ansys-pyensight-core - Versions diffs - 0.8.11__py3-none-any.whl → 0.8.12__py3-none-any.whl - Mend

ansys-pyensight-core 0.8.11py3-none-any.whl → 0.8.12py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of ansys-pyensight-core might be problematic. Click here for more details.

Files changed (14) hide show

ansys/pyensight/core/deep_pixel_view.html CHANGED Viewed

@@ -3,7 +3,7 @@
 	 <head>
 		 <link rel="stylesheet" type="text/css" href="/bootstrap.min.cssOPTIONAL_QUERY"/>
-		 <script src='/jquery-3.4.1.min.jsOPTIONAL_QUERY'></script>
+		 <script src='/jqueryJQUERY_VERSION.min.jsOPTIONAL_QUERY'></script>
 		 <script src='/geotiff.jsOPTIONAL_QUERY'></script>
 		 <script src='/geotiff_nexus.jsOPTIONAL_QUERY'></script>
 		 <script src="/bootstrap.min.jsOPTIONAL_QUERY"></script>
@@ -76,15 +76,15 @@
 		<div style="margin: 0 auto; display:flex; justify-content:center;">
 			<!-- tooltip parent for img --->
 			<div id="probe_display_ITEMID"
-				 data-toggle="tooltip"
-				 data-placement="bottom"
-				 data-fallbackPlacement="['top', 'right']"
-				 data-html="true"
-				 data-container="body"
-				 data-boundary="viewport"
-				 data-animation="false"
-				 data-trigger="manual"
-				 data-title='<span class="f-1r">
+				 data-BS_PREFIXtoggle="tooltip"
+				 data-BS_PREFIXplacement="bottom"
+				 data-BS_PREFIXfallbackPlacement="['top', 'right']"
+				 data-BS_PREFIXhtml="true"
+				 data-BS_PREFIXcontainer="body"
+				 data-BS_PREFIXboundary="viewport"
+				 data-BS_PREFIXanimation="false"
+				 data-BS_PREFIXtrigger="manual"
+				 data-BS_PREFIXtitle='<span class="f-1r">
 											<span>X, Y : <span id="probe_xy_ITEMID">0, 0</span></span>
 											<br>
 											<span id="probe_result_ITEMID"></span>

ansys/pyensight/core/libuserd.py CHANGED Viewed

@@ -63,6 +63,22 @@ warnings.warn(
 )
+def _build_enum(name: str, pb_enum: Any, flag: bool = False) -> Union[enum.IntEnum, enum.IntFlag]:
+    values = {}
+    for v in pb_enum:
+        values[v[0]] = v[1]
+    if flag:
+        return enum.IntFlag(name, values)
+    return enum.IntEnum(name, values)
+ErrorCodes = _build_enum("ErrorCodes", libuserd_pb2.ErrorCodes.items())
+ElementType = _build_enum("ElementType", libuserd_pb2.ElementType.items())
+VariableLocation = _build_enum("VariableLocation", libuserd_pb2.VariableLocation.items())
+VariableType = _build_enum("VariableType", libuserd_pb2.VariableType.items())
+PartHints = _build_enum("PartHints", libuserd_pb2.PartHints.items(), flag=True)
 class LibUserdError(Exception):
     """
     This class is an exception object raised from the libuserd
@@ -179,9 +195,9 @@ class Variable(object):
         The unit label of this variable, "Pa" for example.
     unitDims : str
         The dimensions of this variable, "L/S" for distance per second.
-    location : "LibUserd.LocationType"
+    location : "VariableLocation"
         The location of this variable.
-    type : "LibUserd.VariableType"
+    type : "VariableType"
         The type of this variable.
     timeVarying : bool
         True if the variable is time-varying.
@@ -200,8 +216,8 @@ class Variable(object):
         self.name = pb.name
         self.unitLabel = pb.unitLabel
         self.unitDims = pb.unitDims
-        self.location = self._userd.VariableLocation(pb.varLocation)
-        self.type = self._userd.VariableType(pb.type)
+        self.location = VariableLocation(pb.varLocation)  # type: ignore
+        self.type = VariableType(pb.type)  # type: ignore
         self.timeVarying = pb.timeVarying
         self.isComplex = pb.isComplex
         self.interleaveFlag = pb.interleaveFlag
@@ -240,7 +256,7 @@ class Part(object):
     reader_id : int
         The id of the Reader this part is associated with.
     hints : int
-        See: `LibUserd.PartHints`.
+        See: `PartHints`.
     reader_api_version : float
         The API version number of the USERD reader this part was read with.
     metadata : Dict[str, str]
@@ -315,7 +331,7 @@ class Part(object):
         >>> part = reader.parts()[0]
         >>> elements = part.elements()
         >>> for etype, count in elements.items():
-        ...  print(libuserd_instance.ElementType(etype).name, count)
+        ...  print(libuserd.ElementType(etype).name, count)
         """
         self._userd.connect_check()
@@ -350,14 +366,14 @@ class Part(object):
         --------
         >>> part = reader.parts()[0]
-        >>> conn = part.element_conn(libuserd_instance.ElementType.HEX08)
-        >>> nodes_per_elem = libuserd_instance.nodes_per_element(libuserd_instance.ElementType.HEX08)
+        >>> conn = part.element_conn(libuserd.ElementType.HEX08)
+        >>> nodes_per_elem = libuserd_instance.nodes_per_element(libuserd.ElementType.HEX08)
         >>> conn.shape = (len(conn)//nodes_per_elem, nodes_per_elem)
         >>> for element in conn:
         ...  print(element)
         """
-        if elem_type >= self._userd.ElementType.NSIDED:
+        if elem_type >= ElementType.NSIDED:  # type: ignore
             raise RuntimeError(f"Element type {elem_type} is not valid for this call")
         pb = libuserd_pb2.Part_element_connRequest()
         pb.part_id = self.id
@@ -375,7 +391,7 @@ class Part(object):
             error = self._userd.libuserd_exception(e)
             # if we get an "UNKNOWN" error, then return an empty array
             if isinstance(error, LibUserdError):
-                if error.code == self._userd.ErrorCodes.UNKNOWN:  # type: ignore
+                if error.code == ErrorCodes.UNKNOWN:  # type: ignore
                     return numpy.empty(0, dtype=numpy.uint32)
             raise error
         return conn
@@ -1147,27 +1163,12 @@ class LibUserd(object):
                 raise RuntimeError(f"Unable to start the gRPC server ({str(self.server_pathname)})")
     def _build_enums(self) -> None:
-        """Build the enums values."""
-        values = {}
-        for v in libuserd_pb2.ErrorCodes.items():
-            values[v[0]] = v[1]
-        self.ErrorCodes = enum.IntEnum("ErrorCodes", values)  # type: ignore
-        values = {}
-        for v in libuserd_pb2.ElementType.items():
-            values[v[0]] = v[1]
-        self.ElementType = enum.IntEnum("ElementType", values)  # type: ignore
-        values = {}
-        for v in libuserd_pb2.VariableLocation.items():
-            values[v[0]] = v[1]
-        self.VariableLocation = enum.IntEnum("VariableLocation", values)  # type: ignore
-        values = {}
-        for v in libuserd_pb2.VariableType.items():
-            values[v[0]] = v[1]
-        self.VariableType = enum.IntEnum("VariableType", values)  # type: ignore
-        values = {}
-        for v in libuserd_pb2.PartHints.items():
-            values[v[0]] = v[1]
-        self.PartHints = enum.IntEnum("PartHints", values)  # type: ignore
+        # retained for backward compatibility
+        self.ErrorCodes = ErrorCodes
+        self.ElementType = ElementType
+        self.VariableLocation = VariableLocation
+        self.VariableType = VariableType
+        self.PartHints = PartHints
     def _pull_docker_image(self) -> None:
         """Pull the docker image if not available"""
@@ -1329,6 +1330,13 @@ class LibUserd(object):
             # ways, we'll add that one too, just in case.
             dirs_to_check.append(os.path.join(env_inst, "CEI"))
+        try:
+            import enve
+            dirs_to_check.append(enve.home())
+        except ModuleNotFoundError:
+            pass
         if "CEI_HOME" in os.environ:
             env_inst = os.environ["CEI_HOME"]
             dirs_to_check.append(env_inst)
@@ -1577,7 +1585,7 @@ class LibUserd(object):
         Parameters
         ----------
         element_type
-            The element type:  LibUserd.ElementType enum value
+            The element type:  ElementType enum value
         Returns
         -------
@@ -1602,7 +1610,7 @@ class LibUserd(object):
         Parameters
         ----------
         element_type
-            The element type:  LibUserd.ElementType enum value
+            The element type:  ElementType enum value
         Returns
         -------
@@ -1625,7 +1633,7 @@ class LibUserd(object):
         Parameters
         ----------
         element_type
-            The element type:  LibUserd.ElementType enum value
+            The element type:  ElementType enum value
         Returns
         -------
@@ -1648,7 +1656,7 @@ class LibUserd(object):
         Parameters
         ----------
         element_type
-            The element type:  LibUserd.ElementType enum value
+            The element type:  ElementType enum value
         Returns
         -------
@@ -1671,7 +1679,7 @@ class LibUserd(object):
         Parameters
         ----------
         element_type
-            The element type:  LibUserd.ElementType enum value
+            The element type:  ElementType enum value
         Returns
         -------
@@ -1693,7 +1701,7 @@ class LibUserd(object):
         Part.element_conn() method.  This function returns the number of those elements
         and may be useful in common element type handling code.
-        Note: The value is effectively int(LibUserd.ElementType.NSIDED).
+        Note: The value is effectively int(ElementType.NSIDED).
         Returns
         -------

ansys/pyensight/core/locallauncher.py CHANGED Viewed

@@ -314,6 +314,8 @@ class LocalLauncher(Launcher):
                 return
             except PermissionError:
                 pass
+            except FileNotFoundError:
+                pass
             except Exception:
                 raise
         raise RuntimeError(f"Unable to remove {self.session_directory} in {maximum_wait_secs}s")

ansys/pyensight/core/renderable.py CHANGED Viewed

@@ -389,10 +389,17 @@ class RenderableDeepPixel(Renderable):
         for script in ["geotiff.js", "geotiff_nexus.js", "bootstrap.min.js"]:
             name = base_name + f"'{script}')"
             cmd += f'shutil.copy({name}, r"""{self._session.launcher.session_directory}""")\n'
+        name = "os.path.join(enve.home(), f'nexus{ceiversion.nexus_suffix}', 'django', "
+        name += "'website', 'static', 'website', 'content', 'bootstrap.min.css')"
+        cmd += f'shutil.copy({name}, r"""{self._session.launcher.session_directory}""")\n'
+        self._session.cmd(cmd, do_eval=False)
+        # With Bootstrap 5 (2025 R1), class names have '-bs-' in them, e.g. 'data-bs-toggle' vs 'data-toggle'
+        bs_prefix = "bs-"
+        jquery_version = ""
         if int(self._session._cei_suffix) < 251:
-            jquery = "jquery-3.4.1.min.js"
-        else:
-            jquery = "jquery.min.js"
+            bs_prefix = ""
+            jquery_version = "-3.4.1"
+        jquery = f"jquery{jquery_version}.min.js"
         cmd = "import shutil, enve, ceiversion, os.path\n"
         name = base_name + f"'{jquery}')"
         cmd += "try:"
@@ -409,6 +416,8 @@ class RenderableDeepPixel(Renderable):
         html = html.replace("TIFF_URL", tiff_url)
         html = html.replace("ITEMID", self._guid)
         html = html.replace("OPTIONAL_QUERY", optional_query)
+        html = html.replace("JQUERY_VERSION", jquery_version)
+        html = html.replace("BS_PREFIX", bs_prefix)
         # refresh the remote HTML
         self._save_remote_html_page(html)
         super().update()

ansys/pyensight/core/utils/dsg_server.py CHANGED Viewed

@@ -101,6 +101,12 @@ class Part(object):
                     self.tcoords[
                         cmd.chunk_offset : cmd.chunk_offset + len(cmd.flt_array)
                     ] = cmd.flt_array
+                    # Add the variable hash to the Part's hash, to pick up palette changes
+                    var_cmd = self.session.variables.get(cmd.variable_id, None)
+                    if var_cmd is not None:
+                        self.hash.update(var_cmd.hash.encode("utf-8"))
                 if self.cmd.node_size_variableid == cmd.variable_id:  # type: ignore
                     # Receive the node size var values
                     if self.node_sizes.size != cmd.total_array_size:
@@ -618,6 +624,15 @@ class DSGSession(object):
         """
         logging.warning(s)
+    @staticmethod
+    def error(s: str) -> None:
+        """Issue an error to the logging system
+        The logging message is mapped to "error" and cannot be blocked via verbosity
+        checks.
+        """
+        logging.error(s)
     def start(self) -> int:
         """Start a gRPC connection to an EnSight instance
@@ -741,6 +756,13 @@ class DSGSession(object):
         except queue.Empty:
             return None
+    def _reset(self):
+        self._variables = {}
+        self._groups = {}
+        self._part = Part(self)
+        self._scene_bounds = None
+        self._mesh_block_count = 0  # reset when a new group shows up
     def handle_one_update(self) -> None:
         """Monitor the DSG stream and handle a single update operation
@@ -759,11 +781,7 @@ class DSGSession(object):
             cmd = self._get_next_message()
         # Start anew
-        self._variables = {}
-        self._groups = {}
-        self._part = Part(self)
-        self._scene_bounds = None
-        self._mesh_block_count = 0  # reset when a new group shows up
+        self._reset()
         self._callback_handler.begin_update()
         # Update our status
@@ -839,7 +857,11 @@ class DSGSession(object):
         try:
             self._callback_handler.finalize_part(self.part)
         except Exception as e:
+            import traceback
             self.warn(f"Error encountered while finalizing part geometry: {str(e)}")
+            traceback_str = "".join(traceback.format_tb(e.__traceback__))
+            logging.debug(f"Traceback: {traceback_str}")
         self._mesh_block_count += 1
     def _handle_part(self, part_cmd: Any) -> None:

ansys/pyensight/core/utils/omniverse_cli.py CHANGED Viewed

@@ -276,17 +276,16 @@ class OmniverseGeometryServer(object):
         update_handler = ov_dsg_server.OmniverseUpdateHandler(omni_link)
         # Link it to the GLB file monitoring service
-        glb_link = ov_glb_server.GLBSession(
-            verbose=1,
-            handler=update_handler,
-        )
+        glb_link = ov_glb_server.GLBSession(verbose=1, handler=update_handler, vrmode=self.vrmode)
         if single_file_upload:
             start_time = time.time()
             logging.info(f"Uploading file: {the_dir}.")
             try:
+                glb_link.start_uploads([0.0, 0.0])
                 glb_link.upload_file(the_dir)
+                glb_link.end_uploads()
             except Exception as error:
-                logging.warning(f"Error uploading file: {the_dir}: {error}")
+                logging.error(f"Unable to upload file: {the_dir}: {error}")
             logging.info(f"Uploaded in {(time.time() - start_time):.2f}")
         else:
             logging.info(f"Starting file monitoring for {the_dir}.")
@@ -297,7 +296,7 @@ class OmniverseGeometryServer(object):
                 while not os.path.exists(stop_file):
                     loop_time = time.time()
                     files_to_remove = []
-                    for filename in glob.glob(os.path.join(the_dir, "*", "*.upload")):
+                    for filename in glob.glob(os.path.join(the_dir, "*.upload")):
                         # reset to the launch URI/directory
                         omni_link.destination = orig_destination
                         # Keep track of the files and time values
@@ -317,7 +316,7 @@ class OmniverseGeometryServer(object):
                                 with open(filename, "r") as fp:
                                     glb_info = json.load(fp)
                             except Exception:
-                                logging.warning(f"Error reading file: {filename}")
+                                logging.error(f"Unable to read file: {filename}")
                                 continue
                             # if specified, set the URI/directory target
                             omni_link.destination = glb_info.get("destination", orig_destination)
@@ -326,28 +325,35 @@ class OmniverseGeometryServer(object):
                             files_to_remove.extend(the_files)
                             # Times not used for now, but parse them anyway
                             the_times = glb_info.get("times", [0.0] * len(the_files))
+                            file_timestamps.extend(the_times)
                             # Validate a few things
                             if len(the_files) != len(the_times):
-                                logging.warning(
+                                logging.error(
                                     f"Number of times and files are not the same in: {filename}"
                                 )
                                 continue
-                            if len(set(the_times)) != 1:
-                                logging.warning("Time values not currently supported.")
-                            if len(the_files) > 1:
-                                logging.warning("Multiple glb files not currently fully supported.")
                             files_to_process.extend(the_files)
-                            # Upload the files
-                            for glb_file in files_to_process:
-                                start_time = time.time()
-                                logging.info(
-                                    f"Uploading file: {glb_file} to {omni_link.destination}."
-                                )
-                                try:
-                                    glb_link.upload_file(glb_file)
-                                except Exception as error:
-                                    logging.warning(f"Error uploading file: {glb_file}: {error}")
-                                logging.info(f"Uploaded in {(time.time() - start_time):%.2f}")
+                        # manage time
+                        timeline = sorted(set(file_timestamps))
+                        if len(timeline) != 1:
+                            logging.warning("Time values not currently supported.")
+                        if len(files_to_process) > 1:
+                            logging.warning("Multiple glb files not currently fully supported.")
+                        # Upload the files
+                        glb_link.start_uploads([timeline[0], timeline[-1]])
+                        for glb_file, timestamp in zip(files_to_process, file_timestamps):
+                            start_time = time.time()
+                            logging.info(f"Uploading file: {glb_file} to {omni_link.destination}.")
+                            try:
+                                time_idx = timeline.index(timestamp) + 1
+                                if time_idx == len(timeline):
+                                    time_idx -= 1
+                                limits = [timestamp, timeline[time_idx]]
+                                glb_link.upload_file(glb_file, timeline=limits)
+                            except Exception as error:
+                                logging.error(f"Unable to upload file: {glb_file}: {error}")
+                            logging.info(f"Uploaded in {(time.time() - start_time):.2f}s")
+                        glb_link.end_uploads()
                     for filename in files_to_remove:
                         try:
                             # Only delete the file if it is in the_dir_path
@@ -361,7 +367,10 @@ class OmniverseGeometryServer(object):
             except Exception as error:
                 logging.error(f"Error encountered while monitoring: {error}")
             logging.info("Stopping file monitoring.")
-            os.remove(stop_file)
+            try:
+                os.remove(stop_file)
+            except IOError:
+                logging.error("Unable to remove 'shutdown' file.")
         omni_link.shutdown()

ansys/pyensight/core/utils/omniverse_dsg_server.py CHANGED Viewed

@@ -401,12 +401,14 @@ class OmniverseWrapper(object):
         self, stage, mesh, root_name, diffuse=[1.0, 1.0, 1.0, 1.0], variable=None
     ):
         # https://graphics.pixar.com/usd/release/spec_usdpreviewsurface.html
+        # Use ior==1.0 to be more like EnSight - rays of light do not bend when passing through transparent objs
         material = UsdShade.Material.Define(stage, root_name + "/Material")
         pbrShader = UsdShade.Shader.Define(stage, root_name + "/Material/PBRShader")
         pbrShader.CreateIdAttr("UsdPreviewSurface")
         pbrShader.CreateInput("roughness", Sdf.ValueTypeNames.Float).Set(1.0)
         pbrShader.CreateInput("metallic", Sdf.ValueTypeNames.Float).Set(0.0)
         pbrShader.CreateInput("opacity", Sdf.ValueTypeNames.Float).Set(diffuse[3])
+        pbrShader.CreateInput("ior", Sdf.ValueTypeNames.Float).Set(1.0)
         pbrShader.CreateInput("useSpecularWorkflow", Sdf.ValueTypeNames.Int).Set(1)
         if variable:
             stReader = UsdShade.Shader.Define(stage, root_name + "/Material/stReader")
@@ -416,7 +418,7 @@ class OmniverseWrapper(object):
             )
             diffuseTextureSampler.CreateIdAttr("UsdUVTexture")
             name = self.clean_name(variable.name)
-            filename = self._destinationPath + f"/Parts/Textures/palette_{name}.png"
+            filename = f"./Textures/palette_{name}.png"
             diffuseTextureSampler.CreateInput("file", Sdf.ValueTypeNames.Asset).Set(filename)
             diffuseTextureSampler.CreateInput("st", Sdf.ValueTypeNames.Float2).ConnectToSource(
                 stReader.ConnectableAPI(), "result"

ansys-pyensight-core 0.8.11__py3-none-any.whl → 0.8.12__py3-none-any.whl

Potentially problematic release.

ansys-pyensight-core 0.8.11py3-none-any.whl → 0.8.12py3-none-any.whl