use task module

Author: Josh-XT

agixt/endpoints/Tasks.py

@@ -1,10 +1,11 @@
 from fastapi import APIRouter, Depends, Header
-from ApiClient import verify_api_key, get_api_client
+from ApiClient import verify_api_key
 from Models import ResponseMessage
 from pydantic import BaseModel
 from Globals import getenv
+from Task import Task
+import datetime
 import logging
-import json
 
 
 app = APIRouter()
@@ -60,17 +61,39 @@ async def new_task(
     user=Depends(verify_api_key),
     authorization: str = Header(None),
 ) -> ResponseMessage:
-    agixt = get_api_client(authorization=authorization)
-    response = agixt.execute_command(
+    try:
+        days = int(days)
+    except:
+        days = 0
+    try:
+        hours = int(hours)
+    except:
+        hours = 0
+    try:
+        minutes = int(minutes)
+    except:
+        minutes = 0
+    # Calculate the due date
+    due_date = datetime.datetime.now() + datetime.timedelta(
+        days=days, hours=hours, minutes=minutes
+    )
+
+    # Initialize task manager with the current token
+    task_manager = Task(token=authorization)
+    # Create a descriptive title from the purpose of the follow-up
+    title_preview = task.title.split("\n")[0][:50] + (
+        "..." if len(task.title) > 50 else ""
+    )
+
+    # Create the follow-up task
+    task_id = await task_manager.create_task(
+        title=title_preview,
+        description=task.task_description,
+        category_name="Follow-ups",
         agent_name=task.agent_name,
-        command_name="Schedule Task",
-        command_args={
-            "task_description": task.task_description,
-            "days": task.days,
-            "hours": task.hours,
-            "minutes": task.minutes,
-        },
-        conversation_name=task.conversation_id,
+        due_date=due_date,
+        priority=1,  # High priority for follow-ups
+        memory_collection=task.conversation_id,  # This ensures context preservation
     )
     return ResponseMessage(message=f"Task created for agent '{task.agent_name}'.")
 
@@ -88,17 +111,20 @@ async def new_reoccurring_task(
     user=Depends(verify_api_key),
     authorization: str = Header(None),
 ) -> ResponseMessage:
-    agixt = get_api_client(authorization=authorization)
-    response = agixt.execute_command(
+    task_manager = Task(token=authorization)
+    title_preview = task.title.split("\n")[0][:50] + (
+        "..." if len(task.title) > 50 else ""
+    )
+    task_ids = await task_manager.create_reoccurring_task(
+        title=title_preview,
+        description=task.task_description,
+        category_name="Follow-ups",
         agent_name=task.agent_name,
-        command_name="Schedule Reoccurring Task",
-        command_args={
-            "task_description": task.task_description,
-            "start_date": task.start_date,
-            "end_date": task.end_date,
-            "frequency": task.frequency,
-        },
-        conversation_name=task.conversation_id,
+        start_date=task.start_date,
+        end_date=task.end_date,
+        frequency=task.frequency,
+        priority=1,  # High priority for follow-ups
+        memory_collection=task.conversation_id,  # This ensures context preservation
     )
     return ResponseMessage(
         message=f"Reoccurring task created for agent '{task.agent_name}'."
@@ -118,22 +144,20 @@ async def modify_task(
     user=Depends(verify_api_key),
     authorization: str = Header(None),
 ) -> ResponseMessage:
-    agixt = get_api_client(authorization=authorization)
-    response = agixt.execute_command(
-        agent_name=task.agent_name,
-        command_name="Modify Scheduled Task",
-        command_args={
-            "task_id": task.task_id,
-            "title": task.title,
-            "description": task.description,
-            "due_date": task.due_date,
-            "estimated_hours": task.estimated_hours,
-            "priority": task.priority,
-            "cancel_task": task.cancel_task,
-        },
-        conversation_name=task.conversation_id,
-    )
-    return ResponseMessage(message=f"Task modified for agent '{task.agent_name}'.")
+    task_manager = Task(token=authorization)
+    if str(task.cancel_task).lower() == "true":
+        response = await task_manager.delete_task(task.task_id)
+    else:
+        # Update the task
+        response = await task_manager.update_task(
+            task_id=task.task_id,
+            title=task.title,
+            description=task.description,
+            due_date=task.due_date,
+            estimated_hours=task.estimated_hours,
+            priority=task.priority,
+        )
+    return ResponseMessage(message=response)
 
 
 @app.get(
@@ -146,11 +170,6 @@ async def modify_task(
 async def get_scheduled_tasks(
     user=Depends(verify_api_key), authorization: str = Header(None)
 ):
-    agixt = get_api_client(authorization=authorization)
-    response = agixt.execute_command(
-        agent_name="",
-        command_name="Get Scheduled Tasks",
-        command_args={},
-        conversation_name="",
-    )
-    return json.loads(response)
+    task_manager = Task(token=authorization)
+    tasks = await task_manager.get_pending_tasks()
+    return {"tasks": tasks}

agixt/extensions/scheduled_tasks.py

@@ -1,9 +1,6 @@
-import os
 from Extensions import Extensions
 from Task import Task
 import datetime
-from agixtsdk import AGiXTSDK
-from Globals import getenv
 
 
 class scheduled_tasks(Extensions):
@@ -21,31 +18,11 @@ def __init__(self, **kwargs):
         self.command_name = (
             kwargs["command_name"] if "command_name" in kwargs else "Smart Prompt"
         )
-        self.user = kwargs["user"] if "user" in kwargs else ""
         self.agent_name = kwargs["agent_name"] if "agent_name" in kwargs else "gpt4free"
-        self.conversation_name = (
-            kwargs["conversation_name"] if "conversation_name" in kwargs else ""
-        )
-        self.WORKING_DIRECTORY = (
-            kwargs["conversation_directory"]
-            if "conversation_directory" in kwargs
-            else os.path.join(os.getcwd(), "WORKSPACE")
-        )
-        os.makedirs(self.WORKING_DIRECTORY, exist_ok=True)
         self.conversation_id = (
             kwargs["conversation_id"] if "conversation_id" in kwargs else ""
         )
-
-        self.ApiClient = (
-            kwargs["ApiClient"]
-            if "ApiClient" in kwargs
-            else AGiXTSDK(
-                base_uri=getenv("AGIXT_URI"),
-                api_key=kwargs["api_key"] if "api_key" in kwargs else "",
-            )
-        )
         self.api_key = kwargs["api_key"] if "api_key" in kwargs else ""
-        self.failures = 0
 
     async def schedule_task(
         self,