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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ansys-pyensight-core
-Version: 0.10.2
+Version: 0.10.4
 Summary: A python wrapper for Ansys EnSight
 Author-email: "ANSYS, Inc." <pyansys.core@ansys.com>
 Maintainer-email: "ANSYS, Inc." <pyansys.core@ansys.com>
@@ -17,7 +17,7 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 License-File: LICENSE
 Requires-Dist: importlib-metadata>=4.0; python_version<='3.8'
-Requires-Dist: ansys-api-pyensight==0.4.7
+Requires-Dist: ansys-api-pyensight==0.4.8
 Requires-Dist: requests>=2.28.2
 Requires-Dist: docker>=6.1.0
 Requires-Dist: urllib3<2.4.0
@@ -25,7 +25,7 @@ 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
-Requires-Dist: usd-core==24.8; python_version < '3.13'
+Requires-Dist: usd-core==24.8; python_version < '3.13' and platform_machine != 'aarch64'
 Requires-Dist: pygltflib>=1.16.2
 Requires-Dist: build>=0.10.0 ; extra == "dev"
 Requires-Dist: bump2version>=1.0.1 ; extra == "dev"

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

@@ -6,7 +6,7 @@ build-backend = "flit_core.buildapi"
 
 [project]
 name = "ansys-pyensight-core"
-version = "0.10.2"
+version = "0.10.4"
 description = "A python wrapper for Ansys EnSight"
 readme = "README.rst"
 requires-python = ">=3.10,<3.14"
@@ -27,7 +27,7 @@ classifiers = [
 
 dependencies = [
     "importlib-metadata>=4.0; python_version<='3.8'",
-    "ansys-api-pyensight==0.4.7",
+    "ansys-api-pyensight==0.4.8",
     "requests>=2.28.2",
     "docker>=6.1.0",
     "urllib3<2.4.0",
@@ -35,7 +35,7 @@ dependencies = [
     "Pillow>=9.3.0",
     "pypng>=0.0.20",
     "psutil>=5.9.2",
-    "usd-core==24.8; python_version < '3.13'",
+    "usd-core==24.8; python_version < '3.13' and platform_machine != 'aarch64'",
     "pygltflib>=1.16.2"
 ]
 

{ansys_pyensight_core-0.10.2 → ansys_pyensight_core-0.10.4}/src/ansys/pyensight/core/libuserd.py

@@ -1983,7 +1983,7 @@ class LibUserd(object):
         return output
 
     @staticmethod
-    def _download_files(uri: str, pathname: str, folder: bool = False):
+    def _download_files(uri: str, pathname: str, folder: bool = False, override_root: bool = False):
         """Download files from the input uri and save them on the input pathname.
 
         Parameters:
@@ -1996,9 +1996,21 @@ class LibUserd(object):
         folder : bool
             True if the uri will server files from a directory. In this case,
             pathname will be used as the directory were to save the files.
+        override_root: bool
+            True if the root has been overridden. So don't consider the case
+            of getting the download URL from the github API
         """
         if not folder:
-            with requests.get(uri, stream=True) as r:
+            if override_root:
+                correct_url = uri
+            else:
+                correct_url = None
+                with requests.get(uri) as r:
+                    data = r.json()
+                    correct_url = data["download_url"]
+                if not correct_url:
+                    raise RuntimeError(f"Couldn't retrieve download URL from github uri {uri}")
+            with requests.get(correct_url, stream=True) as r:
                 with open(pathname, "wb") as f:
                     shutil.copyfileobj(r.raw, f)
         else:
@@ -2054,13 +2066,12 @@ class LibUserd(object):
         >>> cas_file = l.download_pyansys_example("mixing_elbow.cas.h5","pyfluent/mixing_elbow")
         >>> dat_file = l.download_pyansys_example("mixing_elbow.dat.h5","pyfluent/mixing_elbow")
         """
-        base_uri = "https://github.com/ansys/example-data/raw/master"
-        base_api_uri = "https://api.github.com/repos/ansys/example-data/contents"
+        base_uri = "https://api.github.com/repos/ansys/example-data/contents"
+        override_root = False
         if not folder:
             if root is not None:
                 base_uri = root
-        else:
-            base_uri = base_api_uri
+                override_root = True
         uri = f"{base_uri}/{filename}"
         if directory:
             uri = f"{base_uri}/{directory}/{filename}"
@@ -2069,7 +2080,7 @@ class LibUserd(object):
         if self._container and self._data_directory:
             # Docker Image
             download_path = os.path.join(self._data_directory, filename)
-        self._download_files(uri, download_path, folder=folder)
+        self._download_files(uri, download_path, folder=folder, override_root=override_root)
         pathname = download_path
         if self._container:
             # Convert local path to Docker mounted volume path

{ansys_pyensight_core-0.10.2 → ansys_pyensight_core-0.10.4}/src/ansys/pyensight/core/locallauncher.py

@@ -110,15 +110,10 @@ class LocalLauncher(Launcher):
             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_ansys = 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
+        if os.path.exists(path_to_webui_ansys):
+            path_to_webui = path_to_webui_ansys
         cmd += ["--server-listen-port", str(self._ports[5])]
         cmd += ["--server-web-roots", path_to_webui]
         cmd += ["--ensight-grpc-port", str(self._ports[0])]

{ansys_pyensight_core-0.10.2 → ansys_pyensight_core-0.10.4}/src/ansys/pyensight/core/session.py

@@ -1278,22 +1278,30 @@ class Session:
         >>> remote = session.show("remote")
         >>> remote.browser()
         """
-        base_uri = "https://github.com/ansys/example-data/raw/master"
-        base_api_uri = "https://api.github.com/repos/ansys/example-data/contents"
+        base_uri = "https://api.github.com/repos/ansys/example-data/contents"
+        override_root = False
         if not folder:
             if root is not None:
                 base_uri = root
-        else:
-            base_uri = base_api_uri
+                override_root = True
         uri = f"{base_uri}/{filename}"
         if directory:
             uri = f"{base_uri}/{directory}/{filename}"
         pathname = f"{self.launcher.session_directory}/{filename}"
         if not folder:
+            if override_root:
+                correct_url = uri
+            else:
+                correct_url = None
+                with requests.get(uri) as r:
+                    data = r.json()
+                    correct_url = data["download_url"]
+                if not correct_url:
+                    raise RuntimeError(f"Couldn't retrieve download URL from github uri {uri}")
             script = "import requests\n"
             script += "import shutil\n"
             script += "import os\n"
-            script += f'url = "{uri}"\n'
+            script += f'url = "{correct_url}"\n'
             script += f'outpath = r"""{pathname}"""\n'
             script += "with requests.get(url, stream=True) as r:\n"
             script += "    with open(outpath, 'wb') as f:\n"

{ansys_pyensight_core-0.10.2 → ansys_pyensight_core-0.10.4}/src/ansys/pyensight/core/utils/export.py

@@ -175,7 +175,7 @@ class Export:
         """
         if array is None:
             return None
-        return dict(shape=array.shape, dtype=array.dtype.str, data=array.tostring())
+        return dict(shape=array.shape, dtype=array.dtype.str, data=array.tobytes())
 
     @staticmethod
     def _numpy_from_dict(obj: Optional[dict]) -> Any:

{ansys_pyensight_core-0.10.2 → ansys_pyensight_core-0.10.4}/src/ansys/pyensight/core/utils/omniverse.py

@@ -18,6 +18,14 @@ if TYPE_CHECKING:
         from ansys.api.pyensight import ensight_api
 
 
+def _handle_fluids_one(install_path):
+    cei_path = install_path
+    interpreter = os.path.join(cei_path, "bin", "cpython")
+    if platform.system() == "Windows":
+        interpreter += ".bat"
+    return interpreter
+
+
 class OmniverseKitInstance:
     """Interface to an Omniverse application instance
 
@@ -47,12 +55,12 @@ class OmniverseKitInstance:
             if psutil.pid_exists(child.pid):
                 # This can be a race condition, so it is ok if the child is dead already
                 try:
-                    child.kill()
+                    child.terminate()
                 except psutil.NoSuchProcess:
                     pass
         # Same issue, this process might already be shutting down, so NoSuchProcess is ok.
         try:
-            proc.kill()
+            proc.terminate()
         except psutil.NoSuchProcess:
             pass
         self._pid = None
@@ -73,6 +81,7 @@ class OmniverseKitInstance:
         return False
 
 
+# Deprecated
 def find_kit_filename(fallback_directory: Optional[str] = None) -> Optional[str]:
     """
     Use a combination of the current omniverse application and the information
@@ -146,6 +155,7 @@ def find_kit_filename(fallback_directory: Optional[str] = None) -> Optional[str]
     return None
 
 
+# Deprecated
 def launch_kit_instance(
     kit_path: Optional[str] = None,
     extension_paths: Optional[List[str]] = None,
@@ -210,6 +220,112 @@ def launch_kit_instance(
     return OmniverseKitInstance(p.pid)
 
 
+def find_app(ansys_installation: Optional[str] = None) -> Optional[str]:
+    dirs_to_check = []
+    if ansys_installation:
+        # Given a different Ansys install
+        local_tp = os.path.join(os.path.join(ansys_installation, "tp", "omni_viewer"))
+        if os.path.exists(local_tp):
+            dirs_to_check.append(local_tp)
+        # Dev Folder
+        local_dev_omni = os.path.join(ansys_installation, "omni_build")
+        if os.path.exists(local_dev_omni):
+            dirs_to_check.append(local_dev_omni)
+    if "PYENSIGHT_ANSYS_INSTALLATION" in os.environ:
+        env_inst = os.environ["PYENSIGHT_ANSYS_INSTALLATION"]
+        dirs_to_check.append(os.path.join(env_inst, "tp", "omni_viewer"))
+
+    # Look for most recent Ansys install, 25.2 or later
+    awp_roots = []
+    for env_name in dict(os.environ).keys():
+        if env_name.startswith("AWP_ROOT") and int(env_name[len("AWP_ROOT") :]) >= 252:
+            awp_roots.append(env_name)
+    awp_roots.sort(reverse=True)
+    for env_name in awp_roots:
+        dirs_to_check.append(os.path.join(os.environ[env_name], "tp", "omni_viewer"))
+
+    # check all the collected locations in order
+    for install_dir in dirs_to_check:
+        launch_file = os.path.join(install_dir, "ansys_tools_omni_core.py")
+        if os.path.isfile(launch_file):
+            return launch_file
+    return None
+
+
+def launch_app(
+    usd_file: Optional[str] = "",
+    layout: Optional[str] = "default",
+    streaming: Optional[bool] = False,
+    offscreen: Optional[bool] = False,
+    log_file: Optional[str] = None,
+    log_level: Optional[str] = "warn",
+    cli_options: Optional[List[str]] = None,
+    ansys_installation: Optional[str] = None,
+    interpreter: Optional[str] = None,
+) -> "OmniverseKitInstance":
+    """Launch the Ansys Omniverse application
+
+    Parameters
+    ----------
+    # usd_file : Optional[str]
+    #    A .usd file to open on startup
+    # layout : Optional[str]
+    #    A UI layout.  viewer, composer, or composer_slim
+    # streaming : Optional[bool]
+    #    Enable webrtc streaming to enable the window in a web page
+    # offscreen : Optional[str]
+    #    Run the app offscreen.  Useful when streaming.
+    # log_file : Optional[str]
+    #    The name of a text file where the logging information for the instance will be saved.
+    # log_level : Optional[str]
+    #    The level of the logging information to record: "verbose", "info", "warn", "error", "fatal",
+    #    the default is "warn".
+    # cli_options : Optional[List[str]]
+    #    Other command line options
+
+    Returns
+    -------
+    OmniverseKitInstance
+        The object interface for the launched instance
+
+    Examples
+    --------
+    Run the app with default options
+
+    >>> from ansys.pyensight.core.utils import omniverse
+    >>> ov = omniverse.launch_app()
+
+    """
+    cmd = [sys.executable]
+    if interpreter:
+        cmd = [interpreter]
+    app = find_app(ansys_installation=ansys_installation)
+    if not app:
+        raise RuntimeError("Unable to find the Ansys Omniverse app")
+    cmd.extend([app])
+    if usd_file:
+        cmd.extend(["-f", usd_file])
+    if layout:
+        cmd.extend(["-l", layout])
+    if streaming:
+        cmd.extend(["-s"])
+    if offscreen:
+        cmd.extend(["-o"])
+    if cli_options:
+        cmd.extend(cli_options)
+    if log_level:
+        if log_level not in ("verbose", "info", "warn", "error", "fatal"):
+            raise RuntimeError(f"Invalid logging level: {log_level}")
+        cmd.extend([f"--/log/level={log_level}"])
+    if log_file:
+        cmd.extend(["--/log/enabled=true", f"--/log/file={log_file}"])
+
+    # 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)
+
+
 class Omniverse:
     """Provides the ``ensight.utils.omniverse`` interface.
 
@@ -284,6 +400,8 @@ class Omniverse:
             pass
         # Using the python interpreter running this code
         self._interpreter = sys.executable
+        if "fluids_one" in self._interpreter:  # compiled simba-app
+            self._interpreter = _handle_fluids_one(self._ensight._session._install_path)
         if is_omni:
             kit_path = os.path.dirname(sys.executable)
             self._interpreter = os.path.join(kit_path, "python")

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

@@ -26,6 +26,7 @@
 import logging
 import math
 import os
+import platform
 import shutil
 import sys
 import tempfile
@@ -42,6 +43,10 @@ except ModuleNotFoundError:
     if sys.version_info.minor >= 13:
         warnings.warn("USD Export not supported for Python >= 3.13")
         sys.exit(1)
+    is_linux_arm64 = platform.system() == "Linux" and platform.machine() == "aarch64"
+    if is_linux_arm64:
+        warnings.warn("USD Export not supported on Linux ARM platforms")
+        sys.exit(1)
 
 
 class OmniverseWrapper(object):