Merge branch 'main' into eric/add-linter

Author: jordanstephens

app/Dockerfile

@@ -49,6 +49,4 @@ EXPOSE 5050
 ENV FLASK_APP=app.py
 
 # Run the application using uWSGI
-# CMD ["uwsgi", "--lazy-apps", "--http", "0.0.0.0:5050", "--wsgi-file", "app.py", "--callable", "app", "--processes", "4"]
-# longer timeout settings to allow for slower rag and llm responses
-CMD ["uwsgi", "--lazy-apps", "--http", "0.0.0.0:5050", "--wsgi-file", "app.py", "--callable", "app", "--processes", "4", "--harakiri", "300", "--socket-timeout", "300", "--http-timeout", "300", "--http-keepalive", "--http-auto-chunked"]
+CMD ["uwsgi", "--lazy-apps", "--http", "0.0.0.0:5050", "--wsgi-file", "app.py", "--callable", "app", "--processes", "2"]

app/get_knowledge_base.py

@@ -3,6 +3,7 @@
 import re
 import json
 from git import Repo
+import logging
 
 kb_file_path = "./data/knowledge_base.json"
 
@@ -33,23 +34,26 @@ def setup_repositories():
     for repo_name, repo_url in repos.items():
         clone_repository(repo_url, os.path.join(tmp_dir, repo_name))
 
-
-def run_prebuild_script():
-    """Run the defang-docs repo prebuild script"""
-
-    subprocess.run(
-        ["npm", "-C", ".tmp/defang-docs", "install"],
-        check=True,
+def run_command(cmd):
+    process = subprocess.Popen(
+        cmd,
         stdout=subprocess.PIPE,
         stderr=subprocess.PIPE,
+        text=True,
     )
+    for line in process.stdout:
+        logging.info(line.rstrip())
+    for line in process.stderr:
+        logging.error(line.rstrip())
+    process.wait()
+    if process.returncode != 0:
+        raise RuntimeError(f"Command {cmd} failed with return code {process.returncode}")
 
-    subprocess.run(
-        ["npm", "-C", ".tmp/defang-docs", "run", "prebuild"],
-        check=True,
-        stdout=subprocess.PIPE,
-        stderr=subprocess.PIPE,
-    )
+def run_prebuild_script():
+    """ Run the defang-docs repo prebuild script"""
+
+    run_command(["npm", "-C", ".tmp/defang-docs", "--loglevel=error", "install"])
+    run_command(["npm", "-C", ".tmp/defang-docs", "run", "prebuild"])
 
 
 def parse_markdown():

app/templates/index.html

@@ -201,7 +201,7 @@
             </a>
         </div>
         <h2>Ask Defang</h2>
-        <div id="chat-box" class="chat-box"></div>
+        <div id="chat-box" class="chat-box">Welcome to Ask Defang. Let's start chatting!</div>
         <input type="text" autofocus="autofocus" id="query-input" class="input-box" placeholder="Ask a question...">
         <button id="send-button" class="submit-btn">
             Send
@@ -260,9 +260,25 @@ <h2>Ask Defang</h2>
             // Display user query
             chatBox.innerHTML += `<p><strong>You:</strong> ${query}</p>`;
 
+            let processingMsg = `Processing<span class="loading-dots"><span>.</span><span>.</span><span>.</span></span>`;
+            // Animate the loading dots
+            setTimeout(() => {
+                const dots = responseContainer?.querySelectorAll('.loading-dots span');
+                if (!dots) return;
+                let visible = 1;
+                const interval = setInterval(() => {
+                    dots.forEach((dot, idx) => {
+                        dot.style.visibility = idx < visible ? 'visible' : 'hidden';
+                    });
+                    visible = visible < 3 ? visible + 1 : 1;
+                    // Stop animation when spinner is hidden (response received)
+                    if (loadingSpinner.style.display === 'none') clearInterval(interval);
+                }, 400);
+            }, 0);
+
             // Create a new response container for this query
             const responseContainer = document.createElement('p');
-            responseContainer.innerHTML = `<strong>Assistant:</strong> <span class="assistant-response"></span>`;
+            responseContainer.innerHTML = `<strong>Assistant:</strong> <span class="assistant-response">${processingMsg}</span>`;
             chatBox.appendChild(responseContainer);
 
             chatBox.scrollTop = chatBox.scrollHeight;

compose.yaml

@@ -30,7 +30,7 @@ services:
       resources:
         reservations:
           memory: 4G
-          cpus: 2.0
+          cpus: 1.0
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:5050/"]
       interval: 30s

discord-bot/app.js

@@ -222,7 +222,7 @@ app.post('/interactions', verifyKeyMiddleware(process.env.DISCORD_PUBLIC_KEY), a
         type: InteractionResponseType.CHANNEL_MESSAGE_WITH_SOURCE,
         data: {
           // Fetches a random emoji to send from a helper function
-          content: `Develop Anything, Deploy Anywhere ${getRandomEmoji()}`,
+          content: `Develop Once, Deploy Anywhere ${getRandomEmoji()}`,
         },
       });
     }