@fencyai/react 0.1.47 → 0.1.48

package/lib/hooks/useFiles/index.d.ts

@@ -1,3 +1,3 @@
-import { UseFileUploadProps } from '../../types/UseFileUploadProps';
-import { UseFileUploads } from '../../types/UseFileUploads';
-export declare function useFiles(props: UseFileUploadProps): UseFileUploads;
+import { UseFiles } from '../../types/UseFiles';
+import { UseFilesProps } from '../../types/UseFilesProps';
+export declare function useFiles(props: UseFilesProps): UseFiles;

package/lib/hooks/useFiles/index.js

@@ -7,7 +7,7 @@ export function useFiles(props) {
     const context = useFencyContext();
     const { createStream } = useStream({
         onFileUploadCompleted: (streamData) => {
-            props.onUploadComplete?.(streamData);
+            props.onUploadCompleted?.(streamData);
             setFileUploads((prev) => prev.map((fileUpload) => {
                 return fileUpload.upload.id === streamData.uploadId
                     ? { ...fileUpload, status: 'upload_complete' }
@@ -15,7 +15,7 @@ export function useFiles(props) {
             }));
         },
         onFileTextContentReady: (streamData) => {
-            props.onFileTextContentReady?.(streamData);
+            props.onTextContentReady?.(streamData);
             setFileUploads((prev) => prev.map((fileUpload) => fileUpload.upload.id === streamData.uploadId
                 ? { ...fileUpload, textContent: streamData.text }
                 : fileUpload));
@@ -23,7 +23,7 @@ export function useFiles(props) {
     });
     const createFileUpload = async (params) => {
         const stream = await createStream({
-            type: 'FileUploadStream',
+            type: 'FileStream',
         });
         if (stream.type === 'success') {
             const response = await createUpload({
@@ -45,8 +45,8 @@ export function useFiles(props) {
                         file: null,
                         error: null,
                         textContent: null,
-                        onUploadComplete: props.onUploadComplete,
-                        onFileTextContentReady: props.onFileTextContentReady,
+                        onUploadCompleted: props.onUploadCompleted,
+                        onTextContentReady: props.onTextContentReady,
                     },
                 ]);
             }

package/lib/hooks/useStream/index.js

@@ -18,7 +18,10 @@ export const useStream = (props) => {
         },
         onMessage: (message) => {
             const streamData = toStreamData(message.data);
-            switch (streamData?.type) {
+            if (!streamData) {
+                return false;
+            }
+            switch (streamData.type) {
                 case 'NewChatCompletionStreamChunk':
                     props?.onNewChatCompletionStreamChunk?.(streamData);
                     return true;
@@ -37,8 +40,12 @@ export const useStream = (props) => {
                 case 'FileTextContentReady':
                     props?.onFileTextContentReady?.(streamData);
                     return true;
-                default:
-                    return false;
+                case 'WebsiteHtmlContentReady':
+                    props?.onWebsiteHtmlContentReady?.(streamData);
+                    return true;
+                case 'WebsiteTextContentReady':
+                    props?.onWebsiteTextContentReady?.(streamData);
+                    return true;
             }
         },
     });

package/lib/hooks/useWebsites/index.d.ts

@@ -1,2 +1,3 @@
 import { UseWebsites } from '../../types/UseWebsites';
-export declare function useWebsites(): UseWebsites;
+import { UseWebsitesProps } from '../../types/UseWebsitesProps';
+export declare function useWebsites(props: UseWebsitesProps): UseWebsites;

package/lib/hooks/useWebsites/index.js

@@ -1,16 +1,53 @@
-import { createWebsite } from '@fencyai/js';
+import { createWebsite as createWebsiteApi, } from '@fencyai/js';
+import { useState } from 'react';
 import { useFencyContext } from '../../provider/useFencyContext';
-export function useWebsites() {
+import { useStream } from '../useStream';
+export function useWebsites(props) {
     const context = useFencyContext();
-    const scrapeContent = async (params) => {
-        const response = await createWebsite({
-            pk: context.fency.publishableKey,
-            request: params,
-            baseUrl: context.fency.baseUrl,
+    const [websites, setWebsites] = useState([]);
+    const { createStream } = useStream({
+        onWebsiteHtmlContentReady: (streamData) => {
+            props.onHtmlContentReady?.(streamData);
+            setWebsites((prev) => prev.map((website) => {
+                return website.id === streamData.websiteId
+                    ? { ...website, status: 'website_complete' }
+                    : website;
+            }));
+        },
+        onWebsiteTextContentReady: (streamData) => {
+            props.onTextContentReady?.(streamData);
+            setWebsites((prev) => prev.map((website) => website.id === streamData.websiteId
+                ? { ...website, textContent: streamData.textContent }
+                : website));
+        },
+    });
+    const createWebsite = async (params) => {
+        const stream = await createStream({
+            type: 'ChatCompletionStream',
         });
-        return response;
+        if (stream.type === 'success') {
+            const response = await createWebsiteApi({
+                pk: context.fency.publishableKey,
+                request: {
+                    url: params.url,
+                    streamId: stream.stream.id,
+                },
+                baseUrl: context.fency.baseUrl,
+            });
+            if (response.type === 'success') {
+                setWebsites([...websites, response.website]);
+            }
+            return response;
+        }
+        else {
+            return {
+                type: 'error',
+                error: stream.error,
+            };
+        }
     };
     return {
-        scrapeContent,
+        createWebsite,
+        websites,
     };
 }

package/lib/types/FileUpload.d.ts

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

package/lib/types/{UseFileUploads.d.ts → UseFiles.d.ts}

@@ -1,7 +1,7 @@
 import { CreateUploadResponse } from '@fencyai/js';
 import { CreateUploadParams } from './CreateUploadParams';
 import { FileUpload } from './FileUpload';
-export interface UseFileUploads {
+export interface UseFiles {
     createFileUpload: (params: CreateUploadParams) => Promise<CreateUploadResponse>;
     fileUploads: FileUpload[];
 }

package/lib/types/UseFilesProps.d.ts

@@ -0,0 +1,5 @@
+import { FileTextContentReady, FileUploadCompleted } from '@fencyai/js/lib/types/StreamData';
+export interface UseFilesProps {
+    onUploadCompleted?: (event: FileUploadCompleted) => void;
+    onTextContentReady?: (event: FileTextContentReady) => void;
+}

package/lib/types/UseStreamProps.d.ts

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

package/lib/types/UseWebsites.d.ts

@@ -1,4 +1,5 @@
-import { CreateWebsiteRequest, CreateWebsiteResponse } from '@fencyai/js';
+import { CreateWebsiteRequest, CreateWebsiteResponse, Website } from '@fencyai/js';
 export interface UseWebsites {
-    scrapeContent: (params: CreateWebsiteRequest) => Promise<CreateWebsiteResponse>;
+    websites: Website[];
+    createWebsite: (params: CreateWebsiteRequest) => Promise<CreateWebsiteResponse>;
 }

package/lib/types/UseWebsitesProps.d.ts

@@ -0,0 +1,5 @@
+import { WebsiteHtmlContentReady, WebsiteTextContentReady } from '@fencyai/js/lib/types/StreamData';
+export interface UseWebsitesProps {
+    onHtmlContentReady?: (event: WebsiteHtmlContentReady) => void;
+    onTextContentReady?: (event: WebsiteTextContentReady) => void;
+}

package/lib/types/UseWebsitesProps.js

@@ -0,0 +1 @@
+export {};

package/lib/types/index.d.ts

@@ -18,8 +18,8 @@ export * from './UseStream';
 export * from './CreateStreamResponse';
 export * from './StreamError';
 export * from './UseStreamProps';
-export * from './UseFileUploads';
-export * from './UseFileUploadProps';
+export * from './UseFiles';
+export * from './UseFilesProps';
 export * from './FileUploadStatus';
 export * from './FileUpload';
 export * from './UseWebsites';

package/lib/types/index.js

@@ -25,8 +25,8 @@ export * from './CreateStreamResponse';
 export * from './StreamError';
 export * from './UseStreamProps';
 // File upload types
-export * from './UseFileUploads';
-export * from './UseFileUploadProps';
+export * from './UseFiles';
+export * from './UseFilesProps';
 export * from './FileUploadStatus';
 export * from './FileUpload';
 // Website types

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fencyai/react",
-  "version": "0.1.47",
+  "version": "0.1.48",
   "description": "> TODO: description",
   "author": "staklau <steinaageklaussen@gmail.com>",
   "homepage": "",
@@ -36,7 +36,7 @@
     "zod": "^4.0.5"
   },
   "devDependencies": {
-    "@fencyai/js": "^0.1.47",
+    "@fencyai/js": "^0.1.48",
     "@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.47",
+    "@fencyai/js": "^0.1.48",
     "react": ">=16.8.0"
   },
-  "gitHead": "f86bd2ae856f0dfc51edbf434e62e63f4c86f79b"
+  "gitHead": "889ff241bad28cb096835f3e72389bfdcf1d51ee"
 }

package/lib/types/UseFileUploadProps.d.ts

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