@botpress/zai 2.0.8 → 2.0.11

package/e2e/utils.ts

@@ -4,10 +4,9 @@ import fs from 'node:fs'
 import path from 'node:path'
 import { beforeAll } from 'vitest'
 import { Zai } from '../src'
-import { fastHash } from '../src/utils'
+import { getCachedCognitiveClient } from './client'
 
 const DATA_PATH = path.join(__dirname, 'data')
-const CACHE_PATH = path.join(DATA_PATH, 'cache.jsonl')
 const DOC_PATH = path.join(DATA_PATH, 'botpress_docs.txt')
 
 export const getClient = () => {
@@ -18,59 +17,8 @@ export const getClient = () => {
   })
 }
 
-function readJSONL<T>(filePath: string, keyProperty: keyof T): Map<string, T> {
-  const lines = fs.readFileSync(filePath, 'utf-8').split(/\r?\n/).filter(Boolean)
-
-  const map = new Map<string, T>()
-
-  for (const line of lines) {
-    const obj = JSON.parse(line) as T
-    const key = String(obj[keyProperty])
-    map.set(key, obj)
-  }
-
-  return map
-}
-
-const cache: Map<string, { key: string; value: any }> = readJSONL(CACHE_PATH, 'key')
-
 export const getCachedClient = () => {
-  const client = getClient()
-
-  const proxy = new Proxy(client, {
-    get(target, prop) {
-      if (prop === 'callAction') {
-        return async (...args: Parameters<Client['callAction']>) => {
-          const key = fastHash(JSON.stringify(args))
-          const cached = cache.get(key)
-
-          if (cached) {
-            return cached.value
-          }
-
-          const response = await target.callAction(...args)
-          cache.set(key, { key, value: response })
-
-          fs.appendFileSync(
-            CACHE_PATH,
-            JSON.stringify({
-              key,
-              value: response,
-            }) + '\n'
-          )
-
-          return response
-        }
-      }
-      return Reflect.get(target, prop)
-    },
-  })
-
-  ;(proxy as any).clone = () => {
-    return getCachedClient()
-  }
-
-  return proxy
+  return getCachedCognitiveClient()
 }
 
 export const getZai = () => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@botpress/zai",
   "description": "Zui AI (zai) – An LLM utility library written on top of Zui and the Botpress API",
-  "version": "2.0.8",
+  "version": "2.0.11",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "exports": {
@@ -23,7 +23,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@botpress/cognitive": "0.1.23",
+    "@botpress/cognitive": "0.1.25",
     "json5": "^2.2.3",
     "jsonrepair": "^3.10.0",
     "lodash-es": "^4.17.21"
@@ -33,6 +33,7 @@
     "@botpress/common": "workspace:*",
     "@botpress/vai": "workspace:*",
     "@types/lodash-es": "^4.17.12",
+    "diff": "^8.0.1",
     "dotenv": "^16.4.4",
     "esbuild": "^0.16.12",
     "glob": "^9.3.4",
@@ -41,7 +42,7 @@
   },
   "peerDependencies": {
     "@bpinternal/thicktoken": "^1.0.0",
-    "@bpinternal/zui": "^0.22.5"
+    "@bpinternal/zui": "^1.0.0"
   },
   "engines": {
     "node": ">=18.0.0"

package/src/adapters/botpress-table.ts

@@ -1,5 +1,5 @@
 import { type Client } from '@botpress/client'
-import { z } from '@bpinternal/zui'
+import { transforms, z } from '@bpinternal/zui'
 
 import { GenerationMetadata } from '../utils'
 import { Adapter, GetExamplesProps, SaveExampleProps } from './adapter'
@@ -73,7 +73,7 @@ const TableSchema = z.object({
 const searchableColumns = ['input'] as const satisfies Array<keyof typeof TableSchema.shape> as string[]
 
 const TableJsonSchema = Object.entries(TableSchema.shape).reduce((acc, [key, value]) => {
-  acc[key] = value.toJsonSchema()
+  acc[key] = transforms.toJSONSchemaLegacy(value)
   acc[key]['x-zui'] ??= {}
   acc[key]['x-zui'].searchable = searchableColumns.includes(key)
   return acc

package/src/operations/check.ts

@@ -9,15 +9,19 @@ const _Example = z.object({
   input: z.any(),
   check: z.boolean(),
   reason: z.string().optional(),
+  condition: z.string().optional(),
 })
 
+type Example = {
+  input: unknown
+  check: boolean
+  reason?: string
+  condition?: string
+}
+
 export type Options = {
   /** Examples to check the condition against */
-  examples?: Array<{
-    input: unknown
-    check: boolean
-    reason?: string
-  }>
+  examples?: Array<Example>
 }
 
 const _Options = z.object({
@@ -88,14 +92,20 @@ Zai.prototype.check = async function (this: Zai, input: unknown, condition: stri
   }
 
   const defaultExamples = [
-    { input: '50 Cent', check: true, reason: '50 Cent is widely recognized as a public personality.' },
+    {
+      input: '50 Cent',
+      check: true,
+      reason: '50 Cent is widely recognized as a public personality.',
+      condition: 'Is the input a public personality?',
+    },
     {
       input: ['apple', 'banana', 'carrot', 'house'],
       check: false,
       reason:
         'The list contains a house, which is not a fruit. Also, the list contains a carrot, which is a vegetable.',
+      condition: 'Is the input exclusively a list of fruits?',
     },
-  ]
+  ] satisfies Example[]
 
   const userExamples = [
     ...examples.map((e) => ({ input: e.input, check: e.output, reason: e.explanation })),
@@ -123,8 +133,12 @@ ${END}
 `.trim()
   }
 
-  const formatExample = (example: { input?: any; check: boolean; reason?: string }) => [
-    { type: 'text' as const, content: formatInput(stringify(example.input ?? null), condition), role: 'user' as const },
+  const formatExample = (example: Example) => [
+    {
+      type: 'text' as const,
+      content: formatInput(stringify(example.input ?? null), example.condition ?? condition),
+      role: 'user' as const,
+    },
     {
       type: 'text' as const,
       content: formatOutput(example.check, example.reason ?? ''),

package/src/operations/extract.ts

@@ -82,7 +82,7 @@ Zai.prototype.extract = async function <S extends OfType<AnyObjectOrArray>>(
     throw new Error('Schema must be either a ZuiObject or a ZuiArray<ZuiObject>')
   }
 
-  const schemaTypescript = schema.toTypescript({ declaration: false })
+  const schemaTypescript = schema.toTypescriptType({ declaration: false })
   const schemaLength = tokenizer.count(schemaTypescript)
 
   options.chunkLength = Math.min(

package/src/zai.ts

@@ -92,7 +92,7 @@ export class Zai {
 
   public constructor(config: ZaiConfig) {
     this._originalConfig = config
-    const parsed = _ZaiConfig.parse(config)
+    const parsed = _ZaiConfig.parse(config) as ZaiConfig
 
     this.client = Cognitive.isCognitiveClient(parsed.client)
       ? (parsed.client as unknown as Cognitive)