@fencyai/react 0.1.44 → 0.1.46

package/lib/types/FileUpload.d.ts

@@ -1,9 +1,11 @@
-import { ApiError, FencyFile, FencyUpload, FileUploadCompleted } from '@fencyai/js';
+import { ApiError, FencyFile, FencyUpload, FileTextContentReady, FileUploadCompleted } from '@fencyai/js';
 import { FileUploadStatus } from './FileUploadStatus';
 export interface FileUpload {
     status: FileUploadStatus;
     upload: FencyUpload;
     file: FencyFile | null;
     error: ApiError | null;
+    textContent: string | null;
     onUploadComplete?: (fileUpload: FileUploadCompleted) => void;
+    onFileTextContentReady?: (fileTextContentReady: FileTextContentReady) => void;
 }

package/lib/types/UseChatCompletions.d.ts

@@ -14,6 +14,7 @@ export interface UseChatCompletions {
         basic: SynchronousChatCompletion | null;
         structured: StructuredChatCompletion<ZodTypeAny> | null;
         streaming: StreamingChatCompletion | null;
+        response: string | null;
     };
     chatCompletions: CombinedChatCompletion[];
     createChatCompletion: (params: CreateSynchronousChatCompletionParams) => Promise<SynchronousChatCompletionResponse>;

package/lib/types/UseFileUploadProps.d.ts

@@ -1,4 +1,5 @@
-import { FileUploadCompleted } from '@fencyai/js';
+import { FileUploadCompleted, FileTextContentReady } from '@fencyai/js';
 export interface UseFileUploadProps {
-    onUploadComplete: (fileUpload: FileUploadCompleted) => void;
+    onUploadComplete?: (fileUpload: FileUploadCompleted) => void;
+    onFileTextContentReady?: (fileTextContentReady: FileTextContentReady) => void;
 }

package/lib/types/UseStreamProps.d.ts

@@ -1,10 +1,12 @@
 import { ChatCompletionStreamCompleted, FileUploadCompleted, NewChatCompletionStreamChunk, StreamNotFound, StreamTimeout } from '@fencyai/js';
 import { StreamError } from './StreamError';
+import { FileTextContentReady } from '@fencyai/js/lib/types/StreamData';
 export interface UseStreamProps {
     onNewChatCompletionStreamChunk?: (streamData: NewChatCompletionStreamChunk) => void;
     onChatCompletionStreamCompleted?: (stream: ChatCompletionStreamCompleted) => void;
     onStreamTimeout?: (error: StreamTimeout) => void;
     onStreamNotFound?: (error: StreamNotFound) => void;
     onFileUploadCompleted?: (error: FileUploadCompleted) => void;
+    onFileTextContentReady?: (error: FileTextContentReady) => void;
     onStreamError?: (error: StreamError) => void;
 }

package/lib/useChatCompletions/index.js

@@ -47,6 +47,13 @@ export function useChatCompletions() {
             streaming: lastCompletion?.type === 'streaming'
                 ? lastCompletion.chatCompletion
                 : null,
+            response: lastCompletion?.type === 'synchronous'
+                ? lastCompletion.chatCompletion.data?.response ?? null
+                : lastCompletion?.type === 'structured'
+                    ? JSON.stringify(lastCompletion.chatCompletion.data?.structuredResponse)
+                    : lastCompletion?.type === 'streaming'
+                        ? lastCompletion.chatCompletion.response
+                        : null,
         };
     }, [combinedChatCompletions]);
     return {

package/lib/useChatCompletions/useStreamingChatCompletions.js

@@ -1,4 +1,4 @@
-import { createChatCompletion } from '@fencyai/js';
+import { createChatCompletion, } from '@fencyai/js';
 import { useCallback, useEffect, useState } from 'react';
 import { useStream } from '../useStream';
 export const useStreamingChatCompletions = (context) => {
@@ -20,9 +20,10 @@ export const useStreamingChatCompletions = (context) => {
                 if (!existing)
                     return prev;
                 return [
-                    ...prev.filter((c) => c.streamId !== error.streamId),
+                    ...prev.filter((c) => c.streamId === error.streamId),
                     {
                         ...existing,
+                        loading: false,
                         error: error.error,
                     },
                 ];

package/lib/useFileUploads/index.js

@@ -8,8 +8,16 @@ export function useFileUploads(props) {
     const { createStream } = useStream({
         onFileUploadCompleted: (streamData) => {
             props.onUploadComplete?.(streamData);
+            setFileUploads((prev) => prev.map((fileUpload) => {
+                return fileUpload.upload.id === streamData.uploadId
+                    ? { ...fileUpload, status: 'upload_complete' }
+                    : fileUpload;
+            }));
+        },
+        onFileTextContentReady: (streamData) => {
+            props.onFileTextContentReady?.(streamData);
             setFileUploads((prev) => prev.map((fileUpload) => fileUpload.upload.id === streamData.uploadId
-                ? { ...fileUpload, status: 'upload_complete' }
+                ? { ...fileUpload, textContent: streamData.text }
                 : fileUpload));
         },
     });
@@ -36,7 +44,9 @@ export function useFileUploads(props) {
                         upload: response.upload,
                         file: null,
                         error: null,
+                        textContent: null,
                         onUploadComplete: props.onUploadComplete,
+                        onFileTextContentReady: props.onFileTextContentReady,
                     },
                 ]);
             }

package/lib/useStream/index.js

@@ -1,18 +1,23 @@
-import { createStream as createStreamApi } from '@fencyai/js';
+import { createStream as createStreamApi, } from '@fencyai/js';
 import { useState } from 'react';
 import { useFencyContext } from '../provider/useFencyContext';
 import { useEventSource } from '../useEventSource';
 export const useStream = (props) => {
     const context = useFencyContext();
-    const [urlToStreamIdMapping, setUrlToStreamIdMapping] = useState({});
     const [stream, setStream] = useState(null);
     const eventSource = useEventSource({
         onError: (url) => {
             console.error('Stream error:', url);
+            props?.onStreamError?.({
+                streamId: url,
+                error: {
+                    code: 'UnknownError',
+                    message: 'Unknown error in useStream',
+                },
+            });
         },
         onMessage: (message) => {
-            const streamId = requireStreamId(message.url, urlToStreamIdMapping);
-            const streamData = toStreamData(message.data, streamId);
+            const streamData = toStreamData(message.data);
             switch (streamData?.type) {
                 case 'NewChatCompletionStreamChunk':
                     props?.onNewChatCompletionStreamChunk?.(streamData);
@@ -29,6 +34,9 @@ export const useStream = (props) => {
                 case 'FileUploadCompleted':
                     props?.onFileUploadCompleted?.(streamData);
                     return true;
+                case 'FileTextContentReady':
+                    props?.onFileTextContentReady?.(streamData);
+                    return true;
                 default:
                     return false;
             }
@@ -43,10 +51,6 @@ export const useStream = (props) => {
         if (response.type === 'success') {
             setStream(response.stream);
             const url = `${context.fency.baseUrl}/v1/pub/streams/${response.stream.id}?pk=${context.fency.publishableKey}`;
-            setUrlToStreamIdMapping((prev) => ({
-                ...prev,
-                [url]: response.stream.id,
-            }));
             eventSource.setSource({
                 url,
             });
@@ -58,14 +62,7 @@ export const useStream = (props) => {
         stream,
     };
 };
-const requireStreamId = (url, urlToStreamIdMapping) => {
-    const streamId = urlToStreamIdMapping[url];
-    if (!streamId) {
-        throw new Error(`Stream ID not found for URL: ${url}`);
-    }
-    return streamId;
-};
-const toStreamData = (data, streamId) => {
+const toStreamData = (data) => {
     try {
         const json = JSON.parse(data);
         if (isStreamData(json)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fencyai/react",
-  "version": "0.1.44",
+  "version": "0.1.46",
   "description": "> TODO: description",
   "author": "staklau <steinaageklaussen@gmail.com>",
   "homepage": "",
@@ -36,7 +36,7 @@
     "zod": "^4.0.5"
   },
   "devDependencies": {
-    "@fencyai/js": "^0.1.44",
+    "@fencyai/js": "^0.1.46",
     "@types/jest": "^29.5.11",
     "@types/node": "^20.10.5",
     "@types/react": "^18.2.45",
@@ -45,8 +45,8 @@
     "typescript": "^5.3.3"
   },
   "peerDependencies": {
-    "@fencyai/js": "^0.1.44",
+    "@fencyai/js": "^0.1.46",
     "react": ">=16.8.0"
   },
-  "gitHead": "307425eea348ef9758f06b91467a9e8ad5dad453"
+  "gitHead": "1abe0a7b18e0145880247c29517b487dc775b1ab"
 }