OraCatQAQ commited on
Commit
a621ff2
·
1 Parent(s): 839d6d7
Files changed (2) hide show
  1. .env +1 -2
  2. app.py +20 -2
.env CHANGED
@@ -1,3 +1,2 @@
1
- TESSERACT_CMD=C:\Program Files\Tesseract-OCR\tesseract.exe
2
- DEEPSIDER_TOKEN=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJkYXRhIjp7ImVtYWlsIjoib3J6Y2F0QGNhbnRlcmxvdC5lZHUucGwiLCJ1aWQiOiI2N2UyMWY5ZjJiNjhlYTlmYzJiMjhiNzgiLCJ2ZXJzaW9uIjowLCJjaGFubmVsVGFnIjoiIn0sImV4cGlyZSI6MTc1MTQyNTU5MTAxNywiaWF0IjoxNzQzNjQ5NTkxLCJleHAiOjE3NTE0MjU1OTF9.gMrecWLlsfLrTGf0VeciJeIhR7edZ2BBJ6a_-wWut24
3
  ADMIN_KEY=sk-123456
 
1
+ DEEPSIDER_TOKEN=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJkYXRhIjp7ImVtYWlsIjoiZWR1enVtQG1haWx0by5wbHVzIiwidWlkIjoiNjdlMGMwYWY2NjE2MTk0Zjg1NzBhMDhhIiwidmVyc2lvbiI6MCwiY2hhbm5lbFRhZyI6IiJ9LCJleHBpcmUiOjE3NTA1NTg3NTUzNjIsImlhdCI6MTc0Mjc4Mjc1NSwiZXhwIjoxNzUwNTU4NzU1fQ.m8pTxcwKdmp-GGpxyB9IwGOmiwKNgRGJUvIYXU9CiEI
 
2
  ADMIN_KEY=sk-123456
app.py CHANGED
@@ -354,7 +354,25 @@ async def stream_openai_response(response, request_id: str, model: str, api_key,
354
  logger.info("检测到验证码响应")
355
  captcha_base64 = extract_captcha_image(content)
356
 
357
- # 向客户端发送验证码提示
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
358
  captcha_message = {
359
  "id": f"chatcmpl-{request_id}",
360
  "object": "chat.completion.chunk",
@@ -364,7 +382,7 @@ async def stream_openai_response(response, request_id: str, model: str, api_key,
364
  {
365
  "index": 0,
366
  "delta": {
367
- "content": "[系统检测到验证码,正在自动识别...]"
368
  },
369
  "finish_reason": None
370
  }
 
354
  logger.info("检测到验证码响应")
355
  captcha_base64 = extract_captcha_image(content)
356
 
357
+ # 先向客户端发送原始验证码响应
358
+ original_captcha_message = {
359
+ "id": f"chatcmpl-{request_id}",
360
+ "object": "chat.completion.chunk",
361
+ "created": timestamp,
362
+ "model": model,
363
+ "choices": [
364
+ {
365
+ "index": 0,
366
+ "delta": {
367
+ "content": content
368
+ },
369
+ "finish_reason": None
370
+ }
371
+ ]
372
+ }
373
+ yield f"data: {json.dumps(original_captcha_message)}\n\n"
374
+
375
+ # 然后显示自动识别提示
376
  captcha_message = {
377
  "id": f"chatcmpl-{request_id}",
378
  "object": "chat.completion.chunk",
 
382
  {
383
  "index": 0,
384
  "delta": {
385
+ "content": "\n[系统检测到验证码,正在自动识别...]"
386
  },
387
  "finish_reason": None
388
  }