alita-sdk 0.3.554__py3-none-any.whl → 0.3.602__py3-none-any.whl

alita_sdk/tools/github/__init__.py

@@ -10,6 +10,7 @@ from ..elitea_base import filter_missconfigured_index_tools
 from ..utils import clean_string, get_max_toolkit_length
 from ...configurations.github import GithubConfiguration
 from ...configurations.pgvector import PgVectorConfiguration
+from ...runtime.utils.constants import TOOLKIT_NAME_META, TOOL_NAME_META, TOOLKIT_TYPE_META
 
 name = "github"
 
@@ -96,7 +97,7 @@ class AlitaGitHubToolkit(BaseToolkit):
                 mode=tool["mode"],
                 description=description,
                 args_schema=tool["args_schema"],
-                metadata={"toolkit_name": toolkit_name} if toolkit_name else {}
+                metadata={TOOLKIT_NAME_META: toolkit_name, TOOLKIT_TYPE_META: name, TOOL_NAME_META: tool["name"]} if toolkit_name else {TOOL_NAME_META: tool["name"]}
             ))
         return cls(tools=tools)
 

alita_sdk/tools/github/github_client.py

@@ -12,10 +12,6 @@ from github.Consts import DEFAULT_BASE_URL
 from langchain_core.tools import ToolException
 
 from ..elitea_base import extend_with_file_operations, BaseCodeToolApiWrapper
-from .schemas import (
-    GitHubAuthConfig,
-    GitHubRepoConfig,
-)
 
 from .schemas import (
     GitHubAuthConfig,
@@ -415,26 +411,53 @@ class GitHubClient(BaseModel):
         Returns:
             str: A detailed diff comparison between the two commits or an error message.
         """
+        def safe_author_info(commit_obj):
+            """Safely extract author info from a commit object, handling None values."""
+            author = commit_obj.commit.author
+            if author:
+                return {
+                    "name": author.name or "Unknown",
+                    "date": author.date.isoformat() if author.date else None
+                }
+            # Fallback to GitHub user info if git author is not available
+            elif commit_obj.author:
+                return {
+                    "name": commit_obj.author.login,
+                    "date": None
+                }
+            return {"name": "Unknown", "date": None}
+
         try:
             # Get the repository
             repo = self.github_api.get_repo(repo_name) if repo_name else self.github_repo_instance
-            
+
             # Get the comparison between the two commits
             comparison = repo.compare(base_sha, head_sha)
-            
+
+            # Get head commit - the GitHub Compare API doesn't return head_commit,
+            # so we get it from the commits list or fetch it directly
+            if comparison.commits:
+                head_commit_obj = comparison.commits[-1]
+            else:
+                # For identical commits or edge cases, fetch head commit directly
+                head_commit_obj = repo.get_commit(head_sha)
+
+            base_author = safe_author_info(comparison.base_commit)
+            head_author = safe_author_info(head_commit_obj)
+
             # Extract comparison information
             diff_info = {
                 "base_commit": {
                     "sha": comparison.base_commit.sha,
                     "message": comparison.base_commit.commit.message,
-                    "author": comparison.base_commit.commit.author.name,
-                    "date": comparison.base_commit.commit.author.date.isoformat()
+                    "author": base_author["name"],
+                    "date": base_author["date"]
                 },
                 "head_commit": {
-                    "sha": comparison.head_commit.sha,
-                    "message": comparison.head_commit.commit.message,
-                    "author": comparison.head_commit.commit.author.name,
-                    "date": comparison.head_commit.commit.author.date.isoformat()
+                    "sha": head_commit_obj.sha,
+                    "message": head_commit_obj.commit.message,
+                    "author": head_author["name"],
+                    "date": head_author["date"]
                 },
                 "status": comparison.status,  # ahead, behind, identical, or diverged
                 "ahead_by": comparison.ahead_by,
@@ -443,14 +466,15 @@ class GitHubClient(BaseModel):
                 "commits": [],
                 "files": []
             }
-            
+
             # Get commits in the comparison
             for commit in comparison.commits:
+                author_info = safe_author_info(commit)
                 commit_info = {
                     "sha": commit.sha,
                     "message": commit.commit.message,
-                    "author": commit.commit.author.name,
-                    "date": commit.commit.author.date.isoformat(),
+                    "author": author_info["name"],
+                    "date": author_info["date"],
                     "url": commit.html_url
                 }
                 diff_info["commits"].append(commit_info)
@@ -1094,65 +1118,12 @@ class GitHubClient(BaseModel):
         except Exception as e:
             return f"Unable to create file due to error:\n{str(e)}"
 
-    def extract_old_new_pairs(self, file_query):
-        # Split the file content by lines
-        code_lines = file_query.split("\n")
-
-        # Initialize lists to hold the contents of OLD and NEW sections
-        old_contents = []
-        new_contents = []
-
-        # Initialize variables to track whether the current line is within an OLD or NEW section
-        in_old_section = False
-        in_new_section = False
-
-        # Temporary storage for the current section's content
-        current_section_content = []
-
-        # Iterate through each line in the file content
-        for line in code_lines:
-            # Check for OLD section start
-            if "OLD <<<" in line:
-                in_old_section = True
-                current_section_content = []  # Reset current section content
-                continue  # Skip the line with the marker
-
-            # Check for OLD section end
-            if ">>>> OLD" in line:
-                in_old_section = False
-                old_contents.append("\n".join(current_section_content).strip())  # Add the captured content
-                current_section_content = []  # Reset current section content
-                continue  # Skip the line with the marker
-
-            # Check for NEW section start
-            if "NEW <<<" in line:
-                in_new_section = True
-                current_section_content = []  # Reset current section content
-                continue  # Skip the line with the marker
-
-            # Check for NEW section end
-            if ">>>> NEW" in line:
-                in_new_section = False
-                new_contents.append("\n".join(current_section_content).strip())  # Add the captured content
-                current_section_content = []  # Reset current section content
-                continue  # Skip the line with the marker
-
-            # If currently in an OLD or NEW section, add the line to the current section content
-            if in_old_section or in_new_section:
-                current_section_content.append(line)
-
-        # Pair the OLD and NEW contents
-        paired_contents = list(zip(old_contents, new_contents))
-
-        return paired_contents
-
     def update_file(self, file_query: str, repo_name: Optional[str] = None, commit_message: Optional[str] = None) -> str:
-        """
-        Updates a file with new content.
+        """Updates a file with new content using OLD/NEW markers and edit_file.
+
         Parameters:
-            file_query(str): Contains the file path and the file contents.
-                The old file contents is wrapped in OLD <<<< and >>>> OLD
-                The new file contents is wrapped in NEW <<<< and >>>> NEW
+            file_query(str): Contains the file path on the first line and the file contents
+                wrapped in OLD <<<< and >>>> OLD / NEW <<<< and >>>> NEW markers.
                 For example:
                 /test/hello.txt
                 OLD <<<<
@@ -1161,13 +1132,13 @@ class GitHubClient(BaseModel):
                 NEW <<<<
                 Hello Mars!
                 >>>> NEW
-            repo_name (Optional[str]): Name of the repository in format 'owner/repo'
+            repo_name (Optional[str]): Name of the repository in format 'owner/repo'. Currently
+                not used by edit_file and must refer to the initialized repository.
 
         Returns:
             A success or failure message
         """
         try:
-            repo = self.github_api.get_repo(repo_name) if repo_name else self.github_repo_instance
             branch = self.active_branch
 
             if branch == self.github_base_branch:
@@ -1176,29 +1147,22 @@ class GitHubClient(BaseModel):
                     "which is protected. Please create a new branch and try again."
                 )
 
-            file_path: str = file_query.split("\n")[0]
-
-            file_content = self._read_file(file_path, branch, repo_name)
-            updated_file_content = file_content
-            for old, new in self.extract_old_new_pairs(file_query):
-                if not old.strip():
-                    continue
-                updated_file_content = updated_file_content.replace(old, new)
-
-            if file_content == updated_file_content:
+            if "\n" not in file_query:
                 return (
-                    "File content was not updated because old content was not found or empty. "
-                    "It may be helpful to use the read_file action to get the current file contents."
+                    "Invalid file_query format. Expected first line to be the file path "
+                    "followed by OLD/NEW blocks."
                 )
 
-            repo.update_file(
-                path=file_path,
-                message=commit_message if commit_message else f"Update {file_path}",
-                content=updated_file_content,
+            file_path, edit_content = file_query.split("\n", 1)
+            file_path = file_path.strip()
+
+            # Delegate to shared edit_file implementation
+            return self.edit_file(
+                file_path=file_path,
+                file_query=edit_content,
                 branch=branch,
-                sha=repo.get_contents(file_path, ref=branch).sha,
+                commit_message=commit_message or f"Update {file_path}",
             )
-            return f"Updated file {file_path}"
         except Exception as e:
             return f"Unable to update file due to error:\n{str(e)}"
 

alita_sdk/tools/github/schemas.py

@@ -92,7 +92,7 @@ SearchIssues = create_model(
     "SearchIssues",
     search_query=(str, Field(description="Keywords or query for searching issues and PRs in Github")),
     repo_name=(Optional[str], Field(description="Name of the repository to search issues in", default=None)),
-    max_count=(Optional[int], Field(description="Maximum number of issues to return", default=30))
+    max_count=(Optional[int], Field(description="Maximum number of issues to return", default=30, gt=0))
 )
 
 CreateIssue = create_model(
@@ -152,7 +152,7 @@ GetCommits = create_model(
     since=(Optional[str], Field(description="Only commits after this date will be returned (ISO format)", default=None)),
     until=(Optional[str], Field(description="Only commits before this date will be returned (ISO format)", default=None)),
     author=(Optional[str], Field(description="The author of the commits", default=None)),
-    max_count=(Optional[int], Field(description="Maximum number of commits to return (default: 30)", default=30))
+    max_count=(Optional[int], Field(description="Maximum number of commits to return (default: 30)", default=30, gt=0))
 )
 
 GetCommitChanges = create_model(
@@ -213,7 +213,7 @@ ListProjectIssues = create_model(
     "ListProjectIssues",
     board_repo=(str, Field(description="The organization and repository for the board (project). Example: 'org-name/repo-name'")),
     project_number=(int, Field(description="The project number as shown in the project URL")),
-    items_count=(Optional[int], Field(description="Maximum number of items to retrieve", default=100))
+    items_count=(Optional[int], Field(description="Maximum number of items to retrieve", default=100, gt=0))
 )
 
 SearchProjectIssues = create_model(
@@ -221,7 +221,7 @@ SearchProjectIssues = create_model(
     board_repo=(str, Field(description="The organization and repository for the board (project). Example: 'org-name/repo-name'")),
     project_number=(int, Field(description="The project number as shown in the project URL")),
     search_query=(str, Field(description="Search query for filtering issues. Examples: 'status:In Progress', 'release:v1.0'")),
-    items_count=(Optional[int], Field(description="Maximum number of items to retrieve", default=100))
+    items_count=(Optional[int], Field(description="Maximum number of items to retrieve", default=100, gt=0))
 )
 
 ListProjectViews = create_model(

alita_sdk/tools/gitlab/__init__.py

@@ -11,6 +11,7 @@ from ..elitea_base import filter_missconfigured_index_tools
 from ..utils import clean_string, get_max_toolkit_length
 from ...configurations.gitlab import GitlabConfiguration
 from ...configurations.pgvector import PgVectorConfiguration
+from ...runtime.utils.constants import TOOLKIT_NAME_META, TOOL_NAME_META, TOOLKIT_TYPE_META
 
 name = "gitlab"
 
@@ -92,7 +93,7 @@ class AlitaGitlabToolkit(BaseToolkit):
                 name=tool["name"],
                 description=description,
                 args_schema=tool["args_schema"],
-                metadata={"toolkit_name": toolkit_name} if toolkit_name else {}
+                metadata={TOOLKIT_NAME_META: toolkit_name, TOOLKIT_TYPE_META: name, TOOL_NAME_META: tool["name"]} if toolkit_name else {TOOL_NAME_META: tool["name"]}
             ))
         return cls(tools=tools)
 

alita_sdk/tools/gitlab/api_wrapper.py

@@ -2,6 +2,7 @@
 import fnmatch
 from typing import Any, Dict, List, Optional
 
+from gitlab import GitlabGetError
 from langchain_core.tools import ToolException
 from pydantic import create_model, Field, model_validator, SecretStr, PrivateAttr
 
@@ -9,6 +10,7 @@ from ..code_indexer_toolkit import CodeIndexerToolkit
 from ..utils.available_tools_decorator import extend_with_parent_available_tools
 from ..elitea_base import extend_with_file_operations, BaseCodeToolApiWrapper
 from ..utils.content_parser import parse_file_content
+from .utils import get_position
 
 AppendFileModel = create_model(
     "AppendFileModel",
@@ -35,7 +37,7 @@ ReadFileModel = create_model(
 )
 UpdateFileModel = create_model(
     "UpdateFileModel",
-    file_query=(str, Field(description="The file query string")),
+    file_query=(str, Field(description="The file query string containing file path on first line, followed by OLD/NEW markers. Format: file_path\\nOLD <<<< old content >>>> OLD\\nNEW <<<< new content >>>> NEW")),
     branch=(str, Field(description="The branch to update the file in")),
 )
 CommentOnIssueModel = create_model(
@@ -52,6 +54,11 @@ CreatePullRequestModel = create_model(
     pr_body=(str, Field(description="The body of the pull request")),
     branch=(str, Field(description="The branch to create the pull request from")),
 )
+CommentOnPRModel = create_model(
+    "CommentOnPRModel",
+    pr_number=(int, Field(description="The number of the pull request/merge request")),
+    comment=(str, Field(description="The comment text to add")),
+)
 
 CreateBranchModel = create_model(
     "CreateBranchModel",
@@ -59,7 +66,7 @@ CreateBranchModel = create_model(
 )
 ListBranchesInRepoModel = create_model(
     "ListBranchesInRepoModel",
-    limit=(Optional[int], Field(default=20, description="Maximum number of branches to return. If not provided, all branches will be returned.")),
+    limit=(Optional[int], Field(default=20, description="Maximum number of branches to return. If not provided, all branches will be returned.", gt=0)),
     branch_wildcard=(Optional[str], Field(default=None, description="Wildcard pattern to filter branches by name. If not provided, all branches will be returned."))
 
 )
@@ -90,9 +97,9 @@ GetPRChangesModel = create_model(
 CreatePRChangeCommentModel = create_model(
     "CreatePRChangeCommentModel",
     pr_number=(int, Field(description="GitLab Merge Request (Pull Request) number")),
-    file_path=(str, Field(description="File path of the changed file")),
-    line_number=(int, Field(description="Line number from the diff for a changed file")),
-    comment=(str, Field(description="Comment content")),
+    file_path=(str, Field(description="File path of the changed file as shown in the diff")),
+    line_number=(int, Field(description="Line index (0-based) from the diff output. Use get_pr_changes first to see the diff and identify the correct line index to comment on.")),
+    comment=(str, Field(description="Comment content to add to the specific line")),
 )
 GetCommitsModel = create_model(
     "GetCommitsModel",
@@ -235,7 +242,9 @@ class GitLabAPIWrapper(CodeIndexerToolkit):
         Returns:
             File content as string
         """
-        return self.read_file(file_path, branch)
+        # Default to active branch if branch is None, consistent with other methods
+        branch = branch if branch else self._active_branch
+        return str(self.read_file(file_path, branch))
 
     def create_branch(self, branch_name: str) -> str:
         try:
@@ -322,7 +331,30 @@ class GitLabAPIWrapper(CodeIndexerToolkit):
         except Exception as e:
             return "Unable to make comment due to error:\n" + str(e)
 
+    def comment_on_pr(self, pr_number: int, comment: str) -> str:
+        """
+        Add a comment to a pull request (merge request) in GitLab.
+
+        This method adds a general comment to the entire merge request,
+        not tied to specific code lines or file changes.
+
+        Parameters:
+            pr_number: GitLab Merge Request (Pull Request) number
+            comment: Comment text to add
+
+        Returns:
+            Success message or error description
+        """
+        try:
+            mr = self.repo_instance.mergerequests.get(pr_number)
+            mr.notes.create({"body": comment})
+            return "Commented on merge request " + str(pr_number)
+        except Exception as e:
+            return "Unable to make comment due to error:\n" + str(e)
+
     def create_file(self, file_path: str, file_contents: str, branch: str) -> str:
+        # Default to active branch if branch is None
+        branch = branch if branch else self._active_branch
         try:
             self.set_active_branch(branch)
             self.repo_instance.files.get(file_path, branch)
@@ -339,6 +371,8 @@ class GitLabAPIWrapper(CodeIndexerToolkit):
             return "Created file " + file_path
 
     def read_file(self, file_path: str, branch: str) -> str:
+        # Default to active branch if branch is None
+        branch = branch if branch else self._active_branch
         self.set_active_branch(branch)
         file = self.repo_instance.files.get(file_path, branch)
         return parse_file_content(file_name=file_path,
@@ -406,43 +440,52 @@ class GitLabAPIWrapper(CodeIndexerToolkit):
             raise ToolException(f"Unable to write file {file_path}: {str(e)}")
 
     def update_file(self, file_query: str, branch: str) -> str:
+        """
+        Update file using edit_file functionality.
+
+        This method now delegates to edit_file which uses OLD/NEW markers.
+        For backwards compatibility, it extracts the file_path from the query.
+
+        Expected format:
+            file_path
+            OLD <<<<
+            old content
+            >>>> OLD
+            NEW <<<<
+            new content
+            >>>> NEW
+
+        Args:
+            file_query: File path on first line, followed by OLD/NEW markers
+            branch: Branch to update the file in
+
+        Returns:
+            Success or error message
+        """
         if branch == self.branch:
             return (
-                "You're attempting to commit to the directly"
+                "You're attempting to commit directly "
                 f"to the {self.branch} branch, which is protected. "
                 "Please create a new branch and try again."
             )
         try:
-            file_path: str = file_query.split("\n")[0]
-            self.set_active_branch(branch)
-            file_content = self.read_file(file_path, branch)
-            updated_file_content = file_content
-            for old, new in self.extract_old_new_pairs(file_query):
-                if not old.strip():
-                    continue
-                updated_file_content = updated_file_content.replace(old, new)
-
-            if file_content == updated_file_content:
+            # Extract file path from first line
+            lines = file_query.split("\n", 1)
+            if len(lines) < 2:
                 return (
-                    "File content was not updated because old content was not found or empty."
-                    "It may be helpful to use the read_file action to get "
-                    "the current file contents."
+                    "Invalid file_query format. Expected:\n"
+                    "file_path\n"
+                    "OLD <<<< old content >>>> OLD\n"
+                    "NEW <<<< new content >>>> NEW"
                 )
 
-            commit = {
-                "branch": branch,
-                "commit_message": "Create " + file_path,
-                "actions": [
-                    {
-                        "action": "update",
-                        "file_path": file_path,
-                        "content": updated_file_content,
-                    }
-                ],
-            }
+            file_path = lines[0].strip()
+            edit_content = lines[1] if len(lines) > 1 else ""
+
+            # Delegate to edit_file method with appropriate commit message
+            commit_message = f"Update {file_path}"
+            return self.edit_file(file_path, edit_content, branch, commit_message)
 
-            self.repo_instance.commits.create(commit)
-            return "Updated file " + file_path
         except Exception as e:
             return "Unable to update file due to error:\n" + str(e)
 
@@ -494,10 +537,41 @@ class GitLabAPIWrapper(CodeIndexerToolkit):
         return res
 
     def create_pr_change_comment(self, pr_number: int, file_path: str, line_number: int, comment: str) -> str:
-        mr = self.repo_instance.mergerequests.get(pr_number)
-        position = {"position_type": "text", "new_path": file_path, "new_line": line_number}
-        mr.discussions.create({"body": comment, "position": position})
-        return "Comment added"
+        """
+        Create a comment on a specific line in a pull request (merge request) change in GitLab.
+
+        This method adds an inline comment to a specific line in the diff of a merge request.
+        The line_number parameter refers to the line index in the diff output (0-based),
+        not the line number in the original file.
+
+        **Important**: Use get_pr_changes first to see the diff and identify the correct
+        line index for commenting.
+
+        Parameters:
+            pr_number: GitLab Merge Request number
+            file_path: Path to the file being commented on (as shown in the diff)
+            line_number: Line index from the diff (0-based index)
+            comment: Comment text to add
+
+        Returns:
+            Success message or error description
+        """
+        try:
+            mr = self.repo_instance.mergerequests.get(pr_number)
+        except GitlabGetError as e:
+            if e.response_code == 404:
+                raise ToolException(f"Merge request number {pr_number} wasn't found: {e}")
+            raise ToolException(f"Error retrieving merge request {pr_number}: {e}")
+
+        try:
+            # Calculate proper position with SHA references and line mappings
+            position = get_position(file_path=file_path, line_number=line_number, mr=mr)
+
+            # Create discussion with the comment
+            mr.discussions.create({"body": comment, "position": position})
+            return f"Comment added successfully to line {line_number} in {file_path} on MR #{pr_number}"
+        except Exception as e:
+            raise ToolException(f"Failed to create comment on MR #{pr_number}: {e}")
 
     def get_commits(self, sha: Optional[str] = None, path: Optional[str] = None, since: Optional[str] = None, until: Optional[str] = None, author: Optional[str] = None):
         params = {}
@@ -575,6 +649,12 @@ class GitLabAPIWrapper(CodeIndexerToolkit):
                 "description": self.comment_on_issue.__doc__ or "Comment on an issue in the repository.",
                 "args_schema": CommentOnIssueModel,
             },
+            {
+                "name": "comment_on_pr",
+                "ref": self.comment_on_pr,
+                "description": self.comment_on_pr.__doc__ or "Comment on a pull request (merge request) in the repository.",
+                "args_schema": CommentOnPRModel,
+            },
             {
                 "name": "create_file",
                 "ref": self.create_file,
@@ -620,7 +700,7 @@ class GitLabAPIWrapper(CodeIndexerToolkit):
             {
                 "name": "create_pr_change_comment",
                 "ref": self.create_pr_change_comment,
-                "description": "Create a comment on a pull request change.",
+                "description": self.create_pr_change_comment.__doc__ or "Create an inline comment on a specific line in a pull request change. Use get_pr_changes first to see the diff and identify the line index for commenting. The line_number is a 0-based index from the diff output, not the file line number.",
                 "args_schema": CreatePRChangeCommentModel,
             },
             {

alita_sdk/tools/gitlab_org/__init__.py

@@ -8,6 +8,7 @@ from pydantic import create_model, BaseModel, ConfigDict, Field, SecretStr
 from ..elitea_base import filter_missconfigured_index_tools
 from ..utils import clean_string, get_max_toolkit_length
 from ...configurations.gitlab import GitlabConfiguration
+from ...runtime.utils.constants import TOOLKIT_NAME_META, TOOL_NAME_META, TOOLKIT_TYPE_META
 
 name = "gitlab_org"
 
@@ -74,7 +75,7 @@ class AlitaGitlabSpaceToolkit(BaseToolkit):
                 name=tool['name'],
                 description=description,
                 args_schema=tool["args_schema"],
-                metadata={"toolkit_name": toolkit_name} if toolkit_name else {}
+                metadata={TOOLKIT_NAME_META: toolkit_name, TOOLKIT_TYPE_META: name, TOOL_NAME_META: tool["name"]} if toolkit_name else {TOOL_NAME_META: tool["name"]}
             ))
         return cls(tools=tools)