xpander-sdk 2.0.168__tar.gz → 2.0.170__tar.gz

{xpander_sdk-2.0.168 → xpander_sdk-2.0.170}/PKG-INFO

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

{xpander_sdk-2.0.168 → xpander_sdk-2.0.170}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setup(
     name="xpander-sdk",
-    version="2.0.168",
+    version="2.0.170",
     author="xpanderAI",
     author_email="dev@xpander.ai",
     description="xpander.ai Backend-as-a-service for AI Agents - SDK",

{xpander_sdk-2.0.168 → xpander_sdk-2.0.170}/src/xpander_sdk/models/compactization.py

@@ -1,4 +1,4 @@
-from typing import List
+from typing import List, Literal, Union
 
 from pydantic import Field
 from xpander_sdk.models.deep_planning import DeepPlanningItem
@@ -34,6 +34,9 @@ class TaskCompactizationInput(XPanderSharedModel):
         )
     )
 
+class TaskCompactizationRetryEvent(XPanderSharedModel):
+    is_retry: bool
+
 class TaskCompactizationOutput(XPanderSharedModel):
     new_task_prompt: str = Field(
         ...,
@@ -99,3 +102,11 @@ class TaskCompactizationOutput(XPanderSharedModel):
             "- Focus on actionable, specific continuation steps.\n"
         ),
     )
+
+
+class TaskCompactizationEvent(XPanderSharedModel):
+    type: Literal["retry", "summarization"]
+    data: Union[
+        TaskCompactizationOutput,
+        TaskCompactizationRetryEvent
+    ]

{xpander_sdk-2.0.168 → xpander_sdk-2.0.170}/src/xpander_sdk/models/events.py

@@ -71,3 +71,6 @@ class TaskUpdateEventType(str, Enum):
     
     # deep planning
     PlanUpdated = "plan_updated"
+    
+    # task compactization
+    TaskCompactization = "task_compactization"

{xpander_sdk-2.0.168 → xpander_sdk-2.0.170}/src/xpander_sdk/modules/backend/utils/mcp_oauth.py

@@ -10,7 +10,7 @@ from xpander_sdk.modules.tools_repository.models.mcp import MCPOAuthGetTokenGene
 POLLING_INTERVAL = 1 # every 1s
 MAX_WAIT_FOR_LOGIN = 600 # 10 mintutes
 
-async def push_event(task: Task, event: TaskUpdateEvent):
+async def push_event(task: Task, event: TaskUpdateEvent, event_type: TaskUpdateEventType):
     client = APIClient(configuration=task.configuration)
     await client.make_request(
         path=APIRoute.PushExecutionEventToQueue.format(task_id=task.id),
@@ -20,7 +20,7 @@ async def push_event(task: Task, event: TaskUpdateEvent):
                 task_id=task.id,
                 organization_id=task.organization_id,
                 time=datetime.now(timezone.utc).isoformat(),
-                type=TaskUpdateEventType.AuthEvent,
+                type=event_type,
                 data=event
                 ).model_dump_safe()
             ]
@@ -59,7 +59,7 @@ async def authenticate_mcp_server(mcp_server: MCPServerDetails, task: Task, user
         if result.type == MCPOAuthResponseType.LOGIN_REQUIRED:
             logger.info(f"Initiating login for MCP Server {mcp_server.url}")
             # Notify user about login requirement
-            await push_event(task=task, event=result)
+            await push_event(task=task, event=result, event_type=TaskUpdateEventType.AuthEvent)
             
             # Poll for token with timeout
             elapsed_time = 0
@@ -73,7 +73,7 @@ async def authenticate_mcp_server(mcp_server: MCPServerDetails, task: Task, user
                     logger.info(f"Successful login for MCP Server {mcp_server.url}")
                     redacted_token_result = MCPOAuthGetTokenResponse(**token_result.model_dump_safe())
                     redacted_token_result.data.access_token = "REDACTED"
-                    await push_event(task=task, event=redacted_token_result)
+                    await push_event(task=task, event=redacted_token_result, event_type=TaskUpdateEventType.AuthEvent)
                     return token_result
             
             # Timeout reached
@@ -83,7 +83,7 @@ async def authenticate_mcp_server(mcp_server: MCPServerDetails, task: Task, user
             logger.info(f"Token ready for MCP Server {mcp_server.url}")
             redacted_token_result = MCPOAuthGetTokenResponse(**result.model_dump_safe())
             redacted_token_result.data.access_token = "REDACTED"
-            await push_event(task=task, event=redacted_token_result)
+            await push_event(task=task, event=redacted_token_result, event_type=TaskUpdateEventType.AuthEvent)
         
         return result
     except Exception as e:

{xpander_sdk-2.0.168 → xpander_sdk-2.0.170}/src/xpander_sdk/modules/tasks/sub_modules/task.py

@@ -82,12 +82,13 @@ from xpander_sdk.modules.tools_repository.models.mcp import (
     MCPServerDetails,
 )
 from xpander_sdk.utils.event_loop import run_sync
+from xpander_sdk.models.compactization import TaskCompactizationEvent
 
 # Type variable for Task class methods
 T = TypeVar("T", bound="Task")
 
 TaskUpdateEventData = Union[
-    T, ToolCallRequest, ToolCallResult, MCPOAuthGetTokenResponse, DeepPlanning
+    TaskCompactizationEvent, T, ToolCallRequest, ToolCallResult, MCPOAuthGetTokenResponse, DeepPlanning
 ]
 
 
@@ -552,7 +553,14 @@ class Task(XPanderSharedModel):
                 message += f"\n{json.dumps(f)}"
 
         if self.deep_planning and self.deep_planning.enabled == True and self.deep_planning.started:
+            task_backup = self.model_copy() # backup result and status
+            
             self.reload()
+            
+            # restore result and status
+            self.result = task_backup.result
+            self.status = task_backup.status
+            
             if not self.deep_planning.question_raised:
                 uncompleted_tasks = [task for task in self.deep_planning.tasks if not task.completed]
                 if len(uncompleted_tasks) != 0: # make a retry with compactization
@@ -800,7 +808,13 @@ class Task(XPanderSharedModel):
             ...     print(f"Remaining tasks: {len(status.uncompleted_tasks)}")
         """
         try:
-            await self.areload()
+            task_backup = self.model_copy() # backup result and status
+            await self.areload() # reload
+            
+            # restore result and status
+            self.result = task_backup.result
+            self.status = task_backup.status
+            
             if self.deep_planning and self.deep_planning.enabled and self.deep_planning.started and self.deep_planning.enforce:
                 
                 # allow early exit to ask question

{xpander_sdk-2.0.168 → xpander_sdk-2.0.170}/src/xpander_sdk/utils/agents/compactization_agent.py

@@ -2,18 +2,36 @@ from typing import TYPE_CHECKING, List, Union
 from agno.agent import Agent as AgnoAgent
 from loguru import logger
 import json
-from xpander_sdk.models.compactization import TaskCompactizationOutput, TaskCompactizationInput
+from xpander_sdk.models.compactization import TaskCompactizationEvent, TaskCompactizationOutput, TaskCompactizationInput, TaskCompactizationRetryEvent
 from xpander_sdk.models.deep_planning import DeepPlanningItem
+from xpander_sdk.models.events import TaskUpdateEventType
 from xpander_sdk.models.frameworks import Framework
 from xpander_sdk.models.shared import Tokens
 from xpander_sdk.modules.agents.agents_module import Agents
 from xpander_sdk.modules.backend.backend_module import Backend
+from xpander_sdk.modules.backend.utils.mcp_oauth import push_event
+from xpander_sdk.modules.tasks.sub_modules.task import TaskUpdateEvent
+from xpander_sdk.utils.event_loop import run_sync
+from xpander_sdk.utils.generic import get_current_timestamp
 
 if TYPE_CHECKING:
     from xpander_sdk.modules.tasks.sub_modules.task import Task
 
 def run_task_compactization(message: str, task: "Task", uncompleted_tasks: List[DeepPlanningItem]) -> Union[str, TaskCompactizationOutput]:
     try:
+        
+        # report retry event
+        try:
+            run_sync(
+                push_event(
+                    task=task,
+                    event=TaskCompactizationEvent(type="retry", data=TaskCompactizationRetryEvent(is_retry=True)),
+                    event_type=TaskUpdateEventType.TaskCompactization
+                )
+            )
+        except Exception as e:
+            pass
+        
         # get agent to identify framework
         agent = Agents(configuration=task.configuration).get(agent_id=task.agent_id,version=task.agent_version)
         
@@ -183,6 +201,18 @@ def run_task_compactization(message: str, task: "Task", uncompleted_tasks: List[
         
         task.report_metrics(configuration=task.configuration)
         
+        # report compactization event
+        try:
+            run_sync(
+                push_event(
+                    task=task,
+                    event=TaskCompactizationEvent(type="summarization", data=run_result.content),
+                    event_type=TaskUpdateEventType.TaskCompactization
+                )
+            )
+        except Exception as e:
+            pass
+        
         return run_result.content
     except Exception as e:
         logger.warning(f"Failed to run task compactization - {str(e)}")

xpander_sdk-2.0.170/src/xpander_sdk/utils/generic.py

@@ -0,0 +1,5 @@
+from datetime import datetime, timezone
+
+
+def get_current_timestamp() -> str:
+    return datetime.now(timezone.utc).isoformat()

{xpander_sdk-2.0.168 → xpander_sdk-2.0.170}/src/xpander_sdk.egg-info/PKG-INFO

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

{xpander_sdk-2.0.168 → xpander_sdk-2.0.170}/src/xpander_sdk.egg-info/SOURCES.txt

@@ -88,6 +88,7 @@ src/xpander_sdk/modules/tools_repository/utils/schemas.py
 src/xpander_sdk/utils/__init__.py
 src/xpander_sdk/utils/env.py
 src/xpander_sdk/utils/event_loop.py
+src/xpander_sdk/utils/generic.py
 src/xpander_sdk/utils/tools.py
 src/xpander_sdk/utils/agents/__init__.py
 src/xpander_sdk/utils/agents/compactization_agent.py