combine grammar and language models

franksh · franksh · commit fdd65d1d83d4 · 2022-03-30T10:21:02.000+02:00
diff --git a/chatbot/chat.py b/chatbot/chat.py
@@ -92,13 +92,10 @@ def get_bot_response(chat_history):
     """ Get response from the bot """
 
     if current_app.config['LOAD_GRAMMAR_MODEL']:
-        pass
-        # chat_history = current_app.grammar_correction.add_correction_to_chat_history(chat_history)
+        # pass
+        chat_history = current_app.grammar_correction.add_correction_to_chat_history(chat_history)
     chat_history = current_app.language_model.add_response_to_chat_history(chat_history)
-    # import sys
-    # print("-----------------\nChat History\n\n", chat_history, file=sys.stdout)
-    # print("-----------------\nChat History\n\n", chat_history.get_as_prompt_with_dialog(), file=sys.stdout)
-    
+
 
     return chat_history
 
@@ -157,13 +154,16 @@ def add_user_message(self, text: str):
         message = ChatMessage(sender='user', text=text)
         self.add_message(message)
     
-    def add_bot_message(self, text: str):
-        message = ChatMessage(sender='bot', text=text)
+    def add_bot_message(self, text: str, correction: bool=False):
+        message = ChatMessage(sender='bot', text=text, correction=correction)
         self.add_message(message)
 
     def add_message(self, chat_message: ChatMessage):
         self.messages.append(chat_message)
 
+    def get_last_message_text(self) -> ChatMessage:
+        return self.messages[-1].text
+
     def get_as_prompt_with_dialog(self, limit_messages: int=10):
         """ Returns the chat history in a Dialog format
 
diff --git a/chatbot/dashboard.py b/chatbot/dashboard.py
@@ -19,7 +19,7 @@ def dashboard():
 
 
     featured_prompts = {key: current_app.prompts[key] for key in
-                        ['general_chat_beginner', 'scenario_restaurant', 'persona_shakespeare']
+                        ['general_chat_intermediate', 'scenario_restaurant', 'persona_shakespeare']
                         }
         
     return render_template('dashboard/dashboard.html',
diff --git a/chatbot/grammar_correction.py b/chatbot/grammar_correction.py
@@ -37,20 +37,14 @@ def add_correction_to_chat_history(self, chat_history):
         Append the message to the user to the chat history.
         Return the corrected sentence.
         """
-        last_user_input = chat_history[-1].get('text')
+        last_user_input = chat_history.get_last_message_text()
         corrected_sentence, correction_message = self.grammar_correction(last_user_input)
         error_types = self.get_edits(last_user_input, corrected_sentence)
         relevant_error = any(error not in self.ignore_errors for error in error_types) # check if there is an error in the sentence which is not in the ignore list 
         token_sort_ratio = fuzz.token_sort_ratio(corrected_sentence, last_user_input) # calculate token similarity (ignoring punctuation and casing)
         
         if correction_message and relevant_error and token_sort_ratio != 100:
-            chat_history.append(
-                {
-                    'sender': 'bot',
-                    'text': correction_message,
-                    'correction': True
-                }
-            )
+            chat_history.add_bot_message(text=correction_message, correction=True)
         
         return chat_history      
 
diff --git a/chatbot/templates/base.html b/chatbot/templates/base.html
@@ -1,6 +1,6 @@
 <!doctype html>
 <html lang="en">
-  <title>{% block title %}{% endblock %}Chatbot</title>
+  <title>{% block title %}{% endblock %}Nova AI</title>
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
@@ -24,7 +24,7 @@
     <!-- Responsive navbar-->
     <nav class="navbar navbar-expand-lg navbar-light">
       <div class="container px-5">
-          <a class="navbar-brand" href="{{ url_for('dashboard.dashboard') if g.user else url_for('index') }}">Home</a>
+          <a class="navbar-brand" href="{{ url_for('dashboard.dashboard') if g.user else url_for('index') }}">Nova AI</a>
           <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button>
           <div class="collapse navbar-collapse" id="navbarSupportedContent">
               <ul class="navbar-nav ms-auto mb-2 mb-lg-0">
diff --git a/setup.py b/setup.py
@@ -38,7 +38,7 @@ def post_install_commands():
 
 
 setup(name='chatbot',
-      version = '0.0.2',
+      version = '0.1.0',
       license='MIT',
       author='Aloïs Villa, Frank Schlosser',
       description='A language learning chatbot',

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ def dashboard():`
`19`	`19`
`20`	`20`
`21`	`21`	`featured_prompts = {key: current_app.prompts[key] for key in`
`22`		`- ['general_chat_beginner', 'scenario_restaurant', 'persona_shakespeare']`
	`22`	`+ ['general_chat_intermediate', 'scenario_restaurant', 'persona_shakespeare']`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`return render_template('dashboard/dashboard.html',`