Skip to content

Commit dc30945

Browse files
authored
Merge pull request #6984 from oobabooga/dev
Merge dev branch
2 parents ace8afb + e4d3f44 commit dc30945

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+954
-405
lines changed

.github/workflows/build-portable-release-cuda.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,8 @@ jobs:
102102
shell: bash
103103
run: |
104104
rm -rf .git cmd* update_wizard* Colab-TextGen-GPU.ipynb docker
105+
allowed=("character_bias" "gallery" "openai" "sd_api_pictures")
106+
find extensions/ -mindepth 1 -maxdepth 1 -type d | grep -v -E "$(printf '%s|' "${allowed[@]}" | sed 's/|$//')" | xargs rm -rf
105107
106108
# Define common variables
107109
CUDA_VERSION="${{ matrix.cuda }}"

.github/workflows/build-portable-release-vulkan.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,8 @@ jobs:
101101
shell: bash
102102
run: |
103103
rm -rf .git cmd* update_wizard* Colab-TextGen-GPU.ipynb docker
104+
allowed=("character_bias" "gallery" "openai" "sd_api_pictures")
105+
find extensions/ -mindepth 1 -maxdepth 1 -type d | grep -v -E "$(printf '%s|' "${allowed[@]}" | sed 's/|$//')" | xargs rm -rf
104106
105107
# Define common variables
106108
AVX_SUPPORT="${{ matrix.avx }}"

.github/workflows/build-portable-release.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,8 @@ jobs:
101101
shell: bash
102102
run: |
103103
rm -rf .git cmd* update_wizard* Colab-TextGen-GPU.ipynb docker
104+
allowed=("character_bias" "gallery" "openai" "sd_api_pictures")
105+
find extensions/ -mindepth 1 -maxdepth 1 -type d | grep -v -E "$(printf '%s|' "${allowed[@]}" | sed 's/|$//')" | xargs rm -rf
104106
105107
# Define common variables
106108
AVX_SUPPORT="${{ matrix.avx }}"

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Its goal is to become the [AUTOMATIC1111/stable-diffusion-webui](https://github.
2222
- Free-form text generation in the Default/Notebook tabs without being limited to chat turns. You can send formatted conversations from the Chat tab to these.
2323
- Multiple sampling parameters and generation options for sophisticated text generation control.
2424
- Switch between different models easily in the UI without restarting, with fine control over settings.
25-
- OpenAI-compatible API with Chat and Completions endpoints – see [examples](https://github.com/oobabooga/text-generation-webui/wiki/12-%E2%80%90-OpenAI-API#examples).
25+
- OpenAI-compatible API with Chat and Completions endpoints, including tool-calling support – see [examples](https://github.com/oobabooga/text-generation-webui/wiki/12-%E2%80%90-OpenAI-API#examples).
2626
- 100% offline and private, with zero telemetry, external resources, or remote update requests.
2727
- Extension support, with numerous built-in and user-contributed extensions available. See the [wiki](https://github.com/oobabooga/text-generation-webui/wiki/07-%E2%80%90-Extensions) and [extensions directory](https://github.com/oobabooga/text-generation-webui-extensions) for details.
2828

@@ -44,7 +44,7 @@ Download from: https://github.com/oobabooga/text-generation-webui/releases
4444

4545
To restart the web UI later, just run the same `start_` script. If you need to reinstall, delete the `installer_files` folder created during setup and run the script again.
4646

47-
You can use command-line flags, like `./start_linux.sh --help`, or add them to `user_data/CMD_FLAGS.txt` (such as `--api` to enable API use). To update the project, run `update_wizard_linux.sh`, `update_wizard_windows.bat`, `update_wizard_macos.sh`, or `update_wizard_wsl.bat`.
47+
You can use command-line flags, like `./start_linux.sh --help`, or add them to `user_data/CMD_FLAGS.txt` (such as `--api` to enable API use). To update the project, run `update_wizard_linux.sh`, `update_wizard_windows.bat`, or `update_wizard_macos.sh`.
4848

4949
<details>
5050
<summary>
@@ -55,12 +55,12 @@ Setup details and information about installing manually
5555

5656
The script uses Miniconda to set up a Conda environment in the `installer_files` folder.
5757

58-
If you ever need to install something manually in the `installer_files` environment, you can launch an interactive shell using the cmd script: `cmd_linux.sh`, `cmd_windows.bat`, `cmd_macos.sh`, or `cmd_wsl.bat`.
58+
If you ever need to install something manually in the `installer_files` environment, you can launch an interactive shell using the cmd script: `cmd_linux.sh`, `cmd_windows.bat`, or `cmd_macos.sh`.
5959

6060
* There is no need to run any of those scripts (`start_`, `update_wizard_`, or `cmd_`) as admin/root.
6161
* To install the requirements for extensions, you can use the `extensions_reqs` script for your OS. At the end, this script will install the main requirements for the project to make sure that they take precedence in case of version conflicts.
6262
* For additional instructions about AMD and WSL setup, consult [the documentation](https://github.com/oobabooga/text-generation-webui/wiki).
63-
* For automated installation, you can use the `GPU_CHOICE`, `USE_CUDA118`, `LAUNCH_AFTER_INSTALL`, and `INSTALL_EXTENSIONS` environment variables. For instance: `GPU_CHOICE=A USE_CUDA118=FALSE LAUNCH_AFTER_INSTALL=FALSE INSTALL_EXTENSIONS=TRUE ./start_linux.sh`.
63+
* For automated installation, you can use the `GPU_CHOICE`, `LAUNCH_AFTER_INSTALL`, and `INSTALL_EXTENSIONS` environment variables. For instance: `GPU_CHOICE=A LAUNCH_AFTER_INSTALL=FALSE INSTALL_EXTENSIONS=TRUE ./start_linux.sh`.
6464

6565
### Manual installation using Conda
6666

@@ -90,7 +90,7 @@ conda activate textgen
9090
|--------|---------|---------|
9191
| Linux/WSL | NVIDIA | `pip3 install torch==2.6.0 torchvision==0.21.0 torchaudio==2.6.0 --index-url https://download.pytorch.org/whl/cu124` |
9292
| Linux/WSL | CPU only | `pip3 install torch==2.6.0 torchvision==0.21.0 torchaudio==2.6.0 --index-url https://download.pytorch.org/whl/cpu` |
93-
| Linux | AMD | `pip3 install torch==2.6.0 torchvision==0.21.0 torchaudio==2.6.0 --index-url https://download.pytorch.org/whl/rocm6.1` |
93+
| Linux | AMD | `pip3 install torch==2.6.0 torchvision==0.21.0 torchaudio==2.6.0 --index-url https://download.pytorch.org/whl/rocm6.2.4` |
9494
| MacOS + MPS | Any | `pip3 install torch==2.6.0 torchvision==0.21.0 torchaudio==2.6.0` |
9595
| Windows | NVIDIA | `pip3 install torch==2.6.0 torchvision==0.21.0 torchaudio==2.6.0 --index-url https://download.pytorch.org/whl/cu124` |
9696
| Windows | CPU only | `pip3 install torch==2.6.0 torchvision==0.21.0 torchaudio==2.6.0` |

css/chat_style-Dark.css

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
.message {
22
display: grid;
3+
align-items: start;
34
grid-template-columns: 60px minmax(0, 1fr);
4-
padding-bottom: 28px;
5+
padding-bottom: 14px;
6+
padding-top: 14px;
57
font-size: 18px;
68
font-family: Roboto, Arial, sans-serif; /* Modern font */
79
line-height: 1.5;
@@ -102,6 +104,7 @@
102104
@media screen and (width <= 688px) {
103105
.message {
104106
display: grid;
107+
align-items: start;
105108
grid-template-columns: 60px minmax(0, 1fr);
106109
padding-bottom: 25px;
107110
font-size: 15px;

css/chat_style-TheEncrypted777.css

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22

33
.message {
44
display: grid;
5+
align-items: start;
56
grid-template-columns: 60px minmax(0, 1fr);
6-
padding-bottom: 28px;
7+
padding-bottom: 14px;
8+
padding-top: 14px;
79
font-size: 18px;
810
font-family: 'Noto Sans', Arial, sans-serif;
911
line-height: 1.428571429;
@@ -100,6 +102,7 @@
100102
@media screen and (width <= 688px) {
101103
.message {
102104
display: grid;
105+
align-items: start;
103106
grid-template-columns: 60px minmax(0, 1fr);
104107
padding-bottom: 25px;
105108
font-size: 15px;

css/chat_style-cai-chat-square.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
}
1717

1818
.message {
19-
padding-bottom: 2em;
19+
padding-bottom: 1em;
20+
padding-top: 1em;
2021
grid-template-columns: 70px minmax(0, 1fr);
2122
}

css/chat_style-cai-chat.css

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
.message {
22
display: grid;
3+
align-items: start;
34
grid-template-columns: 60px minmax(0, 1fr);
4-
padding-bottom: 2em;
5+
padding-bottom: 1em;
6+
padding-top: 1em;
57
font-size: 15px;
68
font-family: 'Noto Sans', Helvetica, Arial, sans-serif;
79
line-height: 22.5px !important;

css/chat_style-messenger.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
.message {
2-
padding-bottom: 25px;
2+
padding-bottom: 12.5px;
3+
padding-top: 12.5px;
34
font-size: 15px;
45
font-family: 'Noto Sans', Helvetica, Arial, sans-serif;
56
line-height: 1.428571429;

css/chat_style-wpp.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
.message {
2-
padding-bottom: 25px;
2+
padding-bottom: 12.5px;
3+
padding-top: 12.5px;
34
font-size: 15px;
45
font-family: 'Noto Sans', Helvetica, Arial, sans-serif;
56
line-height: 1.428571429;

0 commit comments

Comments
 (0)