Update app.py

app.py

@@ -11,6 +11,7 @@ import datetime
 from DataFormat import DataFormat
 from DataFormat import GetTokenforStr
 import uploadData
+import json
 
 def ChatV2(params):
 
@@ -20,7 +21,9 @@ def ChatV2(params):
         # model="gpt-4",
         model=gptVersion,
         messages=[{"role": "system", "content": systemPrompt}, {"role": "user", "content": ques}],
-        temperature=temperature)
+        temperature=temperature,
+        timeout=30
+    )
 
     return systemPrompt, ques, completion['choices'][0]['message']['content']
 def ChatV2_estimate(params):
@@ -29,42 +32,62 @@ def ChatV2_estimate(params):
     maxNum=4
     for i in range(maxNum):
         try:
+            if '{Q1}' in prompt:
+                gptques=prompt.replace('{Q1}',ques)
+            else:
+                gptques=prompt+ques
+            print(gptques)
             completion = openai.ChatCompletion.create(
                 # model="gpt-3.5-turbo",
-                # model="gpt-4",
                 model=gptVersion,
-                messages=[{"role": "system", "content": systemPrompt}, {"role": "user", "content":prompt+ ques}],
-                temperature=temperature)
-
+                messages=[{"role": "system", "content": systemPrompt}, {"role": "user", "content":gptques}],
+                temperature=temperature,
+                timeout=30
+            )
+            print([{"role": "system", "content": systemPrompt}, {"role": "user", "content":gptques}])
             FineTunecompletion = openai.ChatCompletion.create(
                 # model="gpt-3.5-turbo",
                 # model="gpt-4",
                 model=inetuneGptVersion,
-                messages=[{"role": "system", "content": systemPrompt}, {"role": "user", "content": prompt+ques}],
-                temperature=temperature)
+                messages=[{"role": "system", "content": systemPrompt}, {"role": "user", "content": gptques}],
+                temperature=temperature,
+                timeout=30
+            )
         except Exception as e:
             print(e)
             print('第{}次错误，错误文本：{}'.format(i+1,ques))
             time.sleep(6*(i+1)) #如果请求失败则过10s重新请求
             if i==maxNum-1:
-                return ''
-
+                return systemPrompt, ques,'',str(e),''
+    time.sleep(1)
+    gptText=completion['choices'][0]['message']['content']
+    gptText2=FineTunecompletion['choices'][0]['message']['content']
     extData=[]
     for Checkbox in Checkboxgourd:
         if Checkbox == 'GPT生成结果翻译成中文':
-            systemTran='你是一个对中文和日语非常了解的语言大师'
-            prompt_tran='在不改变原意的情况下，请将给你的文本翻译成中文，下面是你要翻译的文本：'
-            transCn = openai.ChatCompletion.create(
-                # model="gpt-3.5-turbo",
-                # model="gpt-4",
-                model=gptVersion,
-                messages=[{"role": "system", "content": systemTran}, {"role": "user", "content": prompt_tran+ques}],
-                temperature=temperature)
-            transCnText=transCn['choices'][0]['message']['content']
-            extData.append(transCnText)
 
-        if Checkbox == 'GPT生成结果翻译成中文':
             systemTran='你是一个对中文和日语非常了解的语言大师'
+            prompt_tran='请将给你的一组文本全部翻译成连贯流畅的中文，一组文本主要有三部分待翻译：text1:文本1  text2:文本2  text3:文本3。然后你需要将其翻译并按照json格式输出：{"tran_text1":"将用户输入的文本翻译成中文的文本","tran_text2":"将gpt改写文本翻译成中文的文本","tran_text3":"将gpt改写的文本翻译成中文的文本"},下面是你要翻译的文本："""{Q1}"""'
+            transques="text1:{}  text2:{}  text3:{}".format(ques,gptText,gptText2)
+            for i in range(2):
+                try:
+                    transCn = openai.ChatCompletion.create(
+                        # model="gpt-3.5-turbo",
+                        # model="gpt-4",
+                        model=gptVersion,
+                        messages=[{"role": "system", "content": systemTran}, {"role": "user", "content": prompt_tran.replace('{Q1}',transques)}],
+                        temperature=temperature,
+                        timeout=30
+                    )
+                    transCnText=json.loads(transCn['choices'][0]['message']['content'])
+                    extData.append(transCnText)
+                    break
+                except Exception as e:
+                    print('error:'+str(e))
+                    pass
+
+        if Checkbox == 'test2':
+            systemTran='你是一个对中文和日语非常了解的翻译官'
             prompt_tran='在不改变原意的情况下，请将给你的文本翻译成中文，下面是你要翻译的文本：'
             transCn = openai.ChatCompletion.create(
                 # model="gpt-3.5-turbo",
@@ -122,13 +145,15 @@ def AI_Produst(systemText,quesList,gptVersion,temperature,num,outputPath,progres
     return outputPath
 
 def AI_Produst_estimate(systemText,prompt,quesList,gptVersion,inetuneGptVersion,temperature,num,outputPath,Checkbox,progress):
+    global stopFlag
+    stopFlag=False
     progress(0, desc="Starting...")
     wb=openpyxl.Workbook()
     ws=wb.active
-    ws.append(["System",'User','GPT_Output','是否合格','FineTune GPT_Output','是否合格'])
+    ws.append(["System",'User','GPT_Output','是否合格','FineTune GPT_Output','是否合格','Tran_User','Tran_GPT_Output','Tran_FineTune GPT_Output'])
     maxNum=min(num,len(quesList))
     print('最大数字'+str(maxNum))
-    with concurrent.futures.ThreadPoolExecutor(max_workers=6) as excutor:
+    with concurrent.futures.ThreadPoolExecutor(max_workers=4) as excutor:
         futures=[]
 
         for i in range(maxNum):
@@ -138,19 +163,31 @@ def AI_Produst_estimate(systemText,prompt,quesList,gptVersion,inetuneGptVersion,
             futures.append(task)
         prad=tqdm(total=len(futures))
         for futrue in concurrent.futures.as_completed(futures):
-            prad.update(1)
+            if stopFlag:
+                break
             try:
-                systemPrompt,ques,GPTAnswer,FineTuneGPTAnswer,exdata=futrue.result()
-            except Exception as e:
-                print('如果本次请求异常则自动退出')
-                ws.append([systemPrompt,ques,'',e,''])
-            #print(systemPrompt)
-            print(ques)
-            if len(exdata)==2:
-                #加入翻译
-                ws.append([systemPrompt,ques,GPTAnswer,'',FineTuneGPTAnswer])
-            else:
-                ws.append([systemPrompt,ques,GPTAnswer,'',FineTuneGPTAnswer])
+                prad.update(1)
+                try:
+                    systemPrompt,ques,GPTAnswer,FineTuneGPTAnswer,exdata=futrue.result(timeout=30)
+                except Exception as e:
+                    print('如果本次请求异常则自动退出')
+                    ws.append([systemPrompt,ques,'',str(e),''])
+                    continue
+                #print(systemPrompt)
+                print(ques)
+                if len(exdata)==1:
+                    try:
+                        translate=exdata[0]
+                    #加入翻译
+                        ws.append([systemPrompt,ques,GPTAnswer,'',FineTuneGPTAnswer,'',translate['tran_text1'],translate['tran_text2'],translate['tran_text3']])
+                    except Exception as e:
+                        ws.append([systemPrompt, ques, GPTAnswer, '', FineTuneGPTAnswer])
+                        print('error:'+str(e))
+                        print(exdata[0])
+                else:
+                    ws.append([systemPrompt,ques,GPTAnswer,'',FineTuneGPTAnswer])
+            except:
+                time.sleep(10)
 
         prad.close()
 
@@ -188,6 +225,7 @@ def AIProdust_batch(systemText,prompt,inputFile,textInput_APIKEY,temperature,gpt
     AI_Produst(systemText,quesList,gptVersion,temperature,num,outputPath,progress)
     return outputPath
 def AIProdust_batch_estimate(systemText,prompt,inputFile,textInput_APIKEY,temperature,gptVersion,fintuneGPTVersion,num,Checkbox,progress=gr.Progress(track_tqdm=True)):
+
     openai.api_key=textInput_APIKEY
     inputFile=inputFile.name
     nowTime=str(datetime.datetime.now()).split('.')[0].replace(' ','_').replace(':','_')
@@ -223,9 +261,14 @@ def Lines2Excel(lines):
     wb.save(outputPath)
 
     return outputPath
+def stopprodust():
+    global stopFlag
+    stopFlag=True
+    return stopFlag
 def AIProdust():
     global tmpdir
 
+
     GPTVersion = ['gpt-4', 'gpt-3.5-turbo', 'gpt-3.5-turbo-0301', 'gpt-3.5-turbo-0613', 'gpt-3.5-turbo-16k',
                   'gpt-3.5-turbo-16k-0613']
 
@@ -328,14 +371,24 @@ def AIProdust():
                 fintuneGPTVersion=gr.Textbox(label='FineTune_GPTVersion', lines=2, placeholder='...')
                 fintuneslider = gr.components.Slider(0, 1, label="Temperature", step=None, value=0.7)
                 fintunenum = gr.Number(label='请求的次数', value=5)
-                Checkbox=gr.CheckboxGroup(["GPT生成结果翻译成中文", "文本语法解析"], label="GPT额外功能", info="为了提高审核速度你要增加什么？")
+                Checkbox=gr.CheckboxGroup(["GPT生成结果翻译成中文", "文本语法解析(暂不支持)"], label="GPT额外功能", info="为了提高审核速度你要增加什么？")
                 fintuneoutPutFile = gr.components.File(label="下载文件")
                 fintunebutton_ques = gr.Button("开始请求")
                 fintunebutton_ques.click(AIProdust_batch_estimate,
                                   inputs=[fintunetextInput_Sys, fintunetextInput_Prompt, fintuneinput_ExcelFile, textInput_APIKEY, fintuneslider,
                                           fintunedrop,fintuneGPTVersion, fintunenum,Checkbox], outputs=fintuneoutPutFile)
+                fintunebutton_quesStop = gr.Button("终止运行")
+                fintunebutton_quesStop.click(stopprodust,outputs=gr.Textbox(label='状态'))
 
-        demo.queue().launch()
+                gr.Markdown("<br><br>")
+                gr.Markdown("### APIKey创建的微调任务状态查询'")
+                input_APIKey = gr.Textbox(label="Openai_APIKEY", lines=2, placeholder='...')
+                button_createTask = gr.Button('微调任务查询')
+                output_TaskSatejson = gr.Json(label='查询微调任务状态')
+                button_createTask.click(uploadData.GetFineTuningJobState,
+                                        inputs=[input_APIKey],
+                                        outputs=output_TaskSatejson)
+        demo.queue().launch(share=True)
 if __name__=="__main__":
    # ChatDemo()
    # AIProdustDemo() #AIGC 批量生成内容并加在Excel文件