@neuralinnovations/dataisland-sdk 0.0.1-dev9 → 0.1.1

package/src/storages/files/file.impl.ts

@@ -1,19 +1,25 @@
-import { Context } from "../../context"
-import { Disposable } from "../../disposable"
-import { FileDto, FileProgressDto } from "../../dto/workspacesResponse"
-import { RpcService } from "../../services/rpcService"
-import { ResponseUtils } from "../../services/responseUtils"
-import { File } from "./file"
+import {Context} from "../../context"
+import {Disposable} from "../../disposable"
+import {
+  FileDto, FileProcessingStage,
+  FileProgressDto,
+  MetadataDto
+} from "../../dto/workspacesResponse"
+import {RpcService} from "../../services/rpcService"
+import {ResponseUtils} from "../../services/responseUtils"
+import {File} from "./file"
+import {FilesEvent} from "./files"
 
 export class FileImpl extends File implements Disposable {
   private _isDisposed: boolean = false
   private _content?: FileDto
+  private _progress?: FileProgressDto
 
   constructor(private readonly context: Context) {
     super()
   }
 
-  public initFrom(file: FileDto): File {
+  async initFrom(file: FileDto): Promise<File> {
     this._content = file
 
     return this
@@ -35,35 +41,86 @@ export class FileImpl extends File implements Disposable {
     return <string>this._content?.name
   }
 
-  async url(): Promise<string> {
-    const response = await this.context
-      .resolve(RpcService)
-      ?.requestBuilder("api/v1/Files/url")
-      .searchParam("id", this.id)
-      .sendGet()
+  get description(): string {
+    return <string>this._content?.description
+  }
 
-    if (ResponseUtils.isFail(response)) {
-      await ResponseUtils.throwError(
-        `Failed to get file ${this.id} url`,
-        response
-      )
+  get metadata(): MetadataDto[] {
+    const metadataString = <string>this._content?.fileMetadata
+    if (metadataString === null || metadataString === undefined){
+      return []
     }
+    return <MetadataDto[]>JSON.parse(metadataString)
+  }
+
+  get createdAt(): number {
+    return <number>this._content?.createdAt
+  }
+
+  get modifiedAt(): number {
+    return <number>this._content?.modifiedAt
+  }
+  
+  get url(): string {
+    return <string>this._content?.url
+  }
+
+  get previewUrl(): string {
+    return <string>this._content?.previewUrl
+  }
 
-    return (await response!.json()).url
+  get status(): FileProcessingStage {
+    return <FileProcessingStage>this._content?.stage
   }
 
-  async status(): Promise<FileProgressDto> {
+  get progress(): FileProgressDto | undefined {
+    return this._progress
+  }
+
+  updateStatus(progress: FileProgressDto): void {
+    if (this._content){
+      this._progress = progress
+      this._content.stage = this._progress.stage
+
+      this.dispatch({
+        type: FilesEvent.UPDATED,
+        data: this
+      })
+    }
+  }
+
+  async update(name: string, metadata: MetadataDto[], description?: string){
+    if (!this._content) {
+      throw new Error("File is not loaded.")
+    }
+
+    if (name === undefined || metadata === undefined || name === null || metadata === null ){
+      throw new Error("File update, one of parameters is undefined or null")
+    }
+
+    const metadataString = JSON.stringify(metadata)
+
     const response = await this.context
       .resolve(RpcService)
-      ?.requestBuilder("api/v1/Files/fetch")
-      .searchParam("id", this.id)
-      .sendGet()
+      ?.requestBuilder("api/v1/Files")
+      .sendPutJson({
+        fileId: this.id,
+        name: name,
+        description: description ?? this.description,
+        metadata: metadataString
+      })
 
     if (ResponseUtils.isFail(response)) {
-      await ResponseUtils.throwError(`Failed to get file ${this.id}`, response)
+      await ResponseUtils.throwError("Failed to update file", response)
     }
 
-    const content = await response!.json()
-    return content.progress as FileProgressDto
+    this._content = (await response!.json() as {
+      file: FileDto
+    }).file as FileDto
+
+    this.dispatch({
+      type: FilesEvent.UPDATED,
+      data: this
+    })
   }
 }

package/src/storages/files/file.ts

@@ -1,11 +1,20 @@
-import { FileProgressDto } from "../../dto/workspacesResponse"
+import {
+  FileProcessingStage,
+  FileProgressDto,
+  MetadataDto
+} from "../../dto/workspacesResponse"
+import { EventDispatcher } from "../../events"
+import { FilesEvent } from "./files"
 
 export type FileId = string
 
 /**
  * File.
  */
-export abstract class File {
+export abstract class File extends EventDispatcher<
+  FilesEvent,
+  File
+> {
   /**
    * File id.
    */
@@ -16,13 +25,54 @@ export abstract class File {
    */
   abstract get name(): string
 
+  /**
+   * File description.
+   */
+  abstract get description(): string
+
+  /**
+   * File metadata.
+   */
+  abstract get metadata(): MetadataDto[]
+
+  /**
+   * File date added.
+   */
+  abstract get createdAt(): number
+
+  /**
+   * File date modified.
+   */
+  abstract get modifiedAt(): number
+
+  /**
+   * File uploading progress
+   */
+  abstract get progress(): FileProgressDto | undefined
+
+  /**
+   * File uploading status
+   */
+  abstract get status(): FileProcessingStage
+
+  /**
+   * Get temporary url.
+   */
+  abstract get url(): string
+
   /**
    * Get temporary url.
    */
-  abstract url(): Promise<string>
+  abstract get previewUrl(): string
+
+  /**
+   * Update file.
+   */
+  abstract update(name: string, metadata: MetadataDto[], description?: string): Promise<void>
 
   /**
-   * Get file status.
+   * Update file status
+   * @param progress
    */
-  abstract status(): Promise<FileProgressDto>
+  abstract updateStatus(progress: FileProgressDto): void
 }

package/src/storages/files/files.impl.ts

@@ -1,34 +1,18 @@
 import { Context } from "../../context"
-import { Disposable } from "../../disposable"
-import { FileDto, FileListResponse } from "../../dto/workspacesResponse"
+import {
+  FileDto,
+  FileListResponse, FileProcessingStage,
+  FilesBatchFetchResponse
+} from "../../dto/workspacesResponse"
 import { RpcService } from "../../services/rpcService"
 import { FileImpl } from "./file.impl"
 import { Files, FilesEvent, UploadFile } from "./files"
 import { WorkspaceImpl } from "../workspaces/workspace.impl"
 import { ResponseUtils } from "../../services/responseUtils"
-import { File } from "./file"
+import {File, FileId} from "./file"
 import { FilesPage } from "./filesPage"
-
-export class FilesPageImpl extends FilesPage implements Disposable {
-  private _isDisposed: boolean = false
-
-  public files: File[] = []
-  public total: number = 0
-  public filesPerPage: number = 0
-  public page: number = 0
-
-  get pages(): number {
-    return Math.ceil(Math.max(this.total / this.filesPerPage, 1.0))
-  }
-
-  get isDisposed(): boolean {
-    return this._isDisposed
-  }
-
-  dispose(): void {
-    this._isDisposed = true
-  }
-}
+import { FilesPageImpl } from "./filesPage.impl"
+// import { FormData } from "../../utils/request"
 
 export class FilesImpl extends Files {
   constructor(
@@ -41,12 +25,25 @@ export class FilesImpl extends Files {
   // Object used as files page data, returned by "query"
   public filesList?: FilesPage
 
-  async upload(file: any): Promise<File> {
-    return await this.internalUpload(file)
+  private _fetchList: FileId[] = []
+
+  async upload(files: UploadFile[]): Promise<File[]> {
+    const loaded_files = []
+    for (const file of files) {
+      const loaded_file = await this.internalUpload(file)
+      if (loaded_file != undefined){
+        loaded_files.push(loaded_file)
+      }
+    }
+    return loaded_files
+  }
+
+  async get(fileId: string): Promise<File>{
+    return await this.internalGetFile(fileId)
   }
 
-  async delete(id: string): Promise<void> {
-    return await this.internalDeleteFile(id)
+  async delete(ids: string[]): Promise<void> {
+    await this.internalDeleteFiles(ids)
   }
 
   async query(query: string, page: number, limit: number): Promise<FilesPage> {
@@ -57,43 +54,107 @@ export class FilesImpl extends Files {
   // INTERNALS
   //----------------------------------------------------------------------------
 
-  /**
-   * Delete organization.
-   * @param id
-   */
-  async internalDeleteFile(id: string): Promise<void> {
+  async internalFetchQuery(): Promise<void> {
+    const response = await this.context
+      .resolve(RpcService)
+      ?.requestBuilder("api/v1/Files/fetch/batch")
+      .searchParam("organizationId", this.workspace.organization.id)
+      .searchParam("fileIds", this._fetchList.join(","))
+      .sendGet()
+
+    if (ResponseUtils.isFail(response)) {
+      await ResponseUtils.throwError(`Failed to fetch files for org ${this.workspace.organization.id} and workspace ${this.workspace.id}`, response)
+    }
+
+    const progress = (await response!.json()) as FilesBatchFetchResponse
+
+    for (const prg of progress.progress){
+      const file = this.filesList?.files?.find(fl => fl.id == prg.file_id)
+      if (file) {
+        file.updateStatus(prg)
+        if (file.status > FileProcessingStage.PROCESSING){
+          const index = this._fetchList.indexOf(file.id)
+          this._fetchList.splice(index, 1)
+        }
+      }
+    }
+
+    if (this._fetchList.length != 0){
+      setTimeout(async () => await this.internalFetchQuery(), 2000)
+    }
+  }
+
+  async internalGetFile(id: string): Promise<File>{
     if (id === undefined || id === null) {
-      throw new Error("File delete, id is undefined or null")
+      throw new Error("File get, id is undefined or null")
     }
     if (id.length === 0 || id.trim().length === 0) {
-      throw new Error("File delete, id is empty")
+      throw new Error("File get, id is empty")
     }
 
     const response = await this.context
       .resolve(RpcService)
-      ?.requestBuilder("/api/v1/Files")
+      ?.requestBuilder("api/v1/Files")
       .searchParam("id", id)
-      .sendDelete()
+      .sendGet()
+
     if (ResponseUtils.isFail(response)) {
-      await ResponseUtils.throwError(`File ${id} delete, failed`, response)
+      await ResponseUtils.throwError(
+        `Failed to get file ${id}`,
+        response
+      )
     }
-    const file = <FileImpl>this.filesList!.files.find(f => f.id === id)
-    const index = this.filesList!.files.indexOf(file)
-    if (index < 0) {
-      throw new Error("Organization delete, index is not found")
+
+    // parse file from the server's response
+    const result = (await response!.json() as { file: FileDto }).file as FileDto
+
+    // create file implementation
+    const fileImpl = new FileImpl(this.context)
+
+    return await fileImpl.initFrom(result)
+  }
+
+  /**
+   * Delete file.
+   * @param ids array of file ids
+   */
+  async internalDeleteFiles(ids: string[]): Promise<void> {
+    if (ids === undefined || ids === null) {
+      throw new Error("File delete, ids array is undefined or null")
+    }
+    if (ids.length === 0) {
+      throw new Error("File delete, array of ids is empty")
     }
 
-    // remove file from collection
-    this.filesList!.files.splice(index, 1)
+    const response = await this.context
+      .resolve(RpcService)
+      ?.requestBuilder("api/v1/Files")
+      .searchParam("fileIds", ids.toString() )
+      .sendDelete()
+      
+    if (ResponseUtils.isFail(response)) {
+      await ResponseUtils.throwError(`Files ${ids} delete, failed`, response)
+    }
 
-    // dispatch event, file removed
-    this.dispatch({
-      type: FilesEvent.REMOVED,
-      data: file
-    })
+    for (const id of ids) {
+      const file = <FileImpl>this.filesList!.files.find(f => f.id === id)
+      const index = this.filesList!.files.indexOf(file)
+      if (index < 0) {
+        throw new Error("File delete, index is not found")
+      }
+
+      // remove file from collection
+      this.filesList!.files.splice(index, 1)
+
+      // dispatch event, file removed
+      this.dispatch({
+        type: FilesEvent.REMOVED,
+        data: file
+      })
 
-    // dispose file
-    file.dispose()
+      // dispose file
+      file.dispose()
+    }
   }
 
   async internalQuery(
@@ -122,7 +183,6 @@ export class FilesImpl extends Files {
     const response = await this.context
       .resolve(RpcService)
       ?.requestBuilder("api/v1/Files/list")
-
       .searchParam("workspaceId", this.workspace.id)
       .searchParam("organizationId", this.workspace.organization.id)
       .searchParam("query", query)
@@ -138,6 +198,8 @@ export class FilesImpl extends Files {
       )
     }
 
+    this._fetchList = []
+
     // parse files from the server's response
     const files = (await response!.json()) as FileListResponse
 
@@ -151,25 +213,27 @@ export class FilesImpl extends Files {
     for (const fl of files.files) {
 
       // create file implementation
-      const file = new FileImpl(this.context).initFrom(fl)
+      const file = await new FileImpl(this.context).initFrom(fl)
 
       // add file to the collection
       filesList.files.push(file)
 
-      // dispatch event, file added
-      this.dispatch({
-        type: FilesEvent.ADDED,
-        data: file
-      })
+      if (file.status <= FileProcessingStage.PROCESSING) {
+        this._fetchList.push(file.id)
+      }
     }
 
     // set files list
     this.filesList = filesList
 
+    if (this._fetchList.length != 0){
+      setTimeout(async () => await this.internalFetchQuery(), 2000)
+    }
+
     return filesList
   }
 
-  async internalUpload(file: UploadFile): Promise<File> {
+  async internalUpload(file: UploadFile): Promise<File | undefined> {
     // check file
     if (file === undefined || file === null) {
       throw new Error("File upload, file is undefined or null")
@@ -190,17 +254,20 @@ export class FilesImpl extends Files {
 
     // check response status
     if (ResponseUtils.isFail(response)) {
+      if (await ResponseUtils.isLimitReached()){
+        return undefined
+      }
+      
       await ResponseUtils.throwError(`File upload ${file.name}`, response)
     }
 
     // parse file from the server's response
-    const result = (await response!.json()).file as FileDto
+    const result = (await response!.json() as { file: FileDto }).file as FileDto
 
     // create file implementation
-    const fileImpl = new FileImpl(this.context).initFrom(result)
+    const fileImpl = new FileImpl(this.context)
 
-    // TODO: why is this here?
-    this.filesList?.files.push(fileImpl)
+    await fileImpl.initFrom(result)
 
     // dispatch event, file added
     this.dispatch({

package/src/storages/files/files.ts

@@ -7,7 +7,8 @@ import { FilesPage } from "./filesPage"
  */
 export enum FilesEvent {
   ADDED = "added",
-  REMOVED = "removed"
+  REMOVED = "removed",
+  UPDATED = "updated"
 }
 
 /**
@@ -22,13 +23,19 @@ export abstract class Files extends EventDispatcher<FilesEvent, File> {
   /**
    * Upload file.
    */
-  abstract upload(file: UploadFile): Promise<File>
+  abstract upload(files: UploadFile[]): Promise<File[]>
 
   /**
-   * Delete file.
-   * @param id
+   * Get file by ID
+   * @param fileId 
    */
-  abstract delete(id: FileId): Promise<void>
+  abstract get(fileId: FileId): Promise<File>
+
+  /**
+   * Delete files.
+   * @param ids
+   */
+  abstract delete(ids: FileId[]): Promise<void>
 
   /**
    * Query files.

package/src/storages/files/filesPage.impl.ts

@@ -0,0 +1,37 @@
+import { FilesPage } from "./filesPage"
+import { Disposable } from "../../disposable"
+import { File } from "./file"
+
+export class FilesPageImpl extends FilesPage implements Disposable {
+  private _isDisposed: boolean = false
+
+  public files: File[] = []
+  public total: number = 0
+  public filesPerPage: number = 0
+  public page: number = 0
+
+  get pages(): number {
+    return Math.ceil(Math.max(this.total / this.filesPerPage, 1.0))
+  }
+
+  get isDisposed(): boolean {
+    return this._isDisposed
+  }
+
+  dispose(): void {
+    this._isDisposed = true
+  }
+
+  equals(other?: FilesPage | null): boolean {
+    if (other === undefined) return false
+    if (other === null) return false
+    if (other === this) return true
+    return (
+      other.pages === this.pages &&
+      other.total === this.total &&
+      other.page === this.page &&
+      (other.files === this.files ||
+        other.files.every((file, index) => file.id === this.files[index].id))
+    )
+  }
+}

package/src/storages/files/filesPage.ts

@@ -24,4 +24,10 @@ export abstract class FilesPage {
    * Get current page.
    */
   abstract get page(): number
+
+  /**
+   * Equals.
+   * @param other
+   */
+  abstract equals(other?: FilesPage | null): boolean
 }