Merge pull request #6912 from oobabooga/dev

Merge dev branch

Author: oobabooga

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

@@ -101,7 +101,7 @@ jobs:
       - name: Build Package
         shell: bash
         run: |
-            rm -rf .git cmd* update_wizard* start_wsl.bat wsl.sh Colab-TextGen-GPU.ipynb docker
+            rm -rf .git cmd* update_wizard* Colab-TextGen-GPU.ipynb docker
 
             # Define common variables
             CUDA_VERSION="${{ matrix.cuda }}"

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

@@ -100,7 +100,7 @@ jobs:
       - name: Build Package
         shell: bash
         run: |
-            rm -rf .git cmd* update_wizard* start_wsl.bat wsl.sh Colab-TextGen-GPU.ipynb docker
+            rm -rf .git cmd* update_wizard* Colab-TextGen-GPU.ipynb docker
 
             # Define common variables
             AVX_SUPPORT="${{ matrix.avx }}"

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

@@ -100,7 +100,7 @@ jobs:
       - name: Build Package
         shell: bash
         run: |
-            rm -rf .git cmd* update_wizard* start_wsl.bat wsl.sh Colab-TextGen-GPU.ipynb docker
+            rm -rf .git cmd* update_wizard* Colab-TextGen-GPU.ipynb docker
 
             # Define common variables
             AVX_SUPPORT="${{ matrix.avx }}"

.gitignore

@@ -1,26 +1,8 @@
-/cache
-/characters
 /css
 /extensions
-/grammars
 /installer_files
-/logs
-/loras
-/models
-/presets
-/prompts
 /repositories
-/softprompts
-/torch-dumps
-/training/datasets
-
-/CMD_FLAGS.txt
-/img_bot*
-/img_me*
-/models/config-user.yaml
-/notification.mp3
-/settings*.json
-/settings*.yaml
+/user_data
 
 .chroma
 .DS_Store

CMD_FLAGS.txt

@@ -625,19 +625,19 @@ div.svelte-362y77>*, div.svelte-362y77>.form>* {
         width: 100%;
         overflow-y: visible;
     }
-    
+
     .message {
         break-inside: avoid;
     }
-    
+
     .gradio-container {
         overflow: visible;
     }
-    
+
     .tab-nav {
         display: none !important;
     }
-    
+
     #chat-tab > :first-child {
         max-width: unset;
     }
@@ -1291,3 +1291,94 @@ div.svelte-362y77>*, div.svelte-362y77>.form>* {
 .dark .footer-button:hover svg {
     stroke: rgb(209 213 219);
 }
+
+.tgw-accordion {
+    padding: 10px 12px !important;
+}
+
+.dark .tgw-accordion {
+    border: 1px solid var(--border-color-dark);
+}
+
+.welcome-greeting {
+    text-align: center;
+    margin-top: 40vh;
+    font-size: 24px;
+    opacity: 0.7;
+    padding-left: 1rem;
+    padding-right: 1rem;
+}
+
+/* Thinking blocks styling */
+.thinking-block {
+    margin-bottom: 12px;
+    border-radius: 8px;
+    border: 1px solid rgb(0 0 0 / 10%);
+    background-color: var(--light-theme-gray);
+    overflow: hidden;
+}
+
+.dark .thinking-block {
+    background-color: var(--darker-gray);
+}
+
+.thinking-header {
+    display: flex;
+    align-items: center;
+    padding: 10px 16px;
+    cursor: pointer;
+    user-select: none;
+    font-size: 14px;
+    color: rgb(0 0 0 / 70%);
+    transition: background-color 0.2s;
+}
+
+.thinking-header:hover {
+    background-color: rgb(0 0 0 / 3%);
+}
+
+.thinking-header::-webkit-details-marker {
+    display: none;
+}
+
+.thinking-icon {
+    margin-right: 8px;
+    color: rgb(0 0 0 / 50%);
+}
+
+.thinking-title {
+    font-weight: 500;
+}
+
+.thinking-content {
+    padding: 12px 16px;
+    border-top: 1px solid rgb(0 0 0 / 7%);
+    color: rgb(0 0 0 / 70%);
+    font-size: 14px;
+    line-height: 1.5;
+    overflow-wrap: break-word;
+    max-height: 250px;
+    overflow-y: scroll;
+    contain: layout;
+}
+
+/* Animation for opening thinking blocks */
+@keyframes fadeIn {
+    from { opacity: 0; }
+    to { opacity: 1; }
+}
+
+.thinking-block[open] .thinking-content {
+    animation: fadeIn 0.3s ease-out;
+}
+
+/* Additional style for in-progress thinking */
+.thinking-block[data-streaming="true"] .thinking-title {
+    animation: pulse 1.5s infinite;
+}
+
+@keyframes pulse {
+    0% { opacity: 0.6; }
+    50% { opacity: 1; }
+    100% { opacity: 0.6; }
+}

README.md

@@ -1,5 +1,5 @@
 '''
-Downloads models from Hugging Face to models/username_modelname.
+Downloads models from Hugging Face to user_data/models/username_modelname.
 
 Example:
 python download-model.py facebook/opt-1.3b
@@ -175,7 +175,7 @@ def get_output_folder(self, model, branch, is_lora, is_llamacpp=False, model_dir
         if model_dir:
             base_folder = model_dir
         else:
-            base_folder = 'models' if not is_lora else 'loras'
+            base_folder = 'user_data/models' if not is_lora else 'user_data/loras'
 
         # If the model is of type GGUF, save directly in the base_folder
         if is_llamacpp:
@@ -356,7 +356,7 @@ def check_model_files(self, model, branch, links, sha256, output_folder):
     parser.add_argument('--specific-file', type=str, default=None, help='Name of the specific file to download (if not provided, downloads all).')
     parser.add_argument('--exclude-pattern', type=str, default=None, help='Regex pattern to exclude files from download.')
     parser.add_argument('--output', type=str, default=None, help='Save the model files to this folder.')
-    parser.add_argument('--model-dir', type=str, default=None, help='Save the model files to a subfolder of this folder instead of the default one (text-generation-webui/models).')
+    parser.add_argument('--model-dir', type=str, default=None, help='Save the model files to a subfolder of this folder instead of the default one (text-generation-webui/user_data/models).')
     parser.add_argument('--clean', action='store_true', help='Does not resume the previous download.')
     parser.add_argument('--check', action='store_true', help='Validates the checksums of model files.')
     parser.add_argument('--max-retries', type=int, default=7, help='Max retries count when get error in download time.')