Upload with huggingface_hub

app.py

@@ -1,83 +1,58 @@
-# Notebook implementation of the self-ask + Google tool use prompt.
-# Adapted from https://github.com/ofirpress/self-ask
 
-from dataclasses import dataclass
+desc = """
+ Notebook implementation of the self-ask + Google tool use prompt.
+ Adapted from https://github.com/ofirpress/self-ask
+"""
 
-from parsita import *
+from dataclasses import dataclass, replace
+from typing import Optional
+from minichain import prompt, show, OpenAI, Google
 
-import minichain
-
-# Define the state of the bot.
-
-@dataclass
-class IntermediateState:
-    s: str
-
-@dataclass
-class FinalState:
-    s: str
 
 @dataclass
-class Out:
-    echo: str
-    state: FinalState | IntermediateState
-
-
-# Self Ask Prompt
-
-class SelfAsk(minichain.TemplatePrompt[Out]):
-    template_file = "selfask.pmpt.tpl"
-    stop_template = "\nIntermediate answer:"
-
-    # Parsita parser.
-    class Parser(TextParsers):
-        follow = (lit("Follow up:") >> reg(r".*")) > IntermediateState
-        finish = (lit("So the final answer is: ") >> reg(r".*")) > FinalState
-        response = follow | finish
-
-    def parse(self, response: str, inp) -> Out:
-        return Out(
-            self.prompt(inp).prompt + response,
-            self.Parser.response.parse(response).or_die(),
-        )
-
-# Runtime loop
-
-def selfask(inp: str, openai, google) -> str:
-    prompt1 = SelfAsk(openai)
-    prompt2 = minichain.SimplePrompt(google)
-    suffix = ""
+class State:
+    question: str
+    history: str =  ""
+    next_query: Optional[str] = None
+    final_answer: Optional[str] = None
+
+
+@prompt(OpenAI(),
+        template_file = "selfask.pmpt.tpl",
+        stop_template = "\nIntermediate answer:")
+def self_ask(model, state):
+    out = model(state)
+    res = out.split(":", 1)[1]
+    if out.startswith("Follow up:"):
+        return replace(state, next_query=res)
+    elif out.startswith("So the final answer is:"):
+        return replace(state, final_answer=res)
+    
+@prompt(Google())
+def google(model, state):
+    if state.next_query is None:
+        return state
+    
+    result = model(state.next_query)
+    return State(state.question,
+                 state.history + "\nIntermediate answer: " + result + "\n")
+
+def selfask(question):
+    state = State(question)
     for i in range(3):
-        out = prompt1(dict(input=inp, suffix=suffix, agent_scratchpad=True))
-
-        if isinstance(out.state, FinalState):
-            break
-        suffix += out.echo
-        out2 = prompt2(out.state.s)
-        suffix += "\nIntermediate answer: " + out2 + "\n"
-    return out.state.s
-
-
-with minichain.start_chain("selfask") as backend:
-    result = selfask(
-        "What is the zip code of the city where George Washington was born?",
-        backend.OpenAI(),
-        backend.Google(),
-    )
-    print(result)
+        state = self_ask(state)
+        state = google(state)
+    return state
 
-# View prompt examples.
 
-# + tags=["hide_inp"]
-SelfAsk().show(
-    {
-        "input": "What is the zip code of the city where George Washington was born?",
-        "agent_scratchpad": True,
-    },
-    "Follow up: Where was George Washington born?",
-)
-# -
+gradio = show(selfask,
+              examples=["What is the zip code of the city where George Washington was born?"],
+              subprompts=[self_ask, google] * 3,
+              description=desc,
+              code=open("selfask.py", "r").read().split("$")[1].strip().strip("#").strip(),
+              out_type="json"
+              )
+if __name__ == "__main__":
+    gradio.launch()
 
-# View log.
 
-minichain.show_log("selfask.log")

requirements.txt

@@ -1,3 +1,4 @@
-gradio
+gradio==3.21.0
 git+https://github.com/srush/minichain@gradio
 manifest-ml
+faiss-cpu

selfask.pmpt.tpl

@@ -34,6 +34,6 @@ Follow up: Where is Martin Campbell from?
 Intermediate answer: New Zealand.
 So the final answer is: No
 
-Question: {{input}}
-Are followup questions needed here: {% if agent_scratchpad %}Yes{%else%}No{% endif %}.
-{{suffix}}
+Question: {{question}}
+Are followup questions needed here: Yes
+{{history}}