alita-sdk 0.3.229__tar.gz → 0.3.230__tar.gz

{alita_sdk-0.3.229 → alita_sdk-0.3.230}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: alita_sdk
-Version: 0.3.229
+Version: 0.3.230
 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
@@ -181,7 +181,7 @@ venv\Scripts\activate
 Install all required dependencies for the SDK and toolkits:
 
 ```bash
-pip install -r req_bkup/requirements-all.txt
+pip install -U '.[all]'
 ```
 
 Environment Setup

{alita_sdk-0.3.229 → alita_sdk-0.3.230}/README.md

@@ -36,7 +36,7 @@ venv\Scripts\activate
 Install all required dependencies for the SDK and toolkits:
 
 ```bash
-pip install -r req_bkup/requirements-all.txt
+pip install -U '.[all]'
 ```
 
 Environment Setup

alita_sdk-0.3.230/alita_sdk/runtime/langchain/document_loaders/AlitaDocLoader.py

@@ -0,0 +1,29 @@
+from langchain_core.document_loaders import BaseLoader
+from langchain_core.documents import Document
+
+from .utils import file_to_bytes
+
+
+class AlitaDocLoader(BaseLoader):
+
+    def __init__(self, **kwargs):
+        if kwargs.get('file_path'):
+            self.file_path = kwargs['file_path']
+        elif kwargs.get('file_content'):
+            self.file_content = kwargs['file_content']
+            self.file_name = kwargs['file_name']
+        else:
+            raise ValueError(
+                "Path parameter is required (either as 'file_path' positional argument or 'path' keyword argument)")
+
+    def load(self):
+        result_content = self.get_content()
+        return [Document(page_content=result_content, metadata={'source': str(self.file_path if hasattr(self, 'file_path') else self.file_name)})]
+
+    def get_content(self):
+        try:
+            import textract
+            content = textract.process(None, extension='doc', input_data=self.file_content if hasattr(self, 'file_content') else file_to_bytes(self.file_path)).decode('utf-8')
+        except Exception as e:
+            content = f"[Error extracting doc: {str(e)}]"
+        return content

{alita_sdk-0.3.229 → alita_sdk-0.3.230}/alita_sdk/runtime/langchain/document_loaders/constants.py

@@ -18,6 +18,7 @@ from langchain_community.document_loaders import (
         UnstructuredPowerPointLoader, PythonLoader)
 
 from .AlitaCSVLoader import AlitaCSVLoader
+from .AlitaDocLoader import AlitaDocLoader
 from .AlitaDocxMammothLoader import AlitaDocxMammothLoader
 from .AlitaExcelLoader import AlitaExcelLoader
 from .AlitaImageLoader import AlitaImageLoader
@@ -124,6 +125,11 @@ loaders_map = {
         'is_multimodal_processing': True,
         'kwargs': {}
     },
+    '.doc': {
+        'class': AlitaDocLoader,
+        'is_multimodal_processing': True,
+        'kwargs': {}
+    },
     '.json': {
         'class': AlitaTextLoader,
         'is_multimodal_processing': False,

{alita_sdk-0.3.229 → alita_sdk-0.3.230}/alita_sdk/runtime/langchain/document_loaders/utils.py

@@ -60,4 +60,25 @@ def create_temp_file(file_content: bytes):
         temp_file.flush()  # Ensure data is written
 
         # Get the file path for operations
-        return temp_file.name
+        return temp_file.name
+
+def file_to_bytes(filepath):
+    """
+    Reads a file and returns its content as a bytes object.
+
+    Args:
+        filepath (str): The path to the file.
+
+    Returns:
+        bytes: The content of the file as a bytes object.
+    """
+    try:
+        with open(filepath, "rb") as f:
+            file_content_bytes = f.read()
+        return file_content_bytes
+    except FileNotFoundError:
+        logger.error(f"File not found: {filepath}")
+        return None
+    except Exception as e:
+        logger.error(f"Error reading file {filepath}: {e}")
+        return None

{alita_sdk-0.3.229 → alita_sdk-0.3.230}/alita_sdk/tools/ado/__init__.py

@@ -10,13 +10,12 @@ def get_tools(tool_type, tool):
         # common
         "selected_tools": tool['settings'].get('selected_tools', []),
         "organization_url": tool['settings']['organization_url'],
-        "project": tool['settings'].get('project', None),
-        "token": tool['settings'].get('token', None),
+        "ado_configuration": tool['settings']['ado_configuration'],
         "limit": tool['settings'].get('limit', 5),
         "toolkit_name": tool.get('toolkit_name', ''),
         # indexer settings
         "llm": tool['settings'].get('llm', None),
-        "connection_string": tool['settings'].get('connection_string', None),
+        "pgvector_configuration": tool['settings'].get('pgvector_configuration', {}),
         "collection_name": tool['toolkit_name'],
         "doctype": 'doc',
         "embedding_model": "HuggingFaceEmbeddings",

{alita_sdk-0.3.229 → alita_sdk-0.3.230}/alita_sdk/tools/ado/repos/__init__.py

@@ -17,15 +17,12 @@ name = "ado_repos"
 def _get_toolkit(tool) -> BaseToolkit:
     return AzureDevOpsReposToolkit().get_toolkit(
         selected_tools=tool['settings'].get('selected_tools', []),
-        organization_url=tool['settings'].get('ado_repos_configuration').get('ado_configuration').get('organization_url', ""),
-        project=tool['settings'].get('ado_repos_configuration').get('ado_configuration').get('project', ""),
-        token=tool['settings'].get('ado_repos_configuration').get('ado_configuration').get('token', ""),
+        ado_repos_configuration=tool['settings']['ado_repos_configuration'],
         limit=tool['settings'].get('limit', 5),
-        repository_id=tool['settings'].get('ado_repos_configuration').get('repository_id', ""),
         base_branch=tool['settings'].get('base_branch', ""),
         active_branch=tool['settings'].get('active_branch', ""),
         toolkit_name=tool['settings'].get('toolkit_name', ""),
-        connection_string=tool['settings'].get('connection_string', None),
+        pgvector_configuration=tool['settings'].get('pgvector_configuration', {}),
         collection_name=tool['toolkit_name'],
         doctype='code',
         embedding_model="HuggingFaceEmbeddings",
@@ -49,14 +46,13 @@ class AzureDevOpsReposToolkit(BaseToolkit):
         AzureDevOpsReposToolkit.toolkit_max_length = get_max_toolkit_length(selected_tools)
         m = create_model(
             name,
-            ado_repos_configuration=(Optional[AdoReposConfiguration], Field(description="Ado Repos configuration", default=None,
+            ado_repos_configuration=(AdoReposConfiguration, Field(description="Ado Repos configuration", default=None,
                                                                        json_schema_extra={'configuration_types': ['ado_repos']})),
             base_branch=(Optional[str], Field(default="", title="Base branch", description="ADO base branch (e.g., main)")),
             active_branch=(Optional[str], Field(default="", title="Active branch", description="ADO active branch (e.g., main)")),
 
             # indexer settings
-            pgvector_configuration=(Optional[PgVectorConfiguration], Field(description="PgVector configuration", default=None, json_schema_extra={'configuration_types': ['pgvector']})),
-                                      json_schema_extra={'secret': True})),
+            pgvector_configuration=(Optional[PgVectorConfiguration], Field(description="PgVector Configuration", json_schema_extra={'configuration_types': ['pgvector']})),
             # embedder settings
             embedding_model=(str, Field(description="Embedding model: i.e. 'HuggingFaceEmbeddings', etc.",
                                     default="HuggingFaceEmbeddings")),
@@ -110,8 +106,14 @@ class AzureDevOpsReposToolkit(BaseToolkit):
             environ["AZURE_DEVOPS_CACHE_DIR"] = "/tmp/.azure-devops"
         if selected_tools is None:
             selected_tools = []
-        
-        azure_devops_repos_wrapper = ReposApiWrapper(**kwargs)
+
+        wrapper_payload = {
+            **kwargs,
+            # TODO use ado_repos_configuration fields
+            **kwargs['ado_repos_configuration'],
+            **(kwargs.get('pgvector_configuration') or {}),
+        }
+        azure_devops_repos_wrapper = ReposApiWrapper(**wrapper_payload)
         available_tools = azure_devops_repos_wrapper.get_available_tools()
         tools = []
         prefix = clean_string(toolkit_name, cls.toolkit_max_length) + TOOLKIT_SPLITTER if toolkit_name else ''

{alita_sdk-0.3.229 → alita_sdk-0.3.230}/alita_sdk/tools/ado/repos/repos_wrapper.py

@@ -242,6 +242,7 @@ class ArgsSchema(Enum):
 
 
 class ReposApiWrapper(BaseCodeToolApiWrapper):
+    # TODO use ado_repos_configuration fields
     organization_url: Optional[str]
     project: Optional[str]
     repository_id: Optional[str]

{alita_sdk-0.3.229 → alita_sdk-0.3.230}/alita_sdk/tools/ado/test_plan/__init__.py

@@ -1,9 +1,11 @@
 from typing import List, Optional, Literal
 
 from langchain_core.tools import BaseTool, BaseToolkit
-from pydantic import create_model, BaseModel, Field, SecretStr
+from pydantic import create_model, BaseModel, Field
 
 import requests
+from ....configurations.ado import AdoConfiguration
+from ....configurations.pgvector import PgVectorConfiguration
 from .test_plan_wrapper import TestPlanApiWrapper
 from ...base.tool import BaseAction
 from ...utils import clean_string, TOOLKIT_SPLITTER, get_max_toolkit_length, check_connection_response
@@ -24,19 +26,10 @@ class AzureDevOpsPlansToolkit(BaseToolkit):
         m = create_model(
             name_alias,
             name=(str, Field(description="Toolkit name", json_schema_extra={'toolkit_name': True, 'max_toolkit_length': AzureDevOpsPlansToolkit.toolkit_max_length})),
-            organization_url=(str, Field(title="Organization URL",
-                                                   description="ADO organization url",
-                                                   json_schema_extra={
-                                                       'configuration': True,
-                                                       'configuration_title': True
-                                                   })),
-            project=(str, Field(title="Project", description="ADO project", json_schema_extra={'configuration': True})),
+            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)),
-            token=(SecretStr, Field(description="ADO token", json_schema_extra={'secret': True, 'configuration': True})),
             # indexer settings
-            connection_string=(Optional[SecretStr], Field(description="Connection string for vectorstore",
-                                                          default=None,
-                                                          json_schema_extra={'secret': True})),
+            pgvector_configuration=(Optional[PgVectorConfiguration], Field(description="PgVector Configuration", json_schema_extra={'configuration_types': ['pgvector']})),
             # embedder settings
             embedding_model=(str, Field(description="Embedding model: i.e. 'HuggingFaceEmbeddings', etc.",
                                         default="HuggingFaceEmbeddings")),
@@ -75,9 +68,12 @@ class AzureDevOpsPlansToolkit(BaseToolkit):
 
         @check_connection_response
         def check_connection(self):
+            ado_config = self.ado_test_plan_configuration.ado_configuration if self.ado_test_plan_configuration else None
+            if not ado_config:
+                raise ValueError("ADO test plan configuration is required")
             response = requests.get(
-                f'{self.organization_url}/{self.project}/_apis/testplan/plans?api-version=7.0',
-                headers = {'Authorization': f'Bearer {self.token}'},
+                f'{ado_config.organization_url}/{ado_config.project}/_apis/testplan/plans?api-version=7.0',
+                headers = {'Authorization': f'Bearer {ado_config.token}'},
                 timeout=5
             )
             return response
@@ -92,7 +88,13 @@ class AzureDevOpsPlansToolkit(BaseToolkit):
             environ['AZURE_DEVOPS_CACHE_DIR'] = '/tmp/.azure-devops'
         if selected_tools is None:
             selected_tools = []
-        azure_devops_api_wrapper = TestPlanApiWrapper(**kwargs)
+        wrapper_payload = {
+            **kwargs,
+            # TODO use ado_configuration fields in TestPlanApiWrapper
+            **kwargs['ado_configuration'],
+            **(kwargs.get('pgvector_configuration') or {}),
+        }
+        azure_devops_api_wrapper = TestPlanApiWrapper(**wrapper_payload)
         available_tools = azure_devops_api_wrapper.get_available_tools()
         tools = []
         prefix = clean_string(toolkit_name, cls.toolkit_max_length) + TOOLKIT_SPLITTER if toolkit_name else ''

{alita_sdk-0.3.229 → alita_sdk-0.3.230}/alita_sdk/tools/ado/test_plan/test_plan_wrapper.py

@@ -164,6 +164,7 @@ TestCasesGetModel = create_model(
 )
 
 class TestPlanApiWrapper(BaseVectorStoreToolApiWrapper):
+    # TODO use ado_configuration instead of organization_url, project and token
     __test__ = False
     organization_url: str
     project: str

{alita_sdk-0.3.229 → alita_sdk-0.3.230}/alita_sdk/tools/ado/wiki/__init__.py

@@ -1,9 +1,11 @@
 from typing import List, Literal, Optional
 from .ado_wrapper import AzureDevOpsApiWrapper  # Import the API wrapper for Azure DevOps
 from langchain_core.tools import BaseTool, BaseToolkit
-from pydantic import create_model, BaseModel, Field, SecretStr
+from pydantic import create_model, BaseModel, Field
 
 import requests
+from ....configurations.ado import AdoConfiguration
+from ....configurations.pgvector import PgVectorConfiguration
 from ...base.tool import BaseAction
 from ...utils import clean_string, TOOLKIT_SPLITTER, get_max_toolkit_length, check_connection_response
 
@@ -25,22 +27,9 @@ class AzureDevOpsWikiToolkit(BaseToolkit):
                                  'toolkit_name': True,
                                  'max_toolkit_length': AzureDevOpsWikiToolkit.toolkit_max_length})
                   ),
-            organization_url=(str, Field(title="Organization URL",
-                                         description="ADO organization url", json_schema_extra={
-                    'configuration': True,
-                })),
-            project=(str, Field(description="ADO project",
-                                json_schema_extra={
-                                    'configuration': True
-                                })),
-            token=(SecretStr,
-                   Field(description="ADO token",
-                         json_schema_extra={'secret': True, 'configuration': True }
-                         )),
+            ado_configuration=(AdoConfiguration, Field(description="Ado configuration", json_schema_extra={'configuration_types': ['ado']})),
             # indexer settings
-            connection_string=(Optional[SecretStr], Field(description="Connection string for vectorstore",
-                                                          default=None,
-                                                          json_schema_extra={'secret': True})),
+            pgvector_configuration=(Optional[PgVectorConfiguration], Field(description="PgVector Configuration", json_schema_extra={'configuration_types': ['pgvector']})),
             # embedder settings
             embedding_model=(str, Field(description="Embedding model: i.e. 'HuggingFaceEmbeddings', etc.",
                                         default="HuggingFaceEmbeddings")),
@@ -53,7 +42,7 @@ class AzureDevOpsWikiToolkit(BaseToolkit):
                 'json_schema_extra': {
                     'metadata': {
                         "label": "ADO wiki",
-                        "icon_url": None,
+                        "icon_url": "ado-wiki-icon.svg",
                         "categories": ["documentation"],
                         "extra_categories": ["knowledge base", "documentation management", "wiki"],
                         "sections": {
@@ -77,9 +66,12 @@ class AzureDevOpsWikiToolkit(BaseToolkit):
 
         @check_connection_response
         def check_connection(self):
+            ado_config = self.ado_wiki_configuration.ado_configuration if self.ado_wiki_configuration else None
+            if not ado_config:
+                raise ValueError("ADO wiki configuration is required")
             response = requests.get(
-                f'{self.organization_url}/{self.project}/_apis/wiki/wikis?api-version=7.0',
-                headers={'Authorization': f'Bearer {self.token}'},
+                f'{ado_config.organization_url}/{ado_config.project}/_apis/wiki/wikis?api-version=7.0',
+                headers={'Authorization': f'Bearer {ado_config.token}'},
                 timeout=5
             )
             return response
@@ -94,7 +86,13 @@ class AzureDevOpsWikiToolkit(BaseToolkit):
             environ['AZURE_DEVOPS_CACHE_DIR'] = '/tmp/.azure-devops'
         if selected_tools is None:
             selected_tools = []
-        azure_devops_api_wrapper = AzureDevOpsApiWrapper(**kwargs)
+        wrapper_payload = {
+            **kwargs,
+            # TODO use ado_configuration fields in AzureDevOpsApiWrapper
+            **kwargs['ado_configuration'],
+            **(kwargs.get('pgvector_configuration') or {}),
+        }
+        azure_devops_api_wrapper = AzureDevOpsApiWrapper(**wrapper_payload)
         available_tools = azure_devops_api_wrapper.get_available_tools()
         tools = []
         prefix = clean_string(toolkit_name, cls.toolkit_max_length) + TOOLKIT_SPLITTER if toolkit_name else ''

{alita_sdk-0.3.229 → alita_sdk-0.3.230}/alita_sdk/tools/ado/wiki/ado_wrapper.py

@@ -61,6 +61,7 @@ RenamePageInput = create_model(
 
 
 class AzureDevOpsApiWrapper(BaseVectorStoreToolApiWrapper):
+    # TODO use ado_configuration instead of organization_url, project and token
     organization_url: str
     project: str
     token: SecretStr

{alita_sdk-0.3.229 → alita_sdk-0.3.230}/alita_sdk/tools/ado/work_item/__init__.py

@@ -1,9 +1,11 @@
 from typing import List, Optional, Literal
 from .ado_wrapper import AzureDevOpsApiWrapper  # Import the API wrapper for Azure DevOps
 from langchain_core.tools import BaseTool, BaseToolkit
-from pydantic import create_model, BaseModel, Field, SecretStr
+from pydantic import create_model, BaseModel, Field
 
 import requests
+from ....configurations.ado import AdoConfiguration
+from ....configurations.pgvector import PgVectorConfiguration
 from ...base.tool import BaseAction
 from ...utils import clean_string, TOOLKIT_SPLITTER, get_max_toolkit_length, check_connection_response
 
@@ -24,23 +26,11 @@ class AzureDevOpsWorkItemsToolkit(BaseToolkit):
                                  'toolkit_name': True,
                                  'max_toolkit_length': AzureDevOpsWorkItemsToolkit.toolkit_max_length})
                   ),
-            organization_url=(str, Field(title="Organization URL",
-                                         description="ADO organization url",
-                                         json_schema_extra={
-                                             'configuration': True
-                                         })),
-            project=(str, Field(description="ADO project",
-                                json_schema_extra={
-                                    'configuration': True
-                                }
-                                )),
-            token=(SecretStr, Field(description="ADO token", json_schema_extra={'secret': True, 'configuration': True})),
+            ado_configuration=(AdoConfiguration, Field(description="Ado Work Item configuration", json_schema_extra={'configuration_types': ['ado_work_item']})),
             limit=(Optional[int], Field(description="ADO plans limit used for limitation of the list with results", default=5)),
             selected_tools=(List[Literal[tuple(selected_tools)]], Field(default=[], json_schema_extra={'args_schemas': selected_tools})),
             # indexer settings
-            connection_string = (Optional[SecretStr], Field(description="Connection string for vectorstore",
-                                                            default=None,
-                                                            json_schema_extra={'secret': True})),
+            pgvector_configuration=(Optional[PgVectorConfiguration], Field(description="PgVector Configuration", json_schema_extra={'configuration_types': ['pgvector']})),
             # embedder settings
             embedding_model=(str, Field(description="Embedding model: i.e. 'HuggingFaceEmbeddings', etc.",
                                         default="HuggingFaceEmbeddings")),
@@ -51,7 +41,7 @@ class AzureDevOpsWorkItemsToolkit(BaseToolkit):
                 'json_schema_extra': {
                     'metadata': {
                         "label": "ADO boards",
-                        "icon_url": None,
+                        "icon_url": "ado-boards-icon.svg",
                         "categories": ["project management"],
                         "extra_categories": ["work item management", "issue tracking", "agile boards"],
                         "sections": {
@@ -75,9 +65,12 @@ class AzureDevOpsWorkItemsToolkit(BaseToolkit):
 
         @check_connection_response
         def check_connection(self):
+            ado_config = self.ado_work_item_configuration.ado_configuration if self.ado_work_item_configuration else None
+            if not ado_config:
+                raise ValueError("ADO work item configuration is required")
             response = requests.get(
-                f'{self.organization_url}/{self.project}/_apis/wit/workitemtypes?api-version=7.0',
-                headers={'Authorization': f'Bearer {self.token}'},
+                f'{ado_config.organization_url}/{ado_config.project}/_apis/wit/workitemtypes?api-version=7.0',
+                headers={'Authorization': f'Bearer {ado_config.token}'},
                 timeout=5
             )
             return response
@@ -93,7 +86,13 @@ class AzureDevOpsWorkItemsToolkit(BaseToolkit):
         if selected_tools is None:
             selected_tools = []
 
-        azure_devops_api_wrapper = AzureDevOpsApiWrapper(**kwargs)
+        wrapper_payload = {
+            **kwargs,
+            # TODO use ado_configuration fields in AzureDevOpsApiWrapper
+            **kwargs['ado_configuration'],
+            **(kwargs.get('pgvector_configuration') or {}),
+        }
+        azure_devops_api_wrapper = AzureDevOpsApiWrapper(**wrapper_payload)
         available_tools = azure_devops_api_wrapper.get_available_tools()
         tools = []
         prefix = clean_string(toolkit_name, cls.toolkit_max_length) + TOOLKIT_SPLITTER if toolkit_name else ''

{alita_sdk-0.3.229 → alita_sdk-0.3.230}/alita_sdk/tools/ado/work_item/ado_wrapper.py

@@ -95,6 +95,7 @@ ADOUnlinkWorkItemsFromWikiPage = create_model(
 )
 
 class AzureDevOpsApiWrapper(BaseVectorStoreToolApiWrapper):
+    # TODO use ado_configuration instead of organization_url, project and token
     organization_url: str
     project: str
     token: SecretStr

{alita_sdk-0.3.229 → alita_sdk-0.3.230}/alita_sdk/tools/azure_ai/search/__init__.py

@@ -15,10 +15,8 @@ name = "azure_search"
 def get_tools(tool):
     return AzureSearchToolkit().get_toolkit(
             selected_tools=tool['settings'].get('selected_tools', []),
-            api_key=tool['settings'].get('azure_search_configuration', {}).get('api_key', None),
-            endpoint=tool['settings'].get('azure_search_configuration', {}).get('endpoint', None),
+            azure_search_configuration=tool['settings']['azure_search_configuration'],
             index_name=tool['settings'].get('index_name', None),
-            api_base=tool['settings'].get('azure_search_configuration', {}).get('api_base', None),
             api_version=tool['settings'].get('api_version', None),
             openai_api_key=tool['settings'].get('access_token', None),
             model_name=tool['settings'].get('model_name', None),
@@ -71,7 +69,12 @@ class AzureSearchToolkit(BaseToolkit):
     def get_toolkit(cls, selected_tools: list[str] | None = None, toolkit_name: Optional[str] = None, **kwargs):
         if selected_tools is None:
             selected_tools = []
-        azure_search_api_wrapper = AzureSearchApiWrapper(**kwargs)
+        wrapper_payload = {
+            **kwargs,
+            # TODO use azure_search_configuration fields
+            **kwargs['azure_search_configuration'],
+        }
+        azure_search_api_wrapper = AzureSearchApiWrapper(**wrapper_payload)
         available_tools = azure_search_api_wrapper.get_available_tools()
         prefix = clean_string(toolkit_name, cls.toolkit_max_length) + TOOLKIT_SPLITTER if toolkit_name else ''
         tools = []

{alita_sdk-0.3.229 → alita_sdk-0.3.230}/alita_sdk/tools/bitbucket/__init__.py

@@ -22,13 +22,12 @@ def get_tools(tool):
         url=tool['settings']['url'],
         project=tool['settings']['project'],
         repository=tool['settings']['repository'],
-        username=tool['settings'].get('bitbucket_configuration', {}).get('username', ''),
-        password=tool['settings'].get('bitbucket_configuration', {}).get('password', ''),
+        bitbucket_configuration=tool['settings']['bitbucket_configuration'],
         branch=tool['settings']['branch'],
         cloud=tool['settings'].get('cloud'),
         llm=tool['settings'].get('llm', None),
         alita=tool['settings'].get('alita', None),
-        connection_string=tool['settings'].get('pgvector_configuration', {}).get('connection_string', None),
+        pgvector_configuration=tool['settings'].get('pgvector_configuration', {}),
         collection_name=str(tool['toolkit_name']),
         doctype='code',
         embedding_model="HuggingFaceEmbeddings",
@@ -91,7 +90,13 @@ class AlitaBitbucketToolkit(BaseToolkit):
             selected_tools = []
         if kwargs["cloud"] is None:
             kwargs["cloud"] = True if "bitbucket.org" in kwargs.get('url') else False
-        bitbucket_api_wrapper = BitbucketAPIWrapper(**kwargs)
+        wrapper_payload = {
+            **kwargs,
+            # TODO use bitbucket_configuration fields
+            **kwargs['bitbucket_configuration'],
+            **(kwargs.get('pgvector_configuration') or {}),
+        }
+        bitbucket_api_wrapper = BitbucketAPIWrapper(**wrapper_payload)
         available_tools: List[Dict] = __all__
         prefix = clean_string(toolkit_name, cls.toolkit_max_length) + TOOLKIT_SPLITTER if toolkit_name else ''
         tools = []

{alita_sdk-0.3.229 → alita_sdk-0.3.230}/alita_sdk/tools/confluence/__init__.py

@@ -17,9 +17,7 @@ def get_tools(tool):
         base_url=tool['settings']['base_url'],
         space=tool['settings'].get('space', None),
         cloud=tool['settings'].get('cloud', True),
-        api_key=tool['settings'].get('confluence_configuration', {}).get('api_key', None),
-        username=tool['settings'].get('confluence_configuration', {}).get('username', None),
-        token=tool['settings'].get('confluence_configuration', {}).get('token', None),
+        confluence_configuration=tool['settings']['confluence_configuration'],
         limit=tool['settings'].get('limit', 5),
         labels=parse_list(tool['settings'].get('labels', None)),
         additional_fields=tool['settings'].get('additional_fields', []),
@@ -28,7 +26,7 @@ def get_tools(tool):
         llm=tool['settings'].get('llm', None),
         toolkit_name=tool.get('toolkit_name'),
         # indexer settings
-        connection_string = tool['settings'].get('pgvector_configuration', {}).get('connection_string', None),
+        pgvector_configuration=tool['settings'].get('pgvector_configuration', {}),
         collection_name=str(tool['toolkit_name']),
         doctype='doc',
         embedding_model="HuggingFaceEmbeddings",
@@ -120,7 +118,13 @@ class ConfluenceToolkit(BaseToolkit):
     def get_toolkit(cls, selected_tools: list[str] | None = None, toolkit_name: Optional[str] = None, **kwargs):
         if selected_tools is None:
             selected_tools = []
-        confluence_api_wrapper = ConfluenceAPIWrapper(**kwargs)
+        wrapper_payload = {
+            **kwargs,
+            # TODO use confluence_configuration fields
+            **kwargs['confluence_configuration'],
+            **(kwargs.get('pgvector_configuration') or {}),
+        }
+        confluence_api_wrapper = ConfluenceAPIWrapper(**wrapper_payload)
         prefix = clean_string(toolkit_name, ConfluenceToolkit.toolkit_max_length) + TOOLKIT_SPLITTER if toolkit_name else ''
         available_tools = confluence_api_wrapper.get_available_tools()
         tools = []

{alita_sdk-0.3.229 → alita_sdk-0.3.230}/alita_sdk/tools/figma/__init__.py

@@ -6,6 +6,7 @@ from pydantic import BaseModel, ConfigDict, Field, create_model, SecretStr
 from ..base.tool import BaseAction
 from .api_wrapper import FigmaApiWrapper, GLOBAL_LIMIT
 from ..utils import clean_string, TOOLKIT_SPLITTER, get_max_toolkit_length
+from ...configurations.pgvector import PgVectorConfiguration
 
 name = "figma"
 
@@ -21,7 +22,7 @@ def get_tools(tool):
             toolkit_name=tool.get('toolkit_name'),
             # indexer settings
             llm=tool['settings'].get('llm', None),
-            connection_string = tool['settings'].get('connection_string', None),
+            pgvector_configuration=tool['settings'].get('pgvector_configuration', {}),
             collection_name=str(tool['toolkit_name']),
             doctype='doc',
             embedding_model="HuggingFaceEmbeddings",
@@ -54,9 +55,7 @@ class FigmaToolkit(BaseToolkit):
                 Field(default=[], json_schema_extra={"args_schemas": selected_tools}),
             ),
             # indexer settings
-            connection_string = (Optional[SecretStr], Field(description="Connection string for vectorstore",
-                                                            default=None,
-                                                            json_schema_extra={'secret': True})),
+            pgvector_configuration=(Optional[PgVectorConfiguration], Field(description="PgVector Configuration", json_schema_extra={'configuration_types': ['pgvector']})),
 
             # embedder settings
             embedding_model=(str, Field(description="Embedding model: i.e. 'HuggingFaceEmbeddings', etc.", default="HuggingFaceEmbeddings")),
@@ -93,7 +92,11 @@ class FigmaToolkit(BaseToolkit):
     def get_toolkit(cls, selected_tools: list[str] | None = None, toolkit_name: Optional[str] = None, **kwargs):
         if selected_tools is None:
             selected_tools = []
-        figma_api_wrapper = FigmaApiWrapper(**kwargs)
+        wrapper_payload = {
+            **kwargs,
+            **(kwargs.get('pgvector_configuration') or {}),
+        }
+        figma_api_wrapper = FigmaApiWrapper(**wrapper_payload)
         prefix = clean_string(toolkit_name, cls.toolkit_max_length) + TOOLKIT_SPLITTER if toolkit_name else ''
         available_tools = figma_api_wrapper.get_available_tools()
         tools = []