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

alita_sdk/tools/ado/repos/repos_wrapper.py

@@ -23,7 +23,8 @@ from langchain_core.tools import ToolException
 from msrest.authentication import BasicAuthentication
 from pydantic import Field, PrivateAttr, create_model, model_validator, SecretStr
 
-from ..utils import extract_old_new_pairs, generate_diff, get_content_from_generator
+from ...elitea_base import BaseCodeToolApiWrapper
+from ..utils import generate_diff, get_content_from_generator
 from ...code_indexer_toolkit import CodeIndexerToolkit
 from ...utils.available_tools_decorator import extend_with_parent_available_tools
 
@@ -129,9 +130,30 @@ class ArgsSchema(Enum):
     )
     UpdateFile = create_model(
         "UpdateFile",
-        branch_name=(str, Field(description="The name of the branch, e.g. `my_branch`.")),
-        file_path=(str, Field(description="Path of a file to be updated.")),
-        update_query=(str, Field(description="Update query used to adjust target file.")),
+        branch_name=(
+            str,
+            Field(description="The name of the branch, e.g. `my_branch`.")
+        ),
+        file_path=(
+            str,
+            Field(description="Path of a file to be updated."),
+        ),
+        update_query=(
+            str,
+            Field(
+                description=(
+                    "The exact OLD text to be replaced and the NEW "
+                    "text to insert, using one or more block pairs like:"
+                    "OLD <<<<Hello Earth!>>>> OLD NEW <<<<Hello Mars!>>>> NEW"
+                    "Each OLD block must contain the exact text that will be replaced "
+                    "via string replacement (exact full match including non-written characters). Each corresponding NEW "
+                    "block contains the replacement text. For multi-line changes, it is "
+                    "preferred to provide several smaller OLD/NEW pairs rather than one "
+                    "large block, so that each OLD block closely matches a contiguous "
+                    "snippet from the file."
+                )
+            ),
+        ),
     )
     DeleteFile = create_model(
         "DeleteFile",
@@ -252,6 +274,9 @@ class ReposApiWrapper(CodeIndexerToolkit):
     token: Optional[SecretStr]
     _client: Optional[GitClient] = PrivateAttr()
 
+    # Reuse common file helpers from BaseCodeToolApiWrapper
+    edit_file = BaseCodeToolApiWrapper.edit_file
+
     class Config:
         arbitrary_types_allowed = True
 
@@ -835,22 +860,50 @@ class ReposApiWrapper(CodeIndexerToolkit):
             logger.error(msg)
             return ToolException(msg)
 
-    def update_file(self, branch_name: str, file_path: str, update_query: str) -> str:
+    def _write_file(self, file_path: str, content: str, branch: str = None, commit_message: str = None) -> str:
+        """Write content to a file in Azure DevOps by creating an edit commit.
+
+        This implementation follows the previous `update_file` behavior: it always
+        performs an 'edit' change (does not create the file), gets the latest
+        commit id for the branch and pushes a new commit containing the change.
         """
-        Updates a file with new content in Azure DevOps.
+        try:
+            # Get the latest commit ID of the target branch
+            branch_obj = self._client.get_branch(
+                repository_id=self.repository_id,
+                project=self.project,
+                name=branch,
+            )
+            if branch_obj is None or not hasattr(branch_obj, 'commit') or not hasattr(branch_obj.commit, 'commit_id'):
+                raise ToolException(f"Branch `{branch}` does not exist or has no commits.")
+
+            latest_commit_id = branch_obj.commit.commit_id
+
+            # Build edit change and push
+            change = GitChange("edit", file_path, content).to_dict()
+
+            ref_update = GitRefUpdate(name=f"refs/heads/{branch}", old_object_id=latest_commit_id)
+            new_commit = GitCommit(comment=commit_message or ("Update " + file_path), changes=[change])
+            push = GitPush(commits=[new_commit], ref_updates=[ref_update])
+
+            self._client.create_push(push=push, repository_id=self.repository_id, project=self.project)
+            return f"Updated file {file_path}"
+        except ToolException:
+            # Re-raise known tool exceptions
+            raise
+        except Exception as e:
+            logger.error(f"Unable to write file {file_path}: {e}")
+            raise ToolException(f"Unable to write file {file_path}: {str(e)}")
+
+    def update_file(self, branch_name: str, file_path: str, update_query: str) -> str:
+        """Updates a file with new content in Azure DevOps using OLD/NEW markers.
+
         Parameters:
             branch_name (str): The name of the branch where update the file.
             file_path (str): Path to the file for update.
-            update_query(str): Contains the file contents requried to be updated.
-                The old file contents is wrapped in OLD <<<< and >>>> OLD
-                The new file contents is wrapped in NEW <<<< and >>>> NEW
-                For example:
-                OLD <<<<
-                Hello Earth!
-                >>>> OLD
-                NEW <<<<
-                Hello Mars!
-                >>>> NEW
+            update_query(str): Contains the file contents required to be updated,
+                wrapped in Git-style OLD/NEW blocks.
+
         Returns:
             A success or failure message
         """
@@ -863,43 +916,16 @@ class ReposApiWrapper(CodeIndexerToolkit):
                 "Please create a new branch and try again."
             )
         try:
-            file_content = self._read_file(file_path, branch_name)
-
-            if isinstance(file_content, ToolException):
-                return file_content
-
-            updated_file_content = file_content
-            for old, new in extract_old_new_pairs(update_query):
-                if not old.strip():
-                    continue
-                updated_file_content = updated_file_content.replace(old, new)
-
-            if file_content == updated_file_content:
-                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."
-                )
-
-            # Get the latest commit ID of the active branch to use as oldObjectId
-            branch = self._client.get_branch(
-                repository_id=self.repository_id,
-                project=self.project,
-                name=self.active_branch,
-            )
-            latest_commit_id = branch.commit.commit_id
-
-            change = GitChange("edit", file_path, updated_file_content).to_dict()
-
-            ref_update = GitRefUpdate(
-                name=f"refs/heads/{self.active_branch}", old_object_id=latest_commit_id
-            )
-            new_commit = GitCommit(comment=f"Update {file_path}", changes=[change])
-            push = GitPush(commits=[new_commit], ref_updates=[ref_update])
-            self._client.create_push(
-                push=push, repository_id=self.repository_id, project=self.project
+            # Let edit_file handle parsing and content updates; this will call _read_file and _write_file.
+            # For ADO, branch_name is used as branch; commit message is derived from file_path.
+            return self.edit_file(
+                file_path=file_path,
+                file_query=update_query,
+                branch=self.active_branch,
+                commit_message=f"Update {file_path}",
             )
-            return "Updated file " + file_path
+        except ToolException as e:
+            return str(e)
         except Exception as e:
             msg = f"Unable to update file due to error:\n{str(e)}"
             logger.error(msg)

alita_sdk/tools/ado/test_plan/__init__.py

@@ -11,6 +11,7 @@ from ....configurations.pgvector import PgVectorConfiguration
 from .test_plan_wrapper import TestPlanApiWrapper
 from ...base.tool import BaseAction
 from ...utils import clean_string, get_max_toolkit_length, check_connection_response
+from ....runtime.utils.constants import TOOLKIT_NAME_META, TOOL_NAME_META, TOOLKIT_TYPE_META
 
 
 name = "azure_devops_plans"
@@ -40,7 +41,7 @@ class AzureDevOpsPlansToolkit(BaseToolkit):
         m = create_model(
             name_alias,
             ado_configuration=(AdoConfiguration, Field(description="Ado configuration", json_schema_extra={'configuration_types': ['ado']})),
-            limit=(Optional[int], Field(description="ADO plans limit used for limitation of the list with results", default=5)),
+            limit=(Optional[int], Field(description="ADO plans limit used for limitation of the list with results", default=5, gt=0)),
             # indexer settings
             pgvector_configuration=(Optional[PgVectorConfiguration], Field(default=None,
                                                                            description="PgVector Configuration", json_schema_extra={'configuration_types': ['pgvector']})),
@@ -122,7 +123,7 @@ class AzureDevOpsPlansToolkit(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/ado/test_plan/test_plan_wrapper.py

@@ -180,7 +180,29 @@ class TestPlanApiWrapper(NonCodeIndexerToolkit):
             connection = Connection(base_url=values['organization_url'], creds=credentials)
             cls._client = connection.clients.get_test_plan_client()
         except Exception as e:
-            raise ImportError(f"Failed to connect to Azure DevOps: {e}")
+            error_msg = str(e).lower()
+            if "expired" in error_msg or "token" in error_msg and ("invalid" in error_msg or "unauthorized" in error_msg):
+                raise ValueError(
+                    "Azure DevOps connection failed: Your access token has expired or is invalid. "
+                    "Please refresh your token in the toolkit configuration."
+                )
+            elif "401" in error_msg or "unauthorized" in error_msg:
+                raise ValueError(
+                    "Azure DevOps connection failed: Authentication failed. "
+                    "Please check your credentials in the toolkit configuration."
+                )
+            elif "404" in error_msg or "not found" in error_msg:
+                raise ValueError(
+                    "Azure DevOps connection failed: Organization or project not found. "
+                    "Please verify your organization URL and project name."
+                )
+            elif "timeout" in error_msg or "timed out" in error_msg:
+                raise ValueError(
+                    "Azure DevOps connection failed: Connection timed out. "
+                    "Please check your network connection and try again."
+                )
+            else:
+                raise ValueError(f"Azure DevOps connection failed: {e}")
         return super().validate_toolkit(values)
 
     def create_test_plan(self, test_plan_create_params: str):

alita_sdk/tools/ado/utils.py

@@ -1,24 +1,6 @@
-import re
 import difflib
 
 
-def extract_old_new_pairs(file_query: str):
-    """
-    Extracts old and new content pairs from a file query.
-    Parameters:
-        file_query (str): The file query containing old and new content.
-    Returns:
-        list of tuples: A list where each tuple contains (old_content, new_content).
-    """
-    old_pattern = re.compile(r"OLD <<<<\s*(.*?)\s*>>>> OLD", re.DOTALL)
-    new_pattern = re.compile(r"NEW <<<<\s*(.*?)\s*>>>> NEW", re.DOTALL)
-
-    old_contents = old_pattern.findall(file_query)
-    new_contents = new_pattern.findall(file_query)
-
-    return list(zip(old_contents, new_contents))
-
-
 def generate_diff(base_text, target_text, file_path):
     base_lines = base_text.splitlines(keepends=True)
     target_lines = target_text.splitlines(keepends=True)
@@ -28,6 +10,7 @@ def generate_diff(base_text, target_text, file_path):
 
     return "".join(diff)
 
+
 def get_content_from_generator(content_generator):
     def safe_decode(chunk):
         try:

alita_sdk/tools/ado/wiki/__init__.py

@@ -10,6 +10,7 @@ from ....configurations.ado import AdoConfiguration
 from ....configurations.pgvector import PgVectorConfiguration
 from ...base.tool import BaseAction
 from ...utils import clean_string, get_max_toolkit_length, check_connection_response
+from ....runtime.utils.constants import TOOLKIT_NAME_META, TOOL_NAME_META, TOOLKIT_TYPE_META
 
 name = "azure_devops_wiki"
 name_alias = 'ado_wiki'
@@ -116,7 +117,7 @@ class AzureDevOpsWikiToolkit(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/ado/wiki/ado_wrapper.py

@@ -105,7 +105,29 @@ class AzureDevOpsApiWrapper(NonCodeIndexerToolkit):
             cls._core_client = connection.clients.get_core_client()
 
         except Exception as e:
-            return ImportError(f"Failed to connect to Azure DevOps: {e}")
+            error_msg = str(e).lower()
+            if "expired" in error_msg or "token" in error_msg and ("invalid" in error_msg or "unauthorized" in error_msg):
+                raise ValueError(
+                    "Azure DevOps connection failed: Your access token has expired or is invalid. "
+                    "Please refresh your token in the toolkit configuration."
+                )
+            elif "401" in error_msg or "unauthorized" in error_msg:
+                raise ValueError(
+                    "Azure DevOps connection failed: Authentication failed. "
+                    "Please check your credentials in the toolkit configuration."
+                )
+            elif "404" in error_msg or "not found" in error_msg:
+                raise ValueError(
+                    "Azure DevOps connection failed: Organization or project not found. "
+                    "Please verify your organization URL and project name."
+                )
+            elif "timeout" in error_msg or "timed out" in error_msg:
+                raise ValueError(
+                    "Azure DevOps connection failed: Connection timed out. "
+                    "Please check your network connection and try again."
+                )
+            else:
+                raise ValueError(f"Azure DevOps connection failed: {e}")
 
         return super().validate_toolkit(values)
 

alita_sdk/tools/ado/work_item/__init__.py

@@ -10,6 +10,7 @@ from ....configurations.ado import AdoConfiguration
 from ....configurations.pgvector import PgVectorConfiguration
 from ...base.tool import BaseAction
 from ...utils import clean_string, get_max_toolkit_length, check_connection_response
+from ....runtime.utils.constants import TOOLKIT_NAME_META, TOOL_NAME_META, TOOLKIT_TYPE_META
 
 name = "ado_boards"
 
@@ -37,7 +38,7 @@ class AzureDevOpsWorkItemsToolkit(BaseToolkit):
         m = create_model(
             name,
             ado_configuration=(AdoConfiguration, Field(description="Ado Work Item configuration", json_schema_extra={'configuration_types': ['ado']})),
-            limit=(Optional[int], Field(description="ADO plans limit used for limitation of the list with results", default=5)),
+            limit=(Optional[int], Field(description="Default ADO boards result limit (can be overridden by agent instructions)", default=5, gt=0)),
             selected_tools=(List[Literal[tuple(selected_tools)]], Field(default=[], json_schema_extra={'args_schemas': selected_tools})),
             # indexer settings
             pgvector_configuration=(Optional[PgVectorConfiguration], Field(default = None,
@@ -117,7 +118,7 @@ class AzureDevOpsWorkItemsToolkit(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/ado/work_item/ado_wrapper.py

@@ -127,7 +127,29 @@ class AzureDevOpsApiWrapper(NonCodeIndexerToolkit):
             cls._core_client = connection.clients_v7_1.get_core_client()
 
         except Exception as e:
-            return ImportError(f"Failed to connect to Azure DevOps: {e}")
+            error_msg = str(e).lower()
+            if "expired" in error_msg or "token" in error_msg and ("invalid" in error_msg or "unauthorized" in error_msg):
+                raise ValueError(
+                    "Azure DevOps connection failed: Your access token has expired or is invalid. "
+                    "Please refresh your token in the toolkit configuration."
+                )
+            elif "401" in error_msg or "unauthorized" in error_msg:
+                raise ValueError(
+                    "Azure DevOps connection failed: Authentication failed. "
+                    "Please check your credentials in the toolkit configuration."
+                )
+            elif "404" in error_msg or "not found" in error_msg:
+                raise ValueError(
+                    "Azure DevOps connection failed: Organization or project not found. "
+                    "Please verify your organization URL and project name."
+                )
+            elif "timeout" in error_msg or "timed out" in error_msg:
+                raise ValueError(
+                    "Azure DevOps connection failed: Connection timed out. "
+                    "Please check your network connection and try again."
+                )
+            else:
+                raise ValueError(f"Azure DevOps connection failed: {e}")
 
         return super().validate_toolkit(values)
 

alita_sdk/tools/advanced_jira_mining/__init__.py

@@ -7,6 +7,7 @@ from .data_mining_wrapper import AdvancedJiraMiningWrapper
 from ..base.tool import BaseAction
 from ..elitea_base import filter_missconfigured_index_tools
 from ..utils import clean_string, get_max_toolkit_length
+from ...runtime.utils.constants import TOOLKIT_NAME_META, TOOL_NAME_META, TOOLKIT_TYPE_META
 
 name = "advanced_jira_mining"
 
@@ -78,7 +79,7 @@ class AdvancedJiraMiningToolkit(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/aws/delta_lake/__init__.py

@@ -9,6 +9,7 @@ from alita_sdk.configurations.delta_lake import DeltaLakeConfiguration
 from ...utils import clean_string, get_max_toolkit_length
 from .api_wrapper import DeltaLakeApiWrapper
 from .tool import DeltaLakeAction
+from ....runtime.utils.constants import TOOLKIT_NAME_META, TOOL_NAME_META, TOOLKIT_TYPE_META
 
 name = "delta_lake"
 
@@ -126,7 +127,7 @@ class DeltaLakeToolkit(BaseToolkit):
                             name=t["name"],
                             description=description,
                             args_schema=t["args_schema"],
-                            metadata={"toolkit_name": toolkit_name} if toolkit_name else {}
+                            metadata={TOOLKIT_NAME_META: toolkit_name, TOOLKIT_TYPE_META: name, TOOL_NAME_META: t["name"]} if toolkit_name else {TOOL_NAME_META: t["name"]}
                         )
                     )
         return instance

alita_sdk/tools/azure_ai/search/__init__.py

@@ -9,6 +9,7 @@ from ...elitea_base import filter_missconfigured_index_tools
 from ...utils import clean_string, get_max_toolkit_length, check_connection_response
 from ....configurations.azure_search import AzureSearchConfiguration
 import requests
+from ....runtime.utils.constants import TOOLKIT_NAME_META, TOOL_NAME_META, TOOLKIT_TYPE_META
 
 logger = getLogger(__name__)
 
@@ -91,7 +92,7 @@ class AzureSearchToolkit(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/azure_ai/search/api_wrapper.py

@@ -11,7 +11,7 @@ logger = logging.getLogger(__name__)
 
 class AzureSearchInput(BaseModel):
     search_text: str = Field(..., description="The text to search for in the Azure Search index.")
-    limit: int = Field(10, description="The number of results to return.")
+    limit: int = Field(10, description="The number of results to return.", gt=0)
     selected_fields: Optional[List[str]] = Field(None, description="The fields to retrieve from the document.")
 
 class AzureDocumentInput(BaseModel):

alita_sdk/tools/base_indexer_toolkit.py

@@ -46,7 +46,7 @@ BaseSearchParams = create_model(
         examples=["{\"key\": \"value\"}", "{\"status\": \"active\"}"]
     )),
     cut_off=(Optional[float], Field(description="Cut-off score for search results", default=DEFAULT_CUT_OFF, ge=0, le=1)),
-    search_top=(Optional[int], Field(description="Number of top results to return", default=10)),
+    search_top=(Optional[int], Field(description="Number of top results to return", default=10, gt=0)),
     full_text_search=(Optional[Dict[str, Any]], Field(
         description="Full text search parameters. Can be a dictionary with search options.",
         default=None
@@ -76,7 +76,7 @@ BaseStepbackSearchParams = create_model(
         examples=["{\"key\": \"value\"}", "{\"status\": \"active\"}"]
     )),
     cut_off=(Optional[float], Field(description="Cut-off score for search results", default=DEFAULT_CUT_OFF, ge=0, le=1)),
-    search_top=(Optional[int], Field(description="Number of top results to return", default=10)),
+    search_top=(Optional[int], Field(description="Number of top results to return", default=10, gt=0)),
     full_text_search=(Optional[Dict[str, Any]], Field(
         description="Full text search parameters. Can be a dictionary with search options.",
         default=None
@@ -186,7 +186,7 @@ class BaseIndexerToolkit(VectorStoreWrapperBase):
             #
             results_count = result["count"]
             # Final update should always be forced
-            self.index_meta_update(index_name, IndexerKeywords.INDEX_META_COMPLETED.value, results_count, update_force=True)
+            self.index_meta_update(index_name, IndexerKeywords.INDEX_META_COMPLETED.value, results_count, update_force=True, error=None)
             self._emit_index_event(index_name)
             #
             return {"status": "ok", "message": f"successfully indexed {results_count} documents" if results_count > 0
@@ -195,8 +195,8 @@ class BaseIndexerToolkit(VectorStoreWrapperBase):
             # Do maximum effort at least send custom event for supposed changed status
             msg = str(e)
             try:
-                # Error update should also be forced
-                self.index_meta_update(index_name, IndexerKeywords.INDEX_META_FAILED.value, result["count"], update_force=True)
+                # Error update should also be forced and include the error message
+                self.index_meta_update(index_name, IndexerKeywords.INDEX_META_FAILED.value, result["count"], update_force=True, error=msg)
             except Exception as ie:
                 logger.error(f"Failed to update index meta status to FAILED for index '{index_name}': {ie}")
                 msg = f"{msg}; additionally failed to update index meta status to FAILED: {ie}"
@@ -505,12 +505,14 @@ class BaseIndexerToolkit(VectorStoreWrapperBase):
                 "task_id": None,
                 "conversation_id": None,
                 "toolkit_id": self.toolkit_id,
+                # Initialize error field to keep track of the latest failure reason if any
+                "error": None,
             }
             metadata["history"] = json.dumps([metadata])
             index_meta_doc = Document(page_content=f"{IndexerKeywords.INDEX_META_TYPE.value}_{index_name}", metadata=metadata)
             add_documents(vectorstore=self.vectorstore, documents=[index_meta_doc])
 
-    def index_meta_update(self, index_name: str, state: str, result: int, update_force: bool = True, interval: Optional[float] = None):
+    def index_meta_update(self, index_name: str, state: str, result: int, update_force: bool = True, interval: Optional[float] = None, error: Optional[str] = None):
         """Update `index_meta` document with optional time-based throttling.
 
         Args:
@@ -522,6 +524,7 @@ class BaseIndexerToolkit(VectorStoreWrapperBase):
             interval: Optional custom interval (in seconds) for this call when `update_force` is `False`.
                       If `None`, falls back to the value stored in `self._index_meta_config["update_interval"]`
                       if present, otherwise uses `INDEX_META_UPDATE_INTERVAL`.
+            error: Optional error message to record when the state represents a failed index.
         """
         self._ensure_vectorstore_initialized()
         if not hasattr(self, "_index_meta_last_update_time"):
@@ -560,6 +563,12 @@ class BaseIndexerToolkit(VectorStoreWrapperBase):
             metadata["updated"] = result
             metadata["state"] = state
             metadata["updated_on"] = time.time()
+            # Attach error if provided, else clear on success
+            if error is not None:
+                metadata["error"] = error
+            elif state == IndexerKeywords.INDEX_META_COMPLETED.value:
+                # Clear previous error on successful completion
+                metadata["error"] = None
             #
             history_raw = metadata.pop("history", "[]")
             try:

alita_sdk/tools/bitbucket/__init__.py

@@ -13,6 +13,7 @@ from ..utils import clean_string, get_max_toolkit_length, check_connection_respo
 from ...configurations.bitbucket import BitbucketConfiguration
 from ...configurations.pgvector import PgVectorConfiguration
 import requests
+from ...runtime.utils.constants import TOOLKIT_NAME_META, TOOL_NAME_META, TOOLKIT_TYPE_META
 
 
 name = "bitbucket"
@@ -114,7 +115,7 @@ class AlitaBitbucketToolkit(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/bitbucket/api_wrapper.py

@@ -57,7 +57,7 @@ SetActiveBranchModel = 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."))
 )
 

alita_sdk/tools/bitbucket/cloud_api_wrapper.py

@@ -8,7 +8,7 @@ from typing import TYPE_CHECKING, Any, Dict, List
 from atlassian.bitbucket import Bitbucket, Cloud
 from langchain_core.tools import ToolException
 from requests import Response
-from ..ado.utils import extract_old_new_pairs
+from ..utils.text_operations import parse_old_new_markers
 
 logger = logging.getLogger(__name__)
 logging.basicConfig(level=logging.DEBUG)
@@ -145,7 +145,7 @@ class BitbucketServerApi(BitbucketApiAbstract):
     def update_file(self, file_path: str, update_query: str, branch: str) -> str:
         file_content = self.get_file(file_path=file_path, branch=branch)
         updated_file_content = file_content
-        for old, new in extract_old_new_pairs(update_query):
+        for old, new in parse_old_new_markers(update_query):
             if not old.strip():
                 continue
             updated_file_content = updated_file_content.replace(old, new)
@@ -319,7 +319,7 @@ class BitbucketCloudApi(BitbucketApiAbstract):
 
         file_content = self.get_file(file_path=file_path, branch=branch)
         updated_file_content = file_content
-        for old, new in extract_old_new_pairs(file_query=update_query):
+        for old, new in parse_old_new_markers(file_query=update_query):
             if not old.strip():
                 continue
             updated_file_content = updated_file_content.replace(old, new)

alita_sdk/tools/browser/__init__.py

@@ -128,7 +128,7 @@ class BrowserToolkit(BaseToolkit):
                 if toolkit_name:
                     tool_entry.description = f"{tool_entry.description}\nToolkit: {toolkit_name}"
                     tool_entry.description = tool_entry.description[:1000]
-                    tool_entry.metadata = {"toolkit_name": toolkit_name}
+                    tool_entry.metadata = {"toolkit_name": toolkit_name, "toolkit_type": name}
                 tools.append(tool_entry)
         return cls(tools=tools)
 

alita_sdk/tools/carrier/__init__.py

@@ -77,7 +77,7 @@ class AlitaCarrierToolkit(BaseToolkit):
                 if toolkit_name:
                     tool_instance.description = f"{tool_instance.description}\nToolkit: {toolkit_name}"
                     tool_instance.description = tool_instance.description[:1000]
-                    tool_instance.metadata = {"toolkit_name": toolkit_name}
+                    tool_instance.metadata = {"toolkit_name": toolkit_name, "toolkit_type": name}
                 tools.append(tool_instance)
                 logger.info(f"[AlitaCarrierToolkit] Successfully initialized tool '{tool_instance.name}'")
             except Exception as e: