@neuralinnovations/dataisland-sdk 0.0.1-dev8 → 0.0.1-dev9

package/src/storages/{workspaces.impl.ts → workspaces/workspaces.impl.ts}

@@ -1,13 +1,13 @@
 import { WorkspaceId, Workspaces, WorkspacesEvent } from "./workspaces"
-import { OrganizationImpl } from "./organization.impl"
-import { Context } from "../context"
+import { OrganizationImpl } from "../organizations/organization.impl"
+import { Context } from "../../context"
 import { Workspace } from "./workspace"
 import { WorkspaceImpl } from "./workspace.impl"
-import { OrganizationId } from "./organizations"
-import { RpcService } from "../services/rpcService"
-import { OrganizationWorkspaces } from "../dto/userInfoResponse"
-import { WorkspaceDto } from "../dto/workspacesResponse"
-import { ResponseUtils } from "../services/responseUtils"
+import { OrganizationId } from "../organizations/organizations"
+import { RpcService } from "../../services/rpcService"
+import { OrganizationWorkspaces } from "../../dto/userInfoResponse"
+import { WorkspaceDto } from "../../dto/workspacesResponse"
+import { ResponseUtils } from "../../services/responseUtils"
 
 export class WorkspacesImpl extends Workspaces {
   private readonly _workspaces: WorkspaceImpl[] = []
@@ -102,7 +102,7 @@ export class WorkspacesImpl extends Workspaces {
 
     // check response status
     if (ResponseUtils.isFail(response)) {
-      await ResponseUtils.throwError("Failed to create workspace", response)
+      await ResponseUtils.throwError(`Failed to create workspace, in organization: ${this.organization.id}`, response)
     }
 
     // parse workspace from the server's response
@@ -139,7 +139,7 @@ export class WorkspacesImpl extends Workspaces {
 
     // check if workspace is already marked as deleted
     if (workspace.isMarkAsDeleted) {
-      throw new Error(`Workspace ${id} is already marked as deleted`)
+      throw new Error(`Workspace ${id} is already marked as deleted, in organization: ${this.organization.id}`)
     }
 
     // mark workspace as deleted
@@ -155,7 +155,7 @@ export class WorkspacesImpl extends Workspaces {
     // check response status
     if (ResponseUtils.isFail(response)) {
       await ResponseUtils.throwError(
-        `Failed to delete workspace: ${workspace.organization.name}/${workspace.name}:${id}`,
+        `Failed to delete workspace: ${workspace.organization.name}/${workspace.name}:${id}, in organization: ${this.organization.id}`,
         response
       )
     }
@@ -184,7 +184,7 @@ export class WorkspacesImpl extends Workspaces {
 
     // check response status
     if (ResponseUtils.isFail(response)) {
-      await ResponseUtils.throwError("Failed to fetch workspaces.", response)
+      await ResponseUtils.throwError(`Failed to fetch workspaces in organization: ${organizationId}`, response)
     }
 
     // parse workspaces from the server's response

package/src/storages/{workspaces.ts → workspaces/workspaces.ts}

@@ -1,4 +1,4 @@
-import { EventDispatcher } from "../events"
+import { EventDispatcher } from "../../events"
 import { Workspace } from "./workspace"
 
 export type WorkspaceId = string
@@ -44,7 +44,7 @@ export abstract class Workspaces extends EventDispatcher<
   /**
    * Create workspace.
    */
-  abstract create(name: string, description: string): Promise<Workspace>
+  abstract create(name: string, description: string, regulation?: { isCreateNewGroup: boolean, newGroupName: string, groupIds: string[]}): Promise<Workspace>
 
   /**
    * Delete workspace.

package/test/chats.test.ts

@@ -0,0 +1,48 @@
+import { ChatAnswerType } from "../src"
+import { AnswerStatus, StepType } from "../src/dto/chatResponse"
+import { testInOrganization } from "./setup"
+
+test("Chat create, ask question, delete", async () => {
+  await testInOrganization(async (app, org) => {
+
+    const chatPromise = org.chats.create()
+
+    // check not throw
+    await expect(chatPromise).resolves.not.toThrow()
+
+    // get chat
+    const chat = await chatPromise
+
+    // check exists
+    expect(chat).not.toBeUndefined()
+
+    // check exists
+    expect(chat).not.toBeNull()
+
+    // check get
+    expect(org.chats.get(chat.id)).toBe(chat)
+
+    // Create answer
+
+    const askPromise = chat.ask("Hello!", ChatAnswerType.SHORT)
+
+    // check not throw
+    await expect(chatPromise).resolves.not.toThrow()
+
+    const answer = await askPromise
+
+    expect(answer.status).toBe(AnswerStatus.RUNNING)
+
+    while (answer.status !== AnswerStatus.SUCCESS) {
+      await new Promise(r => setTimeout(r, 300))
+      await answer.fetch()
+    }
+
+    const tokens = await answer.fetchTokens(StepType.DONE, 0)
+
+    expect(tokens.step_tokens.length).toBeGreaterThan(0)
+
+    // check delete
+    await expect(org.chats.delete(chat.id)).resolves.not.toThrow()
+  })
+})

package/test/organization.test.ts

@@ -1,6 +1,18 @@
 import { dataIslandApp, DebugCredential } from "../src"
 import { HOST, randomHash, TOKEN } from "./setup"
-import { OrganizationImpl } from "../src/storages/organization.impl"
+import {
+  OrganizationImpl
+} from "../src/storages/organizations/organization.impl"
+
+test.skip("Delete all organizations", async () => {
+  const app = await dataIslandApp("delete-all", async builder => {
+    builder.useHost(HOST)
+    builder.useCredential(new DebugCredential(TOKEN))
+  })
+  for (const organization of app.organizations.collection) {
+    await app.organizations.delete(organization.id)
+  }
+})
 
 test("Organization", async () => {
   // make random name

package/test/setup.ts

@@ -19,6 +19,13 @@ export const testInOrganization = async (func: (app: DataIslandApp, org: Organiz
   const app = await dataIslandApp(randomName, async builder => {
     builder.useHost(config?.host ?? HOST)
     builder.useCredential(new DebugCredential(config?.token ?? TOKEN))
+    builder.registerMiddleware(async (req, next) => {
+      const url = req.url
+      console.log("REQUEST", url, req.method)
+      const response = await next(req)
+      console.log("RESPONSE", url, response.status)
+      return response
+    })
   })
   const org = await app.organizations.create(
     randomName,

package/docs/enums/ChatAnswer.md

@@ -1,22 +0,0 @@
-[@neuralinnovations/dataisland-sdk - v0.0.1-dev8](../../README.md) / [Exports](../modules.md) / ChatAnswer
-
-# Enumeration: ChatAnswer
-
-## Table of contents
-
-### Enumeration Members
-
-- [LONG](ChatAnswer.md#long)
-- [SHORT](ChatAnswer.md#short)
-
-## Enumeration Members
-
-### LONG
-
-• **LONG** = ``"long"``
-
-___
-
-### SHORT
-
-• **SHORT** = ``"short"``

package/src/storages/chat.ts

@@ -1,21 +0,0 @@
-export type ChatId = string
-
-export enum ChatAnswer {
-  SHORT = "short",
-  LONG = "long"
-}
-
-export abstract class Chat {
-  /**
-   * Chat id.
-   */
-  abstract get id(): ChatId
-
-  /**
-   * Chat name.
-   */
-  abstract get name(): string
-
-  abstract question(message: string, answer?: ChatAnswer): Promise<void>
-}
-

package/src/storages/chats.ts

@@ -1,17 +0,0 @@
-import { EventDispatcher } from "../events"
-import { Chat } from "./chat"
-
-export enum ChatsEvent {
-  ADDED = "added",
-  REMOVED = "removed"
-}
-
-/**
- * Chats storage.
- */
-export abstract class Chats extends EventDispatcher<ChatsEvent, Chat> {
-  /**
-   * Create new chat.
-   */
-  abstract create(): Promise<Chat>
-}

package/src/storages/groups.ts

@@ -1,43 +0,0 @@
-import { AccessGroupDto } from "../dto/accessGroupResponse"
-import { UserDto } from "../dto/userInfoResponse"
-import { WorkspaceDto } from "../dto/workspacesResponse"
-import { EventDispatcher } from "../events"
-import { OrganizationId } from "./organizations"
-
-export type GroupId = string
-
-export enum GroupEvent {
-    ADDED = "added",
-    REMOVED = "removed",
-    UPDATED = "updated"
-  }
-
-export abstract class Group extends EventDispatcher<GroupEvent, Group> {
-
-    abstract get id(): GroupId
-
-    abstract get group(): AccessGroupDto
-
-    abstract get members(): UserDto[]
-
-    abstract getWorkspaces() : Promise<WorkspaceDto[]>
-
-    abstract setWorkspaces(workspaces: string[]): Promise<void>
-
-    abstract setName(name: string): Promise<void>
-
-    abstract setPermits(permits: {isAdmin: boolean}): Promise<void>
-
-    abstract setMembersIds(members: string[]): Promise<void>
-}
-
-
-export abstract class Groups extends EventDispatcher<GroupEvent, Group>{
-
-    abstract create(name: string, organizationId: OrganizationId, permits: { isAdmin: boolean }, memberIds: string[]): Promise<Group>
-
-    abstract get(id: GroupId): Promise<Group | undefined>
-
-    abstract delete(id: GroupId): Promise<void>
-
-}