nvidia-nat 1.2.0rc8__py3-none-any.whl → 1.3a20250818__py3-none-any.whl

nat/cli/commands/workflow/templates/pyproject.toml.j2

@@ -9,7 +9,7 @@ root = "{{ rel_path_to_repo_root}}"{% else %}requires = ["setuptools >= 64"]{% e
 name = "{{ package_name }}"
 {% if editable %}dynamic = ["version"]{% else %}version = "0.1.0"{% endif %}
 dependencies = [
-  "nvidia-nat[langchain]",
+  "{{ nat_dependency }}",
 ]
 requires-python = ">=3.11,<3.13"
 description = "Custom NeMo Agent Toolkit Workflow"

nat/cli/commands/workflow/workflow_commands.py

@@ -27,6 +27,37 @@ from jinja2 import FileSystemLoader
 logger = logging.getLogger(__name__)
 
 
+def _get_nat_dependency(versioned: bool = True) -> str:
+    """
+    Get the NAT dependency string with version.
+
+    Args:
+        versioned: Whether to include the version in the dependency string
+
+    Returns:
+        str: The dependency string to use in pyproject.toml
+    """
+    # Assume the default dependency is langchain
+    dependency = "nvidia-nat[langchain]"
+
+    if not versioned:
+        logger.debug("Using unversioned NAT dependency: %s", dependency)
+        return dependency
+
+    # Get the current NAT version
+    from nat.cli.entrypoint import get_version
+    current_version = get_version()
+    if current_version == "unknown":
+        logger.warning("Could not detect NAT version, using unversioned dependency")
+        return dependency
+
+    # Extract major.minor (e.g., "1.2.3" -> "1.2")
+    major_minor = ".".join(current_version.split(".")[:2])
+    dependency += f"~={major_minor}"
+    logger.debug("Using NAT dependency: %s", dependency)
+    return dependency
+
+
 class PackageError(Exception):
     pass
 
@@ -166,12 +197,17 @@ def create_command(workflow_name: str, install: bool, workflow_dir: str, descrip
             click.echo(f"Workflow '{workflow_name}' already exists.")
             return
 
+        base_dir = new_workflow_dir / 'src' / package_name
+
+        configs_dir = base_dir / 'configs'
+        data_dir = base_dir / 'data'
+
         # Create directory structure
-        (new_workflow_dir / 'src' / package_name).mkdir(parents=True)
+        base_dir.mkdir(parents=True)
         # Create config directory
-        (new_workflow_dir / 'src' / package_name / 'configs').mkdir(parents=True)
-        # Create package level configs directory
-        (new_workflow_dir / 'configs').mkdir(parents=True)
+        configs_dir.mkdir(parents=True)
+        # Create data directory
+        data_dir.mkdir(parents=True)
 
         # Initialize Jinja2 environment
         env = Environment(loader=FileSystemLoader(str(template_dir)))
@@ -182,13 +218,15 @@ def create_command(workflow_name: str, install: bool, workflow_dir: str, descrip
         else:
             install_cmd = ['pip', 'install', '-e', str(new_workflow_dir)]
 
+        config_source = configs_dir / 'config.yml'
+
         # List of templates and their destinations
         files_to_render = {
             'pyproject.toml.j2': new_workflow_dir / 'pyproject.toml',
-            'register.py.j2': new_workflow_dir / 'src' / package_name / 'register.py',
-            'workflow.py.j2': new_workflow_dir / 'src' / package_name / f'{workflow_name}_function.py',
-            '__init__.py.j2': new_workflow_dir / 'src' / package_name / '__init__.py',
-            'config.yml.j2': new_workflow_dir / 'src' / package_name / 'configs' / 'config.yml',
+            'register.py.j2': base_dir / 'register.py',
+            'workflow.py.j2': base_dir / f'{workflow_name}_function.py',
+            '__init__.py.j2': base_dir / '__init__.py',
+            'config.yml.j2': config_source,
         }
 
         # Render templates
@@ -199,7 +237,8 @@ def create_command(workflow_name: str, install: bool, workflow_dir: str, descrip
             'package_name': package_name,
             'rel_path_to_repo_root': rel_path_to_repo_root,
             'workflow_class_name': f"{_generate_valid_classname(workflow_name)}FunctionConfig",
-            'workflow_description': description
+            'workflow_description': description,
+            'nat_dependency': _get_nat_dependency()
         }
 
         for template_name, output_path in files_to_render.items():
@@ -209,10 +248,17 @@ def create_command(workflow_name: str, install: bool, workflow_dir: str, descrip
                 f.write(content)
 
         # Create symlink for config.yml
-        config_source = new_workflow_dir / 'src' / package_name / 'configs' / 'config.yml'
         config_link = new_workflow_dir / 'configs' / 'config.yml'
         os.symlink(config_source, config_link)
 
+        # Create symlinks for config and data directories
+        config_dir_source = configs_dir
+        config_dir_link = new_workflow_dir / 'configs'
+        data_dir_source = data_dir
+        data_dir_link = new_workflow_dir / 'data'
+        os.symlink(config_dir_source, config_dir_link)
+        os.symlink(data_dir_source, data_dir_link)
+
         if install:
             # Install the new package without changing directories
             click.echo(f"Installing workflow '{workflow_name}'...")

{nvidia_nat-1.2.0rc8.dist-info → nvidia_nat-1.3a20250818.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nvidia-nat
-Version: 1.2.0rc8
+Version: 1.3a20250818
 Summary: NVIDIA NeMo Agent toolkit
 Author: NVIDIA Corporation
 Maintainer: NVIDIA Corporation

{nvidia_nat-1.2.0rc8.dist-info → nvidia_nat-1.3a20250818.dist-info}/RECORD

@@ -1,4 +1,3 @@
-aiq/__init__.py,sha256=E9vuQX0dCZIALhOg360sRLO53f6NXPgMTv3X1sh8WAM,2376
 nat/agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nat/agent/base.py,sha256=vKD3q6RiRdXYlmsZOsB9DB0cVfSMNByhjn7uwp8TxGw,9094
 nat/agent/dual_node.py,sha256=EOYpYzhaY-m1t2W3eiQrBjSfNjYMDttAwtzEEEcYP4s,2353
@@ -87,10 +86,10 @@ nat/cli/commands/sizing/calc.py,sha256=3cJHKCbzvV7EwYfLcpfk3_Ki7soAjOaiBcLK-Q6hP
 nat/cli/commands/sizing/sizing.py,sha256=-Hr9mz_ScEMtBbn6ijvmmWVk0WybLeX0Ryi4qhDiYQU,902
 nat/cli/commands/workflow/__init__.py,sha256=GUJrgGtpvyMUCjUBvR3faAdv-tZzbU9W-izgx9aMEQg,680
 nat/cli/commands/workflow/workflow.py,sha256=40nIOehOX-4xI-qJqJraBX3XVz3l2VtFsZkMQYd897w,1342
-nat/cli/commands/workflow/workflow_commands.py,sha256=ot47b_z6X01-xbW79n6_A5w2P_wyg2pqqpLppVisk10,11882
+nat/cli/commands/workflow/workflow_commands.py,sha256=NodOkGNicA7TLTwyNFRT5w8wu7NzlkkwCDiDM7JcIKc,13109
 nat/cli/commands/workflow/templates/__init__.py.j2,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nat/cli/commands/workflow/templates/config.yml.j2,sha256=KkZl1fOMVQVFBW-BD_d0Lu8kQgNBtjNpfojhSCPu4uA,222
-nat/cli/commands/workflow/templates/pyproject.toml.j2,sha256=-g0lB0V_ndkmNvG5ZD63hFVJ-BaK1O7M4AzD4iGWqs0,740
+nat/cli/commands/workflow/templates/pyproject.toml.j2,sha256=P6-8FNx4YpNulBxhGqkIFjhGcfMeXNE456JIYZrIBMk,739
 nat/cli/commands/workflow/templates/register.py.j2,sha256=SlOFmIZakPDu_E6DbIhUZ3yP8KhTrAQCFGBuhy9Fyg4,170
 nat/cli/commands/workflow/templates/workflow.py.j2,sha256=Z4uZPG9rtf1nxF74dF4DqDtrF3uYmYUmWowDFbQBjao,1241
 nat/data_models/__init__.py,sha256=Xs1JQ16L9btwreh4pdGKwskffAw1YFO48jKrU4ib_7c,685
@@ -426,10 +425,10 @@ nat/utils/reactive/base/observer_base.py,sha256=UAlyAY_ky4q2t0P81RVFo2Bs_R7z5Nde
 nat/utils/reactive/base/subject_base.py,sha256=UQOxlkZTIeeyYmG5qLtDpNf_63Y7p-doEeUA08_R8ME,2521
 nat/utils/settings/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nat/utils/settings/global_settings.py,sha256=CYHQX7F6MDR18vsVFTrEySpS9cBufuVGTUqZm9lREFs,7446
-nvidia_nat-1.2.0rc8.dist-info/licenses/LICENSE-3rd-party.txt,sha256=8o7aySJa9CBvFshPcsRdJbczzdNyDGJ8b0J67WRUQ2k,183936
-nvidia_nat-1.2.0rc8.dist-info/licenses/LICENSE.md,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
-nvidia_nat-1.2.0rc8.dist-info/METADATA,sha256=uQ8zTKL_-xPalV3BSpg4p18o9u0KbRu6ZUPZXDzI6FY,21688
-nvidia_nat-1.2.0rc8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nvidia_nat-1.2.0rc8.dist-info/entry_points.txt,sha256=FNh4pZVSe_61s29zdks66lmXBPtsnko8KSZ4ffv7WVE,653
-nvidia_nat-1.2.0rc8.dist-info/top_level.txt,sha256=lgJWLkigiVZuZ_O1nxVnD_ziYBwgpE2OStdaCduMEGc,8
-nvidia_nat-1.2.0rc8.dist-info/RECORD,,
+nvidia_nat-1.3a20250818.dist-info/licenses/LICENSE-3rd-party.txt,sha256=8o7aySJa9CBvFshPcsRdJbczzdNyDGJ8b0J67WRUQ2k,183936
+nvidia_nat-1.3a20250818.dist-info/licenses/LICENSE.md,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
+nvidia_nat-1.3a20250818.dist-info/METADATA,sha256=HqmqsilD4P1XBwL7JqBcxh9jHhILOa6oDrDBnSs5VsE,21692
+nvidia_nat-1.3a20250818.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nvidia_nat-1.3a20250818.dist-info/entry_points.txt,sha256=FNh4pZVSe_61s29zdks66lmXBPtsnko8KSZ4ffv7WVE,653
+nvidia_nat-1.3a20250818.dist-info/top_level.txt,sha256=8-CJ2cP6-f0ZReXe5Hzqp-5pvzzHz-5Ds5H2bGqh1-U,4
+nvidia_nat-1.3a20250818.dist-info/RECORD,,

{nvidia_nat-1.2.0rc8.dist-info → nvidia_nat-1.3a20250818.dist-info}/top_level.txt

@@ -1,2 +1 @@
-aiq
 nat

aiq/__init__.py

@@ -1,66 +0,0 @@
-# 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 sys
-import importlib
-import importlib.abc
-import importlib.util
-import warnings
-
-
-class CompatFinder(importlib.abc.MetaPathFinder):
-
-    def __init__(self, alias_prefix, target_prefix):
-        self.alias_prefix = alias_prefix
-        self.target_prefix = target_prefix
-
-    def find_spec(self, fullname, path, target=None):  # pylint: disable=unused-argument
-        if fullname == self.alias_prefix or fullname.startswith(self.alias_prefix + "."):
-            # Map aiq.something -> nat.something
-            target_name = self.target_prefix + fullname[len(self.alias_prefix):]
-            spec = importlib.util.find_spec(target_name)
-            if spec is None:
-                return None
-            # Wrap the loader so it loads under the alias name
-            return importlib.util.spec_from_loader(fullname, CompatLoader(fullname, target_name))
-        return None
-
-
-class CompatLoader(importlib.abc.Loader):
-
-    def __init__(self, alias_name, target_name):
-        self.alias_name = alias_name
-        self.target_name = target_name
-
-    def create_module(self, spec):
-        # Reuse the actual module so there's only one instance
-        target_module = importlib.import_module(self.target_name)
-        sys.modules[self.alias_name] = target_module
-        return target_module
-
-    def exec_module(self, module):
-        # Nothing to execute since the target is already loaded
-        pass
-
-
-# Register the compatibility finder
-sys.meta_path.insert(0, CompatFinder("aiq", "nat"))
-
-warnings.warn(
-    "!!! The 'aiq' namespace is deprecated and will be removed in a future release. "
-    "Please use the 'nat' namespace instead.",
-    DeprecationWarning,
-    stacklevel=2,
-)