增加文本为空判断

mistral_api.py

@@ -59,19 +59,22 @@ def predict():
     id_ = str(uuid.uuid1())  # 为query生成唯一标识
     print("uuid: ", uuid)
     d = {'id': id_, 'text': text}  # 绑定文本和query id
-    # try:
+    try:
-    load_request_path = './request_data_logs/{}.json'.format(id_)
+        if text == None:
-    with open(load_request_path, 'w', encoding='utf8') as f2:
+            return_text = {"texts": "请求文本不能为空", "probabilities": None, "status_code": 401}
-        # ensure_ascii=False才能输入中文，否则是Unicode字符
+        else:
-        # indent=2 JSON数据的缩进，美观
+            load_request_path = './request_data_logs/{}.json'.format(id_)
-        json.dump(d, f2, ensure_ascii=False, indent=4)
+            with open(load_request_path, 'w', encoding='utf8') as f2:
-    redis_.rpush(db_key_query, json.dumps({"id": id_, "path": load_request_path}))  # 加入redis
+                # ensure_ascii=False才能输入中文，否则是Unicode字符
-    redis_.sadd(db_key_querying, id_)
+                # indent=2 JSON数据的缩进，美观
-    redis_.sadd(db_key_queryset, id_)
+                json.dump(d, f2, ensure_ascii=False, indent=4)
-    return_text = {"texts": {'id': id_, }, "probabilities": None, "status_code": 200}
+            redis_.rpush(db_key_query, json.dumps({"id": id_, "path": load_request_path}))  # 加入redis
-    # except:
+            redis_.sadd(db_key_querying, id_)
-    #     return_text = {"texts": {'id': id_, }, "probabilities": None, "status_code": 400}
+            redis_.sadd(db_key_queryset, id_)
-    #     smtp_f("vllm-main")
+            return_text = {"texts": {'id': id_, }, "probabilities": None, "status_code": 200}
+    except:
+        return_text = {"texts": {'id': id_, }, "probabilities": None, "status_code": 400}
+        smtp_f("vllm-main")
     return jsonify(return_text)  # 返回结果
 
 
@@ -79,54 +82,54 @@ def predict():
 def search():
     id_ = request.json['id']  # 获取用户query中的文本 例如"I love you"
     result = redis_.get(id_)  # 获取该query的模型结果
-    # try:
+    try:
-    if result is not None:
+        if result is not None:
-        result_path = result.decode('UTF-8')
+            result_path = result.decode('UTF-8')
-        with open(result_path, encoding='utf8') as f1:
+            with open(result_path, encoding='utf8') as f1:
-            # 加载文件的对象
+                # 加载文件的对象
-            result_dict = json.load(f1)
+                result_dict = json.load(f1)
-        code = result_dict["status_code"]
+            code = result_dict["status_code"]
-        texts = result_dict["texts"]
+            texts = result_dict["texts"]
-        probabilities = result_dict["probabilities"]
+            probabilities = result_dict["probabilities"]
-        if str(code) == 400:
+            if str(code) == 400:
-            redis_.rpush(db_key_error, json.dumps({"id": id_}))
+                redis_.rpush(db_key_error, json.dumps({"id": id_}))
-            return False
+                return False
-        result_text = {'code': code, 'text': texts, 'probabilities': probabilities}
+            result_text = {'code': code, 'text': texts, 'probabilities': probabilities}
-    else:
-        querying_list = list(redis_.smembers(db_key_querying))
-        querying_set = set()
-        for i in querying_list:
-            querying_set.add(i.decode())
-
-        querying_bool = False
-        if id_ in querying_set:
-            querying_bool = True
-
-        query_list_json = redis_.lrange(db_key_query, 0, -1)
-        query_set_ids = set()
-        for i in query_list_json:
-            data_dict = json.loads(i)
-            query_id = data_dict['id']
-            query_set_ids.add(query_id)
-
-        query_bool = False
-        if id_ in query_set_ids:
-            query_bool = True
-
-        if querying_bool == True and query_bool == True:
-            result_text = {'code': "201", 'text': "", 'probabilities': None}
-        elif querying_bool == True and query_bool == False:
-            result_text = {'code': "202", 'text': "", 'probabilities': None}
         else:
-            result_text = {'code': "203", 'text': "", 'probabilities': None}
+            querying_list = list(redis_.smembers(db_key_querying))
-            load_request_path = './request_data_logs_203/{}.json'.format(id_)
+            querying_set = set()
-            with open(load_request_path, 'w', encoding='utf8') as f2:
+            for i in querying_list:
-                # ensure_ascii=False才能输入中文，否则是Unicode字符
+                querying_set.add(i.decode())
-                # indent=2 JSON数据的缩进，美观
+
-                json.dump(result_text, f2, ensure_ascii=False, indent=4)
+            querying_bool = False
-    # except:
+            if id_ in querying_set:
-    #     smtp_f("vllm-main")
+                querying_bool = True
-    #     result_text = {'code': "400", 'text': "", 'probabilities': None}
+
+            query_list_json = redis_.lrange(db_key_query, 0, -1)
+            query_set_ids = set()
+            for i in query_list_json:
+                data_dict = json.loads(i)
+                query_id = data_dict['id']
+                query_set_ids.add(query_id)
+
+            query_bool = False
+            if id_ in query_set_ids:
+                query_bool = True
+
+            if querying_bool == True and query_bool == True:
+                result_text = {'code': "201", 'text': "", 'probabilities': None}
+            elif querying_bool == True and query_bool == False:
+                result_text = {'code': "202", 'text': "", 'probabilities': None}
+            else:
+                result_text = {'code': "203", 'text': "", 'probabilities': None}
+                load_request_path = './request_data_logs_203/{}.json'.format(id_)
+                with open(load_request_path, 'w', encoding='utf8') as f2:
+                    # ensure_ascii=False才能输入中文，否则是Unicode字符
+                    # indent=2 JSON数据的缩进，美观
+                    json.dump(result_text, f2, ensure_ascii=False, indent=4)
+    except:
+        smtp_f("vllm-main")
+        result_text = {'code': "400", 'text': "", 'probabilities': None}
     return jsonify(result_text)  # 返回结果
 
 if __name__ == "__main__":