@fencyai/js 0.1.40 → 0.1.42

package/lib/api/createChatCompletion.js

@@ -1,46 +1,48 @@
-import { isApiError } from '../types/ApiError';
 import { isChatCompletion } from '../types/ChatCompletion';
+import { parseNonOkResponse } from '../utils/parseNonOkResponse';
 import { getPackageVersion } from '../utils/version';
 export async function createChatCompletion(params) {
     const apiUrl = `${params.baseUrl}/v1/pub/chat-completions`;
     console.log('request', params.request);
-    const response = await fetch(apiUrl, {
-        method: 'POST',
-        headers: {
-            'Content-Type': 'application/json',
-            Authorization: `Bearer ${params.pk}`,
-            'X-Fency-Sdk-Version': getPackageVersion(),
-        },
-        body: JSON.stringify(params.request),
-    });
-    if (!response.ok) {
-        const error = await response.json();
-        if (isApiError(error)) {
+    try {
+        const response = await fetch(apiUrl, {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
+                Authorization: `Bearer ${params.pk}`,
+                'X-Fency-Sdk-Version': getPackageVersion(),
+            },
+            body: JSON.stringify(params.request),
+        });
+        if (!response.ok) {
+            const error = await parseNonOkResponse(response);
+            return {
+                type: 'error',
+                error: error,
+            };
+        }
+        const completion = await response.json();
+        if (!isChatCompletion(completion)) {
             return {
                 type: 'error',
-                error,
+                error: {
+                    code: 'InvalidResponse',
+                    message: `Invalid chat completion response: ${JSON.stringify(completion)}`,
+                },
             };
         }
         return {
-            type: 'error',
-            error: {
-                code: 'UnknownError',
-                message: `Unknown error: ${JSON.stringify(error)}`,
-            },
+            type: 'success',
+            completion,
         };
     }
-    const completion = await response.json();
-    if (!isChatCompletion(completion)) {
+    catch (error) {
         return {
             type: 'error',
             error: {
-                code: 'InvalidResponse',
-                message: `Invalid chat completion response: ${JSON.stringify(completion)}`,
+                code: 'UnknownError',
+                message: `Unknown error!\n${error ? `Error: ${error}\n` : ''}`.trim(),
             },
         };
     }
-    return {
-        type: 'success',
-        completion,
-    };
 }

package/lib/api/createChatCompletionStream.js

@@ -1,44 +1,46 @@
-import { isApiError } from '../types/ApiError';
 import { isChatCompletionStream, } from '../types/ChatCompletionStream';
+import { parseNonOkResponse } from '../utils/parseNonOkResponse';
 import { getPackageVersion } from '../utils/version';
 export async function createChatCompletionStream(params) {
     const apiUrl = `${params.baseUrl}/v1/pub/chat-completion-streams`;
-    const response = await fetch(apiUrl, {
-        method: 'POST',
-        headers: {
-            'Content-Type': 'application/json',
-            Authorization: `Bearer ${params.pk}`,
-            'X-Fency-Sdk-Version': getPackageVersion(),
-        },
-    });
-    if (!response.ok) {
-        const error = await response.json();
-        if (isApiError(error)) {
+    try {
+        const response = await fetch(apiUrl, {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
+                Authorization: `Bearer ${params.pk}`,
+                'X-Fency-Sdk-Version': getPackageVersion(),
+            },
+        });
+        if (!response.ok) {
+            const error = await parseNonOkResponse(response);
+            return {
+                type: 'error',
+                error: error,
+            };
+        }
+        const stream = await response.json();
+        if (!isChatCompletionStream(stream)) {
             return {
                 type: 'error',
-                error,
+                error: {
+                    code: 'InvalidResponse',
+                    message: `Invalid stream response: ${JSON.stringify(stream)}`,
+                },
             };
         }
         return {
-            type: 'error',
-            error: {
-                code: 'UnknownError',
-                message: `Unknown error: ${JSON.stringify(error)}`,
-            },
+            type: 'success',
+            stream: stream,
         };
     }
-    const stream = await response.json();
-    if (!isChatCompletionStream(stream)) {
+    catch (error) {
         return {
             type: 'error',
             error: {
-                code: 'InvalidResponse',
-                message: `Invalid stream response: ${JSON.stringify(stream)}`,
+                code: 'UnknownError',
+                message: `Unknown error!\n${error ? `Error: ${error}\n` : ''}`.trim(),
             },
         };
     }
-    return {
-        type: 'success',
-        stream: stream,
-    };
 }

package/lib/index.d.ts

@@ -1,21 +1,22 @@
 import { createChatCompletion } from './api/createChatCompletion';
 import { createChatCompletionStream } from './api/createChatCompletionStream';
 import { loadFency } from './loadFency';
-export type { FencyInstance, FencyOptions, } from './types';
+export type { FencyInstance, FencyOptions } from './types';
+export type { AnthropicModel } from './types/AnthropicModel';
 export type { ChatCompletion, isChatCompletion } from './types/ChatCompletion';
 export type { ChatCompletionMessage } from './types/ChatCompletionMessage';
 export type { ChatCompletionStream } from './types/ChatCompletionStream';
-export type { CreateChatCompletionRequest } from './types/CreateChatCompletionRequest';
 export type { CreateAnthropicChatCompletionParams } from './types/CreateAnthropicChatCompletionParams';
+export type { CreateChatCompletionRequest } from './types/CreateChatCompletionRequest';
 export type { CreateGeminiChatCompletionParams } from './types/CreateGeminiChatCompletionParams';
 export type { CreateOpenAiChatCompletionParams } from './types/CreateOpenAiChatCompletionParams';
-export type { AnthropicModel } from './types/AnthropicModel';
 export type { GeminiModel } from './types/GeminiModel';
 export type { OpenAiModel } from './types/OpenAiModel';
 export { createChatCompletion } from './api/createChatCompletion';
 export type { CreateChatCompletionOptions } from './api/createChatCompletion';
 export { createChatCompletionStream } from './api/createChatCompletionStream';
 export { loadFency } from './loadFency';
+export type { ApiError } from './types/ApiError';
 declare const _default: {
     loadFency: typeof loadFency;
     createChatCompletion: typeof createChatCompletion;

package/lib/types/ApiError.d.ts

@@ -1,4 +1,3 @@
-export declare const isApiError: (response: unknown) => response is ApiError;
 export type ApiError = {
     code: string;
     message: string;

package/lib/types/ApiError.js

@@ -1,8 +1 @@
-export const isApiError = (response) => {
-    return (typeof response === 'object' &&
-        response !== null &&
-        'code' in response &&
-        'message' in response &&
-        typeof response.code === 'string' &&
-        typeof response.message === 'string');
-};
+export {};

package/lib/utils/parseApiError.d.ts

@@ -0,0 +1,2 @@
+import { ApiError } from '../types/ApiError';
+export declare const parseApiError: (error: unknown) => ApiError | null;

package/lib/utils/parseApiError.js

@@ -0,0 +1,14 @@
+export const parseApiError = (error) => {
+    if (typeof error === 'object' &&
+        error !== null &&
+        'code' in error &&
+        'message' in error &&
+        typeof error.code === 'string' &&
+        typeof error.message === 'string') {
+        return {
+            code: error.code,
+            message: error.message,
+        };
+    }
+    return null;
+};

package/lib/utils/parseErrorBody.d.ts

@@ -0,0 +1 @@
+export declare const parseErrorBody: (response: Response) => Promise<unknown>;

package/lib/utils/parseErrorBody.js

@@ -0,0 +1,8 @@
+export const parseErrorBody = async (response) => {
+    try {
+        return await response.json();
+    }
+    catch (error) {
+        return null;
+    }
+};

package/lib/utils/parseNonOkResponse.d.ts

@@ -0,0 +1,2 @@
+import { ApiError } from '../types/ApiError';
+export declare const parseNonOkResponse: (response: Response) => Promise<ApiError>;

package/lib/utils/parseNonOkResponse.js

@@ -0,0 +1,35 @@
+import { parseApiError } from './parseApiError';
+import { parseErrorBody } from './parseErrorBody';
+export const parseNonOkResponse = async (response) => {
+    const error = await parseErrorBody(response);
+    const apiError = parseApiError(error);
+    if (apiError) {
+        return apiError;
+    }
+    if (apiError) {
+        return apiError;
+    }
+    if (response.status === 401) {
+        return {
+            code: 'InvalidCredentials',
+            message: `Invalid credentials provided. 
+Please make sure a valid publishable key is set. 
+You can find your publishable key in the Fency dashboard. 
+Take a look at https://docs.fency.ai/docs for more information.`,
+        };
+    }
+    if (response.status === 403) {
+        return {
+            code: 'ForbiddenOperation',
+            message: `Forbidden operation!
+If your publishable key is correctly set, you might need to whitelist the domain you're using in the Fency dashboard.
+If you're using localhost you also need to whitelist that.
+Take a look at https://docs.fency.ai/docs for more information.
+`,
+        };
+    }
+    return {
+        code: 'UnknownError',
+        message: `Unknown error!\n${response.status ? `Status code: ${response.status}\n` : ''}Response Body:${JSON.stringify(error, null, 2)}`.trim(),
+    };
+};

package/lib/utils/version.js

@@ -1,7 +1,7 @@
 // Browser-compatible version utility
 // The version is set at build time and can be overridden if needed
 // Build-time version constant - this should be updated during the build process
-const SDK_VERSION = '0.1.39';
+const SDK_VERSION = '0.1.41';
 // Allow runtime override if needed
 let versionOverride = null;
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fencyai/js",
-  "version": "0.1.40",
+  "version": "0.1.42",
   "description": "> TODO: description",
   "author": "staklau <steinaageklaussen@gmail.com>",
   "homepage": "",
@@ -39,5 +39,5 @@
     "ts-jest": "^29.1.1",
     "typescript": "^5.3.3"
   },
-  "gitHead": "0cab44f006aeac40bf6f333b083a3af7d361a099"
+  "gitHead": "a8e44437447dc885782eaf34c5df4cca71012e3f"
 }