alita-sdk 0.3.462__py3-none-any.whl → 0.3.627__py3-none-any.whl

alita_sdk/runtime/toolkits/vectorstore.py

@@ -1,7 +1,7 @@
 from logging import getLogger
 from typing import Any, List, Literal, Optional
 
-from alita_sdk.tools.utils import clean_string, TOOLKIT_SPLITTER
+from alita_sdk.tools.utils import clean_string
 from pydantic import BaseModel, create_model, Field, ConfigDict
 from langchain_core.tools import BaseToolkit, BaseTool
 from alita_sdk.tools.base.tool import BaseAction
@@ -31,7 +31,8 @@ class VectorStoreToolkit(BaseToolkit):
                     toolkit_name: Optional[str] = None,
                     selected_tools: list[str] = []):
         logger.info("Selected tools: %s", selected_tools)
-        prefix = clean_string(toolkit_name) + TOOLKIT_SPLITTER if toolkit_name else ''
+        # Use clean toolkit name for context (max 1000 chars in description)
+        toolkit_context = f" [Toolkit: {clean_string(toolkit_name)}]" if toolkit_name else ''
         if selected_tools is None:
             selected_tools = []
         tools = []
@@ -46,11 +47,16 @@ class VectorStoreToolkit(BaseToolkit):
             # if selected_tools:
             #     if tool["name"] not in selected_tools:
             #         continue
+            # Add toolkit context to description with character limit
+            description = tool["description"]
+            if toolkit_context and len(description + toolkit_context) <= 1000:
+                description = description + toolkit_context
             tools.append(BaseAction(
                 api_wrapper=vectorstore_wrapper,
-                name=f'{prefix}{tool["name"]}',
-                description=tool["description"],
-                args_schema=tool["args_schema"]
+                name=tool["name"],
+                description=description,
+                args_schema=tool["args_schema"],
+                metadata={"toolkit_name": toolkit_name, "toolkit_type": "vectorstore"} if toolkit_name else {}
             ))
         return cls(tools=tools)
 

alita_sdk/runtime/tools/__init__.py

@@ -10,6 +10,7 @@ from .image_generation import (
     create_image_generation_tool,
     ImageGenerationToolkit
 )
+from .skill_router import SkillRouterWrapper
 
 __all__ = [
     "PyodideSandboxTool",
@@ -18,5 +19,6 @@ __all__ = [
     "EchoTool",
     "ImageGenerationTool",
     "ImageGenerationToolkit",
-    "create_image_generation_tool"
+    "create_image_generation_tool",
+    "SkillRouterWrapper"
 ]

alita_sdk/runtime/tools/application.py

@@ -4,7 +4,7 @@ from ..utils.utils import clean_string
 from langchain_core.tools import BaseTool, ToolException
 from langchain_core.messages import BaseMessage, AIMessage, HumanMessage
 from typing import Any, Type, Optional
-from pydantic import create_model, field_validator, BaseModel
+from pydantic import create_model, model_validator, BaseModel
 from pydantic.fields import FieldInfo
 from ..langchain.mixedAgentRenderes import convert_message_to_json
 from logging import getLogger
@@ -41,8 +41,7 @@ def formulate_query(kwargs):
         if key not in ("task", "chat_history"):
             result[key] = value
     return result
-    
-    
+
 
 class Application(BaseTool):
     name: str
@@ -52,11 +51,24 @@ class Application(BaseTool):
     return_type: str = "str"
     client: Any
     args_runnable: dict = {}
+    metadata: dict = {}
+    is_subgraph: Optional[bool] = False
     
-    @field_validator('name', mode='before')
+    @model_validator(mode='before')
     @classmethod
-    def remove_spaces(cls, v):
-        return clean_string(v)
+    def preserve_original_name(cls, data: Any) -> Any:
+        """Preserve the original name in metadata before cleaning."""
+        if isinstance(data, dict):
+            original_name = data.get('name')
+            if original_name:
+                # Initialize metadata if not present
+                if data.get('metadata') is None:
+                    data['metadata'] = {}
+                # Store original name before cleaning
+                data['metadata']['original_name'] = original_name
+                # Clean the name
+                data['name'] = clean_string(original_name)
+        return data
 
     def invoke(self, input: Any, config: Optional[dict] = None, **kwargs: Any) -> Any:
         """Override default invoke to preserve all fields, not just args_schema"""
@@ -74,6 +86,8 @@ class Application(BaseTool):
             application_variables = {k: {"name": k, "value": v} for k, v in kwargs.items()}
             self.application = self.client.application(**self.args_runnable, application_variables=application_variables)
         response = self.application.invoke(formulate_query(kwargs))
+        if self.is_subgraph:
+            return response
         if self.return_type == "str":
             return response["output"]
         else: