chore(cognitive): cleanup (botpress#14288)

Author: allardy

packages/cognitive/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@botpress/cognitive",
-  "version": "0.1.39",
+  "version": "0.1.40",
   "description": "Wrapper around the Botpress Client to call LLMs",
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",

packages/cognitive/src/client.ts

@@ -166,13 +166,7 @@ export class Cognitive {
       return this._generateContent(input)
     }
 
-    const betaClient = new CognitiveBeta({
-      headers: this._client.config.headers as Record<string, string>,
-      withCredentials: this._client.config.withCredentials,
-      baseUrl: this._client.config.apiUrl.includes('.cloud')
-        ? 'https://cognitive.botpress.cloud'
-        : 'https://cognitive.botpress.dev',
-    })
+    const betaClient = new CognitiveBeta(this._client.config as any)
 
     const response = await betaClient.generateText(input as any)
     return {

packages/cognitive/src/cognitive_beta/index.ts

@@ -5,7 +5,7 @@ import { CognitiveRequest, CognitiveResponse, CognitiveStreamChunk, Model } from
 export { CognitiveRequest, CognitiveResponse, CognitiveStreamChunk }
 
 type ClientProps = {
-  baseUrl?: string
+  apiUrl?: string
   timeout?: number
   botId?: string
   token?: string
@@ -22,49 +22,52 @@ const isBrowser = () => typeof window !== 'undefined' && typeof window.fetch ===
 
 export class CognitiveBeta {
   private _axiosClient: AxiosInstance
-  private readonly _config: Required<ClientProps>
+  private readonly _apiUrl: string
+  private readonly _timeout: number
+  private readonly _withCredentials: boolean
+  private readonly _headers: Record<string, string>
 
   public constructor(props: ClientProps) {
-    this._config = {
-      baseUrl: props.baseUrl || 'https://cognitive.botpress.cloud',
-      timeout: props.timeout || 60_001,
-      token: props.token || '',
-      botId: props.botId || '',
-      withCredentials: props.withCredentials || false,
-      headers: props.headers || {},
+    this._apiUrl = props.apiUrl || 'https://api.botpress.cloud'
+    this._timeout = props.timeout || 60_001
+    this._withCredentials = props.withCredentials || false
+    this._headers = { ...props.headers }
+
+    if (props.botId) {
+      this._headers['X-Bot-Id'] = props.botId
+    }
+
+    if (props.token) {
+      this._headers['Authorization'] = `Bearer ${props.token}`
     }
 
     this._axiosClient = axios.create({
-      headers: {
-        Authorization: `Bearer ${this._config.token}`,
-        'X-Bot-Id': this._config.botId,
-        ...this._config.headers,
-      },
-      withCredentials: this._config.withCredentials,
-      baseURL: this._config.baseUrl,
+      headers: this._headers,
+      withCredentials: this._withCredentials,
+      baseURL: this._apiUrl,
     })
   }
 
   public async generateText(input: CognitiveRequest, options: RequestOptions = {}) {
-    const signal = options.signal ?? AbortSignal.timeout(this._config.timeout)
+    const signal = options.signal ?? AbortSignal.timeout(this._timeout)
 
     const { data } = await this._withServerRetry(() =>
-      this._axiosClient.post<CognitiveResponse>('/v1/generate-text', input, {
+      this._axiosClient.post<CognitiveResponse>('/v2/cognitive/generate-text', input, {
         signal,
-        timeout: options.timeout ?? this._config.timeout,
+        timeout: options.timeout ?? this._timeout,
       })
     )
 
     return data
   }
 
   public async listModels(input: void, options: RequestOptions = {}) {
-    const signal = options.signal ?? AbortSignal.timeout(this._config.timeout)
+    const signal = options.signal ?? AbortSignal.timeout(this._timeout)
 
     const { data } = await this._withServerRetry(() =>
-      this._axiosClient.post<Model[]>('/v1/models', input, {
+      this._axiosClient.post<Model[]>('/v2/cognitive/models', input, {
         signal,
-        timeout: options.timeout ?? this._config.timeout,
+        timeout: options.timeout ?? this._timeout,
       })
     )
 
@@ -75,18 +78,16 @@ export class CognitiveBeta {
     request: CognitiveRequest,
     options: RequestOptions = {}
   ): AsyncGenerator<CognitiveStreamChunk, void, unknown> {
-    const signal = options.signal ?? AbortSignal.timeout(this._config.timeout)
+    const signal = options.signal ?? AbortSignal.timeout(this._timeout)
 
     if (isBrowser()) {
-      const res = await fetch(`${this._config.baseUrl}/v1/generate-text-stream`, {
+      const res = await fetch(`${this._apiUrl}/v2/cognitive/generate-text-stream`, {
         method: 'POST',
         headers: {
-          Authorization: `Bearer ${this._config.token}`,
-          'X-Bot-Id': this._config.botId,
+          ...this._headers,
           'Content-Type': 'application/json',
-          ...this._config.headers,
         },
-        credentials: this._config.withCredentials ? 'include' : 'omit',
+        credentials: this._withCredentials ? 'include' : 'omit',
         body: JSON.stringify({ ...request, stream: true }),
         signal,
       })
@@ -129,7 +130,7 @@ export class CognitiveBeta {
         {
           responseType: 'stream',
           signal,
-          timeout: options.timeout ?? this._config.timeout,
+          timeout: options.timeout ?? this._timeout,
         }
       )
     )

packages/llmz/package.json

@@ -67,7 +67,7 @@
     "tsx": "^4.19.2"
   },
   "peerDependencies": {
-    "@botpress/cognitive": "0.1.39",
+    "@botpress/cognitive": "0.1.40",
     "@bpinternal/thicktoken": "^1.0.5",
     "@bpinternal/zui": "^1.0.1"
   },

packages/zai/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.1.9",
+  "version": "2.1.10",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "exports": {
@@ -29,7 +29,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@botpress/cognitive": "0.1.39",
+    "@botpress/cognitive": "0.1.40",
     "json5": "^2.2.3",
     "jsonrepair": "^3.10.0",
     "lodash-es": "^4.17.21"