Updates - mostly wandb

app.py

@@ -6,12 +6,14 @@ Author: Dr Musashi Hinck
 
 Respondent-facing app. Reads arguments from request (in form of shareable link)
 
-TODO:
-- uuid from request for wandb
+Change Log:
+
+- 2024.01.16: Continuous logging to wandb, change name of run to `userid`
 
 """
 from __future__ import annotations
 
+import os
 import logging
 import json
 import wandb
@@ -22,10 +24,12 @@ from base64 import urlsafe_b64decode
 
 logger = logging.getLogger(__name__)
 
-from utils import PromptTemplate, convert_gradio_to_openai
+from utils import PromptTemplate, convert_gradio_to_openai, seed_openai_key
 
 
 # %% Initialization
+if os.environ.get(f"OPENAI_API_KEY", "DEFAULT") == "DEFAULT":
+    seed_openai_key()
 client = openai.OpenAI()
 
 
@@ -39,14 +43,15 @@ def decode_config(config_dta: str) -> dict[str, str | float]:
 
 def load_config(request: gr.Request):
     "Read parameters from request header"
-    config = decode_config(request.query_params['dta'])
-    survey_question = config['question']
-    survey_template = config['template']
-    initial_message = config['initial_message']
-    model_args = {'model': config['model'], 'temperature': config['temperature']}
-    userid = config['userid']
+    config = decode_config(request.query_params["dta"])
+    survey_question = config["question"]
+    survey_template = config["template"]
+    initial_message = config["initial_message"]
+    model_args = {"model": config["model"], "temperature": config["temperature"]}
+    userid = config["userid"]
     return survey_question, survey_template, initial_message, model_args, userid
 
+
 # Post-loading
 def update_template(question: str, template: PromptTemplate | str) -> str:
     """
@@ -87,17 +92,27 @@ def initialize_interview(
         gr.Textbox(
             placeholder="Type response here.", interactive=True, show_label=False
         ),
+        gr.Button(variant="primary", interactive=True),
         gr.Button("Start Interview", visible=False),
         gr.Button("Save and Exit", visible=True, variant="stop"),
     )
 
 
 def initialize_tracker(
-    model_args: dict[str, str | float], question: str, template: PromptTemplate, userid=str
-):
+    model_args: dict[str, str | float],
+    question: str,
+    template: PromptTemplate,
+    userid=str,
+) -> None:
     "Initializes wandb run for interview"
-    run_config = model_args | {"question": question, "template": str(template), "userid": userid}
-    wandb.init(project="cognitive-debrief", config=run_config, tags=["dev"])
+    run_config = model_args | {
+        "question": question,
+        "template": str(template),
+        "userid": userid,
+    }
+    wandb.init(
+        project="cognitive-debrief", name=userid, config=run_config, tags=["dev"]
+    )
 
 
 def save_interview(
@@ -109,9 +124,9 @@ def save_interview(
             if pair[i] is not None:
                 chat_data += [[role, pair[i]]]
     chat_table = wandb.Table(data=chat_data, columns=["role", "message"])
-    gr.Info("Uploading interview transcript to WandB, please do not close window...")
+    logger.info("Uploading interview transcript to WandB...")
     wandb.log({"chat_history": chat_table})
-    gr.Info("Uploading complete. Thank you for participating.")
+    logger.info("Uploading complete.")
 
 
 def call_openai(
@@ -190,28 +205,30 @@ with gr.Blocks() as demo:
     initialMessage = gr.Textbox(visible=False)
     systemMessage = gr.Textbox(visible=False)
     modelArgs = gr.State(value={"model": "", "temperature": ""})
-    userid = gr.Textbox(visible=False)
-
-    # Debugging
-    # with gr.Accordion("Debugging Panel", open=False):
-    #     debugPane = gr.Textbox(show_label=False, lines=8)
-    #     debugRequest = gr.Button('Read Request')
-    #     debugRequest.click(load_config, outputs=[debugPane])
-
+    userid = gr.Textbox(visible=False, interactive=False)
 
     ## RESPONDENT
     chatDisplay = gr.Chatbot(
         show_label=False,
     )
-    chatInput = gr.Textbox(
-        placeholder="Click 'Start Interview' to begin.",
-        interactive=False,
-        show_label=False,
-    )
+    with gr.Row():
+        chatInput = gr.Textbox(
+            placeholder="Click 'Start Interview' to begin.",
+            interactive=False,
+            show_label=False,
+            scale=10,
+        )
+        chatSubmit = gr.Button(
+            "",
+            variant="secondary",
+            interactive=False,
+            icon="./arrow_icon.svg",
+        )
     startInterview = gr.Button("Start Interview", variant="primary")
     resetButton = gr.Button("Save and Exit", visible=False, variant="stop")
 
     ## INTERACTIONS
+    # Start Interview button
     startInterview.click(
         load_config,
         inputs=None,
@@ -221,7 +238,7 @@ with gr.Blocks() as demo:
             initialMessage,
             modelArgs,
             userid,
-        ]
+        ],
     ).then(
         update_template,
         inputs=[surveyQuestion, surveyTemplate],
@@ -236,25 +253,43 @@ with gr.Blocks() as demo:
         outputs=[
             chatDisplay,
             chatInput,
+            chatSubmit,
             startInterview,
             resetButton,
         ],
-    ).then(initialize_tracker, inputs=[modelArgs, surveyQuestion, surveyTemplate, userid])
+    ).then(
+        initialize_tracker, inputs=[modelArgs, surveyQuestion, surveyTemplate, userid]
+    )
 
+    # "Enter" on textbox
     chatInput.submit(
         user_message,
         inputs=[chatInput, chatDisplay],
         outputs=[chatInput, chatDisplay],
-        queue=False
+        queue=False,
     ).then(
         bot_message,
         inputs=[chatDisplay, systemMessage, modelArgs],
-        outputs=[chatDisplay])
+        outputs=[chatDisplay],
+    ).then(
+        save_interview, inputs=[chatDisplay]
+    )
 
-    resetButton.click(
-        save_interview,
-        [chatDisplay]
+    # "Submit" button
+    chatSubmit.click(
+        user_message,
+        inputs=[chatInput, chatDisplay],
+        outputs=[chatInput, chatDisplay],
+        queue=False,
+    ).then(
+        bot_message,
+        inputs=[chatDisplay, systemMessage, modelArgs],
+        outputs=[chatDisplay],
     ).then(
+        save_interview, inputs=[chatDisplay]
+    )
+
+    resetButton.click(save_interview, [chatDisplay]).then(
         reset_interview,
         outputs=[chatDisplay, startInterview, resetButton],
         show_progress=False,
@@ -262,5 +297,4 @@ with gr.Blocks() as demo:
 
 
 if __name__ == "__main__":
-    # Testing
     demo.launch()

utils.py

@@ -1,5 +1,8 @@
 from __future__ import annotations
 
+import os
+from configparser import ConfigParser
+from pathlib import Path
 from string import Formatter
 
 
@@ -88,3 +91,17 @@ def convert_openai_to_gradio(
     for i in range(0, len(messages), 2):
         chat_history.append([messages[i]["content"], messages[i + 1]["content"]])
     return chat_history
+
+
+def seed_openai_key(cfg: str = "~/.cfg/openai.cfg") -> None:
+    """
+    Reads OpenAI key from config file and adds it to environment.
+    Assumed config location is "~/.cfg/openai.cfg"
+    """
+    # Get OpenAI Key
+    config = ConfigParser()
+    try:
+        config.read(Path(cfg).expanduser())
+    except:
+        raise ValueError(f"Could not using read file at: {cfg}.")
+    os.environ["OPENAI_API_KEY"] = config["API_KEY"]["secret"]