diff --git a/cloud.py b/cloud.py index 1a38eaa..17e3210 100644 --- a/cloud.py +++ b/cloud.py @@ -37,9 +37,4 @@ def delete(name): if is_exist(name): bucket.delete_object(name) if __name__ == '__main__': - print('测试用') - # 测试用 - # print(is_exist('18503.json')) - #download('18503.json') - #检查云端所有文件 - upload('pro_233226_Python.json') \ No newline at end of file + print('测试用') \ No newline at end of file diff --git a/get_answer.py b/get_answer.py index e7292aa..0e05f50 100644 --- a/get_answer.py +++ b/get_answer.py @@ -65,7 +65,7 @@ def load_json_data(json_name:str) -> dict: return data def load_api_key() -> str: with open('apis.json','r',encoding='utf-8') as f: # apis.json为存储api_key的json文件名 - return json.load(f)['openaiapi'] + return json.load(f)['my_api'] #遍历字典,获得每一关的参数,构造请求,获得答案 ''' @@ -204,10 +204,8 @@ def get_programming_answer_from_api(jsonfile:list,client:AsyncOpenAI,promot:str) if __name__ == '__main__': - ans = get_programming_answer_from_api(jsonfile=get_programmingjson( - os.getcwd()), - client=client, - promot=promot2) + promot='' + ans = get_programming_answer_from_api(jsonfile=get_programmingjson(os.getcwd()),client=client,promot=promot) print(ans) rewrite_programming_json(json_names=get_programmingjson(os.getcwd()), new_data=ans) diff --git a/main.py b/main.py index f8c7b3b..03b11a1 100644 --- a/main.py +++ b/main.py @@ -103,11 +103,11 @@ else: transToTxt_programming(JSS) print('答案获取完毕,开始展示') print_txt(get_all_txt_file(os.getcwd())) - if not is_exist(JSS): - print('开始上传答案到云端,请勿关闭程序') - for i in JSS: + for i in JSS: + if not is_exist(i): + print('开始上传答案到云端,请勿关闭程序') upload(i) - print('上传完毕') + print('上传完毕') # #打印完,删除本地txt和json文件 def getalljsons() -> list: return [i for i in os.listdir() if i.endswith('.json')]