Update setup

app.py

@@ -1,49 +1,30 @@
 import random
-import gradio as gr
-
-import os
-from typing import Dict
-from refresh_files import refresh_files
-from refresh_files import REPO_PATH as BOT_PATH
-
-
-class BotCache:
-    def __init__(self):
-        self.bots = self._load_bots()
+from functools import partial
+from typing import List, Tuple
 
-    def update(self) -> Dict[str, type]:
-        self.bots = self._load_bots()
-        return self.bots
-
-    @staticmethod
-    def _load_bots() -> Dict[str, type]:
-        refresh_files()
-        python_files = [f[:-3] for f in os.listdir(BOT_PATH)
-                        if f.endswith(".py")]
-        all_classes = []
-        for py in python_files:
-            mod = __import__('.'.join([BOT_PATH, py]), fromlist=[py])
-            classes = [getattr(mod, x) for x in dir(mod)
-                       if isinstance(getattr(mod, x), type)]
-            all_classes.extend(classes)
-
-        bots = {}
-        for cls in all_classes:
-            bots[cls.get_name()] = cls
+import gradio as gr
 
-        return bots
+from refresh_bots import BotCache
 
 
-cached_bots = BotCache()
+def middchat(bot_cache: BotCache, message: str, history: List[Tuple[str, str]]) -> str:
+    """
+    Generate a message given a message history and bots
 
+    Args:
+        bot_cache (BotCache): a bot cache to get bot classes from
+        message (str): the message sent by the user
+        history (List[Tuple[str, str]]): history of messages/responses
 
-def middchat(message, history):
+    Returns:
+        str: bot's response
+    """
     # get the bot options
     # for new chats, fetch new bots
     if len(history) == 0:
-        all_bots = cached_bots.update()
+        all_bots = bot_cache.update()
     else:
-        all_bots = cached_bots.bots
+        all_bots = bot_cache.bots
 
     # check to see if the bot was set in the message history
     bot = None
@@ -62,7 +43,8 @@ def middchat(message, history):
     # If it doesn't, tell the user about the options again.
     if bot is None:
         if message.strip() in all_bots:
-            return f"You're now chatting with {message.strip()}! If you aren't sure what to say, type \"examples\""
+            return f"You're now chatting with {message.strip()}! \
+                If you aren't sure what to say, type \"examples\""
         else:
             bot_options = "Please choose one of the following bots:\n"
             bot_options += "\n".join(f"* {bot}" for bot in all_bots.keys())
@@ -84,13 +66,14 @@ def middchat(message, history):
 
     return bot.make_reply(message)
 
-
-bot = gr.Chatbot([("Welcome to MiddChat! " + middchat("", []), None)])
+cache = BotCache()
+chat_partial = partial(middchat, cache)
+chatbot = gr.Chatbot([("Welcome to MiddChat! " + chat_partial("", []), None)])
 demo = gr.ChatInterface(
     fn=middchat,
-    chatbot=bot,
+    chatbot=chatbot,
     title="MiddChat",
     clear_btn="Reset chat history and talk to another bot",
     retry_btn=None,
     undo_btn=None)
-demo.launch(share=True)
+demo.launch(share=True)

refresh_bots.py

@@ -0,0 +1,56 @@
+import importlib
+import os
+from typing import Dict
+
+import git
+
+
+REPO_PATH = "student_bots"
+
+
+class BotCache:
+    """
+    Stores and updates bot modules from a git repo
+    """
+    def __init__(self):
+        self.bots = self._load_bots()
+
+    def update(self) -> Dict[str, type]:
+        """
+        Update and return bot dictionary
+
+        Returns:
+            Dict[str, type]: maps bot names to bot classes
+        """
+        self.bots = self._load_bots()
+        return self.bots
+
+    @staticmethod
+    def _load_bots() -> Dict[str, type]:
+        BotCache._refresh_files()
+        python_files = [f[:-3] for f in os.listdir(REPO_PATH)
+                        if f.endswith(".py")]
+        all_classes = []
+        for py in python_files:
+            mod = __import__('.'.join([REPO_PATH, py]), fromlist=[py])
+            classes = [getattr(mod, x) for x in dir(mod)
+                       if isinstance(getattr(mod, x), type)]
+            all_classes.extend(classes)
+
+        bots = {}
+        for cls in all_classes:
+            bots[cls.get_name()] = cls
+
+        return bots
+
+    @staticmethod
+    def _refresh_files():
+        if os.path.exists(REPO_PATH):
+            repo = git.Repo(REPO_PATH)
+            origin = repo.remotes.origin
+            origin.pull()
+        else:
+            pat_token = os.environ["GITHUB_PAT_TOKEN"]
+            username = os.environ["GITHUB_USERNAME"]
+            repo = os.environ["GITHUB_REPO"]
+            git.Repo.clone_from(f"https://{pat_token}@github.com/{username}/{repo}.git", REPO_PATH)

refresh_files.py

@@ -1,20 +0,0 @@
-import os
-import git
-
-REPO_PATH = "student_bots"
-
-
-def refresh_files():
-    if os.path.exists(REPO_PATH):
-        repo = git.Repo(REPO_PATH)
-        origin = repo.remotes.origin
-        origin.pull()
-    else:
-        pat_token = os.environ["GITHUB_PAT_TOKEN"]
-        username = os.environ["GITHUB_USERNAME"]
-        repo = os.environ["GITHUB_REPO"]
-        git.Repo.clone_from(f"https://{pat_token}@github.com/{username}/{repo}.git", REPO_PATH)
-
-
-if __name__ == "__main__":
-    refresh_files()