feat: revert tasuku

package.json

@@ -61,7 +61,6 @@
     "pino": "^8.14.1",
     "pino-pretty": "^10.0.0",
     "quick-lru": "^6.1.1",
-    "tasuku": "^2.0.1",
     "ts-dedent": "^2.2.0",
     "uuid": "^9.0.0",
     "zod": "^3.21.4",

pnpm-lock.yaml

@@ -74,9 +74,6 @@ dependencies:
   quick-lru:
     specifier: ^6.1.1
     version: 6.1.1
-  tasuku:
-    specifier: ^2.0.1
-    version: 2.0.1
   ts-dedent:
     specifier: ^2.2.0
     version: 2.2.0
@@ -1024,10 +1021,6 @@ packages:
     resolution: {integrity: sha512-kNnC1GFBLuhImSnV7w4njQkUiJi0ZXUycu1rUaouPqiKlXkh77JKgdRnTAp1x5eBwcIwbtI+3otwzuIDEuDoxQ==}
     dev: true
 
-  /@types/yoga-layout@1.9.2:
-    resolution: {integrity: sha512-S9q47ByT2pPvD65IvrWp7qppVMpk9WGMbVq9wbWZOHg6tnXSD4vyhao6nOSBwwfDdV2p3Kx9evA9vI+XWTfDvw==}
-    dev: false
-
   /@typescript-eslint/eslint-plugin@5.59.11(@typescript-eslint/parser@5.59.11)(eslint@8.43.0)(typescript@5.1.3):
     resolution: {integrity: sha512-XxuOfTkCUiOSyBWIvHlUraLw/JT/6Io1365RO6ZuI88STKMavJZPNMU0lFcUTeQXEhHiv64CbxYxBNoDVSmghg==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -4254,12 +4247,6 @@ packages:
     engines: {node: '>= 0.4'}
     dev: true
 
-  /tasuku@2.0.1:
-    resolution: {integrity: sha512-BXWDEJzpC1mUiOz5Csba85LS93o9a5pGKRTArLiXJZ2HGF/mXHIl+4SBF706Yxqg+GlJDQurvLxds8tC7EwyRA==}
-    dependencies:
-      yoga-layout-prebuilt: 1.10.0
-    dev: false
-
   /temp-dir@3.0.0:
     resolution: {integrity: sha512-nHc6S/bwIilKHNRgK/3jlhDoIHcp45YgyiwcAk46Tr0LfEqGBVpmiAyuiuxeVE44m3mXnEeVhaipLOEWmH+Njw==}
     engines: {node: '>=14.16'}
@@ -4648,13 +4635,6 @@ packages:
     engines: {node: '>=12.20'}
     dev: true
 
-  /yoga-layout-prebuilt@1.10.0:
-    resolution: {integrity: sha512-YnOmtSbv4MTf7RGJMK0FvZ+KD8OEe/J5BNnR0GHhD8J/XcG/Qvxgszm0Un6FTHWW4uHlTgP0IztiXQnGyIR45g==}
-    engines: {node: '>=8'}
-    dependencies:
-      '@types/yoga-layout': 1.9.2
-    dev: false
-
   /zod-to-json-schema@3.21.2(zod@3.21.4):
     resolution: {integrity: sha512-02yfKymfmIf2rM/5LYGlyw0daEel/f3MsSGMNJZWWf44ato+Y+diFugOpDtgvEUn3cYM5oDAGWW2NHeSD4mByw==}
     peerDependencies:

src/agentic.ts

@@ -1,5 +1,4 @@
 import defaultKy from 'ky'
-import taskTracker from 'tasuku'
 import { SetOptional } from 'type-fest'
 
 import * as types from './types'
@@ -13,7 +12,6 @@ import { defaultIDGeneratorFn, isFunction, isString } from './utils'
 export class Agentic {
   protected _ky: types.KyInstance
   protected _logger: types.Logger
-  protected _taskTracker: types.TaskTracker
 
   protected _openai?: types.openai.OpenAIClient
   protected _anthropic?: types.anthropic.Client
@@ -37,7 +35,6 @@ export class Agentic {
     idGeneratorFn?: types.IDGeneratorFunction
     logger?: types.Logger
     ky?: types.KyInstance
-    taskTracker?: types.TaskTracker
   }) {
     // TODO: This is a bit hacky, but we're doing it to have a slightly nicer API
     // for the end developer when creating subclasses of `BaseTask` to use as
@@ -51,7 +48,6 @@ export class Agentic {
 
     this._ky = opts.ky ?? defaultKy
     this._logger = opts.logger ?? defaultLogger
-    this._taskTracker = opts.taskTracker ?? taskTracker
 
     this._openaiModelDefaults = {
       provider: 'openai',
@@ -98,10 +94,6 @@ export class Agentic {
     return this._logger
   }
 
-  public get taskTracker(): types.TaskTracker {
-    return this._taskTracker
-  }
-
   public get humanFeedbackDefaults() {
     return this._humanFeedbackDefaults
   }

src/task.ts

@@ -178,30 +178,9 @@ export abstract class BaseTask<
   ): Promise<types.TaskResponse<TOutput>> {
     this.validate()
 
-    let _resolve: (value: unknown) => void | undefined
+    // const title = `${this.nameForModel}(${stringifyForDebugging(input, {
-    let _reject: (err: Error) => void | undefined
+    //   maxLength: 120
-    let _taskInnerAPI: types.TaskTrackerInnerAPI | undefined
+    // })})`
-
-    const taskP = new Promise((resolve, reject) => {
-      _resolve = resolve
-      _reject = reject
-    })
-
-    const title = `${this.nameForModel}(${stringifyForDebugging(input, {
-      maxLength: 120
-    })})`
-
-    if (parentCtx?.tracker) {
-      parentCtx.tracker.task(title, (taskInnerAPI) => {
-        _taskInnerAPI = taskInnerAPI
-        return taskP
-      })
-    } else {
-      this._agentic!.taskTracker(title, (taskInnerAPI) => {
-        _taskInnerAPI = taskInnerAPI
-        return taskP
-      })
-    }
 
     this._logger.info({ input }, `Task call "${this.nameForHuman}"`)
 
@@ -218,7 +197,6 @@ export abstract class BaseTask<
     const ctx: types.TaskCallContext<TInput> = {
       input,
       attemptNumber: 0,
-      tracker: _taskInnerAPI!,
       metadata: {
         taskName: this.nameForModel,
         taskId: this.id,
@@ -228,91 +206,76 @@ export abstract class BaseTask<
       }
     }
 
-    try {
+    for (const preHook of this._preHooks) {
-      for (const preHook of this._preHooks) {
+      await preHook(ctx)
-        await preHook(ctx)
+    }
-      }
 
-      const result = await pRetry(
+    const result = await pRetry(
-        async () => {
+      async () => {
-          const result = await this._call(ctx)
+        const result = await this._call(ctx)
 
-          for (const postHook of this._postHooks) {
+        for (const postHook of this._postHooks) {
-            await postHook(result, ctx)
+          await postHook(result, ctx)
+        }
+
+        return result
+      },
+      {
+        ...this._retryConfig,
+        onFailedAttempt: async (err: FailedAttemptError) => {
+          this._logger.warn(
+            err,
+            `Task error "${this.nameForHuman}" failed attempt ${
+              err.attemptNumber
+            }${input ? ': ' + JSON.stringify(input) : ''}`
+          )
+
+          if (this._retryConfig.onFailedAttempt) {
+            await Promise.resolve(this._retryConfig.onFailedAttempt(err))
           }
 
-          return result
+          // TODO: log this task error
-        },
+          ctx.attemptNumber = err.attemptNumber + 1
-        {
+          ctx.metadata.error = err
-          ...this._retryConfig,
-          onFailedAttempt: async (err: FailedAttemptError) => {
-            this._logger.warn(
-              err,
-              `Task error "${this.nameForHuman}" failed attempt ${
-                err.attemptNumber
-              }${input ? ': ' + JSON.stringify(input) : ''}`
-            )
 
-            // const error = `error ${err.attemptNumber}: ${err.message}`
+          if (err instanceof errors.ZodOutputValidationError) {
-            // const errorAsString =
+            ctx.retryMessage = err.message
-            //   error.length > 80 ? error.slice(0, 80 - 3) + '...' : error
+            return
-            // ctx.tracker.setStatus(errorAsString)
+          } else if (err instanceof errors.OutputValidationError) {
-
+            ctx.retryMessage = err.message
-            if (this._retryConfig.onFailedAttempt) {
+            return
-              await Promise.resolve(this._retryConfig.onFailedAttempt(err))
+          } else if (err instanceof errors.HumanFeedbackDeclineError) {
-            }
+            ctx.retryMessage = err.message
-
+            return
-            // TODO: log this task error
+          } else if (
-            ctx.attemptNumber = err.attemptNumber + 1
+            err instanceof errors.KyTimeoutError ||
-            ctx.metadata.error = err
+            err instanceof errors.TimeoutError ||
-
+            (err as any).name === 'TimeoutError'
-            if (err instanceof errors.ZodOutputValidationError) {
+          ) {
-              ctx.retryMessage = err.message
+            // TODO
-              return
+            return
-            } else if (err instanceof errors.OutputValidationError) {
+          } else if ((err.cause as any)?.code === 'UND_ERR_HEADERS_TIMEOUT') {
-              ctx.retryMessage = err.message
+            // TODO: This is a pretty common OpenAI error, and I think it either has
-              return
+            // to do with OpenAI's servers being flaky or the combination of Node.js
-            } else if (err instanceof errors.HumanFeedbackDeclineError) {
+            // `undici` and OpenAI's HTTP requests. Either way, let's just retry the
-              ctx.retryMessage = err.message
+            // task for now.
-              return
+            return
-            } else if (
+          } else {
-              err instanceof errors.KyTimeoutError ||
+            throw err
-              err instanceof errors.TimeoutError ||
-              (err as any).name === 'TimeoutError'
-            ) {
-              // TODO
-              return
-            } else if ((err.cause as any)?.code === 'UND_ERR_HEADERS_TIMEOUT') {
-              // TODO: This is a pretty common OpenAI error, and I think it either has
-              // to do with OpenAI's servers being flaky or the combination of Node.js
-              // `undici` and OpenAI's HTTP requests. Either way, let's just retry the
-              // task for now.
-              return
-            } else {
-              throw err
-            }
           }
         }
-      )
-
-      ctx.metadata.success = true
-      ctx.metadata.numRetries = ctx.attemptNumber
-      ctx.metadata.error = undefined
-
-      ctx.tracker.setOutput(stringifyForDebugging(result, { maxLength: 100 }))
-
-      // @ts-expect-error "_resolve" should be defined above
-      _resolve(result)
-
-      return {
-        result,
-        metadata: ctx.metadata
       }
-    } catch (err: any) {
+    )
-      // @ts-expect-error "_reject" should be defined above
-      _reject(err)
 
-      throw err
+    ctx.metadata.success = true
+    ctx.metadata.numRetries = ctx.attemptNumber
+    ctx.metadata.error = undefined
+
+    // ctx.tracker.setOutput(stringifyForDebugging(result, { maxLength: 100 }))
+
+    return {
+      result,
+      metadata: ctx.metadata
     }
   }
 

src/types.ts

@@ -2,10 +2,6 @@ import * as anthropic from '@anthropic-ai/sdk'
 import * as openai from 'openai-fetch'
 import ky from 'ky'
 import type { Options as RetryOptions } from 'p-retry'
-import type {
-  Task as TaskTracker,
-  TaskInnerAPI as TaskTrackerInnerAPI
-} from 'tasuku'
 import type { JsonObject, Jsonifiable } from 'type-fest'
 import { SafeParseReturnType, ZodType, ZodTypeAny, output, z } from 'zod'
 
@@ -19,7 +15,6 @@ import type { BaseTask } from './task'
 
 export { anthropic, openai }
 
-export type { TaskTracker, TaskTrackerInnerAPI }
 export type { Jsonifiable, Logger }
 export type KyInstance = typeof ky
 
@@ -45,8 +40,6 @@ export interface BaseTaskOptions {
   retryConfig?: RetryConfig
   id?: string
 
-  taskTracker?: TaskTracker
-
   // TODO
   // caching config
   // logging config
@@ -163,7 +156,6 @@ export interface TaskCallContext<
 > {
   input: TInput
   retryMessage?: string
-  tracker: TaskTrackerInnerAPI
 
   attemptNumber: number
   metadata: TMetadata