Skip to content

Commit 01d1895

Browse files
committed
Merge branch 'remoteManagement' into remoteman_stripped
2 parents da68152 + 6d1edb1 commit 01d1895

15 files changed

+340
-20
lines changed

.github/workflows/kcpp-build-release-arm64.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@ jobs:
7171
apt-get update && apt-get install -y build-essential && \
7272
apt-get update && apt-get install -y gcc-12 g++-12 && \
7373
export LD_LIBRARY_PATH=/usr/lib/gcc/x86_64-linux-gnu/12:$LD_LIBRARY_PATH && \
74-
pip install customtkinter pyinstaller tk pdfplumber && \
74+
pip install customtkinter pyinstaller tk pdfplumber PyMuPdf tqdm && \
7575
cd /src && \
76-
pyinstaller --noconfirm --onefile --collect-all customtkinter --collect-all psutil --collect-all pdfplumber \
76+
pyinstaller --noconfirm --onefile --collect-all customtkinter --collect-all psutil --collect-all pdfplumber --collect-all PyMuPdf --collect-all tqdm \
7777
--add-data './koboldcpp_default.so:.' \
7878
--add-data './kcpp_adapters:./kcpp_adapters' \
7979
--add-data './koboldcpp.py:.' \

.github/workflows/kcpp-build-release-osx.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ jobs:
2828
- name: Dependencies
2929
id: depends
3030
run: |
31-
pip install customtkinter pyinstaller tk pdfplumber
31+
pip install customtkinter pyinstaller tk pdfplumber PyMuPdf tqdm
3232
3333
- name: Build
3434
id: make_build
3535
run: |
3636
make LLAMA_METAL=1 LLAMA_PORTABLE=1
3737
chmod +x './create_ver_file.sh'
3838
. create_ver_file.sh
39-
pyinstaller --noconfirm --onefile --collect-all customtkinter --collect-all psutil --collect-all pdfplumber --add-data './koboldcpp_default.so:.' --add-data './ggml-metal-merged.metal:.' --add-data './kcpp_adapters:./kcpp_adapters' --add-data './koboldcpp.py:.' --add-data './json_to_gbnf.py:.' --add-data './launch.cmd:.' --add-data './requirements_minimal.txt:.' --add-data './LICENSE.md:.' --add-data './MIT_LICENSE_GGML_SDCPP_LLAMACPP_ONLY.md:.' --add-data './klite.embd:.' --add-data './kcpp_docs.embd:.' --add-data './kcpp_sdui.embd:.' --add-data './taesd.embd:.' --add-data './taesd_xl.embd:.' --add-data './taesd_f.embd:.' --add-data './taesd_3.embd:.' --add-data './rwkv_vocab.embd:.' --add-data './rwkv_world_vocab.embd:.' --version-file './version.txt' --clean --console koboldcpp.py -n "koboldcpp-mac-arm64"
39+
pyinstaller --noconfirm --onefile --collect-all customtkinter --collect-all psutil --collect-all pdfplumber --collect-all PyMuPdf --collect-all tqdm --add-data './koboldcpp_default.so:.' --add-data './ggml-metal-merged.metal:.' --add-data './kcpp_adapters:./kcpp_adapters' --add-data './koboldcpp.py:.' --add-data './json_to_gbnf.py:.' --add-data './launch.cmd:.' --add-data './requirements_minimal.txt:.' --add-data './LICENSE.md:.' --add-data './MIT_LICENSE_GGML_SDCPP_LLAMACPP_ONLY.md:.' --add-data './klite.embd:.' --add-data './kcpp_docs.embd:.' --add-data './kcpp_sdui.embd:.' --add-data './taesd.embd:.' --add-data './taesd_xl.embd:.' --add-data './taesd_f.embd:.' --add-data './taesd_3.embd:.' --add-data './rwkv_vocab.embd:.' --add-data './rwkv_world_vocab.embd:.' --version-file './version.txt' --clean --console koboldcpp.py -n "koboldcpp-mac-arm64"
4040
4141
- name: Test
4242
id: test

.github/workflows/kcpp-build-release-win-full-cu12.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
- name: Install python dependencies
3434
run: |
3535
python -m pip install --upgrade pip
36-
pip install customtkinter==5.2.0 pyinstaller==5.11.0 psutil==5.9.5 pdfplumber
36+
pip install customtkinter==5.2.0 pyinstaller==5.11.0 psutil==5.9.5 pdfplumber PyMuPdf tqdm
3737
3838
- name: Download and install win64devkit
3939
run: |

.github/workflows/kcpp-build-release-win-full.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
- name: Install python dependencies
3434
run: |
3535
python -m pip install --upgrade pip
36-
pip install customtkinter==5.2.0 pyinstaller==5.11.0 psutil==5.9.5 pdfplumber
36+
pip install customtkinter==5.2.0 pyinstaller==5.11.0 psutil==5.9.5 pdfplumber PyMuPdf tqdm
3737
3838
- name: Download and install win64devkit
3939
run: |

.github/workflows/kcpp-build-release-win-oldcpu-full.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
- name: Install python dependencies
3434
run: |
3535
python -m pip install --upgrade pip
36-
pip install customtkinter==5.2.0 pyinstaller==5.11.0 psutil==5.9.5 pdfplumber
36+
pip install customtkinter==5.2.0 pyinstaller==5.11.0 psutil==5.9.5 pdfplumber PyMuPdf tqdm
3737
3838
- name: Download and install win64devkit
3939
run: |

environment.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,5 @@ dependencies:
2323
- pip:
2424
- customtkinter
2525
- pdfplumber
26+
- PyMuPdf
27+
- tqdm

klite.embd

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27471,7 +27471,8 @@ let checkFinalThoughtsPrompt = `Action: {"command":{"name":"thought","args":{"me
2747127471

2747227472
img.esobold {
2747327473
background-image: var(--img_esobold);
27474-
background-size: cover;
27474+
background-size: contain;
27475+
background-repeat: round;
2747527476
height: 500px !important;
2747627477
aspect-ratio: 1;
2747727478
border-radius: 250px;
@@ -27486,7 +27487,9 @@ let checkFinalThoughtsPrompt = `Action: {"command":{"name":"thought","args":{"me
2748627487
document.getElementById("btnsend").onmouseover = () => {
2748727488
document.getElementById("input_text").placeholder = `Enter text here\nOr enjoy this fact: ${getRandomElemFromArray(facts)}`;
2748827489
document.getElementById("btnsend").style.backgroundImage = `url("${getRandomElemFromArray(icons)}")`;
27489-
document.getElementById("btnsend").style.backgroundSize = "cover"
27490+
document.getElementById("btnsend").style.backgroundSize = "contain"
27491+
document.getElementById("btnsend").style.backgroundPosition = "center"
27492+
document.getElementById("btnsend").style.backgroundRepeat = "no-repeat"
2749027493
}
2749127494

2749227495
window.addEventListener('load', () => {

0 commit comments

Comments
 (0)