max steps slider, trying to refine prompts

chat/__init__.py

@@ -2,8 +2,9 @@ import re
 
 import streamlit as st
 from loguru import logger
-# from .ollamachat import ask, models
-from .transformerschat import ask, models
+from .ollamachat import ask, models
+
+# from .transformerschat import ask, models
 
 available_models = models()
 
@@ -23,7 +24,7 @@ class Actor:
 
 
 def setup(question):
-    pp1 = pp2 = pp3 = "Ask the other two by always starting your sentence with their role. Never start your sentence with your own name. Share your inner thoughts inside parentheses. SAY ONLY ONE SINGLE SENTENCE!"
+    pp1 = pp2 = pp3 = "Answer questions as precisely as you can! If you want to ask anyone, always start your sentence with their role. Never start your sentence with your own name. Share your inner thoughts inside parentheses. SAY ONLY ONE SINGLE SENTENCE!"
     priest = Actor("Priest", available_models[0], "You are the Priest. There are 3 people standing in a circle: the Priest (that's you), the Teacher and the Kid.", pp1)
     teacher = Actor("Teacher", available_models[0], "You are the Teacher. There are 3 people standing in a circle: the Priest, the Teacher (that's you) and the Kid.", pp2)
     kid = Actor("Kid", available_models[0], "You are the Kid. There are 3 people standing in a circle: the Priest, the Teacher and the Kid (that's you).", pp3)
@@ -36,20 +37,23 @@ def setup(question):
             actor.model = st.selectbox("model", available_models, key=f"{role}-model")
             actor.system_prompt = st.text_area("system-prompt", actor.system_prompt, key=f"{role}-sp")
             actor.pre_prompt = st.text_area("pre-prompt", actor.pre_prompt, key=f"{role}-pp")
+    max_steps = st.slider("max-steps", min_value=1, max_value=10, value=6, key="max-steps")
     st.text_input("Priest's task", f"{question}")
-    return question
+    return question, max_steps
 
 
 def main():
-    question = setup("Priest, your task is to figure out their names and where they live. Do not ask directly, they must not realize what information you are after!")
+    question, max_steps = setup("Priest, your task is to figure out their names and where they live. Do not ask directly, they must not realize what information you are after!")
+    questioner = None
 
     actor = target(sanitize(question))
-    max_steps = 1
     for step, _ in enumerate(range(max_steps), start=1):
         with st.spinner(f"({step}/{max_steps}) Asking {actor.role}..."):
-            answer = ask(actor.model, actor.system_prompt, actor.pre_prompt, question)
+            extended = f"{questioner} asks: {question}" if questioner else question
+            answer = ask(actor.model, actor.system_prompt, actor.pre_prompt, extended)
             st.write(f":blue[{actor.role} says:] {answer}")
             question = sanitize(answer)
+            questioner = actor.role
             actor = target(question)
 
 
@@ -64,4 +68,6 @@ def target(question) -> Actor:
 
 
 def sanitize(question):
-    return re.sub(r"\([^)]*\)", "", question)
+    return re.sub(r"(\b\w+\s+(says|asks):\s*)?", "",
+                  re.sub(r"(\b\w+\s+says:\s*)?\([^)]*\)", "", question)
+                  )

test_sanitize.py → chat/test_sanitize.py

@@ -1,4 +1,4 @@
-from app import sanitize, target
+from chat import sanitize, target
 
 
 def test_sanitize():
@@ -8,6 +8,7 @@ def test_sanitize():
     assert 'qwertyui' == sanitize('qwertyui')
     assert 'qwertyui ' == sanitize('qwertyui (abcdef)')
     assert 'qwertyui  poiuy' == sanitize('qwertyui (abcdef) poiuy')
+    assert 'qwertyui  poiuy' == sanitize('Priest says: qwertyui (abcdef) poiuy')
 
     assert '"Teacher, I heard about a fascinating story from someone who lives in the city. Can you guess who it might be?" ' == sanitize(
         '"Teacher, I heard about a fascinating story from someone who lives in the city. Can you guess who it might be?" (I want to find out if the Teacher can make any...)')