alita-sdk 0.3.227__py3-none-any.whl → 0.3.229__py3-none-any.whl

alita_sdk/tools/ado/repos/__init__.py

@@ -1,9 +1,12 @@
 from typing import List, Literal, Optional
 
 from langchain_core.tools import BaseTool, BaseToolkit
-from pydantic import BaseModel, Field, create_model, SecretStr
+from pydantic import BaseModel, Field, create_model
 
 import requests
+
+from ....configurations.ado import AdoReposConfiguration
+from ....configurations.pgvector import PgVectorConfiguration
 from ...base.tool import BaseAction
 from .repos_wrapper import ReposApiWrapper
 from ...utils import clean_string, TOOLKIT_SPLITTER, get_max_toolkit_length, check_connection_response
@@ -14,16 +17,16 @@ name = "ado_repos"
 def _get_toolkit(tool) -> BaseToolkit:
     return AzureDevOpsReposToolkit().get_toolkit(
         selected_tools=tool['settings'].get('selected_tools', []),
-        organization_url=tool['settings'].get('organization_url', ""),
-        project=tool['settings'].get('project', ""),
-        token=tool['settings'].get('token', ""),
+        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', ""),
         limit=tool['settings'].get('limit', 5),
-        repository_id=tool['settings'].get('repository_id', ""),
+        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),
-        collection_name=str(tool['id']),
+        collection_name=tool['toolkit_name'],
         doctype='code',
         embedding_model="HuggingFaceEmbeddings",
         embedding_model_params={"model_name": "sentence-transformers/all-MiniLM-L6-v2"},
@@ -46,33 +49,21 @@ class AzureDevOpsReposToolkit(BaseToolkit):
         AzureDevOpsReposToolkit.toolkit_max_length = get_max_toolkit_length(selected_tools)
         m = create_model(
             name,
-            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})),
-            repository_id=(str, Field(title="Repository ID", description="ADO repository ID",
-                                                json_schema_extra={
-                                                    'max_toolkit_length': AzureDevOpsReposToolkit.toolkit_max_length,
-                                                    'configuration': True})),
-            token=(SecretStr, Field(title="Token", description="ADO token", json_schema_extra={'secret': True, 'configuration': True})),
+            ado_repos_configuration=(Optional[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
-            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", default=None, json_schema_extra={'configuration_types': ['pgvector']})),
+                                      json_schema_extra={'secret': True})),
             # embedder settings
             embedding_model=(str, Field(description="Embedding model: i.e. 'HuggingFaceEmbeddings', etc.",
-                                        default="HuggingFaceEmbeddings")),
+                                    default="HuggingFaceEmbeddings")),
             embedding_model_params=(dict, Field(
-                description="Embedding model parameters: i.e. `{'model_name': 'sentence-transformers/all-MiniLM-L6-v2'}",
-                default={"model_name": "sentence-transformers/all-MiniLM-L6-v2"})),
-            
+            description="Embedding model parameters: i.e. `{'model_name': 'sentence-transformers/all-MiniLM-L6-v2'}",
+            default={"model_name": "sentence-transformers/all-MiniLM-L6-v2"})),
+
             selected_tools=(List[Literal[tuple(selected_tools)]], Field(default=[], json_schema_extra={'args_schemas': selected_tools})),
             __config__={'json_schema_extra': {'metadata':
                 {
@@ -91,11 +82,11 @@ class AzureDevOpsReposToolkit(BaseToolkit):
                     },
                     "categories": ["code repositories"],
                     "extra_categories": ["code", "repository", "version control"],
-                    "configuration_group": {
-                        "name": "ado_repos",
-                        "label": "Azure DevOps Repositories",
-                        "icon_url": "ado-repos-icon.svg",
-                    }
+                    # "configuration_group": {
+                    #     "name": "ado_repos",
+                    #     "label": "Azure DevOps Repositories",
+                    #     "icon_url": "ado-repos-icon.svg",
+                    # }
                 }}}
         )
 

alita_sdk/tools/ado/wiki/ado_wrapper.py

@@ -1,3 +1,4 @@
+import hashlib
 import logging
 from typing import Any, Dict, Generator, Optional
 
@@ -229,21 +230,26 @@ class AzureDevOpsApiWrapper(BaseVectorStoreToolApiWrapper):
             logger.error(f"Unable to modify wiki page: {str(e)}")
             return ToolException(f"Unable to modify wiki page: {str(e)}")
 
-    def _base_loader(self, wiki_identifier: str, **kwargs) -> Generator[Document, None, None]:
+    def _base_loader(self, wiki_identifier: str, title_contains: Optional[str] = None, **kwargs) -> Generator[Document, None, None]:
         pages = self._client.get_pages_batch(pages_batch_request={}, project=self.project, wiki_identifier=wiki_identifier)
         #
         for page in pages:
             content = self._client.get_page_by_id(project=self.project, wiki_identifier=wiki_identifier, id=page.id, include_content=True).page.content
-            yield Document(page_content=content, metadata={
-                'id': page.id, 
-                'path': page.path,
-                'updated_on': ''
-            })
+            content_hash = hashlib.sha256(content.encode("utf-8")).hexdigest()
+            title = page.path.rsplit("/", 1)[-1]
+            if not title_contains or (title_contains and title_contains.lower() in title.lower()):
+                yield Document(page_content=content, metadata={
+                    'id': str(page.id),
+                    'path': page.path,
+                    'title': title,
+                    'updated_on': content_hash
+                })
 
     def _index_tool_params(self):
         """Return the parameters for indexing data."""
         return {
-            "wiki_identifier": (str, Field(description="Wiki identifier to index, e.g., 'ABCProject.wiki'"))
+            "wiki_identifier": (str, Field(description="Wiki identifier to index, e.g., 'ABCProject.wiki'")),
+            'title_contains': (Optional[str], Field(default=None, description="Optional filter to include only pages with titles containing exact this string"))
         }
 
     @extend_with_vector_tools

alita_sdk/tools/aws/delta_lake/__init__.py

@@ -5,6 +5,7 @@ from typing import List, Optional, Type
 from langchain_core.tools import BaseTool, BaseToolkit
 from pydantic import BaseModel, Field, SecretStr, computed_field, field_validator
 
+from alita_sdk.configurations.delta_lake import DeltaLakeConfiguration
 from ...utils import TOOLKIT_SPLITTER, clean_string, get_max_toolkit_length
 from .api_wrapper import DeltaLakeApiWrapper
 from .tool import DeltaLakeAction
@@ -53,12 +54,7 @@ class DeltaLakeToolkitConfig(BaseModel):
             }
         }
 
-    aws_access_key_id: Optional[SecretStr] = Field(default=None, description="AWS access key ID", json_schema_extra={"secret": True, "configuration": True})
-    aws_secret_access_key: Optional[SecretStr] = Field(default=None, description="AWS secret access key", json_schema_extra={"secret": True, "configuration": True})
-    aws_session_token: Optional[SecretStr] = Field(default=None, description="AWS session token (optional)", json_schema_extra={"secret": True, "configuration": True})
-    aws_region: Optional[str] = Field(default=None, description="AWS region for Delta Lake storage", json_schema_extra={"configuration": True})
-    s3_path: Optional[str] = Field(default=None, description="S3 path to Delta Lake data (e.g., s3://bucket/path)", json_schema_extra={"configuration": True, "configuration_title": True})
-    table_path: Optional[str] = Field(default=None, description="Delta Lake table path (if not using s3_path)", json_schema_extra={"configuration": True})
+    delta_lake_configuration: Optional[DeltaLakeConfiguration] = Field(description="Delta Lake Configuration", json_schema_extra={"configuration_types": ["delta_lake"]})
     selected_tools: List[str] = Field(default=[], description="Selected tools", json_schema_extra={"args_schemas": get_available_tools()})
 
     @field_validator("selected_tools", mode="before", check_fields=False)
@@ -69,12 +65,12 @@ class DeltaLakeToolkitConfig(BaseModel):
 def _get_toolkit(tool) -> BaseToolkit:
     return DeltaLakeToolkit().get_toolkit(
         selected_tools=tool["settings"].get("selected_tools", []),
-        aws_access_key_id=tool["settings"].get("aws_access_key_id", None),
-        aws_secret_access_key=tool["settings"].get("aws_secret_access_key", None),
-        aws_session_token=tool["settings"].get("aws_session_token", None),
-        aws_region=tool["settings"].get("aws_region", None),
-        s3_path=tool["settings"].get("s3_path", None),
-        table_path=tool["settings"].get("table_path", None),
+        aws_access_key_id=tool["settings"].get("delta_lake_configuration").get("aws_access_key_id", None),
+        aws_secret_access_key=tool["settings"].get("delta_lake_configuration").get("aws_secret_access_key", None),
+        aws_session_token=tool["settings"].get("delta_lake_configuration").get("aws_session_token", None),
+        aws_region=tool["settings"].get("delta_lake_configuration").get("aws_region", None),
+        s3_path=tool["settings"].get("delta_lake_configuration").get("s3_path", None),
+        table_path=tool["settings"].get("delta_lake_configuration").get("table_path", None),
         toolkit_name=tool.get("toolkit_name"),
     )
 
@@ -103,9 +99,9 @@ class DeltaLakeToolkit(BaseToolkit):
     def available_tools(self) -> List[dict]:
         return self.api_wrapper.get_available_tools()
 
-    @staticmethod
     def toolkit_config_schema() -> Type[BaseModel]:
         return DeltaLakeToolkitConfig
+        return m
 
     @classmethod
     def get_toolkit(

alita_sdk/tools/azure_ai/search/__init__.py

@@ -3,8 +3,9 @@ from typing import List, Optional, Literal
 from .api_wrapper import AzureSearchApiWrapper
 from ...base.tool import BaseAction
 from langchain_core.tools import BaseToolkit, BaseTool
-from pydantic import create_model, BaseModel, ConfigDict, Field, SecretStr
+from pydantic import create_model, BaseModel, ConfigDict, Field
 from ...utils import clean_string, TOOLKIT_SPLITTER, get_max_toolkit_length, check_connection_response
+from ....configurations.azure_search import AzureSearchConfiguration
 import requests
 
 logger = getLogger(__name__)
@@ -14,10 +15,10 @@ name = "azure_search"
 def get_tools(tool):
     return AzureSearchToolkit().get_toolkit(
             selected_tools=tool['settings'].get('selected_tools', []),
-            api_key=tool['settings'].get('api_key', None),
-            endpoint=tool['settings'].get('endpoint', None),
+            api_key=tool['settings'].get('azure_search_configuration', {}).get('api_key', None),
+            endpoint=tool['settings'].get('azure_search_configuration', {}).get('endpoint', None),
             index_name=tool['settings'].get('index_name', None),
-            api_base=tool['settings'].get('api_base', 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),
@@ -38,18 +39,11 @@ class AzureSearchToolkit(BaseToolkit):
         AzureSearchToolkit.toolkit_max_length = get_max_toolkit_length(selected_tools)
         m = create_model(
             name,
-            api_key=(SecretStr, Field(description="API key", json_schema_extra={'secret': True, 'configuration': True})),
-            endpoint=(str, Field(title="Azure Search endpoint",
-                                                   description="Azure Search endpoint",
-                                                   json_schema_extra={
-                                                       'configuration': True,
-                                                       "configuration_title": True
-                                                   })),
             index_name=(str, Field(description="Azure Search index name")),
-            api_base=(Optional[str], Field(description="Azure OpenAI base URL", default=None,
-                                           json_schema_extra={
-                                               'max_toolkit_length': AzureSearchToolkit.toolkit_max_length,
-                                               'configuration': True})),
+            azure_search_configuration=(
+                Optional[AzureSearchConfiguration],
+                Field(description="Azure Search Configuration", json_schema_extra={'configuration_types': ['azure_search']})
+            ),
             api_version=(Optional[str], Field(description="API version", default=None)),
             openai_api_key=(Optional[str], Field(description="Azure OpenAI API Key", default=None, json_schema_extra={'secret': True})),
             model_name=(str, Field(description="Model name for Embeddings model", default=None)),

alita_sdk/tools/bitbucket/__init__.py

@@ -6,8 +6,10 @@ 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, SecretStr
+from pydantic import BaseModel, Field, ConfigDict, create_model
 from ..utils import clean_string, TOOLKIT_SPLITTER, get_max_toolkit_length, check_connection_response
+from ...configurations.bitbucket import BitbucketConfiguration
+from ...configurations.pgvector import PgVectorConfiguration
 import requests
 
 
@@ -20,13 +22,13 @@ def get_tools(tool):
         url=tool['settings']['url'],
         project=tool['settings']['project'],
         repository=tool['settings']['repository'],
-        username=tool['settings']['username'],
-        password=tool['settings']['password'],
+        username=tool['settings'].get('bitbucket_configuration', {}).get('username', ''),
+        password=tool['settings'].get('bitbucket_configuration', {}).get('password', ''),
         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('connection_string', None),
+        connection_string=tool['settings'].get('pgvector_configuration', {}).get('connection_string', None),
         collection_name=str(tool['toolkit_name']),
         doctype='code',
         embedding_model="HuggingFaceEmbeddings",
@@ -53,14 +55,9 @@ class AlitaBitbucketToolkit(BaseToolkit):
             project=(str, Field(description="Project/Workspace", json_schema_extra={'configuration': True})),
             repository=(str, Field(description="Repository", json_schema_extra={'max_toolkit_length': AlitaBitbucketToolkit.toolkit_max_length, 'configuration': True})),
             branch=(str, Field(description="Main branch", default="main")),
-            username=(str, Field(description="Username", json_schema_extra={'configuration': True})),
-            password=(SecretStr, Field(description="GitLab private token", json_schema_extra={'secret': True, 'configuration': True})),
             cloud=(Optional[bool], Field(description="Hosting Option", default=None)),
-            # indexer settings
-            connection_string=(Optional[SecretStr], Field(description="Connection string for vectorstore",
-                                                          default=None,
-                                                          json_schema_extra={'secret': True})),
-
+            bitbucket_configuration=(Optional[BitbucketConfiguration], Field(description="Bitbucket Configuration", json_schema_extra={'configuration_types': ['bitbucket']})),
+            pgvector_configuration=(Optional[PgVectorConfiguration], Field(description="PgVector Configuration", default={'configuration_types': ['pgvector']})),
             # embedder settings
             embedding_model=(str, Field(description="Embedding model: i.e. 'HuggingFaceEmbeddings', etc.", default="HuggingFaceEmbeddings")),
             embedding_model_params=(dict, Field(description="Embedding model parameters: i.e. `{'model_name': 'sentence-transformers/all-MiniLM-L6-v2'}", default={"model_name": "sentence-transformers/all-MiniLM-L6-v2"})),

alita_sdk/tools/confluence/__init__.py

@@ -3,8 +3,10 @@ from langchain_community.agent_toolkits.base import BaseToolkit
 from .api_wrapper import ConfluenceAPIWrapper
 from langchain_core.tools import BaseTool
 from ..base.tool import BaseAction
-from pydantic import create_model, BaseModel, ConfigDict, Field, SecretStr
+from pydantic import create_model, BaseModel, ConfigDict, Field
 from ..utils import clean_string, TOOLKIT_SPLITTER, get_max_toolkit_length, parse_list, check_connection_response
+from ...configurations.confluence import ConfluenceConfiguration
+from ...configurations.pgvector import PgVectorConfiguration
 import requests
 
 name = "confluence"
@@ -15,9 +17,9 @@ 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('api_key', None),
-        username=tool['settings'].get('username', None),
-        token=tool['settings'].get('token', None),
+        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),
         limit=tool['settings'].get('limit', 5),
         labels=parse_list(tool['settings'].get('labels', None)),
         additional_fields=tool['settings'].get('additional_fields', []),
@@ -26,7 +28,7 @@ def get_tools(tool):
         llm=tool['settings'].get('llm', None),
         toolkit_name=tool.get('toolkit_name'),
         # indexer settings
-        connection_string = tool['settings'].get('connection_string', None),
+        connection_string = tool['settings'].get('pgvector_configuration', {}).get('connection_string', None),
         collection_name=str(tool['toolkit_name']),
         doctype='doc',
         embedding_model="HuggingFaceEmbeddings",
@@ -50,10 +52,15 @@ class ConfluenceToolkit(BaseToolkit):
             url = self.base_url.rstrip('/') + '/wiki/rest/api/space'
             headers = {'Accept': 'application/json'}
             auth = None
-            if self.token:
-                headers['Authorization'] = f'Bearer {self.token}'
-            elif self.username and self.api_key:
-                auth = (self.username, self.api_key)
+            confluence_config = self.confluence_configuration or {}
+            token = confluence_config.get('token')
+            username = confluence_config.get('username')
+            api_key = confluence_config.get('api_key')
+
+            if token:
+                headers['Authorization'] = f'Bearer {token}'
+            elif username and api_key:
+                auth = (username, api_key)
             else:
                 raise ValueError('Confluence connection requires either token or username+api_key')
             response = requests.get(url, headers=headers, auth=auth, timeout=5, verify=getattr(self, 'verify_ssl', True))
@@ -62,9 +69,6 @@ class ConfluenceToolkit(BaseToolkit):
         model = create_model(
             name,
             base_url=(str, Field(description="Confluence URL", json_schema_extra={'configuration': True, 'configuration_title': True})),
-            token=(SecretStr, Field(description="Token", default=None, json_schema_extra={'secret': True, 'configuration': True})),
-            api_key=(SecretStr, Field(description="API key", default=None, json_schema_extra={'secret': True, 'configuration': True})),
-            username=(str, Field(description="Username", default=None, json_schema_extra={'configuration': True})),
             space=(str, Field(description="Space", json_schema_extra={'toolkit_name': True,
                                                                                     'max_toolkit_length': ConfluenceToolkit.toolkit_max_length})),
             cloud=(bool, Field(description="Hosting Option", json_schema_extra={'configuration': True})),
@@ -78,17 +82,13 @@ class ConfluenceToolkit(BaseToolkit):
             number_of_retries=(int, Field(description="Number of retries", default=2)),
             min_retry_seconds=(int, Field(description="Min retry, sec", default=10)),
             max_retry_seconds=(int, Field(description="Max retry, sec", default=60)),
-            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})),
-
-            # embedder settings
+            confluence_configuration=(Optional[ConfluenceConfiguration], Field(description="Confluence Configuration", json_schema_extra={'configuration_types': ['confluence']})),
+            pgvector_configuration=(Optional[PgVectorConfiguration], Field(description="PgVector Configuration", json_schema_extra={'configuration_types': ['pgvector']})),
             embedding_model=(str, Field(description="Embedding model: i.e. 'HuggingFaceEmbeddings', etc.", default="HuggingFaceEmbeddings")),
             embedding_model_params=(dict, Field(description="Embedding model parameters: i.e. `{'model_name': 'sentence-transformers/all-MiniLM-L6-v2'}", default={"model_name": "sentence-transformers/all-MiniLM-L6-v2"})),
 
+            selected_tools=(List[Literal[tuple(selected_tools)]],
+                            Field(default=[], json_schema_extra={'args_schemas': selected_tools})),
             __config__=ConfigDict(json_schema_extra={
                 'metadata': {
                     "label": "Confluence",

alita_sdk/tools/confluence/api_wrapper.py

@@ -214,8 +214,11 @@ class ConfluenceAPIWrapper(BaseVectorStoreToolApiWrapper):
                 "`atlassian` package not found, please run "
                 "`pip install atlassian-python-api`"
             )
-
+        if not values.get('base_url'):
+            raise ValueError("Base URL is required for Confluence API Wrapper.")
         url = values['base_url']
+        if not (values.get('token') or (values.get('api_key') and values.get('username'))):
+            raise ValueError("Either 'token' or both 'api_key' and 'username' must be provided for authentication.")
         api_key = values.get('api_key')
         username = values.get('username')
         token = values.get('token')
@@ -844,8 +847,12 @@ class ConfluenceAPIWrapper(BaseVectorStoreToolApiWrapper):
             yield document
 
     def _process_document(self, document: Document) -> Generator[Document, None, None]:
-        for attachment in self.get_page_attachments(document.metadata.get('id')):
-            yield Document(page_content=attachment.get('content', ''), metadata=attachment.get('metadata', {}))
+        attachments = self.get_page_attachments(document.metadata.get('id'))
+        if isinstance(attachments, str):
+            logger.info(f" {document.metadata.get('id')}: {attachments}")
+            return
+        for attachment in attachments:
+            yield Document(page_content=attachment.get('content', '') or attachment.get('llm_analysis', ''), metadata=attachment.get('metadata', {}))
 
     def _download_image(self, image_url):
         """
@@ -1577,7 +1584,7 @@ class ConfluenceAPIWrapper(BaseVectorStoreToolApiWrapper):
         """Return the parameters for indexing data."""
         return {
             "content_format": (Literal['view', 'storage', 'export_view', 'editor', 'anonymous'],
-                            Field(description="The format of the content to be retrieved.")),
+                            Field(description="The format of the content to be retrieved.", default='view')),
             "page_ids": (Optional[List[str]], Field(description="List of page IDs to retrieve.", default=None)),
             "label": (Optional[str], Field(description="Label to filter pages.", default=None)),
             "cql": (Optional[str], Field(description="CQL query to filter pages.", default=None)),

alita_sdk/tools/elitea_base.py

@@ -374,7 +374,7 @@ class BaseVectorStoreToolApiWrapper(BaseToolApiWrapper):
     def list_collections(self):
         """Lists all collections in the vector store."""
         vectorstore_wrapper = self._init_vector_store()
-        return self._adapter.list_collections(vectorstore_wrapper)
+        return self._adapter.list_collections(vectorstore_wrapper, self.collection_name or "")
 
     def search_index(self,
                      query: str,

alita_sdk/tools/github/__init__.py

@@ -1,4 +1,4 @@
-from typing import Dict, List, Optional, Literal, Any
+from typing import Dict, List, Optional, Literal
 
 from langchain_core.tools import BaseTool, BaseToolkit
 from pydantic import create_model, BaseModel, ConfigDict, Field, SecretStr
@@ -7,6 +7,8 @@ from .api_wrapper import AlitaGitHubAPIWrapper
 from .tool import GitHubAction
 
 from ..utils import clean_string, TOOLKIT_SPLITTER, get_max_toolkit_length
+from ...configurations.github import GithubConfiguration
+from ...configurations.pgvector import PgVectorConfiguration
 
 name = "github"
 
@@ -17,14 +19,14 @@ def _get_toolkit(tool) -> BaseToolkit:
         github_repository=tool['settings']['repository'],
         active_branch=tool['settings']['active_branch'],
         github_base_branch=tool['settings']['base_branch'],
-        github_access_token=tool['settings'].get('access_token', ''),
-        github_username=tool['settings'].get('username', ''),
-        github_password=tool['settings'].get('password', ''),
-        github_app_id=tool['settings'].get('app_id', None),
-        github_app_private_key=tool['settings'].get('app_private_key', None),
+        github_access_token=tool['settings'].get('github_configuration', {}).get('access_token', ''),
+        github_username=tool['settings'].get('github_configuration', {}).get('username', ''),
+        github_password=tool['settings'].get('github_configuration', {}).get('password', ''),
+        github_app_id=tool['settings'].get('github_configuration', {}).get('app_id', None),
+        github_app_private_key=tool['settings'].get('github_configuration', {}).get('app_private_key', None),
         llm=tool['settings'].get('llm', None),
         alita=tool['settings'].get('alita', None),
-        connection_string=tool['settings'].get('connection_string', None),
+        connection_string=tool['settings'].get('pgvector_configuration', {}).get('connection_string', None),
         collection_name=str(tool['toolkit_name']),
         doctype='code',
         embedding_model="HuggingFaceEmbeddings",
@@ -45,7 +47,8 @@ class AlitaGitHubToolkit(BaseToolkit):
 
     @staticmethod
     def toolkit_config_schema() -> BaseModel:
-        selected_tools = {x['name']: x['args_schema'].schema() for x in AlitaGitHubAPIWrapper.model_construct().get_available_tools()}
+        selected_tools = {x['name']: x['args_schema'].schema() for x in
+                          AlitaGitHubAPIWrapper.model_construct().get_available_tools()}
         AlitaGitHubToolkit.toolkit_max_length = get_max_toolkit_length(selected_tools)
         return create_model(
             name,
@@ -54,53 +57,27 @@ class AlitaGitHubToolkit(BaseToolkit):
                     'metadata': {
                         "label": "GitHub",
                         "icon_url": None,
-                        "sections": {
-                            "auth": {
-                                "required": False,
-                                "subsections": [
-                                    {
-                                        "name": "Token",
-                                        "fields": ["access_token"]
-                                    },
-                                    {
-                                        "name": "Password",
-                                        "fields": ["username", "password"]
-                                    },
-                                    {
-                                        "name": "App private key",
-                                        "fields": ["app_id", "app_private_key"]
-                                    }
-                                ]
-                            },
-                        },
                         "categories": ["code repositories"],
                         "extra_categories": ["github", "git", "repository", "code", "version control"],
                     },
                 }
             ),
-            base_url=(Optional[str], Field(description="Base API URL", default="https://api.github.com", json_schema_extra={'configuration': True, 'configuration_title': True})),
-            app_id=(Optional[str], Field(description="Github APP ID", default=None, json_schema_extra={'configuration': True})),
-            app_private_key=(Optional[SecretStr], Field(description="Github APP private key", default=None, json_schema_extra={'secret': True, 'configuration': True})),
-
-            access_token=(Optional[SecretStr], Field(description="Github Access Token", default=None, json_schema_extra={'secret': True, 'configuration': True})),
-
-            username=(Optional[str], Field(description="Github Username", default=None, json_schema_extra={'configuration': True})),
-            password=(Optional[SecretStr], Field(description="Github Password", default=None, json_schema_extra={'secret': True, 'configuration': True})),
-
-            repository=(str, Field(description="Github repository", json_schema_extra={'toolkit_name': True, 'max_toolkit_length': AlitaGitHubToolkit.toolkit_max_length})),
+            github_configuration=(Optional[GithubConfiguration], Field(description="Github configuration", default=None,
+                                                                     json_schema_extra={'configuration_types': ['github']})),
+            pgvector_configuration=(Optional[PgVectorConfiguration], Field(description="PgVector configuration", default=None,
+                                                                     json_schema_extra={'configuration_types': ['pgvector']})),
+            repository=(str, Field(description="Github repository", json_schema_extra={'toolkit_name': True,
+                                                                                       'max_toolkit_length': AlitaGitHubToolkit.toolkit_max_length})),
             active_branch=(Optional[str], Field(description="Active branch", default="main")),
             base_branch=(Optional[str], Field(description="Github Base branch", default="main")),
-            
             # indexer settings
-            connection_string = (Optional[SecretStr], Field(description="Connection string for vectorstore",
-                                                            default=None,
-                                                            json_schema_extra={'secret': True})),
-            
-            # embedder settings
+            connection_string=(Optional[SecretStr], Field(description="Connection string for vectorstore",
+                                                          default=None,
+                                                          json_schema_extra={'secret': True})),
             embedding_model=(str, Field(description="Embedding model: i.e. 'HuggingFaceEmbeddings', etc.", default="HuggingFaceEmbeddings")),
             embedding_model_params=(dict, Field(description="Embedding model parameters: i.e. `{'model_name': 'sentence-transformers/all-MiniLM-L6-v2'}", default={"model_name": "sentence-transformers/all-MiniLM-L6-v2"})),
-
-            selected_tools=(List[Literal[tuple(selected_tools)]], Field(default=[], json_schema_extra={'args_schemas': selected_tools}))
+            selected_tools=(List[Literal[tuple(selected_tools)]],
+                            Field(default=[], json_schema_extra={'args_schemas': selected_tools}))
         )
 
     @classmethod

alita_sdk/tools/gitlab/__init__.py

@@ -3,11 +3,13 @@ from typing import Dict, List, Literal, Optional
 from alita_sdk.tools.base.tool import BaseAction
 from langchain_core.tools import BaseTool
 from langchain_core.tools import BaseToolkit
-from pydantic import create_model, BaseModel, ConfigDict, SecretStr
+from pydantic import create_model, BaseModel, ConfigDict
 from pydantic.fields import Field
 
 from .api_wrapper import GitLabAPIWrapper
 from ..utils import clean_string, TOOLKIT_SPLITTER, get_max_toolkit_length
+from ...configurations.gitlab import GitlabConfiguration
+from ...configurations.pgvector import PgVectorConfiguration
 
 name = "gitlab"
 
@@ -18,11 +20,11 @@ def get_tools(tool):
         url=tool['settings']['url'],
         repository=tool['settings']['repository'],
         branch=tool['settings']['branch'],
-        private_token=tool['settings']['private_token'],
+        private_token=tool['settings'].get('gitlab_configuration', {}).get('private_token', ''),
 
         llm=tool['settings'].get('llm', None),
         alita=tool['settings'].get('alita', None),
-        connection_string=tool['settings'].get('connection_string', None),
+        connection_string=tool['settings'].get('pgvector_configuration', {}).get('connection_string', None),
         collection_name=str(tool['toolkit_name']),
         doctype='code',
         embedding_model="HuggingFaceEmbeddings",
@@ -44,13 +46,11 @@ class AlitaGitlabToolkit(BaseToolkit):
             name,
             url=(str, Field(description="GitLab URL", json_schema_extra={'configuration': True, 'configuration_title': True})),
             repository=(str, Field(description="GitLab repository", json_schema_extra={'toolkit_name': True, 'max_toolkit_length': AlitaGitlabToolkit.toolkit_max_length})),
-            private_token=(SecretStr, Field(description="GitLab private token", json_schema_extra={'secret': True, 'configuration': True})),
+            gitlab_configuration=(Optional[GitlabConfiguration], Field(description="GitLab configuration", json_schema_extra={'configuration_types': ['gitlab']})),
             branch=(str, Field(description="Main branch", default="main")),
             # 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", default=None,
+                                    json_schema_extra={'configuration_types': ['pgvector']})),
             # embedder settings
             embedding_model=(str, Field(description="Embedding model: i.e. 'HuggingFaceEmbeddings', etc.", default="HuggingFaceEmbeddings")),
             embedding_model_params=(dict, Field(description="Embedding model parameters: i.e. `{'model_name': 'sentence-transformers/all-MiniLM-L6-v2'}", default={"model_name": "sentence-transformers/all-MiniLM-L6-v2"})),