Browse Source

调整gemini prompt 和 json解析

supeng 5 days ago
parent
commit
94c90bc849
1 changed files with 16 additions and 4 deletions
  1. 16 4
      utils/google_ai_studio.py

+ 16 - 4
utils/google_ai_studio.py

@@ -1,3 +1,4 @@
+import ast
 import os
 import time
 import traceback
@@ -124,10 +125,21 @@ class GoogleAI(object):
                     'timeout': 600,
                 },
             )
-            text = orjson.loads(response.text.strip())
-            genai.delete_file(name=video.name)
-            os.remove(video_path)
-            return text
+            try:
+                text = orjson.loads(response.text.strip())
+                genai.delete_file(name=video.name)
+                os.remove(video_path)
+                return text
+            except orjson.JSONDecodeError:
+                try:
+                    text = ast.literal_eval(response.text.strip())
+                    return text
+                except Exception as err:
+                    raise err
+            # text = orjson.loads(response.text.strip())
+            # genai.delete_file(name=video.name)
+            # os.remove(video_path)
+            # return text
         except Exception as e:
             error_info = traceback.format_exc()
             logger.error(f"[内容分析] 处理异常,异常信息{e} {error_info} {api_key}")