Minor fixes

Author: piyushroshan

services/chatbot/build-image.sh

@@ -17,6 +17,9 @@ set -x
 cd "$(dirname $0)"
 mkdir -p retrieval
 cp -Rv ../../docs retrieval/
+cp -Rv ../../deploy/docker/*.yml retrieval/docs/
+cp -Rv ../../deploy/docker/*.yaml retrieval/docs/
+
 docker build -t crapi/crapi-chatbot:${VERSION:-latest} .
 retVal=$?
 if [ $retVal -ne 0 ]; then

services/chatbot/requirements.txt

@@ -5,6 +5,6 @@ langchain_community==0.0.34
 langchain_core==0.1.45
 langchain_openai==0.1.3
 python-dotenv==1.0.1
-unstructured==0.13.3
+unstructured
 gunicorn==22.0.0
 markdown==3.6

services/chatbot/src/chatbot_api.py

@@ -32,7 +32,10 @@ def document_loader():
         load_dir = "retrieval"
         logger.debug("Loading documents from %s", load_dir)
         loader = DirectoryLoader(
-            load_dir, glob="**/*.md", loader_cls=UnstructuredMarkdownLoader
+            load_dir,
+            exclude=["**/*.png", "**/images/**", "**/images/*", "**/*.pdf"],
+            recursive=True,
+            loader_cls=UnstructuredMarkdownLoader,
         )
         documents = loader.load()
         logger.debug("Loaded %s documents", len(documents))
@@ -113,11 +116,14 @@ def init_bot():
 def state_bot():
     try:
         if loaded_model.is_set():
-            return jsonify({"message": "Model already loaded"})
+            return jsonify({"initialized": "true", "message": "Model already loaded"})
     except Exception as e:
         logger.error("Error checking state ", e)
-        return jsonify({"message": "Error checking state " + str(e)}), 400
-    return jsonify({"message": "Model Error"}), 400
+        return jsonify({"message": "Error checking state " + str(e)}), 200
+    return (
+        jsonify({"initialized": "false", "message": "Model needs to be initialized"}),
+        200,
+    )
 
 
 @app.route("/chatbot/genai/ask", methods=["POST"])

services/web/src/components/bot/ActionProvider.jsx

@@ -151,6 +151,7 @@ class ActionProvider {
           terminateLoading: true,
         },
       );
+      this.addMessageToState(message);
     }
   };
 

services/web/src/components/bot/MessageParser.jsx

@@ -13,47 +13,54 @@
  * limitations under the License.
  */
 import { APIService } from "../../constants/APIConstant";
-const superagent = require("superagent");
+import request from "superagent";
 
 class MessageParser {
   constructor(actionProvider, state) {
     this.actionProvider = actionProvider;
     this.state = state;
   }
 
-  initializationRequired() {
+  async initializationRequired() {
     const stateUrl = APIService.CHATBOT_SERVICE + "genai/state";
-    superagent
+    let initRequired = false;
+    // Wait for the response
+    await request
       .get(stateUrl)
       .set("Accept", "application/json")
       .set("Content-Type", "application/json")
-      .end((err, res) => {
-        if (err) {
-          console.log("Error:");
-          console.log(err);
-          console.log("Initialization required prefetch error");
-          return true;
-        }
-        console.log(res);
-        if (res.status == 200) {
-          console.log("Initialization not required");
-          return false;
+      .then((res) => {
+        console.log("I response:", res.body);
+        if (res.status === 200) {
+          if (res.body.initialized === "true") {
+            initRequired = false;
+          } else {
+            initRequired = true;
+          }
         }
+      })
+      .catch((err) => {
+        console.log("Error prefetch: ", err);
       });
+    console.log("Initialization required:", initRequired);
+    return initRequired;
   }
 
-  parse(message) {
+  async parse(message) {
     console.log("State:", this.state);
     console.log("Message:", message);
     const message_l = message.toLowerCase();
     if (this.state.initializationRequired === undefined) {
-      this.state.initializationRequired = this.initializationRequired();
+      this.state.initializationRequired = await this.initializationRequired();
+      console.log("State:", this.state);
     }
     if (message_l === "help") {
-      this.state.initializationRequired = this.initializationRequired();
+      this.state.initializationRequired = await this.initializationRequired();
+      console.log("State help:", this.state);
       return this.actionProvider.handleHelp(this.state.initializationRequired);
     } else if (message_l === "init" || message_l === "initialize") {
-      this.state.initializationRequired = this.initializationRequired();
+      this.state.initializationRequired = await this.initializationRequired();
+      console.log("State init:", this.state);
       return this.actionProvider.handleInitialize(
         this.state.initializationRequired,
       );