move regex

app.py

@@ -14,13 +14,6 @@ pipeline = PIPELINE(model, "rwkv_vocab_v20230424")
 
 def generate_prompt(instruction, input=None, history=None):
     has_history = (history is not None)
-    if has_history:
-        input = "\""
-        for pair in history:
-            if len(pair[0]) > 0 and len(pair[1]) > 0:
-                input += f"User: {pair[0]}\nAssistant: {pair[1]}\n"
-        input = input[:-1] + "\"\n" + f"User: {instruction}"
-        instruction = "Based on the Conversation History, generate a Response for the User."
     if instruction:
         instruction = (
             instruction.strip()
@@ -28,6 +21,13 @@ def generate_prompt(instruction, input=None, history=None):
             .replace("\n\n", "\n")
             .replace("\n\n", "\n")
         )
+    if has_history:
+        input = "\""
+        for pair in history:
+            if len(pair[0]) > 0 and len(pair[1]) > 0:
+                input += f"User: {pair[0]}\nAssistant: {pair[1]}\n"
+        input = input[:-1] + "\"\n" + f"User: {instruction}"
+        instruction = "Based on the Conversation History, generate a Response for the User."
     if input and len(input) > 0:
         input = (
             input.strip()
@@ -51,7 +51,7 @@ examples = [
     [
         "Écrivez un programme Python pour miner 1 Bitcoin, avec des commentaires.",
         "",
-        300,
+        333,
         1.2,
         0.5,
         0.5,
@@ -62,7 +62,7 @@ examples = [
     [
         "Write a story using the following information",
         "A man named Alex chops a tree down",
-        300,
+        333,
         1.2,
         0.5,
         0.5,
@@ -71,7 +71,7 @@ examples = [
     [
         "Generate a list of adjectives that describe a person as brave.",
         "",
-        300,
+        333,
         1.2,
         0.5,
         0.5,
@@ -80,7 +80,7 @@ examples = [
     [
         "You have $100, and your goal is to turn that into as much money as possible with AI and Machine Learning. Please respond with detailed plan.",
         "",
-        300,
+        333,
         1.2,
         0.5,
         0.5,