new structuire update

This commit is contained in:
Saifeddine ALOUI 2024-08-29 02:22:36 +02:00
parent 9161a6a91e
commit bc6bc477dc
9 changed files with 210 additions and 250 deletions

View File

@ -1,5 +1,5 @@
# =================== Lord Of Large Language Multimodal Systems Configuration file ===========================
version: 133
version: 134
binding_name: null
model_name: null
model_variant: null
@ -105,6 +105,7 @@ active_tts_service: "None" # xtts (offline), openai_tts (API key required), elev
active_tti_service: "None" # autosd (offline), dall-e (online)
active_stt_service: "None" # whisper (offline), asr (offline or online), openai_whiosper (API key required)
active_ttm_service: "None" # musicgen (offline)
active_ttv_service: "None" # cog_video_x (offline)
# -------------------- Services --------------------------
# ***************** STT *****************
@ -204,6 +205,10 @@ comfyui_model: v1-5-pruned-emaonly.ckpt
enable_motion_ctrl_service: false
motion_ctrl_base_url: http://localhost:7861
# ***************** TTV *****************
cog_video_x_model: "THUDM/CogVideoX-5b"
# ***************** TTT *****************
# ollama service

@ -1 +1 @@
Subproject commit 62df82e8e336b285e0b5e3b34fe1977b15d382f5
Subproject commit 9d19668e9a57e991d33a44daa5816b436b4ecb51

View File

@ -421,7 +421,7 @@ class LOLLMSWebUI(LOLLMSElfServer):
mounted_personalities.append(personality)
if self.config.auto_read and len(personality.audio_samples)>0:
try:
from lollms.services.xtts.lollms_xtts import LollmsXTTS
from lollms.services.tts.xtts.lollms_xtts import LollmsXTTS
if self.tts is None:
voice=self.config.xtts_current_voice
if voice!="main_voice":
@ -1354,7 +1354,7 @@ class LOLLMSWebUI(LOLLMSElfServer):
if self.tts and self.config.auto_read and len(self.personality.audio_samples)>0:
try:
self.process_data("Generating voice output",MSG_OPERATION_TYPE.MSG_OPERATION_TYPE_STEP_START,client_id=client_id)
from lollms.services.xtts.lollms_xtts import LollmsXTTS
from lollms.services.tts.xtts.lollms_xtts import LollmsXTTS
voice=self.config.xtts_current_voice
if voice!="main_voice":
voices_folder = self.lollms_paths.custom_voices_path

View File

@ -12,7 +12,7 @@ wheel
psutil
pytest
GitPython
ascii-colors>=0.3.2
ascii-colors>=0.4.2
beautifulsoup4
packaging

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

4
web/dist/index.html vendored
View File

@ -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-16bc4928.js"></script>
<link rel="stylesheet" href="/assets/index-b411a75c.css">
<script type="module" crossorigin src="/assets/index-0d154971.js"></script>
<link rel="stylesheet" href="/assets/index-30c8ee0f.css">
</head>
<body>
<div id="app"></div>

View File

@ -1722,6 +1722,7 @@
<option value="None">None</option>
<option value="browser">Use Browser TTS (doesn't work in realtime mode)</option>
<option value="xtts">XTTS</option>
<option value="parler-tts">Parler-TTS</option>
<option value="openai_tts">Open AI TTS</option>
<option value="eleven_labs_tts">ElevenLabs TTS</option>
</select>
@ -1785,6 +1786,23 @@
</select>
</td>
</tr>
<tr>
<td style="min-width: 200px;">
<label for="active_ttv_service" class="text-sm font-bold" style="margin-right: 1rem;" title="Default Text to speach engine">Active TTV Service:</label>
</td>
<td style="width: 100%;">
<select
id="active_ttv_service"
required
v-model="configFile.active_ttv_service"
@change="settingsChanged=true"
class="w-full mt-1 px-2 py-1 border border-gray-300 rounded dark:bg-gray-600"
>
<option value="None">None</option>
<option value="cog_video_x">Cog Video X</option>
</select>
</td>
</tr>
</table>
</Card>
@ -3406,60 +3424,6 @@
</Card>
</Card>
<Card title="Misc" :is_shrunk="true" :is_subcard="true" class="pb-2 m-2">
<Card title="Motion Ctrl service" :is_subcard="true" class="pb-2 m-2">
<table class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500">
<tr>
<td style="min-width: 200px;">
<label for="enable_sd_service" class="text-sm font-bold" style="margin-right: 1rem;">Enable Motion Ctrl service:</label>
</td>
<td>
<div class="flex flex-row">
<input
type="checkbox"
id="enable_motion_ctrl_service"
required
v-model="configFile.enable_motion_ctrl_service"
@change="settingsChanged=true"
class="mt-1 px-2 py-1 border border-gray-300 rounded dark:bg-gray-600"
>
</div>
</td>
<td>
<div class="hover:text-secondary duration-75 active:scale-90 peer-checked:text-primary" @click="this.$store.state.messageBox.showMessage('Activates Motion ctrl service. The service will be automatically loaded at startup alowing you to use the motoin control endpoint to generate videos')">
<i data-feather="help-circle" class="w-5 h-5 "></i>
</div>
</td>
</tr>
<tr>
<td style="min-width: 200px;">
<label for="install_sd_service" class="text-sm font-bold" style="margin-right: 1rem;">Install Motion Ctrl service:</label>
</td>
<td>
<div class="flex flex-row">
<button class="hover:text-primary bg-green-200 rounded-lg p-4 m-4 w-full text-center items-center" @click="reinstallMotionCtrlService">install Motion Ctrl service</button>
</div>
</td>
</tr>
<tr>
<td style="min-width: 200px;">
<label for="sd_base_url" class="text-sm font-bold" style="margin-right: 1rem;">sd base url:</label>
</td>
<td>
<div class="flex flex-row">
<input
type="text"
id="sd_base_url"
required
v-model="configFile.sd_base_url"
@change="settingsChanged=true"
class="mt-1 px-2 py-1 border border-gray-300 rounded dark:bg-gray-600"
>
</div>
</td>
</tr>
</table>
</Card>
<Card title="Elastic search Service (under construction)" :is_subcard="true" class="pb-2 m-2">
<table class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500">
<tr>
@ -4672,15 +4636,6 @@ export default {
console.error(error);
});
},
reinstallMotionCtrlService(){
axios.post('install_motion_ctrl', {client_id:this.$store.state.client_id})
.then(response => {
})
.catch(error => {
console.error(error);
});
},
reinstallvLLMService(){
axios.post('install_vllm', {client_id:this.$store.state.client_id})
.then(response => {

@ -1 +1 @@
Subproject commit 7d86b3e5f5c16ce3834e2791f8e619801fe7463f
Subproject commit a2467c5f384df45bc7367b2a2dd3c53e11b1f904