alita-sdk 0.3.375__tar.gz → 0.3.376__tar.gz

{alita_sdk-0.3.375 → alita_sdk-0.3.376}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: alita_sdk
-Version: 0.3.375
+Version: 0.3.376
 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 <lifedj27@gmail.com>, Artem Dubrovskiy <ad13box@gmail.com>
 License-Expression: Apache-2.0

{alita_sdk-0.3.375 → alita_sdk-0.3.376}/alita_sdk/runtime/langchain/assistant.py

@@ -137,11 +137,9 @@ class Assistant:
     def runnable(self):
         if self.app_type == 'pipeline':
             return self.pipeline()
-        elif self.app_type == 'openai':
-            return self.getOpenAIToolsAgentExecutor()
         elif self.app_type == 'xml':
             return self.getXMLAgentExecutor()
-        elif self.app_type in ['predict', 'react']:
+        elif self.app_type in ['predict', 'react', 'openai']:
             return self.getLangGraphReactAgent()
         else:
             self.tools = [EchoTool()] + self.tools
@@ -241,6 +239,10 @@ class Assistant:
         # Only use prompt_instructions if explicitly specified (for predict app_type)
         if self.app_type == "predict" and isinstance(self.prompt, str):
             prompt_instructions = self.prompt
+
+        # take the system message from the openai prompt as a prompt instructions
+        if self.app_type == "openai" and hasattr(self.prompt, 'messages'):
+            prompt_instructions = self.__take_prompt_from_openai_messages()
         
         # Create a unified YAML schema with conditional tool binding
         # Build the base node configuration
@@ -341,3 +343,14 @@ class Assistant:
 
     def predict(self, messages: list[BaseMessage]):
         return self.client.invoke(messages)
+
+    def __take_prompt_from_openai_messages(self):
+        if self.prompt and self.prompt.messages:
+            for message in self.prompt.messages:
+                # we don't need any message placeholder from the openai agent prompt
+                if hasattr(message, 'variable_name'):
+                    continue
+                # take only the content of the system message from the openai prompt
+                if isinstance(message, SystemMessage):
+                    return message.content
+        return None

{alita_sdk-0.3.375 → alita_sdk-0.3.376}/alita_sdk/runtime/langchain/langraph_agent.py

@@ -780,7 +780,10 @@ class LangGraphAgentRunnable(CompiledStateGraph):
         
         # Append current input to existing messages instead of overwriting
         if input.get('input'):
-            current_message = input.get('input')[-1]
+            if isinstance(input['input'], str):
+                current_message = input['input']
+            else:
+                current_message = input.get('input')[-1]
             # TODO: add handler after we add 2+ inputs (filterByType, etc.)
             input['input'] = current_message if isinstance(current_message, str) else str(current_message)
             if input.get('messages'):

{alita_sdk-0.3.375 → alita_sdk-0.3.376}/alita_sdk/runtime/tools/function.py

@@ -41,14 +41,21 @@ class FunctionTool(BaseTool):
         # add classes related to sandbox client
         # read the content of alita_sdk/runtime/cliens/sandbox_client.py
         try:
-            with open('alita_sdk/runtime/clients/sandbox_client.py', 'r') as f:
+            import os
+            from pathlib import Path
+
+            # Get the directory of the current file and construct the path to sandbox_client.py
+            current_dir = Path(__file__).parent
+            sandbox_client_path = current_dir.parent / 'clients' / 'sandbox_client.py'
+
+            with open(sandbox_client_path, 'r') as f:
                 sandbox_client_code = f.read()
             pyodide_predata += f"\n{sandbox_client_code}\n"
             pyodide_predata += (f"alita_client = SandboxClient(base_url='{self.alita_client.base_url}',"
                                 f"project_id={self.alita_client.project_id},"
                                 f"auth_token='{self.alita_client.auth_token}')")
         except FileNotFoundError:
-            logger.error("sandbox_client.py not found. Ensure 'alita_sdk/runtime/clients/sandbox_client.py' exists.")
+            logger.error(f"sandbox_client.py not found at {sandbox_client_path}. Ensure the file exists.")
         return pyodide_predata
 
     def _handle_pyodide_output(self, tool_result: Any) -> dict:
@@ -71,8 +78,14 @@ class FunctionTool(BaseTool):
             # execute code tool and update state variables
             try:
                 result_value = tool_result.get('result', {})
-                tool_result_converted.update(result_value if isinstance(result_value, dict)
-                                           else json.loads(result_value))
+                if isinstance(result_value, dict):
+                    tool_result_converted.update(result_value)
+                elif isinstance(result_value, list):
+                    # Handle list case - could wrap in a key or handle differently based on requirements
+                    tool_result_converted.update({"result": result_value})
+                else:
+                    # Handle JSON string case
+                    tool_result_converted.update(json.loads(result_value))
             except json.JSONDecodeError:
                 logger.error(f"JSONDecodeError: {tool_result}")
 

{alita_sdk-0.3.375 → alita_sdk-0.3.376}/alita_sdk/runtime/tools/vectorstore.py

@@ -215,7 +215,7 @@ class VectorStoreWrapper(BaseToolApiWrapper):
         """List all collections in the vectorstore.
         Returns a list of collection names, or if no collections exist,
         returns a dict with an empty list and a message."""
-        raw = self.vector_adapter.list_collections(self)
+        raw = self.vector_adapter.list_indexes(self)
         # Normalize raw result to a list of names
         if not raw:
             # No collections found

{alita_sdk-0.3.375 → alita_sdk-0.3.376}/alita_sdk/runtime/tools/vectorstore_base.py

@@ -208,10 +208,10 @@ class VectorStoreWrapperBase(BaseToolApiWrapper):
             logger.error(f"Error during similarity search: {str(e)}")
             raise ToolException(f"Search failed: {str(e)}")
 
-    def list_collections(self) -> List[str]:
+    def list_indexes(self) -> List[str]:
         """List all collections in the vectorstore."""
 
-        collections = self.vector_adapter.list_collections(self)
+        collections = self.vector_adapter.list_indexes(self)
         if not collections:
             return "No indexed collections"
         return collections

{alita_sdk-0.3.375 → alita_sdk-0.3.376}/alita_sdk/tools/base_indexer_toolkit.py

@@ -343,7 +343,7 @@ class BaseIndexerToolkit(VectorStoreWrapperBase):
         """Cleans the indexed data in the collection."""
         super()._clean_collection(index_name=index_name)
         return (f"Collection '{index_name}' has been removed from the vector store.\n"
-                f"Available collections: {self.list_collections()}") if index_name \
+                f"Available collections: {self.list_indexes()}") if index_name \
             else "All collections have been removed from the vector store." 
 
     def _build_collection_filter(self, filter: dict | str, index_name: str = "") -> dict:
@@ -385,7 +385,7 @@ class BaseIndexerToolkit(VectorStoreWrapperBase):
         """ Searches indexed documents in the vector store."""
         # build filter on top of index_name
 
-        available_collections = super().list_collections()
+        available_collections = super().list_indexes()
         if index_name and index_name not in available_collections:
             return f"Collection '{index_name}' not found. Available collections: {available_collections}"
 
@@ -547,10 +547,10 @@ class BaseIndexerToolkit(VectorStoreWrapperBase):
                 "args_schema": RemoveIndexParams
             },
             {
-                "name": "list_collections",
-                "mode": "list_collections",
-                "ref": self.list_collections,
-                "description": self.list_collections.__doc__,
+                "name": "list_indexes",
+                "mode": "list_indexes",
+                "ref": self.list_indexes,
+                "description": self.list_indexes.__doc__,
                 "args_schema": create_model("ListCollectionsParams")  # No parameters
             },
         ]

{alita_sdk-0.3.375 → alita_sdk-0.3.376}/alita_sdk/tools/elitea_base.py

@@ -17,7 +17,7 @@ from ..runtime.utils.utils import IndexerKeywords
 
 logger = logging.getLogger(__name__)
 
-INDEX_TOOL_NAMES = ['index_data', 'remove_index', 'list_collections', 'search_index', 'stepback_search_index',
+INDEX_TOOL_NAMES = ['index_data', 'remove_index', 'list_indexes', 'search_index', 'stepback_search_index',
                             'stepback_summary_index']
 
 LoaderSchema = create_model(
@@ -403,9 +403,9 @@ class BaseVectorStoreToolApiWrapper(BaseToolApiWrapper):
         """Cleans the indexed data in the collection."""
         self._init_vector_store()._clean_collection(index_name=index_name)
         return (f"Collection '{index_name}' has been removed from the vector store.\n"
-                f"Available collections: {self.list_collections()}")
+                f"Available collections: {self.list_indexes()}")
 
-    def list_collections(self):
+    def list_indexes(self):
         """Lists all collections in the vector store."""
         vectorstore_wrapper = self._init_vector_store()
         return vectorstore_wrapper.list_collections()
@@ -538,9 +538,9 @@ class BaseVectorStoreToolApiWrapper(BaseToolApiWrapper):
             },
             {
                 "name": "list_indexes",
-                "mode": "list_collections",
-                "ref": self.list_collections,
-                "description": self.list_collections.__doc__,
+                "mode": "list_indexes",
+                "ref": self.list_indexes,
+                "description": self.list_indexes.__doc__,
                 "args_schema": create_model("ListCollectionsParams")  # No parameters
             },
 

{alita_sdk-0.3.375 → alita_sdk-0.3.376}/alita_sdk/tools/vector_adapters/VectorStoreAdapter.py

@@ -307,7 +307,7 @@ class ChromaAdapter(VectorStoreAdapter):
 
     def list_collections(self, vectorstore_wrapper) -> str:
         vector_client = vectorstore_wrapper.vectorstore._client
-        return ','.join([collection.name for collection in vector_client.list_collections()])
+        return ','.join([collection.name for collection in vector_client.list_indexes()])
 
     def remove_collection(self, vectorstore_wrapper, collection_name: str):
         vectorstore_wrapper.vectorstore.delete_collection()

{alita_sdk-0.3.375 → alita_sdk-0.3.376}/alita_sdk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: alita_sdk
-Version: 0.3.375
+Version: 0.3.376
 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 <lifedj27@gmail.com>, Artem Dubrovskiy <ad13box@gmail.com>
 License-Expression: Apache-2.0

{alita_sdk-0.3.375 → alita_sdk-0.3.376}/pyproject.toml

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