holoscan-cli 2.9.0__py3-none-any.whl → 3.1.0__py3-none-any.whl

holoscan_cli/__main__.py

@@ -20,7 +20,6 @@ import os
 from pathlib import Path
 from typing import Optional, Union
 
-from .common.enum_types import Platform, PlatformConfiguration
 
 logging.getLogger("docker.api.build").setLevel(logging.WARNING)
 logging.getLogger("docker.auth").setLevel(logging.WARNING)
@@ -97,14 +96,6 @@ def parse_args(argv: Optional[list[str]] = None) -> argparse.Namespace:
         parser.print_help()
         parser.exit()
 
-    if args.command == "package":
-        if args.platform[0] == Platform.X64Workstation:
-            args.platform_config = PlatformConfiguration.dGPU
-        elif args.platform_config is None:
-            parser.error(
-                f"'--platform-config' is required for '{args.platform[0].value}'"
-            )
-
     return args
 
 

holoscan_cli/common/argparse_types.py

@@ -107,6 +107,7 @@ def valid_platforms(platforms_str: str) -> list[Platform]:
     platforms = platforms_str.lower().split(",")
     platform_enums = []
     for platform in platforms:
+        platform = platform.strip()
         if platform not in SDK.PLATFORMS:
             raise argparse.ArgumentTypeError(
                 f"{platform} is not a valid option for --platforms."
@@ -128,7 +129,7 @@ def valid_platform_config(platform_config_str: str) -> PlatformConfiguration:
         Otherwise, raises argparse.ArgumentTypeError.
     """
 
-    platform_config_str = platform_config_str.lower()
+    platform_config_str = platform_config_str.lower().strip()
     if platform_config_str not in SDK.PLATFORM_CONFIGS:
         raise argparse.ArgumentTypeError(
             f"{platform_config_str} is not a valid option for --platform-config."
@@ -149,7 +150,7 @@ def valid_sdk_type(sdk_str: str) -> SdkType:
         Otherwise, raises argparse.ArgumentTypeError.
     """
 
-    sdk_str = sdk_str.lower()
+    sdk_str = sdk_str.lower().strip()
     if sdk_str not in SDK.SDKS:
         raise argparse.ArgumentTypeError(f"{sdk_str} is not a valid option for --sdk.")
 

holoscan_cli/common/constants.py

@@ -77,19 +77,21 @@ class SDK:
     """
 
     # Platform to architecture mappings
-    PLATFORM_MAPPINGS = {
-        Platform.IGXOrinDevIt: Arch.arm64,
-        Platform.JetsonAgxOrinDevKit: Arch.arm64,
+    PLATFORM_ARCH_MAPPINGS = {
+        Platform.Jetson: Arch.arm64,
+        Platform.IGX_iGPU: Arch.arm64,
+        Platform.IGX_dGPU: Arch.arm64,
         Platform.SBSA: Arch.arm64,
-        Platform.X64Workstation: Arch.amd64,
+        Platform.x86_64: Arch.amd64,
     }
 
     # Values of all platforms supported by the Packager
     PLATFORMS = [
-        Platform.IGXOrinDevIt.value,
-        Platform.JetsonAgxOrinDevKit.value,
+        Platform.Jetson.value,
+        Platform.IGX_iGPU.value,
+        Platform.IGX_dGPU.value,
         Platform.SBSA.value,
-        Platform.X64Workstation.value,
+        Platform.x86_64.value,
     ]
 
     # Values of all platform configurations supported by the Packager
@@ -98,6 +100,14 @@ class SDK:
         PlatformConfiguration.dGPU.value,
     ]
 
+    INTERNAL_PLATFORM_MAPPINGS = {
+        Platform.Jetson: (Platform.JetsonAgxOrinDevKit, PlatformConfiguration.iGPU),
+        Platform.IGX_iGPU: (Platform.IGXOrinDevIt, PlatformConfiguration.iGPU),
+        Platform.IGX_dGPU: (Platform.IGXOrinDevIt, PlatformConfiguration.dGPU),
+        Platform.SBSA: (Platform.SBSA, PlatformConfiguration.dGPU),
+        Platform.x86_64: (Platform.X64Workstation, PlatformConfiguration.dGPU),
+    }
+
     # Values of SDKs supported by the Packager
     SDKS = [SdkType.Holoscan.value, SdkType.MonaiDeploy.value]
 

holoscan_cli/common/enum_types.py

@@ -37,10 +37,18 @@ class Arch(Enum):
 
 
 class Platform(Enum):
+    # User values - when a new value is added, please also update SDK.PLATFORMS
+    Jetson = "jetson"
+    IGX_iGPU = "igx-igpu"
+    IGX_dGPU = "igx-dgpu"
+    SBSA = "sbsa"
+    x86_64 = "x86_64"
+
+    # Internal use only - for mapping actual platform with platform configuration
+    #  as defined in SDK.INTERNAL_PLATFORM_MAPPINGS.
     IGXOrinDevIt = "igx-orin-devkit"
     JetsonAgxOrinDevKit = "jetson-agx-orin-devkit"
     X64Workstation = "x64-workstation"
-    SBSA = "sbsa"
 
 
 class PlatformConfiguration(Enum):

holoscan_cli/nics/nics.py

@@ -28,6 +28,6 @@ def execute_nics_command(args: Namespace):
         strs = [f"\n\t{item[0]:<15} : {item[1]}" for item in ip_addresses]
         print(f"Available network interface cards/IP addresses: \n{''.join(strs)}")
     except Exception as ex:
-        logging.error("Error executing nics command.")
+        logger.error("Error executing nics command.")
         logger.debug(ex)
         sys.exit(4)

holoscan_cli/packager/arguments.py

@@ -127,7 +127,9 @@ class PackagingArguments:
                 self.build_parameters.monai_deploy_app_sdk_version
             )
 
-        self._package_manifest.platform_config = args.platform_config.value
+        self._package_manifest.platform_config = self._platforms[
+            0
+        ].platform_config.value
 
     def _read_application_config_file(self, config_file_path: Path):
         self._logger.info(

holoscan_cli/packager/container_builder.py

@@ -377,6 +377,7 @@ class PythonAppBuilder(BuilderBase):
         pip_folder = os.path.join(self._temp_dir, "pip")
         os.makedirs(pip_folder, exist_ok=True)
         pip_requirements_path = os.path.join(pip_folder, "requirements.txt")
+
         with open(pip_requirements_path, "w") as requirements_file:
             # Use local requirements.txt packages if provided, otherwise use sdk provided packages
             if self._build_parameters.requirements_file_path is not None:

holoscan_cli/packager/package_command.py

@@ -22,7 +22,6 @@ from ..common.argparse_types import (
     valid_dir_path,
     valid_existing_dir_path,
     valid_existing_path,
-    valid_platform_config,
     valid_platforms,
     valid_sdk_type,
 )
@@ -70,12 +69,6 @@ def create_package_parser(
         help="target platform(s) for the build output separated by comma. "
         f"Valid values: {str.join(', ', SDK.PLATFORMS)}.",
     )
-    parser.add_argument(
-        "--platform-config",
-        type=valid_platform_config,
-        help="target platform configuration for the build output. "
-        f"Valid values: {str.join(', ', SDK.PLATFORM_CONFIGS)}.",
-    )
     parser.add_argument(
         "--add",
         action="append",

holoscan_cli/packager/parameters.py

@@ -34,14 +34,15 @@ class PlatformParameters:
     def __init__(
         self,
         platform: Platform,
-        platform_config: PlatformConfiguration,
         tag: str,
         version: str,
     ) -> None:
         self._logger = logging.getLogger("platform.parameters")
-        self._platform: Platform = platform
-        self._platform_config: PlatformConfiguration = platform_config
-        self._arch: Arch = SDK.PLATFORM_MAPPINGS[platform]
+        self._platform = SDK.INTERNAL_PLATFORM_MAPPINGS[platform][0]
+        self._platform_config: PlatformConfiguration = SDK.INTERNAL_PLATFORM_MAPPINGS[
+            platform
+        ][1]
+        self._arch: Arch = SDK.PLATFORM_ARCH_MAPPINGS[platform]
         self._tag_prefix: Optional[str]
         self._version: Optional[str]
 

holoscan_cli/packager/platforms.py

@@ -76,11 +76,7 @@ class Platform:
 
         platforms = []
         for platform in args.platform:
-            platform_config = args.platform_config
-
-            platform_parameters = PlatformParameters(
-                platform, platform_config, args.tag, version
-            )
+            platform_parameters = PlatformParameters(platform, args.tag, version)
 
             (
                 platform_parameters.custom_base_image,

holoscan_cli/runner/runner.py

@@ -319,7 +319,6 @@ def execute_run_command(args: Namespace):
     if not _dependency_verification(args.map):
         logger.error("Execution Aborted")
         sys.exit(2)
-
     try:
         # Fetch application manifest from MAP
         app_info, pkg_info = _fetch_map_manifest(args.map)
@@ -330,7 +329,6 @@ def execute_run_command(args: Namespace):
     if not _pkg_specific_dependency_verification(pkg_info):
         logger.error("Execution Aborted")
         sys.exit(2)
-
     try:
         # Run Holoscan Application
         _run_app(args, app_info, pkg_info)

{holoscan_cli-2.9.0.dist-info → holoscan_cli-3.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: holoscan-cli
-Version: 2.9.0
+Version: 3.1.0
 Summary: Command line interface for packaging and running Holoscan applications.
 License: Apache-2.0
 Keywords: AI,holoscan,medical,streaming,HPC,nvidia,docker,container
@@ -37,7 +37,7 @@ Project-URL: Repository, https://github.com/nvidia-holoscan/holoscan-cli
 Description-Content-Type: text/markdown
 
 [![Code Check](https://github.com/nvidia-holoscan/holoscan-cli/actions/workflows/check.yaml/badge.svg)](https://github.com/nvidia-holoscan/holoscan-cli/actions/workflows/check.yaml)
-[![Coverage Status](https://coveralls.io/repos/github/nvidia-holoscan/holoscan-cli/badge.svg?branch=vchang/poetry-setup)](https://coveralls.io/github/nvidia-holoscan/holoscan-cli?branch=vchang/poetry-setup)
+[![Coverage Status](https://coveralls.io/repos/github/nvidia-holoscan/holoscan-cli/badge.svg)](https://coveralls.io/github/nvidia-holoscan/holoscan-cli)
 
 # Holoscan CLI
 
@@ -78,12 +78,15 @@ Holoscan CLI uses [Poetry](https://python-poetry.org/) for package and dependenc
 
 ```bash
 # Create virtual environment
-poetry shell
+poetry env use python3.12
+
+# Activate virtual environment
+eval $(poetry env activate)
 
 # Install dependencies
 poetry install
 
-# Configure pre-commmit hooks
+# Configure pre-commit hooks
 pre-commit install
 
 # Run pre-commit against all files
@@ -96,6 +99,8 @@ poetry build
 poetry run pytest
 ```
 
+For more information on Poetry and its usages, see the [Poetry documentation](https://python-poetry.org/docs/).
+
 ## Contributing to the Holoscan CLI
 
 See [CONTRIBUTING.md](./CONTRIBUTING.md) for details.

{holoscan_cli-2.9.0.dist-info → holoscan_cli-3.1.0.dist-info}/RECORD

@@ -1,27 +1,27 @@
 holoscan_cli/__init__.py,sha256=caPPFDAjPzNIAzHAtpWRuWy9GshNEetcN8FQiMmNsQQ,1092
-holoscan_cli/__main__.py,sha256=Nn_wHeGt3Q7z05xcKt4yc6qURfMzE6eFp4Cput0D3sU,5272
-holoscan_cli/common/argparse_types.py,sha256=nVedsn4LiL3KxgCzzm1LSNoQ7-BPsFmCeGdmEwXKmgw,5501
+holoscan_cli/__main__.py,sha256=sOdEmgaajrtrtVeg39MuW15BU8moal9Vz2HDcWZM__U,4891
+holoscan_cli/common/argparse_types.py,sha256=4AYiQbQlHNx0RBrZyi9Fmy0A5VEJByLAbpv4oS9QQVo,5553
 holoscan_cli/common/artifact_sources.py,sha256=LIz2OFZmCJNRCn5_qkyncEaEjwwpAbzZzBAlE3tnSjs,5728
-holoscan_cli/common/constants.py,sha256=G3CwzZ_lWd-Rt72zentS3mphtgPqpq_4KOpZdyQTR50,4404
+holoscan_cli/common/constants.py,sha256=4yXMmz-PzHth5Qy4zt4E5bvpG6eQN3KQrjhyagRFDGw,4866
 holoscan_cli/common/dockerutils.py,sha256=-gNdxzLh-nQWI-hJUQI-O5BM9OeqJkNa5R3DvVQXu2Q,17318
-holoscan_cli/common/enum_types.py,sha256=-HRtu-kzmQi-40Jb7tgFgKRK7fgyg_lNUMh09N6lcik,1399
+holoscan_cli/common/enum_types.py,sha256=qdqMum01uM0-qrF2jyk1GYGoh76xBJsBUX9cvxVbVtA,1711
 holoscan_cli/common/exceptions.py,sha256=ubN33Av69Xm_CUVC_5DeKx_zO8qfIc_T-_S18xDQguE,2999
 holoscan_cli/common/sdk_utils.py,sha256=uDMOM_Jq3SnzDROrFERc8krDS6-BkhOebKV2h9I_-0Y,6659
 holoscan_cli/common/utils.py,sha256=3plIFGMWy8WcRB2lL4fTqINlE1CyBkm9CDrIVA1qPDU,3796
 holoscan_cli/logging.json,sha256=0tfLHoqV5_xH_q4m9gQufHYfYezocFVJxtlEj6UR3qI,809
 holoscan_cli/nics/__init__.py,sha256=IMHmlnYvJxjlJGi1UxwRG0deK4w9M7-_WWDoCqKcjJE,737
-holoscan_cli/nics/nics.py,sha256=XYeFAJb8uuRx36N95JdSKW610l14X9xs2H0wgcW3K24,1259
+holoscan_cli/nics/nics.py,sha256=xcpo8uwQDJ7-46rPR-BEAWkyKHZOZ19gl9ahuxLNphs,1258
 holoscan_cli/package-source.json,sha256=-Cheb17hJqV7-CJktvj9RATIM_oA00k6_VPpFkIlPAc,1326
 holoscan_cli/packager/__init__.py,sha256=8uVz-FlG2vJV7Cz8ICOajioBbI9An5h-dRtSrkMCXZo,744
-holoscan_cli/packager/arguments.py,sha256=YgYJfgqKk4Jrtn0k8byaD9VKkT6UGVdmPg8H0EtHaik,5703
+holoscan_cli/packager/arguments.py,sha256=h29zdNctHjGm5s9MihNa4VtrcyXpR8rn4wmKFyBtHXw,5739
 holoscan_cli/packager/config_reader.py,sha256=oE0Tnp7v9dh_qAj6nPap-_R-YGLpYKGh09_FSV9oqVA,7352
-holoscan_cli/packager/container_builder.py,sha256=VUmP8nOelFqwlJZSs6eAr067oxoF4iB1bwa_rqnQBMg,17668
+holoscan_cli/packager/container_builder.py,sha256=3y9UniwXK-lCBDZVvtrdqqpG00LwGrnk1Xr7w1CjCRg,17669
 holoscan_cli/packager/manifest_files.py,sha256=jueQMgZzQ9DhP2KGC1YdndDNwJl3ECunEKicBb3Z9Mc,5957
 holoscan_cli/packager/models.py,sha256=t3HXROo-obN5iNjKOkp8JvL6WuGP4QSRVZzET6V1wmI,3758
-holoscan_cli/packager/package_command.py,sha256=WuAr2gBPvlR5OyWzSvPztWlWTBAIwXHddCVGMfYRILw,6614
+holoscan_cli/packager/package_command.py,sha256=woveQzQ3DSmygwUCy66QuWi49mq31sibWAfzrljdfew,6357
 holoscan_cli/packager/packager.py,sha256=2Rykbb7pD3Ve0p_H0F0xNHr3J-moliTm8CNIhDWkRxI,4728
-holoscan_cli/packager/parameters.py,sha256=LJMu40plF7QpWRWWrTGKF-QgNtqkS2izhlokGQXpdp4,18661
-holoscan_cli/packager/platforms.py,sha256=aGNRT0RUZluj0VdfvE5Uscyu9btc4ihIN2YIAdteO_k,16820
+holoscan_cli/packager/parameters.py,sha256=ipxOuCMnbq5OzdmGnehxIElXX6YS_ZofqQH3CZgr22s,18693
+holoscan_cli/packager/platforms.py,sha256=H9AMr83YkW_Vx8cpp6qJLDCLqa2lcVnSAfkKc6vl6iU,16721
 holoscan_cli/packager/templates/Dockerfile.jinja2,sha256=BMNWtv0n1F6lP5H7RiKb8iUVZTtHvDgQCSHC_PpuBgE,16982
 holoscan_cli/packager/templates/dockerignore,sha256=zzBkA9eWgPW4KWyObuYjp13bv_m24AnFUgoENGNhMcY,1755
 holoscan_cli/packager/templates/tools.sh,sha256=q-LT31TfUPiSS6IWrESDJcR_F8dCU0Tnl8w3xTbaW6M,13509
@@ -29,11 +29,11 @@ holoscan_cli/py.typed,sha256=Z4hkVtwnqwhmVXOMES05WQZWjt4_rFEuditXTouPUJQ,684
 holoscan_cli/runner/__init__.py,sha256=N3dOMkOWT3adYk_pRKqn2zYgZjVCkpn5u7xatA9_aWQ,738
 holoscan_cli/runner/resources.py,sha256=R7wLnfwsG67jJD6U8d_gvteycsLPPDfWDYimAmnC-N4,5996
 holoscan_cli/runner/run_command.py,sha256=5QKK70xng36LtYyPHz43YrocTLUxDh6h6UNTeHuIaSQ,7148
-holoscan_cli/runner/runner.py,sha256=bSgPEzWZJY302He57b3QP0yHkLG5RCDwad6IVIU7y88,10568
+holoscan_cli/runner/runner.py,sha256=1imprOaey_RYdNwwtXWTL9IfqyG3Z_DB82FInSo1YUk,10566
 holoscan_cli/version/__init__.py,sha256=1pf-RBR16STdFXsh82bYly_lUyv1MgxuczbLOTDJRto,743
 holoscan_cli/version/version.py,sha256=FL4DUcQ2FA4eyvL8YjR2rcdPCduMnbTBhLNeXlESLsI,1738
-holoscan_cli-2.9.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-holoscan_cli-2.9.0.dist-info/METADATA,sha256=gbjT19vPLw3sp_LwX-d4g_jpDo-P8_YRQ-OFqlWG27w,3847
-holoscan_cli-2.9.0.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-holoscan_cli-2.9.0.dist-info/entry_points.txt,sha256=ZbJklrhFtmmhqcGvGizL_4Pf9FTRgmZ11LblKPbj8yo,95
-holoscan_cli-2.9.0.dist-info/RECORD,,
+holoscan_cli-3.1.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+holoscan_cli-3.1.0.dist-info/METADATA,sha256=OqmahGLJJDu652yOqvDA1a-bNIFS83DffuL6uZOgLAs,3978
+holoscan_cli-3.1.0.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+holoscan_cli-3.1.0.dist-info/entry_points.txt,sha256=ZbJklrhFtmmhqcGvGizL_4Pf9FTRgmZ11LblKPbj8yo,95
+holoscan_cli-3.1.0.dist-info/RECORD,,

{holoscan_cli-2.9.0.dist-info → holoscan_cli-3.1.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.0.1
+Generator: poetry-core 2.1.2
 Root-Is-Purelib: true
 Tag: py3-none-any