get rid of task state step I

Author: yeus

src/components/taskyon/TaskWidget.vue

@@ -6,10 +6,7 @@
       <div class="row items-end q-gutter-xs">
         <!--task icon-->
         <div
-          v-if="
-            task.state === 'Error' ||
-            (task.result && task.result instanceof Object && 'error' in task.result)
-          "
+          v-if="task.result && task.result instanceof Object && 'error' in task.result"
           class="col-auto self-center"
         >
           <q-icon :name="matWarning" color="negative" size="sm"
@@ -27,8 +24,7 @@
           <q-expansion-item
             dense
             :header-class="
-              task.state === 'Error' ||
-              (task.result && task.result instanceof Object && 'error' in task.result)
+              task.result && task.result instanceof Object && 'error' in task.result
                 ? 'text-negative'
                 : isWorking
                   ? 'text-info'
@@ -283,7 +279,6 @@ async function taskDraftFromTask(taskId: string) {
   const jsonTask = JSON.stringify(await (await tystate.getTaskManager()).getTask(taskId))
   const task = TaskNode.partial().parse(JSON.parse(jsonTask))
   task.debugging = {}
-  task.state = 'Open'
   state.llmSettings.taskDraft = partialTaskDraft.parse(task)
   return task
 }

src/modules/taskyon/rxdb.ts

@@ -47,6 +47,7 @@ const taskNodeSchemaLiteral = {
     content: {
       type: 'string',
     },
+    // TODO: also get rid of this
     state: {
       type: 'string',
       enum: ['Open', 'Queued', 'In Progress', 'Completed', 'Error', 'Cancelled'],
@@ -70,6 +71,7 @@ const taskNodeSchemaLiteral = {
     debugging: {
       type: 'string', // Storing debugging as a JSON string
     },
+    // TODO: also get rid of this
     result: {
       type: 'string', // Storing result as a JSON string
     },
@@ -288,6 +290,8 @@ export function transformTaskNodeToDocType(taskNode: TaskNode): TaskNodeDocType
       debugging: JSON.stringify(taskNode.debugging),
     }),
     ...(taskNode.result !== undefined && { result: JSON.stringify(taskNode.result) }),
+    // TODO: remove this state here...
+    state: 'Completed' as 'Open' | 'Queued' | 'In Progress' | 'Completed' | 'Error',
   }
 
   return convertedTask

src/modules/taskyon/taskManager.ts

@@ -139,7 +139,6 @@ export const initAddTask2Tree =
       role: task.role,
       priorID,
       content: task.content,
-      state: task.state || 'Open',
       debugging: task.debugging || {},
       id: uuid,
       created_at: Date.now(),
@@ -164,11 +163,9 @@ export const initAddTask2Tree =
     if (execute) {
       // we need processTasksQueue as an argument here!!!
       processTasksQueue.push(newTask.id)
-      newTask.state = 'Queued'
       await taskManager.setTask(newTask, false)
     } else {
       // in the case of a task which is not processed, we can save it :)
-      newTask.state = 'Completed'
       await taskManager.setTask(newTask, true)
     }
 
@@ -955,7 +952,6 @@ export function useTyTaskManager(
         delete partialTask.debugging
         delete partialTask.result
         delete partialTask.id
-        delete partialTask.state
         delete partialTask.created_at
         delete partialTask.priorID
         if (message) delete partialTask.content

src/modules/taskyon/taskWorker.ts

@@ -201,14 +201,12 @@ async function parseChatResponse2TaskDraft(message: string): Promise<Record<stri
 
 // use helper function to make code more concise ;)
 const createTaskGenerator =
-  (childCosts: object, finishedTask: TaskNode) =>
-  async (execute: boolean, partialTask: partialTaskDraft) => {
+  (childCosts: object, finishedTask: TaskNode) => async (partialTask: partialTaskDraft) => {
     partialTask.debugging = { ...partialTask.debugging, ...childCosts }
     const taskTemplate: Partial<TaskNode> = {
       configuration: finishedTask.configuration,
     }
     const newTask = deepMerge(taskTemplate, partialTask)
-    newTask.state = execute ? 'Open' : 'Completed'
     return newTask
   }
 
@@ -240,7 +238,7 @@ async function generateFollowupFromStructuredResponse(
 
   if (useTool) {
     console.log('trying to get tool call from structured response')
-    const newTask = await generateFollowUpTask(false, {
+    const newTask = await generateFollowUpTask({
       role: 'assistant',
       content: { structuredResponse: choice.message.content || '' },
     })
@@ -257,7 +255,7 @@ async function generateFollowupFromStructuredResponse(
       const command = res.data
       return [
         newTask,
-        await generateFollowUpTask(true, {
+        await generateFollowUpTask({
           priorID: newTask.priorID,
           role: 'assistant',
           content: { functionCall: command },
@@ -266,7 +264,7 @@ async function generateFollowupFromStructuredResponse(
     } else {
       return [
         newTask,
-        await generateFollowUpTask(true, {
+        await generateFollowUpTask({
           priorID: newTask.priorID,
           role: 'system',
           content: {
@@ -280,7 +278,7 @@ async function generateFollowupFromStructuredResponse(
     // in the case that we don't call a tool, provide a "normal" answer :)
     // this time we declare it as "Open" and set execution to "true"
     return [
-      await generateFollowUpTask(true, {
+      await generateFollowUpTask({
         role: 'assistant',
         content: { structuredResponse: choice.message.content || '' },
       }),
@@ -335,7 +333,7 @@ async function generateFollowUpTasksFromResult(
   if (finishedTask.result) {
     if ('functionCall' in finishedTask.content) {
       return [
-        await generateFollowUpTask(true, {
+        await generateFollowUpTask({
           role: 'system',
           content: { toolResult: finishedTask.result },
         }),
@@ -354,7 +352,7 @@ async function generateFollowUpTasksFromResult(
       if (functionCall[0]) {
         // TODO: enable multiple parallel function calls
         return [
-          await generateFollowUpTask(true, {
+          await generateFollowUpTask({
             role: 'function',
             content: { functionCall: functionCall[0] },
           }),
@@ -379,7 +377,7 @@ async function generateFollowUpTasksFromResult(
       } else {
         // if 'message' in finishedTask.content && finishedTask.role === 'assistant'
         // this is the final response, so we simply add it to the chain without executing it
-        const newTask = await generateFollowUpTask(false, {
+        const newTask = await generateFollowUpTask({
           role: 'assistant',
           content: { message: choice.message.content },
         })
@@ -478,7 +476,6 @@ async function processTask(
   void taskManager.updateTask(
     {
       id: taskId,
-      state: 'In Progress',
     },
     false,
   )
@@ -512,7 +509,6 @@ async function processTask(
   // get token usage for this task..
   await addTaskCostInformation(task, taskManager, llmSettings, apiKey)
 
-  task.state = 'Completed'
   return task
 }
 
@@ -640,7 +636,7 @@ export async function runTaskWorker(
             // interrupt execution if interrupted flag is shown!
             // this makes sure that results are still saved, even if we stop any
             // further execution
-            taskWorkerController.isInterrupted() ? false : t.state == 'Open' ? true : false,
+            taskWorkerController.isInterrupted() ? false : true,
           )
           llmSettings.selectedTaskId = newTaskId
         }
@@ -658,10 +654,6 @@ export async function runTaskWorker(
         )
       }
 
-      if (task) {
-        task.state = 'Error'
-      }
-
       const errorTask: partialTaskDraft = {
         role: 'system',
         configuration: task?.configuration,

src/modules/taskyon/types.ts

@@ -319,9 +319,6 @@ export const TaskNode = z.object({
 For example this is, what an LLM would actually get to see. There are only a few different ways
 of how content can be structured. `,
   ),
-  // TODO: get rid of task state...  the reason is that its stateful (as the nam suggests)
-  //       what we can do is this: move it into
-  state: TaskState,
   label: z.array(z.string()).optional(),
   context: z.record(z.string(), z.string()).optional(),
   configuration: z
@@ -389,7 +386,6 @@ export const partialTaskDraft = TaskNode.pick({
   priorID: true,
   name: true,
   configuration: true,
-  state: true,
   allowedTools: true,
   debugging: true,
   label: true,