build: reorganize python packaging to build new wheels (#118)

container/Dockerfile.tensorrt_llm

@@ -99,25 +99,25 @@ COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
 RUN mkdir /opt/dynamo && \
     uv venv /opt/dynamo/venv --python 3.12 && \
     source /opt/dynamo/venv/bin/activate && \
+    cd /workspace/lib/bindings/python && \
     uv build --wheel --out-dir /workspace/dist && \
-    uv pip install /workspace/dist/ai_dynamo*cp312*.whl && \
-    cd /workspace/deploy/dynamo/sdk && \
+    uv pip install /workspace/dist/ai_dynamo_runtime*cp312*.whl && \
+    cd /workspace && \
     uv build --wheel --out-dir /workspace/dist && \
-    uv pip install /workspace/dist/ai_dynamo_sdk*any.whl
+    uv pip install /workspace/dist/ai_dynamo*any.whl
 
 # Package the bindings
 RUN mkdir -p /opt/dynamo/bindings/wheels && \
     mkdir /opt/dynamo/bindings/lib && \
-    cp dist/ai_dynamo*cp312*.whl /opt/dynamo/bindings/wheels/. && \
+    cp dist/ai_dynamo_runtime*cp312*.whl /opt/dynamo/bindings/wheels/. && \
     cp target/release/libdynamo_llm_capi.so /opt/dynamo/bindings/lib/. && \
     cp -r lib/bindings/c/include /opt/dynamo/bindings/.
 
 # Install dynamo.runtime and dynamo.llm wheels globally in container for tests that
 # currently run without virtual environment activated.
 # TODO: In future, we may use a virtualenv for everything and remove this.
-RUN cd /opt/dynamo/bindings/wheels && \
-    pip install ai_dynamo*cp312*.whl  && \
-    pip install /workspace/dist/ai_dynamo_sdk*any.whl
+RUN pip install dist/ai_dynamo_runtime*cp312*.whl  && \
+    pip install dist/ai_dynamo*any.whl
 
 # Tell TRTLLM worker to use the Dynamo LLM C API for KV Cache Routing
 ENV DYNAMO_KV_CAPI_PATH="/opt/dynamo/bindings/lib/libdynamo_llm_capi.so"

container/Dockerfile.vllm

@@ -233,11 +233,12 @@ RUN cargo build --release --locked --features mistralrs,sglang,vllm,python && \
 COPY deploy/dynamo/sdk /workspace/deploy/dynamo/sdk
 # Build dynamo wheel
 RUN source /opt/dynamo/venv/bin/activate && \
+    cd /workspace/lib/bindings/python && \
     uv build --wheel --out-dir /workspace/dist && \
-    uv pip install /workspace/dist/ai_dynamo*cp312*.whl && \
-    cd /workspace/deploy/dynamo/sdk && \
+    uv pip install /workspace/dist/ai_dynamo_runtime*cp312*.whl && \
+    cd /workspace && \
     uv build --wheel --out-dir /workspace/dist && \
-    uv pip install /workspace/dist/ai_dynamo_sdk*any.whl
+    uv pip install /workspace/dist/ai_dynamo*any.whl
 
 # Package the bindings
 RUN mkdir -p /opt/dynamo/bindings/wheels && \

deploy/dynamo/sdk/src/dynamo/sdk/cli/run_executable.py

+#  SPDX-FileCopyrightText: Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+#  SPDX-License-Identifier: Apache-2.0
+#  #
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#  #
+#  http://www.apache.org/licenses/LICENSE-2.0
+#  #
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+import os
+import subprocess
+import sys
+
+
+def run_executable(executable_name, args=None, capture_output=True, text=True):
+    """
+    Runs an executable located in the cli/bin directory.
+
+    Parameters:
+        executable_name (str): Name of the executable file.
+        args (list): List of arguments to pass to the executable.
+        capture_output (bool): Whether to capture stdout and stderr.
+        text (bool): If True, returns output as string; otherwise bytes.
+
+    Returns:
+        subprocess.CompletedProcess: The result of the executed command.
+    """
+    script_dir = os.path.dirname(os.path.abspath(__file__))
+    bin_dir = os.path.join(script_dir, "bin")
+
+    # Construct full path to executable
+    executable_path = os.path.join(bin_dir, executable_name)
+
+    # Check if executable exists
+    if not os.path.isfile(executable_path):
+        raise FileNotFoundError(
+            f"Executable '{executable_name}' not found in {bin_dir}"
+        )
+
+    # Prepare command
+    command = [executable_path]
+    if args:
+        command = [executable_path] + args
+    else:
+        command = [executable_path]
+
+    # Run the command using subprocess.run()
+    result = subprocess.run(command, capture_output=capture_output, text=text)
+
+    return result
+
+
+def dynamo_run(args=None):
+    """
+    Run the dynamo-run executable with the provided arguments.
+    If no args provided, passes through sys.argv[1:] to the executable.
+    """
+    if args is None:
+        args = sys.argv[1:]
+
+    # Run with capture_output=False to allow direct stdout/stderr streaming
+    result = run_executable("dynamo-run", args=args, capture_output=False)
+    return result.returncode
+
+
+def llmctl(args=None):
+    """
+    Run the llmctl executable with the provided arguments.
+    If no args provided, passes through sys.argv[1:] to the executable.
+    """
+    if args is None:
+        args = sys.argv[1:]
+    result = run_executable("llmctl", args=args, capture_output=False)
+    return result.returncode
+
+
+def http(args=None):
+    """
+    Run the http executable with the provided arguments.
+    If no args provided, passes through sys.argv[1:] to the executable.
+    """
+    if args is None:
+        args = sys.argv[1:]
+    result = run_executable("http", args=args, capture_output=False)
+    return result.returncode
+
+
+def metrics(args=None):
+    """
+    Run the metrics executable with the provided arguments.
+    If no args provided, passes through sys.argv[1:] to the executable.
+    """
+    if args is None:
+        args = sys.argv[1:]
+    result = run_executable("metrics", args=args, capture_output=False)
+    return result.returncode

deploy/dynamo/sdk/src/dynamo/sdk/cli/start.py

@@ -27,8 +27,6 @@ import rich
 
 logger = logging.getLogger(__name__)
 
-print("this module was loaded")
-
 
 def build_start_command() -> click.Group:
     from bentoml._internal.utils import add_experimental_docstring

lib/bindings/python/LICENSE

+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

lib/bindings/python/pyproject.toml

+# SPDX-FileCopyrightText: Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+[project]
+name = "ai-dynamo-runtime"
+version = "0.1.0"
+description = "Dynamo Inference Framework Runtime"
+readme = "README.md"
+authors = [
+    { name = "NVIDIA Inc.", email = "sw-dl-dynamo@nvidia.com" },
+]
+license = { text = "Apache-2.0" }
+license-files = ["LICENSE"]
+requires-python = ">=3.10"
+dependencies = [
+    "pydantic>=2.10.6",
+    "uvloop>=0.21.0",
+    "nats-py>=2.6.0",
+]
+classifiers = [
+    "Development Status :: 4 - Beta",
+    "Intended Audience :: Developers",
+    "Intended Audience :: Science/Research",
+    "Intended Audience :: Information Technology",
+    "License :: OSI Approved :: Apache Software License",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Topic :: Scientific/Engineering",
+    "Topic :: Scientific/Engineering :: Artificial Intelligence",
+    "Operating System :: POSIX :: Linux",
+]
+keywords = ["llm", "genai", "inference", "nvidia", "distributed", "dynamo"]
+
+[tool.maturin]
+module-name = "dynamo._core"
+manifest-path = "Cargo.toml"
+python-packages = ["dynamo"]
+python-source = "src"
+
+[build-system]
+requires = ["maturin>=1.0,<2.0", "patchelf"]
+build-backend = "maturin"
+
+[tool.uv]
+config-settings = { build-args = '--auditwheel repair --manylinux' }
\ No newline at end of file

pyproject.toml

@@ -21,30 +21,52 @@ readme = "README.md"
 authors = [
     { name = "NVIDIA Inc.", email = "sw-dl-dynamo@nvidia.com" },
 ]
-license = { file = "LICENSE" }
+license = { text = "Apache-2.0" }
+license-files = ["LICENSE"]
 requires-python = ">=3.10"
 dependencies = [
     "pytest>=8.3.4",
-    "pydantic>=2.10.6",
-    "uvloop>=0.21.0",
-    "nats-py>=2.6.0",
+    "bentoml==1.4.1",
+    "types-psutil==7.0.0.20250218",
+    "ai-dynamo-runtime==0.1.0",
 ]
+classifiers = [
+    "Development Status :: 4 - Beta",
+    "Intended Audience :: Developers",
+    "Intended Audience :: Science/Research",
+    "Intended Audience :: Information Technology",
+    "License :: OSI Approved :: Apache Software License",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Topic :: Scientific/Engineering",
+    "Topic :: Scientific/Engineering :: Artificial Intelligence",
+    "Operating System :: POSIX :: Linux",
+]
+keywords = ["llm", "genai", "inference", "nvidia", "distributed", "dynamo"]
 
-[tool.maturin]
-module-name = "dynamo._core"
-# Point to the Rust crate directory
-manifest-path = "lib/bindings/python/Cargo.toml"
-# Include all Python packages
-python-packages = ["dynamo"]
-# Specify the Python source directory
-python-source = "lib/bindings/python/src"
-
-[tool.uv]
-config-settings = { build-args = '--auditwheel repair --manylinux' }
+[project.scripts]
+dynamo = "dynamo.sdk.cli.cli:cli"
+dynamo-run = "dynamo.sdk.cli.run_executable:dynamo_run"
+llmctl = "dynamo.sdk.cli.run_executable:llmctl"
+http = "dynamo.sdk.cli.run_executable:http"
+metrics = "dynamo.sdk.cli.run_executable:metrics"
 
 [build-system]
-requires = ["maturin>=1.0,<2.0", "patchelf"]
-build-backend = "maturin"
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[tool.hatch.build.targets.wheel]
+packages = ["deploy/dynamo/sdk/src/dynamo"]
+
+# This section is for including the binaries in the wheel package
+# but doesn't make them executable scripts in the venv bin directory
+[tool.hatch.build.targets.wheel.force-include]
+"target/release/dynamo-run" = "dynamo/sdk/cli/bin/dynamo-run"
+"target/release/llmctl" = "dynamo/sdk/cli/bin/llmctl"
+"target/release/http" = "dynamo/sdk/cli/bin/http"
+"target/release/metrics" = "dynamo/sdk/cli/bin/metrics"
 
 [tool.codespell]
 # note: pre-commit passes explicit lists of files here, which this skip file list doesn't override -
@@ -95,20 +117,20 @@ addopts = [
 xfail_strict = true
 log_cli_level = "INFO"
 filterwarnings = [
-  "error",
-  "ignore:.*cuda*:DeprecationWarning", # Need this to avoid deprecation warnings from CUDA in tensorrt_llm.
-  "ignore:.*pkg_resources.*:DeprecationWarning",
-  "ignore:.*multipart.*:PendingDeprecationWarning"
+    "error",
+    "ignore:.*cuda*:DeprecationWarning", # Need this to avoid deprecation warnings from CUDA in tensorrt_llm.
+    "ignore:.*pkg_resources.*:DeprecationWarning",
+    "ignore:.*multipart.*:PendingDeprecationWarning"
 ]
 
 
 # NOTE: Can also manually mark tests with @pytest.mark.asyncio
 asyncio_mode = "auto"
 markers = [
-  "pre_merge: marks tests to run before merging",
-  "nightly: marks tests to run nightly",
-  "weekly: marks tests to run weekly",
-  "gpu: marks tests to run on GPU"
+    "pre_merge: marks tests to run before merging",
+    "nightly: marks tests to run nightly",
+    "weekly: marks tests to run weekly",
+    "gpu: marks tests to run on GPU"
 ]
 
 # Linting/formatting
@@ -143,8 +165,4 @@ check_untyped_defs = true
 # Skip mypy analysis on internal dependencies of vllm
 module = ["vllm.*", "bentoml.*", "fs.*", "_bentoml_sdk.*"]
 follow_imports = "skip"
-ignore_missing_imports = true
-
-# declare namespace packages
-[tool.setuptools]
-namespace-packages = ["dynamo", "dynamo.sdk"]
+ignore_missing_imports = true
\ No newline at end of file