alita-sdk 0.3.257__tar.gz → 0.3.258__tar.gz

{alita_sdk-0.3.257 → alita_sdk-0.3.258}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: alita_sdk
-Version: 0.3.257
+Version: 0.3.258
 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.257 → alita_sdk-0.3.258}/alita_sdk/tools/ado/__init__.py

@@ -14,11 +14,12 @@ def get_tools(tool_type, tool):
         "limit": tool['settings'].get('limit', 5),
         "toolkit_name": tool.get('toolkit_name', ''),
         # indexer settings
+        "alita": tool['settings'].get('alita', None),
         "llm": tool['settings'].get('llm', None),
         "pgvector_configuration": tool['settings'].get('pgvector_configuration', {}),
         "collection_name": tool['toolkit_name'],
         "doctype": 'doc',
-        "embedding_model": tool['settings'].get('embedding_configuration', {}).get('name', None),
+        "embedding_model": tool['settings'].get('embedding_model'),
         "vectorstore_type": "PGVector"
     }
     if tool_type == 'ado_plans':

{alita_sdk-0.3.257 → alita_sdk-0.3.258}/alita_sdk/tools/ado/repos/__init__.py

@@ -23,10 +23,9 @@ def _get_toolkit(tool) -> BaseToolkit:
         active_branch=tool['settings'].get('active_branch', ""),
         toolkit_name=tool['settings'].get('toolkit_name', ""),
         pgvector_configuration=tool['settings'].get('pgvector_configuration', {}),
-        collection_name=tool['toolkit_name'],
-        doctype='code',
         embedding_model=tool['settings'].get('embedding_model'),
-        vectorstore_type="PGVector",
+        collection_name=tool['toolkit_name'],
+        alita=tool['settings'].get('alita', None),
     )
 
 def get_toolkit():
@@ -62,11 +61,6 @@ class AzureDevOpsReposToolkit(BaseToolkit):
                     "icon_url": "ado-repos-icon.svg",
                     "categories": ["code repositories"],
                     "extra_categories": ["code", "repository", "version control"],
-                    # "configuration_group": {
-                    #     "name": "ado_repos",
-                    #     "label": "Azure DevOps Repositories",
-                    #     "icon_url": "ado-repos-icon.svg",
-                    # }
                 }}}
         )
 

{alita_sdk-0.3.257 → alita_sdk-0.3.258}/alita_sdk/tools/ado/repos/repos_wrapper.py

@@ -251,15 +251,6 @@ class ReposApiWrapper(BaseCodeToolApiWrapper):
     token: Optional[SecretStr]
     _client: Optional[GitClient] = PrivateAttr()
 
-    llm: 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] = {"model_name": "sentence-transformers/all-MiniLM-L6-v2"}
-    vectorstore_type: Optional[str] = "PGVector"
-
     class Config:
         arbitrary_types_allowed = True
 

{alita_sdk-0.3.257 → alita_sdk-0.3.258}/alita_sdk/tools/ado/test_plan/test_plan_wrapper.py

@@ -16,11 +16,6 @@ from pydantic.fields import FieldInfo as Field
 from ..work_item import AzureDevOpsApiWrapper
 from ...elitea_base import BaseVectorStoreToolApiWrapper, extend_with_vector_tools
 
-try:
-    from alita_sdk.runtime.langchain.interfaces.llm_processor import get_embeddings
-except ImportError:
-    from alita_sdk.langchain.interfaces.llm_processor import get_embeddings
-
 logger = logging.getLogger(__name__)
 
 # Input models for Test Plan operations

{alita_sdk-0.3.257 → alita_sdk-0.3.258}/alita_sdk/tools/ado/wiki/ado_wrapper.py

@@ -17,11 +17,6 @@ from pydantic.fields import Field
 
 from ...elitea_base import BaseVectorStoreToolApiWrapper, extend_with_vector_tools
 
-try:
-    from alita_sdk.runtime.langchain.interfaces.llm_processor import get_embeddings
-except ImportError:
-    from alita_sdk.langchain.interfaces.llm_processor import get_embeddings
-
 logger = logging.getLogger(__name__)
 
 GetWikiInput = create_model(
@@ -68,13 +63,6 @@ class AzureDevOpsApiWrapper(BaseVectorStoreToolApiWrapper):
     _client: Optional[WikiClient] = PrivateAttr()  # Private attribute for the wiki client
     _core_client: Optional[CoreClient] = PrivateAttr()  # Private attribute for the CoreClient client
 
-    llm: Any = None
-    connection_string: Optional[SecretStr] = None
-    collection_name: Optional[str] = None
-    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"
-
     class Config:
         arbitrary_types_allowed = True  # Allow arbitrary types (e.g., WorkItemTrackingClient)
 

{alita_sdk-0.3.257 → alita_sdk-0.3.258}/alita_sdk/tools/base_indexer_toolkit.py

@@ -5,7 +5,6 @@ from typing import Any, Optional, List, Literal, Dict, Generator
 from langchain_core.documents import Document
 from pydantic import create_model, Field, SecretStr
 
-# from alita_sdk.runtime.langchain.interfaces.llm_processor import get_embeddings
 from .utils.content_parser import process_content_by_type
 from .vector_adapters.VectorStoreAdapter import VectorStoreAdapterFactory
 from ..runtime.tools.vectorstore_base import VectorStoreWrapperBase

{alita_sdk-0.3.257 → alita_sdk-0.3.258}/alita_sdk/tools/chunkers/sematic/json_chunker.py

@@ -9,7 +9,7 @@ def json_chunker(file_content_generator: Generator[Document, None, None], config
     for doc in file_content_generator:
         try:
             data_dict = json.loads(doc.page_content)
-            chunks = RecursiveJsonSplitter(max_chunk_size=max_tokens).split_json(json_data=data_dict)
+            chunks = RecursiveJsonSplitter(max_chunk_size=max_tokens).split_json(json_data=data_dict, convert_lists=True)
             if len(chunks) == 1:
                 yield doc
                 continue

{alita_sdk-0.3.257 → alita_sdk-0.3.258}/alita_sdk/tools/xray/__init__.py

@@ -17,9 +17,7 @@ name = "xray_cloud"
 def get_tools(tool):
     return XrayToolkit().get_toolkit(
         selected_tools=tool['settings'].get('selected_tools', []),
-        base_url=tool['settings'].get('base_url', None),
-        client_id=tool['settings'].get('client_id', None),
-        client_secret=tool['settings'].get('client_secret', None),
+        xray_configuration=tool['settings'].get('xray_configuration', {}),
         limit=tool['settings'].get('limit', 20),
         verify_ssl=tool['settings'].get('verify_ssl', True),
         toolkit_name=tool.get('toolkit_name'),
@@ -29,7 +27,6 @@ def get_tools(tool):
         pgvector_configuration=tool['settings'].get('pgvector_configuration', {}),
         embedding_model=tool['settings'].get('embedding_model'),
         collection_name=str(tool['toolkit_name']),
-        vectorstore_type="PGVector"
     ).get_tools()
 
 
@@ -44,7 +41,7 @@ class XrayToolkit(BaseToolkit):
         return create_model(
             name,
             limit=(Optional[int], Field(description="Limit", default=100)),
-            xray_configuration=(Optional[XrayConfiguration], Field(description="Xray Configuration", json_schema_extra={'configuration_types': ['xray']})),
+            xray_configuration=(XrayConfiguration, Field(description="Xray Configuration", json_schema_extra={'configuration_types': ['xray']})),
             pgvector_configuration=(Optional[PgVectorConfiguration], Field(default=None,
                                                                            description="PgVector Configuration",
                                                                            json_schema_extra={
@@ -71,7 +68,7 @@ class XrayToolkit(BaseToolkit):
         wrapper_payload = {
             **kwargs,
             # Use xray_configuration fields
-            **kwargs.get('xray_configuration', {}),
+            **(kwargs.get('xray_configuration') or {}),
             **(kwargs.get('pgvector_configuration') or {}),
         }
         xray_api_wrapper = XrayApiWrapper(**wrapper_payload)

{alita_sdk-0.3.257 → alita_sdk-0.3.258}/alita_sdk/tools/zephyr_enterprise/api_wrapper.py

@@ -1,14 +1,13 @@
 import logging
-from importlib.metadata import metadata
-from operator import ifloordiv
-from typing import Optional, List, Generator
+from typing import Optional, List, Generator, Literal
 
 from langchain_core.tools import ToolException
 from pydantic import create_model, model_validator, PrivateAttr, Field, SecretStr
 
 from langchain_core.documents import Document
 from .zephyr_enterprise import ZephyrClient
-from ..elitea_base import BaseToolApiWrapper, BaseVectorStoreToolApiWrapper, extend_with_vector_tools
+from ..non_code_indexer_toolkit import NonCodeIndexerToolkit
+from ..utils.available_tools_decorator import extend_with_parent_available_tools
 
 logger = logging.getLogger(__name__)
 
@@ -23,7 +22,7 @@ zql_description = """
                     "folder=\"TestToolkit\"", "name~\"TestToolkit5\"
                     """
 
-class ZephyrApiWrapper(BaseVectorStoreToolApiWrapper):
+class ZephyrApiWrapper(NonCodeIndexerToolkit):
     base_url: str
     token: SecretStr
     _client: Optional[ZephyrClient] = PrivateAttr()
@@ -34,7 +33,7 @@ class ZephyrApiWrapper(BaseVectorStoreToolApiWrapper):
         base_url = values.get('base_url')
         token = values.get('token')
         cls._client = ZephyrClient(base_url=base_url, token=token)
-        return values
+        return super().validate_toolkit(values)
 
     def get_test_case(self, testcase_id: str):
 
@@ -153,7 +152,8 @@ class ZephyrApiWrapper(BaseVectorStoreToolApiWrapper):
         Returns a list of fields for index_data args schema.
         """
         return {
-            "zql": (str, Field(description=zql_description, examples=["folder=\"TestToolkit\"", "name~\"TestToolkit5\""]))
+            "zql": (str, Field(description=zql_description, examples=["folder=\"TestToolkit\"", "name~\"TestToolkit5\""])),
+            'chunking_tool': (Literal['json'], Field(description="Name of chunking tool", default='json'))
         }
 
     def _base_loader(self, zql: str, **kwargs) -> Generator[Document, None, None]:
@@ -166,12 +166,17 @@ class ZephyrApiWrapper(BaseVectorStoreToolApiWrapper):
             }
             yield Document(page_content='', metadata=metadata)
 
-    def _process_document(self, document: Document) -> Generator[Document, None, None]:
-        id = document.metadata['id']
-        test_case_content = self.get_test_case_steps(id)
-        document.page_content = test_case_content
-
-    @extend_with_vector_tools
+    def _extend_data(self, documents: Generator[Document, None, None]) -> Generator[Document, None, None]:
+        for document in documents:
+            try:
+                id = document.metadata['id']
+                test_case_content = self.get_test_case_steps(id)
+                document.page_content = test_case_content
+            except Exception as e:
+                logging.error(f"Failed to process document: {e}")
+            yield document
+
+    @extend_with_parent_available_tools
     def get_available_tools(self):
         return [
             {

{alita_sdk-0.3.257 → alita_sdk-0.3.258}/alita_sdk/tools/zephyr_essential/api_wrapper.py

@@ -4,7 +4,6 @@ from typing import Optional, Generator, Literal
 from pydantic import model_validator, create_model, Field, SecretStr, PrivateAttr
 
 from .client import ZephyrEssentialAPI
-from ..elitea_base import extend_with_vector_tools, BaseVectorStoreToolApiWrapper
 from langchain_core.documents import Document
 from langchain_core.tools import ToolException
 
@@ -236,8 +235,7 @@ class ZephyrEssentialApiWrapper(NonCodeIndexerToolkit):
 
     def _index_tool_params(self):
         return {
-            'chunking_tool':(Literal[None, 'json'],
-                           Field(description="Name of chunking tool", default='json'))
+            'chunking_tool':(Literal['json'], Field(description="Name of chunking tool", default='json'))
         }
 
     def _base_loader(self, **kwargs) -> Generator[Document, None, None]:
@@ -258,21 +256,24 @@ class ZephyrEssentialApiWrapper(NonCodeIndexerToolkit):
     def _extend_data(self, documents: Generator[Document, None, None]) -> Generator[Document, None, None]:
         for document in documents:
             try:
-                if document.metadata['type'] and document.metadata['type'] == "TEST_CASE":
+                if 'type' in document.metadata and document.metadata['type'] == "TEST_CASE":
                     additional_content = self._process_test_case(document.metadata['key'])
-                    document.page_content = json.dumps(additional_content)
-            except json.JSONDecodeError as e:
-                logging.error(f"Failed to decode JSON from document: {e}")
+                    for steps_type, content in additional_content.items():
+                        if content:
+                            document.page_content = json.dumps(content)
+                            document.metadata["steps_type"] = steps_type
+            except Exception as e:
+                logging.error(f"Failed to process document: {e}")
             yield document
 
-    def _process_test_case(self, key):
+    def _process_test_case(self, key) -> dict:
         steps = self.get_test_case_test_steps(key)
+        if steps and not isinstance(steps, ToolException):
+            return {"steps": steps}
         script = self.get_test_case_test_script(key)
-        additional_content = {
-            "steps": "" if isinstance(steps, ToolException) else steps,
-            "script": "" if isinstance(script, ToolException) else script,
-        }
-        return additional_content
+        if script and not isinstance(script, ToolException):
+            return {"script": script}
+        return {"empty": ""}
 
     @extend_with_parent_available_tools
     def get_available_tools(self):

{alita_sdk-0.3.257 → alita_sdk-0.3.258}/alita_sdk/tools/zephyr_scale/api_wrapper.py

@@ -1,15 +1,18 @@
 import json
 import logging
 import re
-from typing import Any, Optional, List, Dict, Tuple, Union, Generator
+from typing import Any, Optional, List, Dict, Tuple, Union, Generator, Literal
 
 from pydantic import model_validator, BaseModel, SecretStr
 from langchain_core.tools import ToolException
 from pydantic import create_model, PrivateAttr
 from pydantic.fields import Field
 
-from ..elitea_base import BaseVectorStoreToolApiWrapper, BaseIndexParams, extend_with_vector_tools
 from langchain_core.documents import Document
+
+from ..non_code_indexer_toolkit import NonCodeIndexerToolkit
+from ..utils.available_tools_decorator import extend_with_parent_available_tools
+
 try:
     from alita_sdk.runtime.langchain.interfaces.llm_processor import get_embeddings
 except ImportError:
@@ -249,7 +252,7 @@ ZephyrUpdateTestSteps = create_model(
 )
 
 
-class ZephyrScaleApiWrapper(BaseVectorStoreToolApiWrapper):
+class ZephyrScaleApiWrapper(NonCodeIndexerToolkit):
     # url for a Zephyr server
     base_url: Optional[str] = ""
     # auth with Jira token (cloud & server)
@@ -296,7 +299,7 @@ class ZephyrScaleApiWrapper(BaseVectorStoreToolApiWrapper):
         # else:
         # Cloud version is enabled for now
         cls._api = ZephyrScale(token=values['token']).api
-        return values
+        return super().validate_toolkit(values)
 
     def get_tests(self, project_key: str = None, folder_id: str = None, maxResults: Optional[int] = 10, startAt: Optional[int] = 0):
         """Retrieves all test cases. Query parameters can be used to filter the results.
@@ -1210,7 +1213,8 @@ class ZephyrScaleApiWrapper(BaseVectorStoreToolApiWrapper):
         
             Example:
                 'folder = "Authentication" AND label in ("Smoke", "Critical") AND text ~ "login" AND orderBy = "name" AND orderDirection = "ASC"'
-            """))
+            """)),
+            'chunking_tool': (Literal['json'], Field(description="Name of chunking tool", default='json'))
         }
 
     def _base_loader(self, project_key: str, jql: str, **kwargs) -> Generator[Document, None, None]:
@@ -1250,8 +1254,8 @@ class ZephyrScaleApiWrapper(BaseVectorStoreToolApiWrapper):
             for key, value in folder.items():
                 if value is not None:
                     metadata[key] = value
-            page_content['type'] = "FOLDER"
-            yield Document(page_content=json.dumps(page_content), metadata=metadata)
+            metadata['type'] = "FOLDER"
+            yield Document(page_content="", metadata=metadata)
 
     def _get_test_cases_docs(self, project_key: str, jql: str) -> Generator[Document, None, None]:
         try:
@@ -1269,31 +1273,31 @@ class ZephyrScaleApiWrapper(BaseVectorStoreToolApiWrapper):
                 metadata['updated_on'] = last_version['createdOn']
             else:
                 metadata['updated_on'] = case['createdOn']
+            metadata['type'] = "TEST_CASE"
 
-            case['type'] = "TEST_CASE"
-
-            yield Document(page_content=json.dumps(case), metadata=metadata)
-
-    def _process_document(self, document: Document) -> Generator[Document, None, None]:
-        try:
-            base_data = json.loads(document.page_content)
-
-            if base_data['type'] and base_data['type'] == "TEST_CASE":
-                additional_content = self._process_test_case(base_data)
-                base_data['test_case_content'] = additional_content
+            yield Document(page_content="", metadata=metadata)
 
-            document.page_content = json.dumps(base_data)
-        except json.JSONDecodeError as e:
-            raise ToolException(f"Failed to decode JSON from document: {e}")
-
-    def _process_test_case(self, case):
-        steps = self.get_test_steps(case['key'], return_list=True)
-        script = self.get_test_script(case['key'], return_only_script=True)
-        additional_content = {
-            "steps": "" if isinstance(steps, ToolException) else steps,
-            "script": "" if isinstance(script, ToolException) else script,
-        }
-        return additional_content
+    def _extend_data(self, documents: Generator[Document, None, None]) -> Generator[Document, None, None]:
+        for document in documents:
+            try:
+                if 'type' in document.metadata and document.metadata['type'] == "TEST_CASE":
+                    additional_content = self._process_test_case(document.metadata['key'])
+                    for steps_type, content in additional_content.items():
+                        if content:
+                            document.page_content = json.dumps(content)
+                            document.metadata["steps_type"] = steps_type
+            except Exception as e:
+                logging.error(f"Failed to process document: {e}")
+            yield document
+
+    def _process_test_case(self, key):
+        steps = self.get_test_steps(key, return_list=True)
+        if steps and not isinstance(steps, ToolException):
+            return {"steps": steps}
+        script = self.get_test_script(key, return_only_script=True)
+        if script and not isinstance(script, ToolException):
+            return {"script": script}
+        return {"empty": ""}
 
     def get_tests_recursive(self, project_key: str = None, folder_id: str = None, maxResults: Optional[int] = 100, startAt: Optional[int] = 0):
         """Retrieves all test cases recursively from a folder and all its subfolders.
@@ -1552,7 +1556,7 @@ class ZephyrScaleApiWrapper(BaseVectorStoreToolApiWrapper):
         except Exception as e:
             return ToolException(f"Error updating test steps for test case {test_case_key}: {str(e)}")
 
-    @extend_with_vector_tools
+    @extend_with_parent_available_tools
     def get_available_tools(self):
         return [
             {

{alita_sdk-0.3.257 → alita_sdk-0.3.258}/alita_sdk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: alita_sdk
-Version: 0.3.257
+Version: 0.3.258
 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.257 → alita_sdk-0.3.258}/pyproject.toml

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