Skip to content

Commit a904ec0

Browse files
committed
upgraded and fixed multiple ui problems
1 parent 6cc3452 commit a904ec0

35 files changed

+1639
-865
lines changed

lollms_core

scripts/windows/ui_installer/lollms_installer.iss

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#define MyAppName "LOLLMS"
2-
#define MyAppVersion "13.0"
2+
#define MyAppVersion "14.0"
33
#define MyAppPublisher "ParisNeo"
44
#define MyAppURL "https://github.com/ParisNeo/lollms-webui"
55

@@ -43,7 +43,6 @@ Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\lollms.bat"; IconFilename:
4343
Name: "{autoprograms}\{#MyAppName} CMD"; Filename: "{app}\lollms_cmd.bat"; IconFilename: "{app}\logo.ico"
4444
Name: "{autodesktop}\{#MyAppName} CMD"; Filename: "{app}\lollms_cmd.bat"; IconFilename: "{app}\logo.ico"; Tasks: desktopicon
4545

46-
4746
[Run]
4847
Filename: "{app}\lollmsenv_installer.bat"; Parameters: "--dir ""{app}\lollmsenv"" -y"; StatusMsg: "Installing LollmsEnv..."; Flags: runhidden
4948
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
5352
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
5453
Filename: "{app}\lollms.bat"; Description: "Run LOLLMS"; Flags: postinstall nowait skipifsilent; Tasks: runafterinstall
5554

56-
5755
[UninstallDelete]
5856
Type: files; Name: "{app}\lollms.bat"
5957
Type: files; Name: "{app}\lollms_cmd.bat"
6058
Type: filesandordirs; Name: "{app}\lollmsenv"
6159
Type: filesandordirs; Name: "{app}\lollms-webui"
6260
Type: filesandordirs; Name: "{app}\lollmsenv_install"
61+
6362
[Code]
6463
var
6564
BindingPage: TInputOptionWizardPage;
6665
PersonalFolderPage: TInputDirWizardPage;
67-
UninstallPersonalDataPage: TInputOptionWizardPage;
6866
6967
function IsGitInstalled: Boolean;
7068
var
@@ -177,7 +175,7 @@ begin
177175
178176
// Create global_paths_cfg.yaml file
179177
YamlContent := 'lollms_path: ' + ExpandConstant('{app}\lollms-webui\lollms_core\lollms') + #13#10 +
180-
'lollms_personal_path: ' + PersonalFolder;
178+
'lollms_personal_path: ' + PersonalFolder ;
181179
SaveStringToFile(ExpandConstant('{app}\lollms-webui\global_paths_cfg.yaml'), YamlContent, False);
182180
183181
case BindingPage.SelectedValueIndex of
@@ -205,22 +203,21 @@ begin
205203
'', SW_SHOW, ewWaitUntilTerminated, ResultCode);
206204
end;
207205
208-
209-
210206
SaveStringToFile(ExpandConstant('{app}\lollms.bat'),
211207
'@echo off' + #13#10 +
212-
'call "' + ExpandConstant('{app}') + '\lollmsenv\envs\lollms_env\Scripts\activate.bat"' + #13#10 +
213-
'cd "' + ExpandConstant('{app}') + '\lollms-webui"' + #13#10 +
208+
'call "lollmsenv\envs\lollms_env\Scripts\activate.bat"' + #13#10 +
209+
'cd /d "lollms-webui"' + #13#10 +
214210
'python app.py %*' + #13#10 +
215211
'pause', False);
216212
217213
SaveStringToFile(ExpandConstant('{app}\lollms_cmd.bat'),
218214
'@echo off' + #13#10 +
219-
'call "' + ExpandConstant('{app}') + '\lollmsenv\envs\lollms_env\Scripts\activate.bat"' + #13#10 +
220-
'cd "' + ExpandConstant('{app}') + '\lollms-webui"' + #13#10 +
215+
'call "lollmsenv\envs\lollms_env\Scripts\activate.bat"' + #13#10 +
216+
'cd /d "lollms-webui"' + #13#10 +
221217
'cmd /k', False);
222218
end;
223219
end;
220+
224221
procedure CurUninstallStepChanged(CurUninstallStep: TUninstallStep);
225222
var
226223
PersonalFolder: string;
@@ -242,6 +239,9 @@ begin
242239
if Pos('lollms_personal_path:', YamlContent[I]) = 1 then
243240
begin
244241
PersonalFolder := Trim(Copy(YamlContent[I], Length('lollms_personal_path:') + 1, MaxInt));
242+
// Remove surrounding quotes if present
243+
if (Length(PersonalFolder) > 1) and (PersonalFolder[1] = '"') and (PersonalFolder[Length(PersonalFolder)] = '"') then
244+
PersonalFolder := Copy(PersonalFolder, 2, Length(PersonalFolder) - 2);
245245
Break;
246246
end;
247247
end;
@@ -272,4 +272,3 @@ begin
272272
end;
273273
end;
274274
end;
275-

scripts/windows/ui_installer/lollmsenv_installer.bat

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
11
@echo off
22
setlocal enabledelayedexpansion
33
:: Version number
4-
set VERSION=1.3.3
4+
set VERSION=1.4.2
55
set USE_MASTER=false
66

77
:: Check for --use-master option
8+
set ARGS=
89
for %%a in (%*) do (
9-
if "%%a"=="--use-master" set USE_MASTER=true
10+
if "%%a"=="--use-master" (
11+
set USE_MASTER=true
12+
) else (
13+
set ARGS=!ARGS! %%a
14+
)
1015
)
1116

1217
:: Temporary directory for downloading and extraction
@@ -41,10 +46,6 @@ if "%USE_MASTER%"=="true" (
4146
cd /d "%TEMP_DIR%\LollmsEnv-%VERSION%"
4247
)
4348

44-
:: Remove --use-master from arguments
45-
set ARGS=%*
46-
set ARGS=%ARGS:--use-master=%
47-
4849
:: Run the install script with forwarded parameters
4950
echo Running installation...
5051
call install.bat %ARGS%

web/dist/assets/index-C4lyxCdb.css

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 29 additions & 29 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

web/dist/assets/index-x900GuGZ.css

Lines changed: 0 additions & 8 deletions
This file was deleted.

web/dist/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<script src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-svg.js"></script>
77
<meta name="viewport" content="width=device-width, initial-scale=1.0">
88
<title>LoLLMS WebUI</title>
9-
<script type="module" crossorigin src="/assets/index-BxkXwSKb.js"></script>
10-
<link rel="stylesheet" crossorigin href="/assets/index-x900GuGZ.css">
9+
<script type="module" crossorigin src="/assets/index-ZQkh7DUY.js"></script>
10+
<link rel="stylesheet" crossorigin href="/assets/index-C4lyxCdb.css">
1111
</head>
1212
<body>
1313
<div id="app"></div>

0 commit comments

Comments
 (0)