xpander-sdk 2.0.168__py3-none-any.whl → 2.0.170__py3-none-any.whl

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/models/events.py

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

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/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/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/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.dist-info → xpander_sdk-2.0.170.dist-info}/METADATA

@@ -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.dist-info → xpander_sdk-2.0.170.dist-info}/RECORD

@@ -9,10 +9,10 @@ xpander_sdk/exceptions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 xpander_sdk/exceptions/module_exception.py,sha256=2Urni1QEdzOrCdYSRc5eLpuz8aDlvRcn8KNejo_2nGc,1687
 xpander_sdk/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 xpander_sdk/models/activity.py,sha256=I3CxOzUNbrKwHqynCbm7FJja6vanVkCzwwBwET7qvzA,2085
-xpander_sdk/models/compactization.py,sha256=sKq8Lm43ij-wN_G8jK4pppaM8oMJ3NLxS4TlT2SYmUE,5314
+xpander_sdk/models/compactization.py,sha256=I0tfDQZKaaKvWHIg1O07oJUPUrbwvr4Q0azDsx5OfAE,5596
 xpander_sdk/models/configuration.py,sha256=Un8p3C3p3eMiqKK5VsHaZdWhZTRYHbrw2aPUMV8lJSc,3370
 xpander_sdk/models/deep_planning.py,sha256=pCFV5iNSfT99ap1-09k7oO_DIwXx2vPJ3aVM472xL4w,554
-xpander_sdk/models/events.py,sha256=2vIkuPGAbntN_7xggJRw5sMJ1_EzcXyljxPH0ekISlw,2235
+xpander_sdk/models/events.py,sha256=HnootQSUIIRM4BIdaTbuPUEJ55hLVtA7KDCSsnHeBKw,2313
 xpander_sdk/models/frameworks.py,sha256=-7W_m5cvgS1qLp0gGAFP4noNWT82IT1ZqtQv5WuOC2k,2939
 xpander_sdk/models/shared.py,sha256=gW88kA_UslNinUjtQKpLVF0sHDZnckwLWexRapxPivU,3125
 xpander_sdk/models/user.py,sha256=_FTG0JO6iTrbcvJp-BBJ6nuj281zhyQB5ldQkBCyYDU,749
@@ -33,7 +33,7 @@ xpander_sdk/modules/backend/frameworks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JC
 xpander_sdk/modules/backend/frameworks/agno.py,sha256=z8olkGD4QPMPX-g6Z-4E5n5Gxs8i1L8vbaKXKry7wjU,37881
 xpander_sdk/modules/backend/frameworks/dispatch.py,sha256=5dP4c37C42U53VjM2kkwIRwEw1i0IN3G0YESHH7J3OE,1557
 xpander_sdk/modules/backend/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-xpander_sdk/modules/backend/utils/mcp_oauth.py,sha256=a4xQGQwRGf2T9h38Vc9VNUwpIeY9y7Mn6B4D2G3tMQM,4387
+xpander_sdk/modules/backend/utils/mcp_oauth.py,sha256=slmrtpjGM__g7mkhvnY9yNRtGHS-fDcLH82rIkBKxkA,4527
 xpander_sdk/modules/events/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 xpander_sdk/modules/events/events_module.py,sha256=DVlho7JxT6Jy8GeyuSakswmYwR18xqO2JcCJ-8Zc3s8,25317
 xpander_sdk/modules/events/decorators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -60,7 +60,7 @@ xpander_sdk/modules/tasks/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRk
 xpander_sdk/modules/tasks/models/task.py,sha256=B0_fwzQEkRE_pZMSLnWuXsUBMdy8HEIxm1FfRpCQma0,5000
 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=dbvM-wdH9IHIRfJxuSE6ZBIvRuXH1g15ssO9lUZEu8U,37121
+xpander_sdk/modules/tasks/sub_modules/task.py,sha256=mQD3_fe4j0HnskahOmxVIsAbVh1czsn3W7nXF91_Zd0,37692
 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
@@ -79,11 +79,12 @@ xpander_sdk/modules/tools_repository/utils/schemas.py,sha256=EUi35h7CRrOVXV-TH-l
 xpander_sdk/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 xpander_sdk/utils/env.py,sha256=U_zIhqWgKs5fk2-HXjAaODj4oWMc5dRQ0fvw6fqVcFk,1522
 xpander_sdk/utils/event_loop.py,sha256=kJrN0upgBhyI86tkTdfHeajznrIZl44Rl6WDiDG3GHE,2516
+xpander_sdk/utils/generic.py,sha256=XrRj2-L8c0YWpfPdDyXE-pVL-6lKF9VpyZzKHQ4wuCc,127
 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=iRd18bBOYYyC95wdc1Xq6T1r3RyNivvP_fD3EkSbK4A,11659
-xpander_sdk-2.0.168.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-xpander_sdk-2.0.168.dist-info/METADATA,sha256=_x5aw3qeUPMwboas-n4J1b-v5yBo909AwRtMlqRTKzI,15312
-xpander_sdk-2.0.168.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-xpander_sdk-2.0.168.dist-info/top_level.txt,sha256=UCjnxQpsMy5Zoe7lmRuVDO6DI2V_6PgRFfm4oizRbVs,12
-xpander_sdk-2.0.168.dist-info/RECORD,,
+xpander_sdk/utils/agents/compactization_agent.py,sha256=iMViaUnpuZFMyo-pQCen9bAIADmFWV2yx3JuNaG5bx0,12815
+xpander_sdk-2.0.170.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+xpander_sdk-2.0.170.dist-info/METADATA,sha256=F97VFAV0KLgZgilAO42QBdAm_GOG1cKvRCRZoO5_NAo,15312
+xpander_sdk-2.0.170.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+xpander_sdk-2.0.170.dist-info/top_level.txt,sha256=UCjnxQpsMy5Zoe7lmRuVDO6DI2V_6PgRFfm4oizRbVs,12
+xpander_sdk-2.0.170.dist-info/RECORD,,