add more detailed error message and fix 1099 meets rsp.ok bug

demo/chat_frontend.py

@@ -6,7 +6,7 @@
 #    Email         : zhangfan@baai.ac.cn
 #    Institute     : Beijing Academy of Artificial Intelligence (BAAI)
 #    Create On     : 2023-12-12 18:05
-#    Last Modified : 2023-12-20 05:25
+#    Last Modified : 2023-12-20 05:42
 #    File Name     : chat_frontend.py
 #    Description   :
 #
@@ -102,7 +102,6 @@ def generate(
 
     t0 = time.time()
     try:
-        print(do_sample)
         rsp = requests.post(
             CONTROLLER_URL + "/v1/mmc",
             files=image_list,
@@ -119,21 +118,22 @@ def generate(
                 "repetition_penalty": repetition_penalty,
             },
         )
-    except:
+    except Exception as ex:
         rsp = requests.Response()
         rsp.status_code = 1099
+        rsp._content = str(ex).encode()
     t1 = time.time()
 
     logging.info(f"{meta.log_id}: get response with status code: {rsp.status_code}, time: {(t1-t0)*1000:.3f}ms")
 
-    if rsp.ok:
+    if rsp.status_code == requests.codes.ok:
         content = json.loads(rsp.text)
         if content["code"] == 0:
             meta.append(Role.ASSISTANT, DataMeta.build(text=content["data"]))
         else:
             meta.append(Role.ASSISTANT, DataMeta.build(text=f"GENERATE FAILED: {content['data']}", is_error=True))
     else:
-        meta.append(Role.ASSISTANT, DataMeta.build(text=f"GENERATE FAILED: http failed with code {rsp.status_code}", is_error=True))
+        meta.append(Role.ASSISTANT, DataMeta.build(text=f"GENERATE FAILED: http failed with code {rsp.status_code}, msg: {rsp.text}", is_error=True))
 
     return meta.format_chatbot(), meta
 

demo/generation_frontend.py

@@ -6,7 +6,7 @@
 #    Email         : zhangfan@baai.ac.cn
 #    Institute     : Beijing Academy of Artificial Intelligence (BAAI)
 #    Create On     : 2023-12-11 15:35
-#    Last Modified : 2023-12-20 05:25
+#    Last Modified : 2023-12-20 05:43
 #    File Name     : generation_frontend.py
 #    Description   :
 #
@@ -107,14 +107,15 @@ def generate(meta, classifier_free_guidance, steps):
                 "steps": steps,
             },
         )
-    except:
+    except Exception as ex:
         rsp = requests.Response()
         rsp.status_code = 1099
+        rsp._content = str(ex).encode()
     t1 = time.time()
 
     logging.info(f"{meta.log_id}: get response with status code: {rsp.status_code}, time: {(t1-t0)*1000:.3f}ms")
 
-    if rsp.ok:
+    if rsp.status_code == requests.codes.ok:
         content = json.loads(rsp.text)
         if content["code"] == 0:
             image = Image.open(io.BytesIO(base64.b64decode(content["data"])))
@@ -122,7 +123,7 @@ def generate(meta, classifier_free_guidance, steps):
         else:
             meta.append(Role.ASSISTANT, DataMeta.build(text=f"GENERATE FAILED: {content['data']}", is_error=True))
     else:
-        meta.append(Role.ASSISTANT, DataMeta.build(text=f"GENERATE FAILED: http failed with code {rsp.status_code}", is_error=True))
+        meta.append(Role.ASSISTANT, DataMeta.build(text=f"GENERATE FAILED: http failed with code {rsp.status_code}, msg: {rsp.text}", is_error=True))
 
     return meta.format_chatbot(), meta