dev update

app.py

@@ -3,6 +3,7 @@ from huggingface_hub import InferenceClient
 
 
 client = InferenceClient("mistralai/Mistral-7B-Instruct-v0.3")
+#client = InferenceClient("Qwen/Qwen2.5-7B-Instruct")
 
 
 def generate_text(messages):
@@ -17,7 +18,7 @@ def generate_text(messages):
         yield generated
         #print(token.choices[0].delta)
     
-    #return generated+"." #no stram version
+    #return generated+"\n" #no stram version
 
 def call_generate_text(message, history):
     #if len(message) == 0:
@@ -46,101 +47,8 @@ def call_generate_text(message, history):
 head = '''
 <script src="https://cdn.jsdelivr.net/npm/onnxruntime-web/dist/ort.webgpu.min.js" ></script>
 <script type="module">
-        import { matcha_tts,env ,start_thread_play_tts} from "https://akjava.github.io/Matcha-TTS-Japanese/js-esm/matcha_tts_onnx_en.js";
-        window.MatchaTTSEn = matcha_tts
-        window.start_threads = async function(){
-            //sadly onload unstable.only me or gradle
-            //console.log("start_threads")
-            await start_thread_play_tts();
-            await start_multi_line_tts();
-        }
-</script>
-
-<script>
-let is_start_threads = false
-let last_chatbot_size = 0
-let tts_text_index = 0
-let tts_texts = []
-
-const interval = 10
-
-async function start_multi_line_tts() {
-  //console.log("start_multi_line_tts")
-  //console.log(tts_texts.length)
-  if (tts_texts.length > tts_text_index){
-  const tts_text = tts_texts[tts_text_index]
-  tts_text_index += 1
-  console.log(tts_text)
-  if (tts_text!=""){
-    //console.log("statar await load")
-    await window.MatchaTTSEn(tts_text,"/file=models/ljspeech_sim.onnx")
-    //console.log("end await ")
-  }
-
-  
-  }
-  setTimeout(start_multi_line_tts, interval);
-}
-
-
-function reset_tts_text(){
-    if (is_start_threads == false){
-        window.start_threads()
-        is_start_threads = true
-    }
-    console.log("new messages")
-    tts_text_index = 0
-    tts_texts = []
-}
-function replaceSpecialChars(text) {
-    const pattern = /[^a-zA-Z0-9,.!?-_']/g;
-    return text.replace(pattern, ' ');
-}
-
-
-function update_tts_texts(text){
-    //console.log(text)
-    const replaced_text = replaceSpecialChars(text)
-    const new_texts = []
-    //const splited = replaced_text.split(/[.!?]+\s*/);
-    const splited = replaced_text.match(/[^.?!,]+[.?!,]+\s?/g);
-    if(!splited){
-        return
-    }
-    for (let i = 0; i < splited.length; i++) {
-    const value = splited[i].trim();
-    
-    if (i === splited.length - 1) {
-        if (value.endsWith(".") || value.endsWith("?") || value.endsWith("!")){
-            new_texts.push(value);
-        }
-        //console.log("Last element:", value);
-    } else {
-        // その他の要素に対する処理
-        new_texts.push(value);
-    }
-    }
-    tts_texts=new_texts
-    
-}
-
-function update_chatbot(chatbot){
-    //console.log(chatbot)
-    if (chatbot.length!=last_chatbot_size){
-        last_chatbot_size = chatbot.length
-        reset_tts_text()
-    }
-    text = (chatbot[chatbot.length -1])["content"]
-    update_tts_texts(text)
-    
-}
-
-window.replaceSpecialChars = replaceSpecialChars
-
-window.update_chatbot = update_chatbot
-window.update_tts_texts = update_tts_texts
-window.reset_tts_text = reset_tts_text  
-
+        import { env } from "http://localhost:8000/js-esm/matcha_tts_onnx_en.js";
+        env.matcha_tts_model_path = "/file=models/ljspeech_sim.onnx"
 </script>
 '''
 
@@ -151,16 +59,12 @@ with gr.Blocks(title="LLM with TTS",head=head) as demo:
     
     js = """
     function(chatbot){
-    window.update_chatbot(chatbot)
-    var chatElement = document.getElementById('gr-chatbot');
-    chatElement.scrollTop = chatElement.scrollHeight;
-    var logElement = chatElement.querySelector('div[role="log"]');
-    logElement.scrollTop = logElement.scrollHeight;
-
-    //text = (chatbot[chatbot.length -1])["content"]
-    //tts_text = window.replaceSpecialChars(text)
-    //console.log(tts_text)
-    //window.MatchaTTSEn(tts_text,"/file=models/ljspeech_sim.onnx")
+        window.update_chatbot(chatbot)
+        //auto scroll
+        var chatElement = document.getElementById('gr-chatbot');
+        chatElement.scrollTop = chatElement.scrollHeight;
+        var logElement = chatElement.querySelector('div[role="log"]');
+        logElement.scrollTop = logElement.scrollHeight;
     }
     """
     chatbot = gr.Chatbot(type="messages",elem_id="gr-chatbot")
@@ -194,6 +98,9 @@ with gr.Blocks(title="LLM with TTS",head=head) as demo:
     msg.submit(call_generate_text, [msg, chatbot], [msg, chatbot])
 
 import os
-dir ="/home/user/app/"
-#dir = "C:\\Users\\owner\\Documents\\pythons\\huggingface\\mistral-7b-v0.3-matcha-tts-en"
-demo.launch(allowed_paths=[os.path.join(dir,"models","ljspeech_sim.onnx")])
+remote_dir ="/home/user/app/"
+local_dir = "C:\\Users\\owner\\Documents\\pythons\\huggingface\\mistral-7b-v0.3-matcha-tts-en"  #sorry this is my develop env
+#print(os.path.join(dir,"js-esm","matcha_tts_onnx_en.js"))
+# set not dir but file
+#demo.launch(allowed_paths=[os.path.join(remote_dir,"models","ljspeech_sim.onnx")])
+demo.launch(allowed_paths=[os.path.join(local_dir,"models","ljspeech_sim.onnx")])