xpander-sdk 2.0.218__py3-none-any.whl → 2.0.220__py3-none-any.whl

xpander_sdk/models/orchestrations.py

@@ -5,7 +5,7 @@ including various node types, execution strategies, and control flow conditions.
 """
 
 from enum import Enum
-from typing import Dict, List, Literal, Optional, Union
+from typing import Any, Dict, List, Literal, Optional, Union
 from uuid import uuid4
 
 from pydantic import Field
@@ -45,6 +45,17 @@ class OrchestrationNodeType(str, Enum):
     Summarizer = "summarizer"
     SendToEnd = "send_to_end"
 
+class OrchestrationPointerNodeInstructionsMode(str, Enum):
+    """Modes for instruction usage in pointer node.
+
+    Attributes:
+        Replace: Replaces the traget asset instructions.
+        Append: Appends to the traget asset instructions.
+    """
+
+    Replace = "replace"
+    Append = "append"
+
 class OrchestrationConditionType(str, Enum):
     """Types of conditions for orchestration control flow.
 
@@ -52,11 +63,26 @@ class OrchestrationConditionType(str, Enum):
         Regex: Condition based on regular expression matching.
         Contains: Condition based on substring containment.
         Else: Fallback condition that always matches (executed when no other conditions match).
+        Equal: Condition based on equality comparison (path == value).
+        NotEqual: Condition based on inequality comparison (path != value).
+        GreaterThan: Condition based on greater than comparison (path > value).
+        LessThan: Condition based on less than comparison (path < value).
+        GreaterThanOrEqual: Condition based on greater than or equal comparison (path >= value).
+        LessThanOrEqual: Condition based on less than or equal comparison (path <= value).
+        NotEmpty: Condition that checks if a path value is not empty/null.
     """
 
     Regex = "regex"
     Contains = "contains"
     Else = "else"
+    # Classic comparison operators
+    Equal = "equal"
+    NotEqual = "not_equal"
+    GreaterThan = "gt"
+    LessThan = "lt"
+    GreaterThanOrEqual = "gte"
+    LessThanOrEqual = "lte"
+    NotEmpty = "not_empty"
 
 class OrchestrationWaitNodeType(str, Enum):
     """Types of wait nodes in orchestration workflows.
@@ -73,15 +99,21 @@ class OrchestrationCondition(XPanderSharedModel):
     """Condition for controlling orchestration flow.
 
     Attributes:
-        type: Type of condition (regex, contains, or else).
-        term: The pattern or string to match against. Optional for 'else' type.
+        type: Type of condition (regex, contains, else, or comparison operators).
+        term: The pattern or string to match against. Used for 'regex' and 'contains' types.
         group_id: Optional group ID for group-based classifier routing.
                  When set, routing matches by group ID instead of term matching.
+        path: Path to extract value from input data (e.g., "input.client_id" or "client_id").
+              Used for comparison operators (equal, not_equal, gt, lt, gte, lte, not_empty).
+        value: Value to compare against. Used with comparison operators.
+               Not required for 'not_empty' type.
     """
 
     type: OrchestrationConditionType
     term: Optional[str] = None
     group_id: Optional[str] = None
+    path: Optional[str] = None
+    value: Optional[Any] = None
 
 class OrchestrationRetryStrategy(XPanderSharedModel):
     """Strategy for retrying failed orchestration nodes.
@@ -165,6 +197,7 @@ class OrchestrationPointerNode(XPanderSharedModel):
         output_type: Expected output format. Defaults to Text.
         output_schema: JSON schema for structured output validation.
         instructions: Optional instructions for the pointer node (Action only).
+        instructions_mode: Mode to use for pointer node, specifically for agent nodes.
         ignore_response: Should ignore the node result and proceed with previous result?.
         schema_override: Optional schema override with permanentValue fields for fixed values.
     """
@@ -180,6 +213,7 @@ class OrchestrationPointerNode(XPanderSharedModel):
     output_type: Optional[OutputFormat] = OutputFormat.Text
     output_schema: Optional[Dict] = None
     instructions: Optional[str] = None
+    instructions_mode: Optional[OrchestrationPointerNodeInstructionsMode] = OrchestrationPointerNodeInstructionsMode.Append
     ignore_response: Optional[bool] = False
     schema_override: Optional[SchemaOverride] = None
 

xpander_sdk/modules/agents/sub_modules/agent.py

@@ -413,6 +413,7 @@ class Agent(XPanderSharedModel):
         output_schema: Optional[Dict] = None,
         events_streaming: Optional[bool] = False,
         additional_context: Optional[str] = None,
+        additional_instructions: Optional[str] = None,
         expected_output: Optional[str] = None,
         mcp_servers: Optional[List[MCPServerDetails]] = [],
         triggering_agent_id: Optional[str] = None,
@@ -438,6 +439,7 @@ class Agent(XPanderSharedModel):
             output_schema (Optional[Dict]): Schema defining structure of output.
             events_streaming (Optional[bool]): Flag idicating for events are required for this task.
             additional_context (Optional[str]): Additional context to be passed to the agent.
+            additional_instructions (Optional[str]): Additional instructions to be appended to the agent's system prompt.
             expected_output (Optional[str]): Expected output of the execution.
             mcp_servers (Optional[List[MCPServerDetails]]): Optional list of mcp servers to use.
             triggering_agent_id (Optional[str]): Optional triggering agent id.
@@ -473,6 +475,7 @@ class Agent(XPanderSharedModel):
                     "run_locally": run_locally,
                     "events_streaming": events_streaming,
                     "additional_context": additional_context,
+                    "additional_instructions": additional_instructions,
                     "expected_output": expected_output,
                     "mcp_servers": [server.model_dump() for server in mcp_servers],
                     "triggering_agent_id": triggering_agent_id,

xpander_sdk/modules/backend/frameworks/agno.py

@@ -130,7 +130,7 @@ async def build_agent_args(
             "name": xpander_agent.name,
             "model": model,
             "description": xpander_agent.instructions.description,
-            "instructions": xpander_agent.instructions.instructions,
+            "instructions": xpander_agent.instructions.instructions + (f"\n<additional_overriding_instructions>{task.additional_instructions}</additional_overriding_instructions>" if task.additional_instructions else ""),
             "expected_output": (
                 task.expected_output
                 if task and task.expected_output

xpander_sdk/modules/tasks/sub_modules/task.py

@@ -132,6 +132,7 @@ class Task(XPanderSharedModel):
         output_schema (Optional[Dict]): Schema for the task's output.
         events_streaming (Optional[bool]): Flag indicating if the task has events streaming.
         additional_context (Optional[str]): Additional context to be passed to the agent.
+        additional_instructions (Optional[str]): Additional instructions to be appended to the agent's system prompt.
         expected_output (Optional[str]): Expected output of the execution.
         mcp_servers (Optional[List[MCPServerDetails]]): Optional list of mcp servers to use.
         triggering_agent_id (Optional[str]): Optional triggering agent id.
@@ -180,6 +181,7 @@ class Task(XPanderSharedModel):
     events_streaming: Optional[bool] = False
     is_orchestration: Optional[bool] = False
     additional_context: Optional[str] = None
+    additional_instructions: Optional[str] = None
     expected_output: Optional[str] = (None,)
     mcp_servers: Optional[List[MCPServerDetails]] = ([],)
     triggering_agent_id: Optional[str] = (None,)

xpander_sdk/modules/tasks/tasks_module.py

@@ -234,6 +234,7 @@ class Tasks(ModuleBase):
         output_schema: Optional[Dict] = None,
         events_streaming: Optional[bool] = False,
         additional_context: Optional[str] = None,
+        additional_instructions: Optional[str] = None,
         expected_output: Optional[str] = None,
         mcp_servers: Optional[List[MCPServerDetails]] = [],
         triggering_agent_id: Optional[str] = None,
@@ -263,6 +264,7 @@ class Tasks(ModuleBase):
             output_schema (Optional[Dict]): Schema defining the expected output structure.
             events_streaming (Optional[bool]): Flag idicating for events are required for this task.
             additional_context (Optional[str]): Additional context to be passed to the agent.
+            additional_instructions (Optional[str]): Additional instructions to be appended to the agent's system prompt.
             expected_output (Optional[str]): Expected output of the execution.
             mcp_servers (Optional[List[MCPServerDetails]]): Optional list of mcp servers to use.
             triggering_agent_id (Optional[str]): Optional triggering agent id.
@@ -309,6 +311,7 @@ class Tasks(ModuleBase):
                     "run_locally": run_locally,
                     "events_streaming": events_streaming,
                     "additional_context": additional_context,
+                    "additional_instructions": additional_instructions,
                     "expected_output": expected_output,
                     "mcp_servers": [server.model_dump() for server in mcp_servers],
                     "triggering_agent_id": triggering_agent_id,

{xpander_sdk-2.0.218.dist-info → xpander_sdk-2.0.220.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xpander-sdk
-Version: 2.0.218
+Version: 2.0.220
 Summary: xpander.ai Backend-as-a-service for AI Agents - SDK
 Home-page: https://www.xpander.ai
 Author: xpanderAI

{xpander_sdk-2.0.218.dist-info → xpander_sdk-2.0.220.dist-info}/RECORD

@@ -16,7 +16,7 @@ xpander_sdk/models/events.py,sha256=HnootQSUIIRM4BIdaTbuPUEJ55hLVtA7KDCSsnHeBKw,
 xpander_sdk/models/frameworks.py,sha256=-7W_m5cvgS1qLp0gGAFP4noNWT82IT1ZqtQv5WuOC2k,2939
 xpander_sdk/models/generic.py,sha256=yw5rBRdZ-6ucTI4AwtskenddepOooiFRM--9xx5jrL8,681
 xpander_sdk/models/notifications.py,sha256=ryc0VDXoiuZDEh791LYzW73GC0qH1y2hYl8Fj5Xv0FU,4141
-xpander_sdk/models/orchestrations.py,sha256=hoL2YBMcMXZ6kXMLiJtpC-g4Ibv9RLovtdFHpVvm-gA,13463
+xpander_sdk/models/orchestrations.py,sha256=W6lY1QQpuKdMAgrUF_RUw_ClAvgg3vMUdPcw_F-YeSw,15161
 xpander_sdk/models/shared.py,sha256=gW88kA_UslNinUjtQKpLVF0sHDZnckwLWexRapxPivU,3125
 xpander_sdk/models/user.py,sha256=_FTG0JO6iTrbcvJp-BBJ6nuj281zhyQB5ldQkBCyYDU,749
 xpander_sdk/modules/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -27,7 +27,7 @@ xpander_sdk/modules/agents/models/agent.py,sha256=9foTMH4UOfgT9mPfObpeRxHEJButyQ
 xpander_sdk/modules/agents/models/agent_list.py,sha256=byEayS2uLwDKaVT3lAHltrFocQFKpr8XEwQ6NTEEEMo,4081
 xpander_sdk/modules/agents/models/knowledge_bases.py,sha256=YimpjVJxWe8YTbGMD6oGQOA_YV8ztHQHTTBOaBB44ZM,1037
 xpander_sdk/modules/agents/sub_modules/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-xpander_sdk/modules/agents/sub_modules/agent.py,sha256=xMO_e8_sU--EVnPZDttyB-vo_t2Mmg84W_umTzfRIxg,37131
+xpander_sdk/modules/agents/sub_modules/agent.py,sha256=7-HRZT7vhUbkpiaG4gLnsUYl6-9j8d3zYnLiP9ANOL0,37380
 xpander_sdk/modules/agents/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 xpander_sdk/modules/agents/utils/generic.py,sha256=XbG4OeHMQo4gVYCsasMlW_b8OoqS1xL3MlUZSjXivu0,81
 xpander_sdk/modules/backend/__init__.py,sha256=-NjikuZgHBhOM9xHML2vKsG0ICX9S2RKHktrWaODCBE,171
@@ -36,7 +36,7 @@ xpander_sdk/modules/backend/events_registry.py,sha256=d0V-lsz3I3G1QB643EM1i-a5oJ
 xpander_sdk/modules/backend/decorators/__init__.py,sha256=ub9c8G0Ll6AuCvfcFB6rqR8iamMJxtcW7QjWw3WSkPU,106
 xpander_sdk/modules/backend/decorators/on_auth_event.py,sha256=Xt_x9nncujMcF_SgM5hG6M-iZ6B-rDS97EPmgZkGdMk,4715
 xpander_sdk/modules/backend/frameworks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-xpander_sdk/modules/backend/frameworks/agno.py,sha256=9uk2Ht-prT-2otEIfai5Rz2_hGi9wKrhf5GeNnTwCOo,43836
+xpander_sdk/modules/backend/frameworks/agno.py,sha256=yVMKvWAgCXU8BS_42BjwuAl5GGTJl3r6znz5Vquodsw,43989
 xpander_sdk/modules/backend/frameworks/dispatch.py,sha256=ht9hT5-cHATofQbWsbWeTARx51Hne3TNNNjw6KECRtA,1814
 xpander_sdk/modules/backend/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 xpander_sdk/modules/backend/utils/mcp_oauth.py,sha256=5sYJcw557V3pSgutxUFzkBp5YxUJFUoB1V1rEe814pc,5430
@@ -62,12 +62,12 @@ xpander_sdk/modules/knowledge_bases/sub_modules/knowledge_base.py,sha256=0HTUYjC
 xpander_sdk/modules/knowledge_bases/sub_modules/knowledge_base_document_item.py,sha256=oLQApvsd573ZfYGV7Ji4XB5bNUyUFIeZWPIhZS1DIM4,1815
 xpander_sdk/modules/knowledge_bases/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 xpander_sdk/modules/tasks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-xpander_sdk/modules/tasks/tasks_module.py,sha256=Hn-Gkhv3gaj_sKAc6qYI1r18tV8UDez-J_FVJWFhhZg,20626
+xpander_sdk/modules/tasks/tasks_module.py,sha256=Wa1lxWmyd-k_uGFKKFZxQC0K8UK38QtAmNec2TsD6jI,20875
 xpander_sdk/modules/tasks/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 xpander_sdk/modules/tasks/models/task.py,sha256=pYzXg0jnE6ft4pVFvxiVexO5eMUFkg1VxXybzFtL1ys,4483
 xpander_sdk/modules/tasks/models/tasks_list.py,sha256=8V1T0vCtGN79qLMPwe37pOA7Wvuf8pbJNOhWL0BPo-8,5126
 xpander_sdk/modules/tasks/sub_modules/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-xpander_sdk/modules/tasks/sub_modules/task.py,sha256=0OsZnoP91od46jw5qln_nVqrK0gDre4q0UFQ47qbjA4,37959
+xpander_sdk/modules/tasks/sub_modules/task.py,sha256=yDGJEyxG-ZXOwB5AtOnb53FUQr_MlQM5Hvr2MMEe5T8,38127
 xpander_sdk/modules/tasks/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 xpander_sdk/modules/tasks/utils/files.py,sha256=KqqwSQSrwim2-H3XP5wOadDDfngAyEI034tA7Oon-vc,3631
 xpander_sdk/modules/tools_repository/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -90,8 +90,8 @@ xpander_sdk/utils/generic.py,sha256=XrRj2-L8c0YWpfPdDyXE-pVL-6lKF9VpyZzKHQ4wuCc,
 xpander_sdk/utils/tools.py,sha256=lyFkq2yP7DxBkyXYVlnFRwDhQCvf0fZZMDm5fBycze4,1244
 xpander_sdk/utils/agents/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 xpander_sdk/utils/agents/compactization_agent.py,sha256=S_U1dSmDC7I0JUsp_THUYjfutEI5QMBaMPJEXGp0_Sw,14389
-xpander_sdk-2.0.218.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-xpander_sdk-2.0.218.dist-info/METADATA,sha256=6cp3OHkDp-1UnHS-korSXv2M3ZZyuM4HewIzj7aOunU,17952
-xpander_sdk-2.0.218.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-xpander_sdk-2.0.218.dist-info/top_level.txt,sha256=UCjnxQpsMy5Zoe7lmRuVDO6DI2V_6PgRFfm4oizRbVs,12
-xpander_sdk-2.0.218.dist-info/RECORD,,
+xpander_sdk-2.0.220.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+xpander_sdk-2.0.220.dist-info/METADATA,sha256=qwMfStmf8KHPgM2JnXp5HRwN1b14awrwZ79hBj_p7pQ,17952
+xpander_sdk-2.0.220.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+xpander_sdk-2.0.220.dist-info/top_level.txt,sha256=UCjnxQpsMy5Zoe7lmRuVDO6DI2V_6PgRFfm4oizRbVs,12
+xpander_sdk-2.0.220.dist-info/RECORD,,