alita-sdk 0.3.258__py3-none-any.whl → 0.3.260__py3-none-any.whl

alita_sdk/runtime/toolkits/tools.py

@@ -72,7 +72,7 @@ def get_tools(tools_list: list, alita_client, llm, memory_store: BaseStore = Non
                 bucket=tool['settings']['bucket'],
                 toolkit_name=tool.get('toolkit_name', ''),
                 selected_tools=tool['settings'].get('selected_tools', []),
-                llm=tool['settings'].get('llm'),
+                llm=llm,
                 # indexer settings
                 connection_string=tool['settings'].get('connection_string', None),
                 collection_name=tool.get('toolkit_name'),

alita_sdk/runtime/tools/artifact.py

@@ -9,11 +9,6 @@ from pydantic import create_model, Field, model_validator
 
 from alita_sdk.tools.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
-
 class ArtifactWrapper(BaseVectorStoreToolApiWrapper):
     bucket: str
     artifact: Optional[Any] = None

alita_sdk/runtime/tools/vectorstore_base.py

@@ -133,7 +133,6 @@ How did you come up with the answer?
 class VectorStoreWrapperBase(BaseToolApiWrapper):
     llm: Any
     embedding_model: str
-    embedding_model_params: dict
     vectorstore_type: str
     vectorstore_params: dict
     max_docs_per_add: int = 100
@@ -158,13 +157,11 @@ class VectorStoreWrapperBase(BaseToolApiWrapper):
             raise ValueError("Embedding model is required.")
         if not values.get('vectorstore_params'):
             raise ValueError("Vectorstore parameters are required.")
-        if not values.get('embedding_model_params'):
-            raise ValueError("Embedding model parameters are required.")
         values["dataset"] = values.get('vectorstore_params').get('collection_name')
         if not values["dataset"]:
             raise ValueError("Collection name is required.")
         if not values.get('embeddings'):
-            values['embeddings'] = get_embeddings(values['embedding_model'], values['embedding_model_params'])
+            values['embeddings'] = values['alita'].get_embeddings(values['embedding_model'])
         values['vectorstore'] = get_vectorstore(values['vectorstore_type'], values['vectorstore_params'], embedding_func=values['embeddings'])
         values['vectoradapter'] = VectorAdapter(
             vectorstore=values['vectorstore'],

alita_sdk/tools/base_indexer_toolkit.py

@@ -16,7 +16,6 @@ logger = logging.getLogger(__name__)
 BaseIndexParams = create_model(
     "BaseIndexParams",
     collection_suffix=(str, Field(description="Suffix for collection name (max 7 characters) used to separate datasets", min_length=1, max_length=7)),
-    vectorstore_type=(Optional[str], Field(description="Vectorstore type (Chroma, PGVector, Elastic, etc.)", default="PGVector")),
 )
 
 RemoveIndexParams = create_model(
@@ -30,7 +29,6 @@ BaseSearchParams = create_model(
     collection_suffix=(Optional[str], Field(
         description="Optional suffix for collection name (max 7 characters). Leave empty to search across all datasets",
         default="", max_length=7)),
-    vectorstore_type=(Optional[str], Field(description="Vectorstore type (Chroma, PGVector, Elastic, etc.)", default="PGVector")),
     filter=(Optional[dict | str], Field(
         description="Filter to apply to the search results. Can be a dictionary or a JSON string.",
         default={},
@@ -60,7 +58,6 @@ BaseStepbackSearchParams = create_model(
     "BaseStepbackSearchParams",
     query=(str, Field(description="Query text to search in the index")),
     collection_suffix=(Optional[str], Field(description="Optional suffix for collection name (max 7 characters)", default="", max_length=7)),
-    vectorstore_type=(Optional[str], Field(description="Vectorstore type (Chroma, PGVector, Elastic, etc.)", default="PGVector")),
     messages=(Optional[List], Field(description="Chat messages for stepback search context", default=[])),
     filter=(Optional[dict | str], Field(
         description="Filter to apply to the search results. Can be a dictionary or a JSON string.",
@@ -107,7 +104,6 @@ class BaseIndexerToolkit(VectorStoreWrapperBase):
     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"
     _embedding: Optional[Any] = None
     alita: Any = None # Elitea client, if available
@@ -117,10 +113,8 @@ class BaseIndexerToolkit(VectorStoreWrapperBase):
         connection_string = conn.get_secret_value() if isinstance(conn, SecretStr) else conn
         collection_name = kwargs.get('collection_name')
         
-        # if 'embedding_model' not in kwargs:
-        kwargs['embedding_model'] = 'HuggingFaceEmbeddings'
-        if 'embedding_model_params' not in kwargs:
-            kwargs['embedding_model_params'] = {"model_name": "sentence-transformers/all-MiniLM-L6-v2"}
+        if 'embedding_model' not in kwargs:
+            kwargs['embedding_model'] = 'HuggingFaceEmbeddings'
         if 'vectorstore_type' not in kwargs:
             kwargs['vectorstore_type'] = 'PGVector'
         vectorstore_type = kwargs.get('vectorstore_type')
@@ -257,6 +251,16 @@ class BaseIndexerToolkit(VectorStoreWrapperBase):
         return (f"Collection '{collection_suffix}' has been removed from the vector store.\n"
                 f"Available collections: {self.list_collections()}")
 
+    def _build_collection_filter(self, filter: dict | str, collection_suffix: str = "") -> dict:
+        """Builds a filter for the collection based on the provided suffix."""
+
+        filter = filter if isinstance(filter, dict) else json.loads(filter)
+        if collection_suffix:
+            filter.update({"collection": {
+                "$eq": collection_suffix.strip()
+            }})
+        return filter
+
     def search_index(self,
                      query: str,
                      collection_suffix: str = "",
@@ -268,12 +272,7 @@ class BaseIndexerToolkit(VectorStoreWrapperBase):
                      **kwargs):
         """ Searches indexed documents in the vector store."""
         # build filter on top of collection_suffix
-        filter = filter if isinstance(filter, dict) else json.loads(filter)
-        if collection_suffix:
-            filter.update({"collection": {
-                "$eq": collection_suffix.strip()
-            }})
-
+        filter = self._build_collection_filter(filter, collection_suffix)
         found_docs = super().search_documents(
             query,
             doctype=self.doctype,
@@ -298,6 +297,7 @@ class BaseIndexerToolkit(VectorStoreWrapperBase):
                      extended_search: Optional[List[str]] = None,
                      **kwargs):
         """ Searches indexed documents in the vector store."""
+        filter = self._build_collection_filter(filter, collection_suffix)
         found_docs = super().stepback_search(
             query,
             messages,
@@ -322,6 +322,8 @@ class BaseIndexerToolkit(VectorStoreWrapperBase):
                      extended_search: Optional[List[str]] = None,
                      **kwargs):
         """ Generates a summary of indexed documents using stepback technique."""
+
+        filter = self._build_collection_filter(filter, collection_suffix)
         return super().stepback_summary(
             query, 
             messages, 

{alita_sdk-0.3.258.dist-info → alita_sdk-0.3.260.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: alita_sdk
-Version: 0.3.258
+Version: 0.3.260
 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.258.dist-info → alita_sdk-0.3.260.dist-info}/RECORD

@@ -88,12 +88,12 @@ alita_sdk/runtime/toolkits/configurations.py,sha256=kIDAlnryPQfbZyFxV-9SzN2-Vefz
 alita_sdk/runtime/toolkits/datasource.py,sha256=qk78OdPoReYPCWwahfkKLbKc4pfsu-061oXRryFLP6I,2498
 alita_sdk/runtime/toolkits/prompt.py,sha256=WIpTkkVYWqIqOWR_LlSWz3ug8uO9tm5jJ7aZYdiGRn0,1192
 alita_sdk/runtime/toolkits/subgraph.py,sha256=ZYqI4yVLbEPAjCR8dpXbjbL2ipX598Hk3fL6AgaqFD4,1758
-alita_sdk/runtime/toolkits/tools.py,sha256=o_l2Md1Z0dRoBdt5jN4GTQkwcbCPTAOr0_J7hhTyo2s,8023
+alita_sdk/runtime/toolkits/tools.py,sha256=kOoWkG3MQtphc7WHqtbf7WTTZ1e-kjmlrdjcAEeoHnw,7999
 alita_sdk/runtime/toolkits/vectorstore.py,sha256=BGppQADa1ZiLO17fC0uCACTTEvPHlodEDYEzUcBRbAA,2901
 alita_sdk/runtime/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 alita_sdk/runtime/tools/agent.py,sha256=m98QxOHwnCRTT9j18Olbb5UPS8-ZGeQaGiUyZJSyFck,3162
 alita_sdk/runtime/tools/application.py,sha256=mC2_ZFx4WLHc98Gzll88Vw6cqyx2cmbig2IeJBtHRdg,2836
-alita_sdk/runtime/tools/artifact.py,sha256=WpSGvGzypa5MShOv0qRC6ncEyhIzxTlR8jab5HkPDyA,8803
+alita_sdk/runtime/tools/artifact.py,sha256=zm7Yo7uItxxZ8kX19xki0FA5TwP4f764rN32AXC3kiU,8617
 alita_sdk/runtime/tools/datasource.py,sha256=pvbaSfI-ThQQnjHG-QhYNSTYRnZB0rYtZFpjCfpzxYI,2443
 alita_sdk/runtime/tools/echo.py,sha256=spw9eCweXzixJqHnZofHE1yWiSUa04L4VKycf3KCEaM,486
 alita_sdk/runtime/tools/function.py,sha256=ZFpd7TGwIawze2e7BHlKwP0NHwNw42wwrmmnXyJQJhk,2600
@@ -107,7 +107,7 @@ alita_sdk/runtime/tools/prompt.py,sha256=nJafb_e5aOM1Rr3qGFCR-SKziU9uCsiP2okIMs9
 alita_sdk/runtime/tools/router.py,sha256=wCvZjVkdXK9dMMeEerrgKf5M790RudH68pDortnHSz0,1517
 alita_sdk/runtime/tools/tool.py,sha256=lE1hGi6qOAXG7qxtqxarD_XMQqTghdywf261DZawwno,5631
 alita_sdk/runtime/tools/vectorstore.py,sha256=yl6FKJGVQDevftSkxWTkMbqjIskIFz69vXELdEGp9u4,34780
-alita_sdk/runtime/tools/vectorstore_base.py,sha256=HFaNk_oBoeZWrQWBrvEsozajHqwjWxsV6RigkQyq-eQ,27586
+alita_sdk/runtime/tools/vectorstore_base.py,sha256=Ko-82amS4mBoJqX-v6h-iUrQ5LNzMvM978q2i8TcfVw,27409
 alita_sdk/runtime/utils/AlitaCallback.py,sha256=E4LlSBuCHWiUq6W7IZExERHZY0qcmdjzc_rJlF2iQIw,7356
 alita_sdk/runtime/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 alita_sdk/runtime/utils/constants.py,sha256=Xntx1b_uxUzT4clwqHA_U6K8y5bBqf_4lSQwXdcWrp4,13586
@@ -119,7 +119,7 @@ alita_sdk/runtime/utils/toolkit_runtime.py,sha256=MU63Fpxj0b5_r1IUUc0Q3-PN9VwL7r
 alita_sdk/runtime/utils/toolkit_utils.py,sha256=I9QFqnaqfVgN26LUr6s3XlBlG6y0CoHURnCzG7XcwVs,5311
 alita_sdk/runtime/utils/utils.py,sha256=CpEl3LCeLbhzQySz08lkKPm7Auac6IiLF7WB8wmArMI,589
 alita_sdk/tools/__init__.py,sha256=ko5TToGYZFmBrho26DRAVvrkHWxQ2sfs8gVAASinYp8,10611
-alita_sdk/tools/base_indexer_toolkit.py,sha256=mfPo2iWhfHg-ihMC59nCf9XTomCPqPmKAudGkbpgBSE,18193
+alita_sdk/tools/base_indexer_toolkit.py,sha256=UVaTzYkWEvH9LLTaxOEOUtU98CAhcXko9uvFZjhRYd0,17957
 alita_sdk/tools/elitea_base.py,sha256=PfelIUb5YFTjDN_1jNYT9tJbjfYr11PAUrPQHyW2d5I,32830
 alita_sdk/tools/non_code_indexer_toolkit.py,sha256=v9uq1POE1fQKCd152mbqDtF-HSe0qoDj83k4E5LAkMI,1080
 alita_sdk/tools/ado/__init__.py,sha256=u2tdDgufGuDb-7lIgKKQlqgStL9Wd1gzNmRNYems2c0,1267
@@ -336,8 +336,8 @@ alita_sdk/tools/zephyr_scale/api_wrapper.py,sha256=HOt9ShtJI_1tVPcwd3Rwk-VS0SMLq
 alita_sdk/tools/zephyr_squad/__init__.py,sha256=0AI_j27xVO5Gk5HQMFrqPTd4uvuVTpiZUicBrdfEpKg,2796
 alita_sdk/tools/zephyr_squad/api_wrapper.py,sha256=kmw_xol8YIYFplBLWTqP_VKPRhL_1ItDD0_vXTe_UuI,14906
 alita_sdk/tools/zephyr_squad/zephyr_squad_cloud_client.py,sha256=R371waHsms4sllHCbijKYs90C-9Yu0sSR3N4SUfQOgU,5066
-alita_sdk-0.3.258.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-alita_sdk-0.3.258.dist-info/METADATA,sha256=2j5Uqki3lIbS41bXwlA4RiIVvtsBROzSHIoisJhN1gc,18897
-alita_sdk-0.3.258.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-alita_sdk-0.3.258.dist-info/top_level.txt,sha256=0vJYy5p_jK6AwVb1aqXr7Kgqgk3WDtQ6t5C-XI9zkmg,10
-alita_sdk-0.3.258.dist-info/RECORD,,
+alita_sdk-0.3.260.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+alita_sdk-0.3.260.dist-info/METADATA,sha256=dRh-jEpVK5p3pK7KvE4h_JEX6qfMkaHe8F4NkOdHs8c,18897
+alita_sdk-0.3.260.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+alita_sdk-0.3.260.dist-info/top_level.txt,sha256=0vJYy5p_jK6AwVb1aqXr7Kgqgk3WDtQ6t5C-XI9zkmg,10
+alita_sdk-0.3.260.dist-info/RECORD,,