dev(hansbug): fix this

app.py

@@ -10,6 +10,18 @@ _QUESTIONS = list_ordered_questions()
 _LANG = os.environ.get('QUESTION_LANG', 'cn')
 _LLM = os.environ.get('QUESTION_LLM', 'chatgpt')
 
+
+def _need_api_key():
+    return _LLM == 'chatgpt'
+
+
+def _get_api_key_cfgs(api_key):
+    if _LLM == 'chatgpt':
+        return {'api_key': api_key}
+    else:
+        return {}
+
+
 if __name__ == '__main__':
     with gr.Blocks() as demo:
         with gr.Row():
@@ -20,6 +32,8 @@ if __name__ == '__main__':
                 gr_submit = gr.Button('Submit', interactive=False)
 
             with gr.Column():
+                gr_api_key = gr.Text(placeholder='Your API Key', label='API Key', type='password',
+                                     visible=_need_api_key())
                 gr_predict = gr.Label(label='Correctness')
                 gr_explanation = gr.TextArea(label='Explanation')
                 gr_next = gr.Button('Next')
@@ -47,8 +61,15 @@ if __name__ == '__main__':
         )
 
 
-        def _submit_answer(qs_text: str):
-            executor = QuestionExecutor(_QUESTIONS[_QUESTION_ID], _LANG)
+        def _submit_answer(qs_text: str, api_key: str):
+            if _need_api_key() and not api_key:
+                return '---', {}, 'Please Enter API Key Before Submitting Question.', \
+                    gr.Button('Next', interactive=False)
+
+            executor = QuestionExecutor(
+                _QUESTIONS[_QUESTION_ID], _LANG,
+                llm=_LLM, llm_cfgs=_get_api_key_cfgs(api_key) if _need_api_key() else {}
+            )
             answer_text, correctness, explanation = executor.check(qs_text)
             labels = {'Correct': 1.0} if correctness else {'Wrong': 1.0}
             if correctness:
@@ -59,7 +80,7 @@ if __name__ == '__main__':
 
         gr_submit.click(
             _submit_answer,
-            inputs=[gr_question],
+            inputs=[gr_question, gr_api_key],
             outputs=[gr_answer, gr_predict, gr_explanation, gr_next],
         )
 

llmriddles/llms/base.py

@@ -1,11 +1,11 @@
 from typing import Callable, Dict
 
-_LLMS: Dict[str, Callable[[str], str]] = {}
+_LLMS: Dict[str, Callable] = {}
 
 
-def register_llm(name: str, llm_ask_fn: Callable[[str], str]):
+def register_llm(name: str, llm_ask_fn: Callable):
     _LLMS[name] = llm_ask_fn
 
 
-def get_llm_fn(name: str) -> Callable[[str], str]:
+def get_llm_fn(name: str) -> Callable:
     return _LLMS[name]

llmriddles/llms/chatgpt.py

@@ -1,31 +1,25 @@
-import os
 from functools import lru_cache
 
-import openai
+from openai import OpenAI
 
 from .base import register_llm
 
 
 @lru_cache()
-def _setup_openai():
-    current_path = os.path.dirname(os.path.realpath(__file__))
-    parent_dir = os.path.dirname(current_path)
-    if 'OPENAI_KEY' in os.environ:
-        openai.api_key = os.environ['OPENAI_KEY']
-    else:
-        openai.api_key_path = f'{parent_dir}/.key'
+def _get_openai_client(api_key):
+    return OpenAI(api_key=api_key)
 
 
-def ask_chatgpt(message: str):
-    _setup_openai()
+def ask_chatgpt(message: str, api_key: str):
+    client = _get_openai_client(api_key)
 
-    response = openai.ChatCompletion.create(
+    response = client.chat.completions.create(
         model="gpt-3.5-turbo",
         messages=[
             {"role": "user", "content": message}
         ],
     )
-    return response["choices"][0]["message"]["content"].strip()
+    return response.choices[0].message.content.strip()
 
 
 register_llm('chatgpt', ask_chatgpt)

llmriddles/questions/executor.py

@@ -5,17 +5,18 @@ from ..llms import get_llm_fn
 
 
 class QuestionExecutor:
-    def __init__(self, question: Question, lang: str = 'cn', llm: str = 'chatgpt'):
+    def __init__(self, question: Question, lang: str = 'cn', llm: str = 'chatgpt', llm_cfgs=None):
         self.question = question
         self.lang = lang
         self.llm = llm
+        self.llm_cfgs = dict(llm_cfgs or {})
 
     @property
     def question_text(self):
         return self.question.texts[self.lang]
 
     def check(self, qs_text: str) -> Tuple[str, bool, str]:
-        answer_text = get_llm_fn(self.llm)(qs_text)
+        answer_text = get_llm_fn(self.llm)(qs_text, **self.llm_cfgs)
         correct, explanation = self.check_answer(answer_text)
         return answer_text, correct, explanation
 

requirements.txt

@@ -2,4 +2,4 @@ hbutils>=0.9.1
 tqdm
 requests>=2.20
 gradio==4.1.1
-openai<1
+openai>=1