nvidia-nat 1.3.0.dev2__py3-none-any.whl → 1.3.0rc1__py3-none-any.whl

nat/tool/github_tools.py

@@ -0,0 +1,450 @@
+# 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.
+
+from datetime import datetime
+from typing import Literal
+
+from pydantic import BaseModel
+from pydantic import Field
+from pydantic import PositiveInt
+from pydantic import computed_field
+from pydantic import field_validator
+
+from nat.builder.builder import Builder
+from nat.builder.function import FunctionGroup
+from nat.builder.function_info import FunctionInfo
+from nat.cli.register_workflow import register_function
+from nat.cli.register_workflow import register_function_group
+from nat.data_models.function import FunctionBaseConfig
+from nat.data_models.function import FunctionGroupBaseConfig
+
+
+class GithubCreateIssueModel(BaseModel):
+    title: str = Field(description="The title of the GitHub Issue")
+    body: str = Field(description="The body of the GitHub Issue")
+
+
+class GithubCreateIssueModelList(BaseModel):
+    issues: list[GithubCreateIssueModel] = Field(default_factory=list,
+                                                 description=("A list of GitHub issues, "
+                                                              "each with a title and a body"))
+
+
+class GithubGetIssueModel(BaseModel):
+    state: Literal["open", "closed", "all"] | None = Field(default="open",
+                                                           description="Issue state used in issue query filter")
+    assignee: str | None = Field(default=None, description="Assignee name used in issue query filter")
+    creator: str | None = Field(default=None, description="Creator name used in issue query filter")
+    mentioned: str | None = Field(default=None, description="Name of person mentioned in issue")
+    labels: list[str] | None = Field(default=None, description="A list of labels that are assigned to the issue")
+    since: str | None = Field(default=None,
+                              description="Only show results that were last updated after the given time.")
+
+    @classmethod
+    @field_validator('since', mode='before')
+    def validate_since(cls, v):
+        if v is None:
+            return v
+        try:
+            # Parse the string to a datetime object
+            parsed_date = datetime.strptime(v, "%Y-%m-%dT%H:%M:%SZ")
+            # Return the formatted string
+            return parsed_date.isoformat() + 'Z'
+        except ValueError as e:
+            raise ValueError("since must be in ISO 8601 format: YYYY-MM-DDTHH:MM:SSZ") from e
+
+
+class GithubGetIssueModelList(BaseModel):
+    filter_parameters: list[GithubGetIssueModel] = Field(default_factory=list,
+                                                         description=("A list of query params when fetching issues "
+                                                                      "each of type GithubGetIssueModel"))
+
+
+class GithubUpdateIssueModel(BaseModel):
+    issue_number: str = Field(description="The issue number that will be updated")
+    title: str | None = Field(default=None, description="The title of the GitHub Issue")
+    body: str | None = Field(default=None, description="The body of the GitHub Issue")
+    state: Literal["open", "closed"] | None = Field(default=None, description="The new state of the issue")
+
+    state_reason: Literal["completed", "not_planned", "reopened"] | None = Field(
+        default=None, description="The reason for changing the state of the issue")
+
+    labels: list[str] | None = Field(default=None, description="A list of labels to assign to the issue")
+    assignees: list[str] | None = Field(default=None, description="A list of assignees to assign to the issue")
+
+
+class GithubUpdateIssueModelList(BaseModel):
+    issues: list[GithubUpdateIssueModel] = Field(default_factory=list,
+                                                 description=("A list of GitHub issues each "
+                                                              "of type GithubUpdateIssueModel"))
+
+
+class GithubCreatePullModel(BaseModel):
+    title: str = Field(description="Title of the pull request")
+    body: str = Field(description="Description of the pull request")
+    source_branch: str = Field(description="The name of the branch containing your changes", serialization_alias="head")
+    target_branch: str = Field(description="The name of the branch you want to merge into", serialization_alias="base")
+    assignees: list[str] | None = Field(default=None,
+                                        description="List of GitHub usernames to assign to the PR. "
+                                        "Always the current user")
+    reviewers: list[str] | None = Field(default=None, description="List of GitHub usernames to request review from")
+
+
+class GithubCreatePullList(BaseModel):
+    pull_details: list[GithubCreatePullModel] = Field(
+        default_factory=list, description=("A list of params used for creating the PR in GitHub"))
+
+
+class GithubGetPullsModel(BaseModel):
+    state: Literal["open", "closed", "all"] | None = Field(default="open",
+                                                           description="Issue state used in issue query filter")
+    head: str | None = Field(default=None,
+                             description="Filters pulls by head user or head organization and branch name")
+    base: str | None = Field(default=None, description="Filters pull by branch name")
+
+
+class GithubGetPullsModelList(BaseModel):
+    filter_parameters: list[GithubGetPullsModel] = Field(
+        default_factory=list,
+        description=("A list of query params when fetching pull requests "
+                     "each of type GithubGetPullsModel"))
+
+
+class GithubCommitCodeModel(BaseModel):
+    branch: str = Field(description="The branch of the remote repo to which the code will be committed")
+    commit_msg: str = Field(description="Message with which the code will be committed to the remote repo")
+    local_path: str = Field(description="Local filepath of the file that has been updated and "
+                            "needs to be committed to the remote repo")
+    remote_path: str = Field(description="Remote filepath of the updated file in GitHub. Path is relative to "
+                             "root of current repository")
+
+
+class GithubCommitCodeModelList(BaseModel):
+    updated_files: list[GithubCommitCodeModel] = Field(default_factory=list,
+                                                       description=("A list of local filepaths and commit messages"))
+
+
+class GithubGroupConfig(FunctionGroupBaseConfig, name="github"):
+    """Function group for GitHub repository operations.
+
+    Exposes issue, pull request, and commit operations with shared configuration.
+    """
+    repo_name: str = Field(description="The repository name in the format 'owner/repo'")
+    timeout: int = Field(default=300, description="Timeout in seconds for GitHub API requests")
+    # Required for commit function
+    local_repo_dir: str | None = Field(default=None,
+                                       description="Absolute path to the local clone. Required for 'commit' function")
+
+
+@register_function_group(config_type=GithubGroupConfig)
+async def github_tool(config: GithubGroupConfig, _builder: Builder):
+    """Register the `github` function group with shared configuration.
+
+    Implements:
+      - create_issue, get_issue, update_issue
+      - create_pull, get_pull
+      - commit
+    """
+    import base64
+    import json
+    import os
+
+    import httpx
+
+    token: str | None = None
+    for env_var in ["GITHUB_TOKEN", "GITHUB_PAT", "GH_TOKEN"]:
+        token = os.getenv(env_var)
+        if token:
+            break
+
+    if not token:
+        raise ValueError("No GitHub token found in environment variables. Please set one of the following"
+                         "environment variables: GITHUB_TOKEN, GITHUB_PAT, GH_TOKEN")
+
+    headers = {
+        "Authorization": f"Bearer {token}",
+        "Accept": "application/vnd.github+json",
+        "User-Agent": "NeMo-Agent-Toolkit",
+    }
+
+    async with httpx.AsyncClient(timeout=config.timeout, headers=headers) as client:
+
+        # Issues
+        async def create_issue(issues_list: GithubCreateIssueModelList) -> str:
+            url = f"https://api.github.com/repos/{config.repo_name}/issues"
+            results = []
+            for issue in issues_list.issues:
+                payload = issue.model_dump(exclude_unset=True)
+                response = await client.post(url, json=payload)
+                response.raise_for_status()
+                results.append(response.json())
+            return json.dumps(results)
+
+        async def get_issue(issues_list: GithubGetIssueModelList) -> str:
+            url = f"https://api.github.com/repos/{config.repo_name}/issues"
+            results = []
+            for issue in issues_list.filter_parameters:
+                params = issue.model_dump(exclude_unset=True, exclude_none=True)
+                response = await client.get(url, params=params)
+                response.raise_for_status()
+                results.append(response.json())
+            return json.dumps(results)
+
+        async def update_issue(issues_list: GithubUpdateIssueModelList) -> str:
+            url = f"https://api.github.com/repos/{config.repo_name}/issues"
+            results = []
+            for issue in issues_list.issues:
+                payload = issue.model_dump(exclude_unset=True, exclude_none=True)
+                issue_number = payload.pop("issue_number")
+                issue_url = f"{url}/{issue_number}"
+                response = await client.patch(issue_url, json=payload)
+                response.raise_for_status()
+                results.append(response.json())
+            return json.dumps(results)
+
+        # Pull requests
+        async def create_pull(pull_list: GithubCreatePullList) -> str:
+            results = []
+            pr_url = f"https://api.github.com/repos/{config.repo_name}/pulls"
+
+            for pull_detail in pull_list.pull_details:
+
+                pr_data = pull_detail.model_dump(
+                    include={"title", "body", "source_branch", "target_branch"},
+                    by_alias=True,
+                )
+                pr_response = await client.post(pr_url, json=pr_data)
+                pr_response.raise_for_status()
+                pr_number = pr_response.json()["number"]
+
+                result = {"pull_request": pr_response.json()}
+
+                if pull_detail.assignees:
+                    assignees_url = f"https://api.github.com/repos/{config.repo_name}/issues/{pr_number}/assignees"
+                    assignees_data = {"assignees": pull_detail.assignees}
+                    assignees_response = await client.post(assignees_url, json=assignees_data)
+                    assignees_response.raise_for_status()
+                    result["assignees"] = assignees_response.json()
+
+                if pull_detail.reviewers:
+                    reviewers_url = f"https://api.github.com/repos/{config.repo_name}/pulls/{pr_number}/requested_reviewers"
+                    reviewers_data = {"reviewers": pull_detail.reviewers}
+                    reviewers_response = await client.post(reviewers_url, json=reviewers_data)
+                    reviewers_response.raise_for_status()
+                    result["reviewers"] = reviewers_response.json()
+
+                results.append(result)
+
+            return json.dumps(results)
+
+        async def get_pull(pull_list: GithubGetPullsModelList) -> str:
+            url = f"https://api.github.com/repos/{config.repo_name}/pulls"
+            results = []
+            for pull_params in pull_list.filter_parameters:
+                params = pull_params.model_dump(exclude_unset=True, exclude_none=True)
+                response = await client.get(url, params=params)
+                response.raise_for_status()
+                results.append(response.json())
+
+            return json.dumps(results)
+
+        # Commits (commit updated files)
+        async def commit(updated_file_list: GithubCommitCodeModelList) -> str:
+            if not config.local_repo_dir:
+                raise ValueError("'local_repo_dir' must be set in the github function group config to use 'commit'")
+
+            results = []
+            for updated_file in updated_file_list.updated_files:
+                branch = updated_file.branch
+                commit_msg = updated_file.commit_msg
+                local_path = updated_file.local_path
+                remote_path = updated_file.remote_path
+
+                # Read content from the local file (secure + binary-safe)
+                safe_root = os.path.realpath(config.local_repo_dir)
+                candidate = os.path.realpath(os.path.join(config.local_repo_dir, local_path))
+                if not candidate.startswith(safe_root + os.sep):
+                    raise ValueError(f"local_path '{local_path}' resolves outside local_repo_dir")
+                if not os.path.isfile(candidate):
+                    raise FileNotFoundError(f"File not found: {candidate}")
+                with open(candidate, "rb") as f:
+                    content_bytes = f.read()
+                content_b64 = base64.b64encode(content_bytes).decode("ascii")
+
+                # 1) Create blob
+                blob_url = f"https://api.github.com/repos/{config.repo_name}/git/blobs"
+                blob_data = {"content": content_b64, "encoding": "base64"}
+                blob_response = await client.post(blob_url, json=blob_data)
+                blob_response.raise_for_status()
+                blob_sha = blob_response.json()["sha"]
+
+                # 2) Get current ref (parent commit SHA)
+                ref_url = f"https://api.github.com/repos/{config.repo_name}/git/refs/heads/{branch}"
+                ref_response = await client.get(ref_url)
+                ref_response.raise_for_status()
+                parent_commit_sha = ref_response.json()["object"]["sha"]
+
+                # 3) Get parent commit to retrieve its tree SHA
+                parent_commit_url = f"https://api.github.com/repos/{config.repo_name}/git/commits/{parent_commit_sha}"
+                parent_commit_resp = await client.get(parent_commit_url)
+                parent_commit_resp.raise_for_status()
+                base_tree_sha = parent_commit_resp.json()["tree"]["sha"]
+
+                # 4) Create tree
+                tree_url = f"https://api.github.com/repos/{config.repo_name}/git/trees"
+                tree_data = {
+                    "base_tree": base_tree_sha,
+                    "tree": [{
+                        "path": remote_path, "mode": "100644", "type": "blob", "sha": blob_sha
+                    }],
+                }
+                tree_response = await client.post(tree_url, json=tree_data)
+                tree_response.raise_for_status()
+                tree_sha = tree_response.json()["sha"]
+
+                # 5) Create commit
+                commit_url = f"https://api.github.com/repos/{config.repo_name}/git/commits"
+                commit_data = {"message": commit_msg, "tree": tree_sha, "parents": [parent_commit_sha]}
+                commit_response = await client.post(commit_url, json=commit_data)
+                commit_response.raise_for_status()
+                commit_sha = commit_response.json()["sha"]
+
+                # 6) Update ref
+                update_ref_url = f"https://api.github.com/repos/{config.repo_name}/git/refs/heads/{branch}"
+                update_ref_data = {"sha": commit_sha, "force": False}
+                update_ref_response = await client.patch(update_ref_url, json=update_ref_data)
+                update_ref_response.raise_for_status()
+
+                results.append({
+                    "blob_resp": blob_response.json(),
+                    "parent_commit": parent_commit_resp.json(),
+                    "new_tree": tree_response.json(),
+                    "commit_resp": commit_response.json(),
+                    "update_ref_resp": update_ref_response.json(),
+                })
+
+            return json.dumps(results)
+
+        group = FunctionGroup(config=config)
+
+        group.add_function("create_issue",
+                           create_issue,
+                           description=f"Creates a GitHub issue in the repo named {config.repo_name}",
+                           input_schema=GithubCreateIssueModelList)
+        group.add_function("get_issue",
+                           get_issue,
+                           description=f"Fetches a particular GitHub issue in the repo named {config.repo_name}",
+                           input_schema=GithubGetIssueModelList)
+        group.add_function("update_issue",
+                           update_issue,
+                           description=f"Updates a GitHub issue in the repo named {config.repo_name}",
+                           input_schema=GithubUpdateIssueModelList)
+        group.add_function("create_pull",
+                           create_pull,
+                           description="Creates a pull request with assignees and reviewers in"
+                           f"the GitHub repository named {config.repo_name}",
+                           input_schema=GithubCreatePullList)
+        group.add_function("get_pull",
+                           get_pull,
+                           description="Fetches the files for a particular GitHub pull request"
+                           f"in the repo named {config.repo_name}",
+                           input_schema=GithubGetPullsModelList)
+        group.add_function("commit",
+                           commit,
+                           description="Commits and pushes modified code to a GitHub repository"
+                           f"in the repo named {config.repo_name}",
+                           input_schema=GithubCommitCodeModelList)
+
+        yield group
+
+
+class GithubFilesGroupConfig(FunctionBaseConfig, name="github_files_tool"):
+    timeout: int = Field(default=5, description="Timeout in seconds for HTTP requests")
+
+
+@register_function(config_type=GithubFilesGroupConfig)
+async def github_files_tool(config: GithubFilesGroupConfig, _builder: Builder):
+
+    import re
+
+    import httpx
+
+    class FileMetadata(BaseModel):
+        repo_path: str
+        file_path: str
+        start: str | None = Field(default=None)
+        end: str | None = Field(default=None)
+
+        @computed_field
+        @property
+        def start_line(self) -> PositiveInt | None:
+            return int(self.start) if self.start else None
+
+        @computed_field
+        @property
+        def end_line(self) -> PositiveInt | None:
+            return int(self.end) if self.end else None
+
+    async with httpx.AsyncClient(timeout=config.timeout) as client:
+
+        async def get(url_text: str) -> str:
+            """
+            Returns the text of a github file using a github url starting with https://github.com and ending
+            with a specific file. If a line reference is provided (#L409), the text of the line is returned.
+            If a range of lines is provided (#L409-L417), the text of the lines is returned.
+
+            Examples:
+            - https://github.com/org/repo/blob/main/README.md -> Returns full text of the README.md file
+            - https://github.com/org/repo/blob/main/README.md#L409 -> Returns the 409th line of the README.md file
+            - https://github.com/org/repo/blob/main/README.md#L409-L417 -> Returns lines 409-417 of the README.md file
+            """
+
+            pattern = r"https://github\.com/(?P<repo_path>[^/]*/[^/]*)/blob/(?P<file_path>[^?#]*)(?:#L(?P<start>\d+)(?:-L(?P<end>\d+))?)?"
+            match = re.match(pattern, url_text)
+            if not match:
+                return ("Invalid github url. Please provide a valid github url. "
+                        "Example: 'https://github.com/org/repo/blob/main/README.md' "
+                        "or 'https://github.com/org/repo/blob/main/README.md#L409' "
+                        "or 'https://github.com/org/repo/blob/main/README.md#L409-L417'")
+
+            file_metadata = FileMetadata(**match.groupdict())
+
+            # The following URL is the raw URL of the file. refs/heads/ always points to the top commit of the branch
+            raw_url = f"https://raw.githubusercontent.com/{file_metadata.repo_path}/refs/heads/{file_metadata.file_path}"
+            try:
+                response = await client.get(raw_url)
+                response.raise_for_status()
+            except httpx.TimeoutException:
+                return f"Timeout encountered when retrieving resource: {raw_url}"
+
+            if file_metadata.start_line is None:
+                return f"```{response.text}\n```"
+
+            lines = response.text.splitlines()
+
+            if file_metadata.start_line > len(lines):
+                return f"Error: Line {file_metadata.start_line} is out of range for the file {file_metadata.file_path}"
+
+            if file_metadata.end_line is None:
+                return f"```{lines[file_metadata.start_line - 1]}\n```"
+
+            if file_metadata.end_line > len(lines):
+                return f"Error: Line {file_metadata.end_line} is out of range for the file {file_metadata.file_path}"
+
+            selected_lines = lines[file_metadata.start_line - 1:file_metadata.end_line]
+            response_text = "\n".join(selected_lines)
+            return f"```{response_text}\n```"
+
+        yield FunctionInfo.from_fn(get, description=get.__doc__)

nat/tool/nvidia_rag.py

@@ -86,7 +86,7 @@ async def nvidia_rag_tool(config: NVIDIARAGToolConfig, builder: Builder):
                     [await aformat_document(doc, document_prompt) for doc in docs])
                 return parsed_output
             except Exception as e:
-                logger.exception("Error while running the tool", exc_info=True)
+                logger.exception("Error while running the tool")
                 return f"Error while running the tool: {e}"
 
         yield FunctionInfo.from_fn(

nat/tool/register.py

@@ -13,7 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# pylint: disable=unused-import
 # flake8: noqa
 
 # Import any tools which need to be automatically registered here
@@ -25,14 +24,8 @@ from . import nvidia_rag
 from . import retriever
 from . import server_tools
 from .code_execution import register
-from .github_tools import create_github_commit
-from .github_tools import create_github_issue
-from .github_tools import create_github_pr
-from .github_tools import get_github_file
-from .github_tools import get_github_issue
-from .github_tools import get_github_pr
-from .github_tools import update_github_issue
-from .mcp import mcp_tool
+from .github_tools import github_tool
+from .github_tools import github_files_tool
 from .memory_tools import add_memory_tool
 from .memory_tools import delete_memory_tool
 from .memory_tools import get_memory_tool

nat/tool/retriever.py

@@ -78,8 +78,9 @@ async def retriever_tool(config: RetrieverConfig, builder: Builder):
 
         except RetrieverError as e:
             if config.raise_errors:
-                raise e
-            logger.warning("Retriever threw an error: %s. Returning an empty response.", e)
+                logger.error("Retriever threw an error: %s.", e)
+                raise
+            logger.exception("Retriever threw an error: %s. Returning an empty response.", e)
             return RetrieverOutput(results=[])
 
     yield FunctionInfo.from_fn(

nat/utils/callable_utils.py

@@ -0,0 +1,70 @@
+# 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 inspect
+from collections.abc import Callable
+from typing import Any
+
+
+async def ainvoke_any(func: Callable[..., Any], *args: Any, **kwargs: Any) -> Any:
+    """Execute any type of callable and return the result.
+
+    Handles synchronous functions, asynchronous functions, generators,
+    and async generators uniformly, returning the final result value.
+
+    Args:
+        func (Callable[..., Any]): The function to execute (sync/async function, generator, etc.)
+
+    Returns:
+        Any: The result of executing the callable
+    """
+    # Execute the function
+    result_value = func(*args, **kwargs)
+
+    # Handle different return types
+    if inspect.iscoroutine(result_value):
+        # Async function - await the coroutine
+        return await result_value
+
+    if inspect.isgenerator(result_value):
+        # Sync generator - consume until StopIteration and get return value
+        try:
+            while True:
+                next(result_value)
+        except StopIteration as e:
+            # Return the generator's return value, or None if not provided
+            return e.value
+
+    if inspect.isasyncgen(result_value):
+        # Async generator - consume all values and return the last one
+        last_value = None
+        async for value in result_value:
+            last_value = value
+        return last_value
+
+    # Direct value from sync function (most common case)
+    return result_value
+
+
+def is_async_callable(func: Callable[..., Any]) -> bool:
+    """Check if a function is async (coroutine function or async generator function).
+
+    Args:
+        func (Callable[..., Any]): The function to check
+
+    Returns:
+        bool: True if the function is async, False otherwise
+    """
+    return inspect.iscoroutinefunction(func) or inspect.isasyncgenfunction(func)

nat/utils/data_models/schema_validator.py

@@ -21,7 +21,7 @@ from ..exception_handlers.schemas import yaml_exception_handler
 
 
 @schema_exception_handler
-def validate_schema(metadata, Schema):  # pylint: disable=invalid-name
+def validate_schema(metadata, Schema):
 
     try:
         return Schema(**metadata)
@@ -31,7 +31,7 @@ def validate_schema(metadata, Schema):  # pylint: disable=invalid-name
 
 
 @yaml_exception_handler
-def validate_yaml(ctx, param, value):  # pylint: disable=unused-argument
+def validate_yaml(ctx, param, value):
     """
     Validate that the file is a valid YAML file
 
@@ -52,7 +52,7 @@ def validate_yaml(ctx, param, value):  # pylint: disable=unused-argument
     if value is None:
         return None
 
-    with open(value, 'r', encoding="utf-8") as f:
+    with open(value, encoding="utf-8") as f:
         yaml.safe_load(f)
 
     return value