upgraded and fixed multiple ui problems

ParisNeo · Nov 11, 2024 · a904ec0 · a904ec0
1 parent 6cc3452
commit a904ec0
Show file tree

Hide file tree

Showing 35 changed files with 1,639 additions and 865 deletions.
diff --git a/lollms_core b/lollms_core
diff --git a/scripts/windows/ui_installer/lollms_installer.iss b/scripts/windows/ui_installer/lollms_installer.iss
@@ -1,5 +1,5 @@
 #define MyAppName "LOLLMS"
-#define MyAppVersion "13.0"
+#define MyAppVersion "14.0"
 #define MyAppPublisher "ParisNeo"
 #define MyAppURL "https://github.com/ParisNeo/lollms-webui"
 
@@ -43,7 +43,6 @@ Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\lollms.bat"; IconFilename:
 Name: "{autoprograms}\{#MyAppName} CMD"; Filename: "{app}\lollms_cmd.bat"; IconFilename: "{app}\logo.ico"
 Name: "{autodesktop}\{#MyAppName} CMD"; Filename: "{app}\lollms_cmd.bat"; IconFilename: "{app}\logo.ico"; Tasks: desktopicon
 
-
 [Run]
 Filename: "{app}\lollmsenv_installer.bat"; Parameters: "--dir ""{app}\lollmsenv"" -y"; StatusMsg: "Installing LollmsEnv..."; Flags: runhidden
 Filename: "{app}\lollmsenv\bin\lollmsenv.bat"; Parameters: "create-env lollms_env"; StatusMsg: "Creating Python environment..."; Flags: runhidden
@@ -53,18 +52,17 @@ Filename: "{app}\lollmsenv\envs\lollms_env\Scripts\python.exe"; Parameters: "-m
 Filename: "{app}\lollmsenv\envs\lollms_env\Scripts\python.exe"; Parameters: "-m pip install -e ""{app}\lollms-webui\lollms_core"""; StatusMsg: "Installing LOLLMS core..."; Flags: runhidden
 Filename: "{app}\lollms.bat"; Description: "Run LOLLMS"; Flags: postinstall nowait skipifsilent; Tasks: runafterinstall
 
-
 [UninstallDelete]
 Type: files; Name: "{app}\lollms.bat"
 Type: files; Name: "{app}\lollms_cmd.bat"
 Type: filesandordirs; Name: "{app}\lollmsenv"
 Type: filesandordirs; Name: "{app}\lollms-webui"
 Type: filesandordirs; Name: "{app}\lollmsenv_install"
+
 [Code]
 var
   BindingPage: TInputOptionWizardPage;
   PersonalFolderPage: TInputDirWizardPage;
-  UninstallPersonalDataPage: TInputOptionWizardPage;
 
 function IsGitInstalled: Boolean;
 var
@@ -177,7 +175,7 @@ begin
     
     // Create global_paths_cfg.yaml file
     YamlContent := 'lollms_path: ' + ExpandConstant('{app}\lollms-webui\lollms_core\lollms') + #13#10 +
-                   'lollms_personal_path: ' + PersonalFolder;
+                   'lollms_personal_path: ' + PersonalFolder ;
     SaveStringToFile(ExpandConstant('{app}\lollms-webui\global_paths_cfg.yaml'), YamlContent, False);
 
     case BindingPage.SelectedValueIndex of
@@ -205,22 +203,21 @@ begin
            '', SW_SHOW, ewWaitUntilTerminated, ResultCode);
     end;
 
-
-
     SaveStringToFile(ExpandConstant('{app}\lollms.bat'),
       '@echo off' + #13#10 +
-      'call "' + ExpandConstant('{app}') + '\lollmsenv\envs\lollms_env\Scripts\activate.bat"' + #13#10 +
-      'cd "' + ExpandConstant('{app}') + '\lollms-webui"' + #13#10 +
+      'call "lollmsenv\envs\lollms_env\Scripts\activate.bat"' + #13#10 +
+      'cd /d "lollms-webui"' + #13#10 +
       'python app.py %*' + #13#10 +
       'pause', False);
 
     SaveStringToFile(ExpandConstant('{app}\lollms_cmd.bat'),
       '@echo off' + #13#10 +
-      'call "' + ExpandConstant('{app}') + '\lollmsenv\envs\lollms_env\Scripts\activate.bat"' + #13#10 +
-      'cd "' + ExpandConstant('{app}') + '\lollms-webui"' + #13#10 +
+      'call "lollmsenv\envs\lollms_env\Scripts\activate.bat"' + #13#10 +
+      'cd /d "lollms-webui"' + #13#10 +
       'cmd /k', False);
   end;
 end;
+
 procedure CurUninstallStepChanged(CurUninstallStep: TUninstallStep);
 var
   PersonalFolder: string;
@@ -242,6 +239,9 @@ begin
           if Pos('lollms_personal_path:', YamlContent[I]) = 1 then
           begin
             PersonalFolder := Trim(Copy(YamlContent[I], Length('lollms_personal_path:') + 1, MaxInt));
+            // Remove surrounding quotes if present
+            if (Length(PersonalFolder) > 1) and (PersonalFolder[1] = '"') and (PersonalFolder[Length(PersonalFolder)] = '"') then
+              PersonalFolder := Copy(PersonalFolder, 2, Length(PersonalFolder) - 2);
             Break;
           end;
         end;
@@ -272,4 +272,3 @@ begin
     end;
   end;
 end;
-
diff --git a/scripts/windows/ui_installer/lollmsenv_installer.bat b/scripts/windows/ui_installer/lollmsenv_installer.bat
@@ -1,12 +1,17 @@
 @echo off
 setlocal enabledelayedexpansion
 :: Version number
-set VERSION=1.3.3
+set VERSION=1.4.2
 set USE_MASTER=false
 
 :: Check for --use-master option
+set ARGS=
 for %%a in (%*) do (
-    if "%%a"=="--use-master" set USE_MASTER=true
+    if "%%a"=="--use-master" (
+        set USE_MASTER=true
+    ) else (
+        set ARGS=!ARGS! %%a
+    )
 )
 
 :: Temporary directory for downloading and extraction
@@ -41,10 +46,6 @@ if "%USE_MASTER%"=="true" (
     cd /d "%TEMP_DIR%\LollmsEnv-%VERSION%"
 )
 
-:: Remove --use-master from arguments
-set ARGS=%*
-set ARGS=%ARGS:--use-master=%
-
 :: Run the install script with forwarded parameters
 echo Running installation...
 call install.bat %ARGS%

diff --git a/web/dist/assets/index-C4lyxCdb.css b/web/dist/assets/index-C4lyxCdb.css
diff --git a/web/dist/assets/index-BxkXwSKb.js → web/dist/assets/index-ZQkh7DUY.js b/web/dist/assets/index-BxkXwSKb.js → web/dist/assets/index-ZQkh7DUY.js
diff --git a/web/dist/assets/index-x900GuGZ.css b/web/dist/assets/index-x900GuGZ.css
diff --git a/web/dist/index.html b/web/dist/index.html
@@ -6,8 +6,8 @@
     <script src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-svg.js"></script>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>LoLLMS WebUI</title>
-    <script type="module" crossorigin src="/assets/index-BxkXwSKb.js"></script>
-    <link rel="stylesheet" crossorigin href="/assets/index-x900GuGZ.css">
+    <script type="module" crossorigin src="/assets/index-ZQkh7DUY.js"></script>
+    <link rel="stylesheet" crossorigin href="/assets/index-C4lyxCdb.css">
   </head>
   <body>
     <div id="app"></div>