59 fix default workspace env (#68)

* Fix default workspace environment

---------

Co-authored-by: JMLizano <[email protected]>

lynxkite-app/src/lynxkite/app/crdt.py

@@ -11,7 +11,7 @@ import pycrdt_websocket
 import pycrdt_websocket.ystore
 import uvicorn
 import builtins
-from lynxkite.core import workspace
+from lynxkite.core import workspace, ops
 
 router = fastapi.APIRouter()
 DATA_PATH = pathlib.Path.cwd() / "data"
@@ -52,7 +52,7 @@ class WebsocketServer(pycrdt_websocket.WebsocketServer):
         if "edges" not in ws:
             ws["edges"] = pycrdt.Array()
         if "env" not in ws:
-            ws["env"] = "unset"
+            ws["env"] = next(iter(ops.CATALOGS), 'unset') 
             # We have two possible sources of truth for the workspaces, the YStore and the JSON files.
             # In case we didn't find the workspace in the YStore, we try to load it from the JSON files.
             try_to_load_workspace(ws, name)

lynxkite-app/web/playwright.config.ts

@@ -3,7 +3,7 @@ import { defineConfig, devices } from '@playwright/test';
 
 export default defineConfig({
   testDir: './tests',
-  timeout: 60000,
+  timeout: 30000,
   fullyParallel: false,
   /* Fail the build on CI if you accidentally left test.only in the source code. */
   forbidOnly: !!process.env.CI,
@@ -26,6 +26,6 @@ export default defineConfig({
   webServer: {
     command: 'cd .. && lynxkite',
     url: 'http://127.0.0.1:8000',
-    reuseExistingServer: !process.env.CI,
+    reuseExistingServer: false,
   },
 });

lynxkite-app/web/src/Directory.tsx

@@ -25,7 +25,7 @@ const fetcher = (url: string) => fetch(url).then((res) => res.json());
 export default function () {
   const { path } = useParams();
   const encodedPath = encodeURIComponent(path || '');
-  let list = useSWR(`/api/dir/list?path=${encodedPath}`, fetcher);
+  const list = useSWR(`/api/dir/list?path=${encodedPath}`, fetcher);
   const navigate = useNavigate();
   const [isCreatingDir, setIsCreatingDir] = useState(false);
   const [isCreatingWorkspace, setIsCreatingWorkspace] = useState(false);
@@ -70,7 +70,6 @@ export default function () {
       headers: { 'Content-Type': 'application/json' },
       body: JSON.stringify({ path: pathSlash + name }),
     });
-    list = await res.json();
     if (res.ok) {
       navigate(`/dir/${pathSlash}${name}`);
     } else {
@@ -83,12 +82,11 @@ export default function () {
     const pathSlash = path ? `${path}/` : "";
 
     const apiPath = item.type === "directory" ? `/api/dir/delete`: `/api/delete`;
-    const res = await fetch(apiPath, {
+    await fetch(apiPath, {
       method: "POST",
       headers: { "Content-Type": "application/json" },
       body: JSON.stringify({ path: pathSlash + item.name }),
     });
-    list = await res.json();
   }
 
   return (

lynxkite-app/web/tests/basic.spec.ts

@@ -10,7 +10,7 @@ test.beforeEach(async ({ browser }) => {
   workspace = await Workspace.empty(await browser.newPage(), 'basic_spec_test');
 });
 
-test.afterEach(async ({ }) => {
+test.afterEach(async () => {
   await workspace.close();
   const splash = await new Splash(workspace.page);
   splash.page.on('dialog', async dialog => { await dialog.accept(); });

lynxkite-app/web/tests/directory.spec.ts

@@ -20,7 +20,6 @@ test.describe("Directory operations", () => {
     // Not checking for exact match, since there may be pre-existing "Untitled" workspaces
     expect(workspace.name).toContain('Untitled');
     await workspace.close();
-    await splash.deleteEntry(workspace.name);
   });
 
   test('Create & delete workspace', async () => {

lynxkite-app/web/tests/examples.spec.ts

@@ -5,7 +5,7 @@ import { Workspace } from './lynxkite';
 
 test('LynxKite Graph Analytics example', async ({ page }) => {
     const ws = await Workspace.open(page, "NetworkX demo");
-    expect(await ws.isErrorFree()).toBeTruthy();
+    expect(await ws.isErrorFree(process.env.CI? 2000: 1000)).toBeTruthy();
 });
 
 
@@ -31,7 +31,7 @@ test.fail('LynxScribe example', async ({ page }) => {
 test.fail('Graph RAG', async ({ page }) => {
     // Fails due to some issue with ChromaDB
     const ws = await Workspace.open(page, "Graph RAG");
-    expect(await ws.isErrorFree()).toBeTruthy();
+    expect(await ws.isErrorFree(process.env.CI? 2000: 500)).toBeTruthy();
 });
 
 
@@ -46,7 +46,7 @@ test.fail('night demo', async ({ page }) => {
     // airlines.graphml file not found
     // requires cugraph
     const ws = await Workspace.open(page, "night demo");
-    expect(await ws.isErrorFree()).toBeTruthy();
+    expect(await ws.isErrorFree(process.env.CI? 10000: 500)).toBeTruthy();
 });
 
 

lynxkite-app/web/tests/lynxkite.ts

@@ -29,19 +29,20 @@ export class Workspace {
   static async open(page: Page, workspaceName: string): Promise<Workspace> {
     const splash = await Splash.open(page);
     const ws = await splash.openWorkspace(workspaceName);
-    await ws.waitForNodesToLoad()
+    await ws.waitForNodesToLoad();
     await ws.expectCurrentWorkspaceIs(workspaceName);
     return ws
   }
 
   async getEnvs() {
     // Return all available workspace environments
-    return await this.page.locator('select[name="workspace-env"] option').allInnerTexts();
+    const envs =  this.page.locator('select[name="workspace-env"] option');
+    await expect(envs).not.toHaveCount(0);
+    return await envs.allInnerTexts();
   }
 
   async setEnv(env: string) {
     await this.page.locator('select[name="workspace-env"]').selectOption(env);
-    // await this.page.getByRole('combobox', {'name': 'workspace-env'}).selectOption(env);
   }
 
   async expectCurrentWorkspaceIs(name) {
@@ -50,11 +51,8 @@ export class Workspace {
 
   async waitForNodesToLoad() {
     // This method should be used only on non empty workspaces
-    await this.page.locator('.react-flow__nodes').waitFor({state: 'visible'});
-    let nodes: Locator[] = [];
-    while (nodes.length === 0) {
-      nodes = await this.getBoxes();
-    } 
+    await this.page.locator('.react-flow__nodes').waitFor();
+    await this.page.locator('.react-flow__node').first().waitFor();
   }
 
   async addBox(boxName) {
@@ -131,7 +129,10 @@ export class Workspace {
     await this.page.mouse.up();
   }
 
-  async isErrorFree(): Promise<boolean> {
+  async isErrorFree(executionWaitTime?): Promise<boolean> {
+    // TODO: Workaround, to account for workspace execution. Once
+    // we have a load indicator we can use that instead.
+    await new Promise(resolve => setTimeout(resolve, executionWaitTime? executionWaitTime : 500));
     const boxes = await this.getBoxes();
     for (const box of boxes) {
       if (await box.locator('.error').isVisible()) {
@@ -188,8 +189,6 @@ export class Splash {
     }
     await this.page.locator('input[name="workspaceName"]').press('Enter');
     const ws = new Workspace(this.page, workspaceName);
-    // Workaround until we fix the default environment
-    await ws.setEnv('PyTorch model'); 
     await ws.setEnv('LynxKite Graph Analytics');
     return ws;
   }