STU-288 | Test Sequencer Project

captain/utils/pytest/discover_tests.py

@@ -11,6 +11,7 @@
 from pytest_jsonreport.plugin import JSONReport
 from captain.utils.import_utils import unload_module
 import re
+import pathlib
 
 
 def check_missing_imports(report: RootModel):
@@ -61,7 +62,9 @@ def dfs(
                 test_list.append(
                     TestDiscoveryResponse(
                         test_name=node.nodeid.replace(" ", "_"),
-                        path=os.path.join(json_data.root, node.nodeid),
+                        path=pathlib.Path(
+                            os.path.join(json_data.root, node.nodeid)
+                        ).as_posix(),
                     )
                 )
 
@@ -72,7 +75,9 @@ def dfs(
         return
     if one_file:
         return_val.append(
-            TestDiscoveryResponse(test_name=os.path.basename(path), path=path)
+            TestDiscoveryResponse(
+                test_name=os.path.basename(path), path=pathlib.Path(path).as_posix()
+            )
         )
     else:
         return_val.extend(test_list)

src/api/fileSave.ts

@@ -9,6 +9,15 @@ export function saveFile(
   ipcRenderer.send(API.writeFileSync, path, data, allowedExtensions);
 }
 
+export async function saveToFile(path: string, data: string): Promise<boolean> {
+  try {
+    saveFile(path, data, ["tjoy"]);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
 export async function saveFileAs(
   defaultFilename: string,
   data: string,

src/api/index.ts

@@ -4,6 +4,7 @@ import { InterpretersList } from "@/main/python/interpreter";
 import { PoetryGroupInfo, PythonDependency } from "src/types/poetry";
 import { ResultAsync, fromPromise } from "neverthrow";
 import type { User } from "@/types/auth";
+import path from "path";
 
 export const API = {
   checkPythonInstallation: "CHECK_PYTHON_INSTALLATION",
@@ -20,6 +21,7 @@ export const API = {
   statusBarLogging: "STATUSBAR_LOGGING",
   setPythonInterpreter: "SET_PY_INTERPRETER",
   writeFileSync: "WRITE_FILE_SYNC",
+  writeFile: "WRITE_FILE",
   showSaveDialog: "SHOW_SAVE_DIALOG",
   browsePythonInterpreter: "BROWSE_PY_INTERPRETER",
   sendLogToStatusbar: "SEND_LOG_TO_STATUSBAR",
@@ -41,8 +43,10 @@ export const API = {
   poetryInstallDepUserGroup: "POETRY_INSTALL_DEP_USER_GROUP",
   poetryUninstallDepUserGroup: "POETRY_UNINSTALL_DEP_USER_GROUP",
   poetryUninstallDepGroup: "POETRY_UNINSTALL_DEP_GROUP",
+  poetryInstallRequirementsUserGroup: "POETRY_INSTALL_REQUIREMENTS_USER_GROUP",
   openFilePicker: "OPEN_FILE_PICKER",
   getFileContent: "GET_FILE_CONTENT",
+  isFileOnDisk: "IS_FILE_ON_DISK",
   openEditorWindow: "OPEN_EDITOR_WINDOW",
   loadFileFromFullPath: "LOAD_FILE_FROM_FULL_PATH",
   saveFileToFullPath: "SAVE_FILE_TO_FULL_PATH",
@@ -95,7 +99,8 @@ export default {
   ping: (addr: string): Promise<string> => ipcRenderer.invoke(API.ping, addr),
   netstat: (): Promise<string> => ipcRenderer.invoke(API.netstat),
   ifconfig: (): Promise<string> => ipcRenderer.invoke(API.ifconfig),
-  pickDirectory: (): Promise<string> => ipcRenderer.invoke(API.pickDirectory),
+  pickDirectory: (allowDirectoryCreation: boolean): Promise<string> =>
+    ipcRenderer.invoke(API.pickDirectory, allowDirectoryCreation),
   downloadLogs: (): void => ipcRenderer.send(API.downloadLogs),
   checkForUpdates: (): void => ipcRenderer.send(API.checkForUpdates),
   restartCaptain: (): Promise<void> => ipcRenderer.invoke(API.restartCaptain),
@@ -116,12 +121,17 @@ export default {
     ipcRenderer.invoke(API.poetryUninstallDepGroup, group),
   poetryInstallDepUserGroup: (dep: string): Promise<boolean> =>
     ipcRenderer.invoke(API.poetryInstallDepUserGroup, dep),
+  poetryInstallRequirementsUserGroup: (filePath: string): Promise<boolean> =>
+    ipcRenderer.invoke(API.poetryInstallRequirementsUserGroup, filePath),
   poetryUninstallDepUserGroup: (dep: string): Promise<boolean> =>
     ipcRenderer.invoke(API.poetryUninstallDepUserGroup, dep),
 
   openTestPicker: (): Promise<{ filePath: string; fileContent: string }> =>
     ipcRenderer.invoke(API.openTestPicker),
 
+  isFileOnDisk: (filepath: string): Promise<boolean> =>
+    ipcRenderer.invoke(API.isFileOnDisk, filepath),
+
   openFilePicker: (
     allowedExtensions: string[] = ["json"],
   ): Promise<{ filePath: string; fileContent: string } | undefined> =>
@@ -130,6 +140,8 @@ export default {
   getFileContent: (filepath: string): Promise<string> =>
     ipcRenderer.invoke(API.getFileContent, filepath),
 
+  getPathSeparator: () => path.sep,
+
   openEditorWindow: (filepath: string): Promise<void> =>
     ipcRenderer.invoke(API.openEditorWindow, filepath),
 

src/main/ipc-main-handlers.ts

@@ -11,6 +11,7 @@ import {
   readFileSync,
   saveFileToFullPath,
   writeFileSync,
+  isFileOnDisk,
 } from "./utils";
 import {
   getAllLogs,
@@ -41,6 +42,7 @@ import {
   poetryGetGroupInfo,
   poetryInstallDepGroup,
   poetryInstallDepUserGroup,
+  poetryInstallRequirementsUserGroup,
   poetryShowTopLevel,
   poetryShowUserGroup,
   poetryUninstallDepGroup,
@@ -100,6 +102,7 @@ export const registerIpcMainHandlers = () => {
     return Promise.resolve(!app.isPackaged);
   });
   ipcMain.handle(API.getAllLogs, getAllLogs);
+  ipcMain.handle(API.writeFile, writeFileSync);
   ipcMain.handle(API.getCustomBlocksDir, getCustomBlocksDir);
   ipcMain.handle(API.restartCaptain, restartCaptain);
   ipcMain.handle(API.setPythonInterpreter, handlePythonInterpreter);
@@ -139,6 +142,9 @@ export const registerIpcMainHandlers = () => {
   ipcMain.handle(API.poetryInstallDepUserGroup, (_, dep) => {
     return poetryInstallDepUserGroup(dep);
   });
+  ipcMain.handle(API.poetryInstallRequirementsUserGroup, (_, filePath) => {
+    return poetryInstallRequirementsUserGroup(filePath);
+  });
   ipcMain.handle(API.openFilePicker, openFilePicker);
   ipcMain.handle(
     API.openTestPicker,
@@ -168,4 +174,5 @@ export const registerIpcMainHandlers = () => {
   ipcMain.handle(API.createUserProfile, createUserProfile);
   ipcMain.handle(API.deleteUserProfile, deleteUserProfile);
   ipcMain.handle(API.getFileContent, readFileSync);
+  ipcMain.handle(API.isFileOnDisk, isFileOnDisk);
 };

src/main/python/poetry.ts

@@ -4,6 +4,7 @@ import { execCommand } from "../executor";
 import pyproject from "../../../pyproject.toml?raw";
 import toml from "toml";
 import { store } from "../store";
+import * as fs from "fs";
 
 // FIXME: do not hardcode the groups here
 export const POETRY_DEP_GROUPS: Pick<
@@ -156,6 +157,24 @@ export async function poetryInstallDepUserGroup(
   return true;
 }
 
+export async function poetryInstallRequirementsUserGroup(
+  filePath: string,
+): Promise<boolean> {
+  try {
+    const content = fs.readFileSync(filePath, { encoding: "utf-8" }).toString();
+    const packages: string[] = content
+      .split("\n")
+      .filter((line) => line !== "" && !line.startsWith("#"));
+    if (packages.length > 0) {
+      await poetryInstallDepUserGroup(packages.join(" "));
+    }
+    return true;
+  } catch (e) {
+    console.error(e);
+    return false;
+  }
+}
+
 export async function poetryUninstallDepUserGroup(
   name: string,
 ): Promise<boolean> {

src/main/utils.ts

@@ -4,7 +4,7 @@ import { isIP } from "net";
 import { execCommand } from "./executor";
 import { Command } from "./command";
 import { app, dialog } from "electron";
-import { join } from "path";
+import { join, posix, sep } from "path";
 import { killCaptain } from "./python";
 import log from "electron-log";
 import { ChildProcess } from "node:child_process";
@@ -73,11 +73,21 @@ export const writeFileSync = (_, filePath: string, text: string): void => {
   fs.writeFileSync(filePath, text);
 };
 
-export const pickDirectory = async (): Promise<string> => {
+export const pickDirectory = async (
+  _,
+  allowDirectoryCreation: boolean = false,
+): Promise<string> => {
+  const properties = ["openDirectory"];
+  if (allowDirectoryCreation) {
+    properties.push("createDirectory");
+  }
   const handler = await dialog.showOpenDialog({
-    properties: ["openDirectory"],
+    // @ts-ignore
+    properties: properties,
   });
-  return handler.canceled ? "" : handler.filePaths[0];
+  return handler.canceled
+    ? ""
+    : handler.filePaths[0].split(sep).join(posix.sep);
 };
 
 export const getCustomBlocksDir = async () => {
@@ -128,7 +138,7 @@ export const openFilePicker = (
           encoding: "utf-8",
         });
         resolve({
-          filePath: selectedPaths[0],
+          filePath: selectedPaths[0].split(sep).join(posix.sep),
           fileContent,
         });
       }
@@ -166,3 +176,7 @@ export const saveFileToFullPath = fs.writeFileSync;
 export const readFileSync = (_, filePath: string) => {
   return fs.readFileSync(filePath, { encoding: "utf-8" });
 };
+
+export const isFileOnDisk = (_, filePath: string): Promise<boolean> => {
+  return Promise.resolve(fs.existsSync(filePath));
+};

src/renderer/components/ui/button.tsx

@@ -26,6 +26,7 @@ const buttonVariants = cva(
                 hover:rounded-md shadow-[4px_4px_0px_0px] shadow-foreground  
                 active:translate-x-[4px] active:translate-y-[4px] 
                 active:rounded-2xl active:shadow-none`,
+        none: "",
         // neumorphism:
         //   "px-4 py-2 rounded-full flex items-center gap-2 text-slate-500 shadow-[-5px_-5px_10px_rgba(255,_255,_255,_0.8),_5px_5px_10px_rgba(0,_0,_0,_0.25)] transition-all hover:shadow-[-1px_-1px_5px_rgba(255,_255,_255,_0.6),_1px_1px_5px_rgba(0,_0,_0,_0.3),inset_-2px_-2px_5px_rgba(255,_255,_255,_1),inset_2px_2px_4px_rgba(0,_0,_0,_0.3)] hover:text-violet-500",
       },

src/renderer/components/ui/path-input.tsx

@@ -0,0 +1,122 @@
+import * as React from "react";
+import { cn } from "@/renderer/lib/utils";
+import { Button } from "./button";
+
+interface InputProps extends React.InputHTMLAttributes<HTMLInputElement> {
+  allowedExtention?: string[];
+  allowDirectoryCreation?: boolean;
+  pickerType?: "file" | "directory";
+}
+
+const filePicker = (
+  allowedExtensions: string[] = [],
+): Promise<string | null> => {
+  return new Promise((resolve, reject) => {
+    window.api
+      .openFilePicker(allowedExtensions)
+      .then((result) => {
+        if (!result) resolve(null);
+        else resolve(result.filePath);
+      })
+      .catch((error) => {
+        console.error("Errors when trying to load file: ", error);
+        reject(error);
+      });
+  });
+};
+
+const directoryPicker = (
+  allowDirectoryCreation: boolean = false,
+): Promise<string | null> => {
+  return new Promise((resolve, reject) => {
+    window.api
+      .pickDirectory(allowDirectoryCreation)
+      .then((result) => {
+        if (!result) resolve(null);
+        else resolve(result);
+      })
+      .catch((error) => {
+        console.error("Errors when trying to load file: ", error);
+        reject(error);
+      });
+  });
+};
+
+const PathInput = React.forwardRef<HTMLInputElement, InputProps>(
+  (
+    {
+      className,
+      onChange: onChangeProp,
+      disabled,
+      allowedExtention,
+      allowDirectoryCreation,
+      pickerType,
+      ...props
+    },
+    ref,
+  ) => {
+    const [selectedFilePath, setSelectedFilePath] = React.useState<
+      string | null
+    >("");
+    const [manualPath, setManualPath] = React.useState<string>("");
+
+    const handlePickerClick = async () => {
+      const path =
+        pickerType === "directory"
+          ? await directoryPicker(allowDirectoryCreation)
+          : await filePicker(allowedExtention);
+      if (path) {
+        setSelectedFilePath(path);
+        setManualPath(path);
+        if (onChangeProp) {
+          onChangeProp({
+            target: { value: path },
+          } as React.ChangeEvent<HTMLInputElement>);
+        }
+      }
+    };
+
+    const handleManualPathChange = (
+      event: React.ChangeEvent<HTMLInputElement>,
+    ) => {
+      setManualPath(event.target.value);
+      setSelectedFilePath("");
+      if (onChangeProp) {
+        onChangeProp(event);
+      }
+    };
+
+    return (
+      <div
+        className={cn(
+          "flex inline-flex h-10 w-full items-center justify-center rounded-md rounded-md border bg-background text-sm text-sm font-medium ring-offset-background transition-colors placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 disabled:opacity-50",
+        )}
+      >
+        <input
+          className={cn(
+            "h-9 w-full rounded-md bg-background pl-3 ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50",
+            className,
+          )}
+          ref={ref}
+          // @ts-ignore
+          value={selectedFilePath !== "" ? selectedFilePath : manualPath}
+          onChange={handleManualPathChange}
+          disabled={disabled}
+          {...props}
+        />
+        <Button
+          variant={"none"}
+          disabled={disabled}
+          className="h-9 hover:accent-transparent"
+          onClick={handlePickerClick}
+        >
+          {" "}
+          {"Select"}{" "}
+        </Button>
+      </div>
+    );
+  },
+);
+PathInput.displayName = "Select a path";
+
+export { PathInput };