demo config changes

.env

@@ -5,8 +5,10 @@ TTS_BACKEND_URL=https://api.tts.d-popov.com/
 TTS_BACKEND_URL2=http://localhost:9002/asr 
 TTS_BACKEND_URL3=http://192.168.0.10:9008/asr #gpu
 #! TTS_BACKEND_URL4=http://192.168.0.10:9009/asr #cpu 9008-gpu
-WS_URL=ws://localhost:8081
+# WS_URL=ws://localhost:8080
-SERVER_PORT_WS=8081
+PUBLIC_HOSTNAME=tts.d-popov.com
+WS_URL=wss://tts.d-popov.com
+SERVER_PORT_WS=8080
 SERVER_PORT_HTTP=3005
 
 # aider

.env.demo

@@ -3,4 +3,21 @@
 # TTS_BACKEND_URL=http://192.168.0.10:9008/asr
 # WS_URL=ws://192.168.0.10:9008
 # SERVER_PORT_WS=8081
-# SERVER_PORT_HTTP=8080
+# SERVER_PORT_HTTP=8080
+
+ENV_NAME=development
+TTS_API_URL=https://api.tts.d-popov.com/asr
+
+# LLN_MODEL=qwen2
+# LNN_API_URL=https://ollama.d-popov.com/api/generate
+
+LLN_MODEL=qwen2
+LNN_API_URL=https://ollama.d-popov.com/api/generate
+
+GROQ_API_KEY=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
+OPENAI_API_KEY=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
+
+WS_URL=wss://tts.d-popov.com
+PUBLIC_HOSTNAME=tts.d-popov.com
+SERVER_PORT_WS=8080
+SERVER_PORT_HTTP=8080

.env.development

@@ -11,6 +11,6 @@ LNN_API_URL=https://ollama.d-popov.com/api/generate
 GROQ_API_KEY=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
 OPENAI_API_KEY=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
 
-WS_URL=ws://localhost:8081
+WS_URL=ws://localhost:8080
-SERVER_PORT_WS=8081
+SERVER_PORT_WS=8080
 SERVER_PORT_HTTP=8080

.vscode/launch.json

@@ -27,15 +27,20 @@
             }
         },
         {
-            "name": "Launch chat-server.js",
+            "name": "start chat-server.js",
             "type": "node",
             "request": "launch",
-            "program": "${workspaceFolder}/web/chat-server.js",
+            // "program": "${workspaceFolder}/web/chat-server.js",
+            "runtimeExecutable": "npm", // Use npm to run the script
+            "runtimeArgs": [
+              "run",
+              "start:demo-chat" // The script to run
+            ],
             "console": "integratedTerminal",
             "internalConsoleOptions": "neverOpen",
             "env": {
-                "CONDA_ENV": "node", //?
+                "NODE_ENV": "demo"
-                "NODE_ENV": "development"
+                "OPENAI_API_KEY":
             },
             "skipFiles": [
                 "<node_internals>/**"

docker-compose.yml

@@ -16,3 +16,17 @@ services:
     ports:
       - 28081:8081
       - 28080:8080
+  mlchat:
+    image: kevinai
+    container_name: kevinai-chat
+    build:
+      context: .
+      dockerfile: ./Dockerfile
+    environment:
+      NODE_ENV: demo
+      # TTS_BACKEND_URL: http://192.168.0.10:9009/asr 
+      WS_URL: wss://tts.d-popov.com
+      SERVER_PORT_WS: 8080
+      SERVER_PORT_HTTP: 8080
+    ports:
+      - 28080:8080

package.json

@@ -5,6 +5,7 @@
     "scripts": {
         "start": "node web/server.js",
         "start:demo": "NODE_ENV=demo node web/server.js",
+        "start:demo-chat": "node web/chat-server.js",
         "start:tele": "python agent-py-bot/agent.py"
     },
     "dependencies": {

web/.env

@@ -1,22 +0,0 @@
-
-TTS_BACKEND_URL=https://api.tts.d-popov.com/
-WS_URL=ws://localhost:8081
-SERVER_PORT_WS=8081
-SERVER_PORT_HTTP=3005
-
-# aider
-AIDER_MODEL=
-AIDER_4=false
-#AIDER_35TURBO=
-
-# OPENAI_API_KEY=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 
-# OPENAI_API_BASE=https://api.deepseek.com/v1
-# OPENAI_API_KEY=sk-99df7736351f4536bd72cd64a416318a
-# AIDER_MODEL=deepseek-coder #deepseek-coder, deepseek-chat
-
-
-GROQ_API_KEY=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
-aider --model groq/llama3-70b-8192
-
-# List models available from Groq
-aider --models groq/

web/chat-client.html

@@ -127,7 +127,7 @@
         function connect() {
             return new Promise((resolve, reject) => {
                 connectionStatus.innerHTML = "Connecting to WS...";
-                let wsurl = "ws://localhost:8081";
+                let wsurl = "ws://localhost:8080";
                 fetch("/wsurl")
                     .then((response) => response.text())
                     .then((data) => {

web/chat-server.js

@@ -12,7 +12,7 @@ const OpenAI = require('openai');
 const Groq = require('groq-sdk');
 
 // Load environment variables
-dotenv.config({ path: `.env${process.env.NODE_ENV === 'development' ? '.development' : ''}` });
+dotenv.config({ path: `.env${process.env.NODE_ENV === 'development' ? '.development' :'.'+ process.env.NODE_ENV }` });
 
 // Initialize services
 const openai = new OpenAI({ apiKey: process.env.OPENAI_API_KEY });
@@ -343,6 +343,10 @@ app.post('/log', (req, res) => {
 });
 
 app.get('/wsurl', (req, res) => {
+    if(process.env.PUBLIC_HOSTNAME){
+        process.env.WS_URL = `wss://${process.env.PUBLIC_HOSTNAME}`
+    }
+    console.log('Request for WS URL resolved with:', process.env.WS_URL );
     res.status(200).send(process.env.WS_URL);
 });