alita-sdk 0.3.260__tar.gz → 0.3.262__tar.gz

{alita_sdk-0.3.260 → alita_sdk-0.3.262}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: alita_sdk
-Version: 0.3.260
+Version: 0.3.262
 Summary: SDK for building langchain agents using resources from Alita
 Author-email: Artem Rozumenko <artyom.rozumenko@gmail.com>, Mikalai Biazruchka <mikalai_biazruchka@epam.com>, Roman Mitusov <roman_mitusov@epam.com>, Ivan Krakhmaliuk <lifedjik@gmail.com>, Artem Dubrovskiy <ad13box@gmail.com>
 License-Expression: Apache-2.0

{alita_sdk-0.3.260 → alita_sdk-0.3.262}/alita_sdk/runtime/clients/client.py

@@ -20,6 +20,7 @@ from .prompt import AlitaPrompt
 from .datasource import AlitaDataSource
 from .artifact import Artifact
 from ..langchain.chat_message_template import Jinja2TemplatedChatMessagesTemplate
+from ..utils.utils import TOOLKIT_SPLITTER
 from ...tools import get_available_toolkit_models
 
 logger = logging.getLogger(__name__)
@@ -762,7 +763,7 @@ class AlitaClient:
                             base_available_tools.append(base_name)
 
                         # Track full names separately
-                        if '___' in tool_name_attr:
+                        if TOOLKIT_SPLITTER in tool_name_attr:
                             full_available_tools.append(tool_name_attr)
 
                 # Create comprehensive error message

{alita_sdk-0.3.260 → alita_sdk-0.3.262}/alita_sdk/runtime/langchain/assistant.py

@@ -5,6 +5,7 @@ from typing import Any, Optional
 from langchain.agents import (
     AgentExecutor, create_openai_tools_agent,
     create_json_chat_agent)
+from langgraph.graph.state import CompiledStateGraph
 from langgraph.store.base import BaseStore
 from .agents.xml_chat import create_xml_chat_agent
 from .langraph_agent import create_graph
@@ -61,11 +62,11 @@ class Assistant:
         #     )
         #     self.client = target_cls(**model_params)
         # validate agents compatibility: non-pipeline agents cannot have pipelines as toolkits
-        if app_type not in ["pipeline", "predict"]:
-            tools_to_check = data.get('tools', [])
-            if any(tool['agent_type'] == 'pipeline' for tool in tools_to_check):
-                raise ToolException("Non-pipeline agents cannot have pipelines as a toolkits. "
-                                    "Review toolkits configuration or use pipeline as master agent.")
+        # if app_type not in ["pipeline", "predict"]:
+        #     tools_to_check = data.get('tools', [])
+        #     if any(tool['agent_type'] == 'pipeline' for tool in tools_to_check):
+        #         raise ToolException("Non-pipeline agents cannot have pipelines as a toolkits. "
+        #                             "Review toolkits configuration or use pipeline as master agent.")
 
         # configure memory store if memory tool is defined (not needed for predict agents)
         if app_type != "predict":
@@ -148,20 +149,20 @@ class Assistant:
 
     def getAgentExecutor(self):
         # Exclude compiled graph runnables from simple tool agents
-        simple_tools = [t for t in self.tools if isinstance(t, BaseTool)]
+        simple_tools = [t for t in self.tools if isinstance(t, (BaseTool, CompiledStateGraph))]
         agent = create_json_chat_agent(llm=self.client, tools=simple_tools, prompt=self.prompt)
         return self._agent_executor(agent)
 
 
     def getXMLAgentExecutor(self):
         # Exclude compiled graph runnables from simple tool agents
-        simple_tools = [t for t in self.tools if isinstance(t, BaseTool)]
+        simple_tools = [t for t in self.tools if isinstance(t, (BaseTool, CompiledStateGraph))]
         agent = create_xml_chat_agent(llm=self.client, tools=simple_tools, prompt=self.prompt)
         return self._agent_executor(agent)
 
     def getOpenAIToolsAgentExecutor(self):
         # Exclude compiled graph runnables from simple tool agents
-        simple_tools = [t for t in self.tools if isinstance(t, BaseTool)]
+        simple_tools = [t for t in self.tools if isinstance(t, (BaseTool, CompiledStateGraph))]
         agent = create_openai_tools_agent(llm=self.client, tools=simple_tools, prompt=self.prompt)
         return self._agent_executor(agent)
 
@@ -171,7 +172,7 @@ class Assistant:
         This creates a proper LangGraphAgentRunnable with modern tool support.
         """
         # Exclude compiled graph runnables from simple tool agents
-        simple_tools = [t for t in self.tools if isinstance(t, BaseTool)]
+        simple_tools = [t for t in self.tools if isinstance(t, (BaseTool, CompiledStateGraph))]
         
         # Set up memory/checkpointer if available
         checkpointer = None

{alita_sdk-0.3.260 → alita_sdk-0.3.262}/alita_sdk/runtime/toolkits/tools.py

@@ -77,7 +77,6 @@ def get_tools(tools_list: list, alita_client, llm, memory_store: BaseStore = Non
                 connection_string=tool['settings'].get('connection_string', None),
                 collection_name=tool.get('toolkit_name'),
                 embedding_model=tool['settings'].get('embedding_model'),
-                embedding_model_params=tool['settings'].get('embedding_model_params', None),
                 vectorstore_type="PGVector"
             ).get_tools())
         elif tool['type'] == 'vectorstore':

{alita_sdk-0.3.260 → alita_sdk-0.3.262}/alita_sdk/runtime/tools/vectorstore_base.py

@@ -421,7 +421,7 @@ class VectorStoreWrapperBase(BaseToolApiWrapper):
                         for result in text_results:
                             doc_id = result['id']
                             text_score = result['text_score']
-                            
+
                             if doc_id in doc_map:
                                 # Document exists in vector results, combine scores
                                 doc, vector_score = doc_map[doc_id]
@@ -452,7 +452,7 @@ class VectorStoreWrapperBase(BaseToolApiWrapper):
         
         # Apply cutoff filter
         if cut_off:
-            combined_items = [item for item in combined_items if abs(item[1]) >= cut_off]
+            combined_items = [item for item in combined_items if abs(item[1]) <= cut_off]
         
         # Sort by score and limit results
         # DISABLED: for chroma we want ascending order (lower score is better), for others descending

{alita_sdk-0.3.260 → alita_sdk-0.3.262}/alita_sdk/tools/bitbucket/__init__.py

@@ -3,7 +3,6 @@ from typing import Dict, List, Literal, Optional
 from requests.auth import HTTPBasicAuth
 
 from .api_wrapper import BitbucketAPIWrapper
-from .tools import __all__
 from langchain_core.tools import BaseToolkit
 from langchain_core.tools import BaseTool
 from pydantic import BaseModel, Field, ConfigDict, create_model
@@ -41,10 +40,8 @@ class AlitaBitbucketToolkit(BaseToolkit):
 
     @staticmethod
     def toolkit_config_schema() -> BaseModel:
-        selected_tools = {}
-        for t in __all__:
-            default = t['tool'].__pydantic_fields__['args_schema'].default
-            selected_tools[t['name']] = default.schema() if default else default
+        selected_tools = {x['name']: x['args_schema'].schema() for x in
+                          BitbucketAPIWrapper.model_construct().get_available_tools()}
         AlitaBitbucketToolkit.toolkit_max_length = get_max_toolkit_length(selected_tools)
         m = create_model(
             name,
@@ -98,7 +95,7 @@ class AlitaBitbucketToolkit(BaseToolkit):
             **(kwargs.get('pgvector_configuration') or {}),
         }
         bitbucket_api_wrapper = BitbucketAPIWrapper(**wrapper_payload)
-        available_tools: List[Dict] = __all__
+        available_tools: List[Dict] = bitbucket_api_wrapper.get_available_tools()
         prefix = clean_string(toolkit_name, cls.toolkit_max_length) + TOOLKIT_SPLITTER if toolkit_name else ''
         tools = []
         for tool in available_tools:

{alita_sdk-0.3.260 → alita_sdk-0.3.262}/alita_sdk/tools/bitbucket/api_wrapper.py

@@ -2,21 +2,119 @@
 from __future__ import annotations
 
 import logging
-from typing import TYPE_CHECKING, Any, Dict, List, Optional
+from typing import Any, Dict, List, Optional
+import fnmatch
 
 from langchain_core.tools import ToolException
-from pydantic import model_validator, SecretStr
+from pydantic import model_validator, SecretStr, create_model, Field
 from .bitbucket_constants import create_pr_data
 from .cloud_api_wrapper import BitbucketCloudApi, BitbucketServerApi
 from pydantic.fields import PrivateAttr
 
-from ..elitea_base import BaseCodeToolApiWrapper
+from ..elitea_base import BaseCodeToolApiWrapper, extend_with_vector_tools
 
 logger = logging.getLogger(__name__)
 
+# Pydantic model definitions for tool arguments
+CreateBranchModel = create_model(
+    "CreateBranchModel",
+    branch_name=(str, Field(description="The name of the branch, e.g. `my_branch`.")),
+)
 
-if TYPE_CHECKING:
-    pass
+CreatePullRequestModel = create_model(
+    "CreatePullRequestModel",
+    pr_json_data=(str, Field(description=create_pr_data)),
+)
+
+CreateFileModel = create_model(
+    "CreateFileModel",
+    file_path=(str, Field(description="The path of the file")),
+    file_contents=(str, Field(description="The contents of the file")),
+    branch=(str, Field(description="The branch to create the file in")),
+)
+
+UpdateFileModel = create_model(
+    "UpdateFileModel",
+    file_path=(str, Field(description="The path of the file")),
+    update_query=(str, Field(description="Contains the file contents required to be updated. "
+                                       "The old file contents is wrapped in OLD <<<< and >>>> OLD. "
+                                       "The new file contents is wrapped in NEW <<<< and >>>> NEW")),
+    branch=(str, Field(description="The branch to update the file in")),
+)
+
+ReadFileModel = create_model(
+    "ReadFileModel",
+    file_path=(str, Field(description="The path of the file")),
+    branch=(str, Field(description="The branch to read the file from")),
+)
+
+SetActiveBranchModel = create_model(
+    "SetActiveBranchModel",
+    branch_name=(str, Field(description="The name of the branch, e.g. `my_branch`.")),
+)
+
+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.")),
+    branch_wildcard=(Optional[str], Field(default=None, description="Wildcard pattern to filter branches by name. If not provided, all branches will be returned."))
+)
+
+ListFilesModel = create_model(
+    "ListFilesModel",
+    path=(Optional[str], Field(description="The path to list files from")),
+    recursive=(bool, Field(description="Whether to list files recursively", default=True)),
+    branch=(Optional[str], Field(description="The branch to list files from")),
+)
+
+GetPullRequestsCommitsModel = create_model(
+    "GetPullRequestsCommitsModel",
+    pr_id=(str, Field(description="The ID of the pull request to get commits from")),
+)
+
+GetPullRequestModel = create_model(
+    "GetPullRequestModel",
+    pr_id=(str, Field(description="The ID of the pull request to get details from")),
+)
+
+GetPullRequestsChangesModel = create_model(
+    "GetPullRequestsChangesModel",
+    pr_id=(str, Field(description="The ID of the pull request to get changes from")),
+)
+
+AddPullRequestCommentModel = create_model(
+    "AddPullRequestCommentModel",
+    pr_id=(str, Field(description="The ID of the pull request to add a comment to")),
+    content=(str, Field(description="The comment content")),
+    inline=(Optional[dict], Field(default=None, description="Inline comment details. Example: {'from': 57, 'to': 122, 'path': '<string>'}"))
+)
+
+DeleteFileModel = create_model(
+    "DeleteFileModel",
+    file_path=(str, Field(description="The path of the file")),
+    branch=(str, Field(description="The branch to delete the file from")),
+    commit_message=(str, Field(default=None, description="Commit message for deleting the file. Optional.")),
+)
+
+AppendFileModel = create_model(
+    "AppendFileModel",
+    file_path=(str, Field(description="The path of the file")),
+    content=(str, Field(description="The content to append to the file")),
+    branch=(str, Field(description="The branch to append the file in")),
+)
+
+GetIssuesModel = create_model(
+    "GetIssuesModel",
+)
+
+GetIssueModel = create_model(
+    "GetIssueModel",
+    issue_number=(int, Field(description="The number of the issue")),
+)
+
+CommentOnIssueModel = create_model(
+    "CommentOnIssueModel",
+    comment_query=(str, Field(description="The comment query string")),
+)
 
 
 class BitbucketAPIWrapper(BaseCodeToolApiWrapper):
@@ -41,18 +139,6 @@ class BitbucketAPIWrapper(BaseCodeToolApiWrapper):
     """Bitbucket installation type: true for cloud, false for server.
     """
 
-    llm: Optional[Any] = None
-    # Alita instance
-    alita: Optional[Any] = None
-
-    # Vector store configuration
-    connection_string: Optional[SecretStr] = None
-    collection_name: Optional[str] = None
-    doctype: Optional[str] = 'code'
-    embedding_model: Optional[str] = "HuggingFaceEmbeddings"
-    embedding_model_params: Optional[Dict[str, Any]] = {"model_name": "sentence-transformers/all-MiniLM-L6-v2"}
-    vectorstore_type: Optional[str] = "PGVector"
-
     @model_validator(mode='before')
     @classmethod
     def validate_env(cls, values: Dict) -> Dict:
@@ -83,14 +169,34 @@ class BitbucketAPIWrapper(BaseCodeToolApiWrapper):
         cls._active_branch = values.get('branch')
         return values
 
-    def set_active_branch(self, branch: str) -> None:
+    def set_active_branch(self, branch_name: str) -> str:
         """Set the active branch for the bot."""
-        self._active_branch = branch
-        return f"Active branch set to `{branch}`"
+        self._active_branch = branch_name
+        return f"Active branch set to `{branch_name}`"
 
-    def list_branches_in_repo(self) -> List[str]:
-        """List all branches in the repository."""
-        return self._bitbucket.list_branches()
+    def list_branches_in_repo(self, limit: Optional[int] = 20, branch_wildcard: Optional[str] = None) -> List[str]:
+        """
+        Lists branches in the repository with optional limit and wildcard filtering.
+
+        Parameters:
+            limit (Optional[int]): Maximum number of branches to return
+            branch_wildcard (Optional[str]): Wildcard pattern to filter branches (e.g., '*dev')
+
+        Returns:
+            List[str]: List containing names of branches
+        """
+        try:
+            branches = self._bitbucket.list_branches()
+
+            if branch_wildcard:
+                branches = [branch for branch in branches if fnmatch.fnmatch(branch, branch_wildcard)]
+
+            if limit is not None:
+                branches = branches[:limit]
+
+            return branches
+        except Exception as e:
+            return f"Failed to list branches: {str(e)}"
 
     def create_branch(self, branch_name: str) -> None:
         """Create a new branch in the repository."""
@@ -266,3 +372,106 @@ class BitbucketAPIWrapper(BaseCodeToolApiWrapper):
             return self._bitbucket.get_file(file_path=file_path, branch=branch)
         except Exception as e:
             raise ToolException(f"Can't extract file content (`{file_path}`) due to error:\n{str(e)}")
+
+    def list_files(self, path: str = None, recursive: bool = True, branch: str = None) -> List[str]:
+        """List files in the repository with optional path, recursive search, and branch."""
+        branch = branch if branch else self._active_branch
+        try:
+            files_str = self._get_files(path, branch)
+            # Parse the string response to extract file paths
+            # This is a simplified implementation - might need adjustment based on actual response format
+            import ast
+            try:
+                files_list = ast.literal_eval(files_str)
+                if isinstance(files_list, list):
+                    return files_list
+                else:
+                    return [str(files_list)]
+            except:
+                return [files_str] if files_str else []
+        except Exception as e:
+            return f"Failed to list files: {str(e)}"
+
+    def read_file(self, file_path: str, branch: str) -> str:
+        """Read the contents of a file in the repository."""
+        try:
+            return self._read_file(file_path, branch)
+        except Exception as e:
+            return f"Failed to read file {file_path}: {str(e)}"
+
+    @extend_with_vector_tools
+    def get_available_tools(self):
+        return [
+            {
+                "name": "create_branch",
+                "ref": self.create_branch,
+                "description": self.create_branch.__doc__ or "Create a new branch in the repository.",
+                "args_schema": CreateBranchModel,
+            },
+            {
+                "name": "list_branches_in_repo",
+                "ref": self.list_branches_in_repo,
+                "description": self.list_branches_in_repo.__doc__ or "List branches in the repository with optional limit and wildcard filtering.",
+                "args_schema": ListBranchesInRepoModel,
+            },
+            {
+                "name": "list_files",
+                "ref": self.list_files,
+                "description": self.list_files.__doc__ or "List files in the repository with optional path, recursive search, and branch.",
+                "args_schema": ListFilesModel,
+            },
+            {
+                "name": "create_pull_request",
+                "ref": self.create_pull_request,
+                "description": self.create_pull_request.__doc__ or "Create a pull request in the repository.",
+                "args_schema": CreatePullRequestModel,
+            },
+            {
+                "name": "create_file",
+                "ref": self.create_file,
+                "description": self.create_file.__doc__ or "Create a new file in the repository.",
+                "args_schema": CreateFileModel,
+            },
+            {
+                "name": "read_file",
+                "ref": self.read_file,
+                "description": self.read_file.__doc__ or "Read the contents of a file in the repository.",
+                "args_schema": ReadFileModel,
+            },
+            {
+                "name": "update_file",
+                "ref": self.update_file,
+                "description": self.update_file.__doc__ or "Update the contents of a file in the repository.",
+                "args_schema": UpdateFileModel,
+            },
+            {
+                "name": "set_active_branch",
+                "ref": self.set_active_branch,
+                "description": self.set_active_branch.__doc__ or "Set the active branch in the repository.",
+                "args_schema": SetActiveBranchModel,
+            },
+            {
+                "name": "get_pull_requests_commits",
+                "ref": self.get_pull_requests_commits,
+                "description": self.get_pull_requests_commits.__doc__ or "Get commits from a pull request in the repository.",
+                "args_schema": GetPullRequestsCommitsModel,
+            },
+            {
+                "name": "get_pull_request",
+                "ref": self.get_pull_request,
+                "description": self.get_pull_request.__doc__ or "Get details of a pull request in the repository.",
+                "args_schema": GetPullRequestModel,
+            },
+            {
+                "name": "get_pull_requests_changes",
+                "ref": self.get_pull_requests_changes,
+                "description": self.get_pull_requests_changes.__doc__ or "Get changes from a pull request in the repository.",
+                "args_schema": GetPullRequestsChangesModel,
+            },
+            {
+                "name": "add_pull_request_comment",
+                "ref": self.add_pull_request_comment,
+                "description": self.add_pull_request_comment.__doc__ or "Add a comment to a pull request in the repository.",
+                "args_schema": AddPullRequestCommentModel,
+            },
+        ]

{alita_sdk-0.3.260 → alita_sdk-0.3.262}/alita_sdk/tools/utils/content_parser.py

@@ -142,7 +142,7 @@ def load_content(file_path: str, extension: str = None, loader_extra_config: dic
         if "file_path" in loader_kwargs:
             del loader_kwargs["file_path"]
 
-        loader = loader_cls(file_path, **loader_kwargs)
+        loader = loader_cls(file_path=file_path, **loader_kwargs)
         documents = loader.load()
 
         page_contents = [doc.page_content for doc in documents]

{alita_sdk-0.3.260 → alita_sdk-0.3.262}/alita_sdk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: alita_sdk
-Version: 0.3.260
+Version: 0.3.262
 Summary: SDK for building langchain agents using resources from Alita
 Author-email: Artem Rozumenko <artyom.rozumenko@gmail.com>, Mikalai Biazruchka <mikalai_biazruchka@epam.com>, Roman Mitusov <roman_mitusov@epam.com>, Ivan Krakhmaliuk <lifedjik@gmail.com>, Artem Dubrovskiy <ad13box@gmail.com>
 License-Expression: Apache-2.0

{alita_sdk-0.3.260 → alita_sdk-0.3.262}/alita_sdk.egg-info/SOURCES.txt

@@ -156,7 +156,6 @@ alita_sdk/tools/bitbucket/__init__.py
 alita_sdk/tools/bitbucket/api_wrapper.py
 alita_sdk/tools/bitbucket/bitbucket_constants.py
 alita_sdk/tools/bitbucket/cloud_api_wrapper.py
-alita_sdk/tools/bitbucket/tools.py
 alita_sdk/tools/browser/__init__.py
 alita_sdk/tools/browser/crawler.py
 alita_sdk/tools/browser/duck_duck_go_search.py

{alita_sdk-0.3.260 → alita_sdk-0.3.262}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "alita_sdk"
-version = "0.3.260"
+version = "0.3.262"
 description = "SDK for building langchain agents using resources from Alita"
 readme = "README.md"
 requires-python = ">=3.10"