Fixed listify bug.

therapist.py

@@ -9,9 +9,11 @@ openai.api_key = os.getenv("OPENAI_API_KEY")
 
 available_questionnaires = list(questionnaires.topics)
 
-def listify(options: list, lower=True):
-    if len(options) > 1: options[-1] = "and " + options[-1]
+def listify(options: list, end_and=True, lower=True, use_format=None):
+    options = options.copy()
+    if end_and is True and len(options) > 1: options[-1] = "and " + options[-1]
     if lower is True: options = list(map(str.lower, options))
+    if use_format: list(map(use_format.format, options))
     return ", ".join(options) if len(options) > 2 else " ".join(options)
 
 def content_summarizer():
@@ -21,12 +23,12 @@ def assess_response(question: str, response:str, options: list, uses_scale=True,
     context_prompt = "" if context=="" else f"The context of this discussion is {context}. "
     if uses_scale is True:
         prompt = context_prompt + f"""
-        Given the question '{question}' and this response to the question '{response}', rate the response on the following scale: {", ".join(map("'{}'".format, options))}. 
+        Given the question '{question}' and this response to the question '{response}', rate the response on the following scale: {listify(options, end_and=False, lower=False, use_format="'{}'")}. 
         Return only the corresponding scale item and nothing else.
         """
     else:
         prompt = context_prompt + f"""
-        Given the question '{question}' and this response to the question '{response}', which of the following is the response most similar to? {", ".join(map("'{}'".format, options))}. 
+        Given the question '{question}' and this response to the question '{response}', which of the following is the response most similar to? {listify(options, end_and=False, lower=False, use_format="'{}'")}. 
         Return only the most similar item and nothing else.
         """
     response = openai.Completion.create(
@@ -41,10 +43,12 @@ def yes_no(message):
     return assess_response(question="Yes or No?", response=message, options=["Yes", "No"], context="", uses_scale=False)
 
 def questionnaire_chooser(message):
+    options = available_questionnaires + ["Suicidal", "None of the previously mentioned options"]
+
     topic = assess_response(
         question = initial_message,
         response = message,
-        options = available_questionnaires + ["Suicidal", "None of the previously mentioned options"],
+        options = options,
         uses_scale = False
         )