fix import on windows

Signed-off-by: James <[email protected]>
janhq · Aug 1, 2024 · a52a503 · a52a503
1 parent 8ce640f
commit a52a503
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 36 deletions.
diff --git a/electron/main.ts b/electron/main.ts
@@ -59,10 +59,11 @@ Object.assign(console, log.functions)
 app
   .whenReady()
   .then(() => {
-    log.info('Starting cortex with path:', cortexPath)
+    const command = `${cortexPath} -a 127.0.0.1 -p 1337`
+
+    log.info('Starting cortex with command:', command)
     // init cortex
-    // running shell command cortex init -s
-    exec(`${cortexPath}`, (error, stdout, stderr) => {
+    exec(`${command}`, (error, stdout, stderr) => {
       if (error) {
         log.error(`error: ${error.message}`)
         return

diff --git a/web/containers/Providers/DownloadEventListener.tsx b/web/containers/Providers/DownloadEventListener.tsx
@@ -54,6 +54,7 @@ const DownloadEventListener: React.FC = () => {
           const localImportEvents: DownloadState2[] = []
           // filter out the import local events
           for (const event of downloadEvents) {
+            console.debug('Receiving event', event)
             if (
               isAbsolutePath(event.id) &&
               event.type === 'model' &&

diff --git a/web/hooks/useCortex.ts b/web/hooks/useCortex.ts
@@ -321,12 +321,12 @@ const useCortex = () => {
 
   const isSystemAlive = useCallback(async () => {
     try {
-      await cortex.system.status();
-      return true;
-    } catch { 
-      return false; 
+      await cortex.system.status()
+      return true
+    } catch {
+      return false
     }
-  }, [host])
+  }, [cortex.system])
 
   return {
     fetchAssistants,
@@ -354,7 +354,7 @@ const useCortex = () => {
     createModel,
     initializeEngine,
     getEngineStatuses,
-    isSystemAlive
+    isSystemAlive,
   }
 }
 

diff --git a/web/hooks/useDropModelBinaries.ts b/web/hooks/useDropModelBinaries.ts
@@ -24,17 +24,23 @@ export default function useDropModelBinaries() {
       )
       const supportedFiles = files.filter((file) => file.path.endsWith('.gguf'))
 
-      const importingModels: ImportingModel[] = supportedFiles.map((file) => ({
-        importId: file.path,
-        modelId: undefined,
-        name: file.name.replace('.gguf', ''),
-        description: '',
-        path: file.path,
-        tags: [],
-        size: file.size,
-        status: 'PREPARING',
-        format: 'gguf',
-      }))
+      const importingModels: ImportingModel[] = supportedFiles.map((file) => {
+        const normalizedPath = isWindows
+          ? file.path.replace(/\\/g, '/')
+          : file.path
+
+        return {
+          importId: normalizedPath,
+          modelId: undefined,
+          name: normalizedPath.replace('.gguf', ''),
+          description: '',
+          path: file.path,
+          tags: [],
+          size: file.size,
+          status: 'PREPARING',
+          format: 'gguf',
+        }
+      })
       if (unsupportedFiles.length > 0) {
         snackbar({
           description: `Only files with .gguf extension can be imported.`,

diff --git a/web/screens/Settings/ImportSuccessIcon/index.tsx b/web/screens/Settings/ImportSuccessIcon/index.tsx
@@ -31,7 +31,7 @@ const ImportSuccessIcon: React.FC<Props> = ({ onEditModelClick }) => {
 }
 
 const SuccessIcon = React.memo(() => (
-  <div className="bg-primary flex h-8 w-8 items-center justify-center rounded-full text-white">
+  <div className="bg-primary flex h-8 w-8 items-center justify-center rounded-full">
     <Check size={20} />
   </div>
 ))

diff --git a/web/screens/Settings/SelectingModelModal/index.tsx b/web/screens/Settings/SelectingModelModal/index.tsx
@@ -23,10 +23,10 @@ const SelectingModelModal: React.FC = () => {
   const importModelStage = useAtomValue(getImportModelStageAtom)
   const { onDropModels } = useDropModelBinaries()
   const onSelectFileClick = useCallback(async () => {
-    if (isWindows) {
-      setImportModelStage('CHOOSE_WHAT_TO_IMPORT')
-      return
-    }
+    // if (isWindows) {
+    //   setImportModelStage('CHOOSE_WHAT_TO_IMPORT')
+    //   return
+    // }
     const options: SelectFileOption = {
       title: 'Select model folders',
       buttonLabel: 'Select',
@@ -38,17 +38,21 @@ const SelectingModelModal: React.FC = () => {
 
     const importingModels: ImportingModel[] = filePaths
       .filter((path) => path.endsWith('.gguf'))
-      .map((path) => ({
-        importId: path,
-        modelId: undefined,
-        name: path.replace('.gguf', ''),
-        description: '',
-        path: path,
-        tags: [],
-        size: 0,
-        status: 'PREPARING',
-        format: 'gguf',
-      }))
+      .map((path) => {
+        const normalizedPath = isWindows ? path.replace(/\\/g, '/') : path
+
+        return {
+          importId: normalizedPath,
+          modelId: undefined,
+          name: normalizedPath.replace('.gguf', ''),
+          description: '',
+          path: path,
+          tags: [],
+          size: 0,
+          status: 'PREPARING',
+          format: 'gguf',
+        }
+      })
     if (importingModels.length < 1) {
       snackbar({
         description: `Only files with .gguf extension can be imported.`,