bug fix: 部分组件未正确传递request_id

appbuilder/core/components/animal_recognize/component.py

@@ -161,7 +161,7 @@ def tool_eval(
         img_name = kwargs.get("img_name", "")
         img_url = kwargs.get("img_url", "")
         file_urls = kwargs.get("file_urls", {})
-        rec_res = self._recognize_w_post_process(img_name, img_url, file_urls, traceid)
+        rec_res = self._recognize_w_post_process(img_name, img_url, file_urls, request_id=traceid)
         if streaming:
             yield rec_res
         else:
@@ -185,7 +185,7 @@ def _recognize_w_post_process(self, img_name, img_url, file_urls, request_id=Non
             req.url = img_url
         req.top_num = TOP_NUM
         req.baike_num = BAIKE_NUM
-        result = self._recognize(req, request_id)
+        result = self._recognize(req, request_id=request_id)
         result_dict = proto.Message.to_dict(result)
         rec_res = "模型识别结果为：\n"
         for rec_info in result_dict['result']:

appbuilder/core/components/doc_format_converter/component.py

@@ -121,7 +121,7 @@ def run(self, message: Message, timeout: float = None, retry: int = 0, request_i
             else:
                 with open(doc_message.file_path, 'rb') as f:
                     submit_request.image =  base64.b64encode(f.read())
-        docConverterSubmitResponse = self.submitDocFormatConverterTask(submit_request, request_id)
+        docConverterSubmitResponse = self.submitDocFormatConverterTask(submit_request, request_id=request_id)
         taskId = docConverterSubmitResponse.result.task_id
         TASK_PROGRESS_COMPLETED = 3
         TASK_PROGRESS_FAILED = 4
@@ -130,7 +130,7 @@ def run(self, message: Message, timeout: float = None, retry: int = 0, request_i
             while True:
                 request = DocFormatConverterQueryRequest()
                 request.task_id = taskId
-                docConverterQueryResponse = self.queryDocFormatConverterTask(request, request_id)
+                docConverterQueryResponse = self.queryDocFormatConverterTask(request, request_id=request_id)
                 if docConverterQueryResponse.result.ret_code is not None:
                     task_progress = docConverterQueryResponse.result.ret_code
                     if task_progress == TASK_PROGRESS_COMPLETED:
@@ -234,7 +234,7 @@ def tool_eval(self, streaming: bool, origin_query: str, **kwargs,):
             if not file_url:
                 raise InvalidRequestArgumentError("request format error, file url is not set")
         try:
-            result = self.run(Message({"file_path": file_url, "page_num": page_num}), traceid)
+            result = self.run(Message({"file_path": file_url, "page_num": page_num}), request_id=traceid)
         except AppBuilderServerException:
             raise
         except Exception as e:

appbuilder/core/components/general_ocr/component.py

@@ -176,7 +176,7 @@ def tool_eval(self, name: str, streaming: bool, **kwargs):
         req = GeneralOCRRequest(url=img_url)
         req.detect_direction = "true"
         req.language_type = "auto_detect"
-        result = proto.Message.to_dict(self._recognize(req, traceid))
+        result = proto.Message.to_dict(self._recognize(req, request_id=traceid))
         results = {
             "识别结果": " \n".join(item["words"] for item in result["words_result"])
         }

appbuilder/core/components/handwrite_ocr/component.py

@@ -121,7 +121,7 @@ def tool_eval(self, name: str, streaming: bool, **kwargs):
             req.probability = "false"
             req.detect_direction = "true"
             req.detect_alteration = "true"
-            response = self._recognize(req, traceid)
+            response = self._recognize(req, request_id=traceid)
             text = "".join([w.words for w in response.words_result])
             result += f"{file_name}的手写识别结果是：{text} "
 

appbuilder/core/components/image_understand/component.py

@@ -223,7 +223,7 @@ def _recognize_w_post_process(
             if img_url in file_urls:
                 img_url = file_urls[img_url]
             req.url = img_url
-        response = self.__recognize(req, request_id)
+        response = self.__recognize(req, request_id=request_id)
         description_to_llm = response.result.description_to_llm
         description_processed = description_to_llm.rsplit("。", 2)[0]
         return description_processed

appbuilder/core/components/mix_card_ocr/component.py

@@ -170,7 +170,7 @@ def tool_eval(self, name: str, streaming: bool, **kwargs):
             request.detect_quality = "false"
             request.detect_photo = "false"
             request.detect_card = "false"
-            response = self._recognize(request, traceid)
+            response = self._recognize(request, request_id=traceid)
             out = MixCardOCROutMsg()
             for res in response.words_result:
                 card_type = res.card_info.card_type

appbuilder/core/components/object_recognize/component.py

@@ -162,7 +162,7 @@ def tool_eval(self, name: str, streaming: bool, **kwargs):
                 raise InvalidRequestArgumentError(f"request format error, file {img_name} url does not exist")
         score_threshold = kwargs.get("score_threshold", 0.5)
         req = ObjectRecognitionRequest(url=img_url)
-        result = proto.Message.to_dict(self._recognize(req, traceid))
+        result = proto.Message.to_dict(self._recognize(req, request_id=traceid))
         results = []
         for item in result["result"]:
             if item["score"] < score_threshold and len(results) > 0:

appbuilder/core/components/plant_recognize/component.py

@@ -166,7 +166,7 @@ def tool_eval(
         img_name = kwargs.get("img_name", "")
         img_url = kwargs.get("img_url", "")
         file_urls = kwargs.get("file_urls", {})
-        rec_res = self._recognize_w_post_process(img_name, img_url, file_urls, traceid)
+        rec_res = self._recognize_w_post_process(img_name, img_url, file_urls, request_id=traceid)
         if streaming:
             yield rec_res
         else:
@@ -190,7 +190,7 @@ def _recognize_w_post_process(self, img_name, img_url, file_urls, request_id=Non
             req.url = img_url
         req.top_num = TOP_NUM
         req.baike_num = BAIKE_NUM
-        result = self.__recognize(req, request_id)
+        result = self.__recognize(req, request_id=request_id)
         result_dict = proto.Message.to_dict(result)
         rec_res = "模型识别结果为：\n"
         for rec_info in result_dict['result']:

appbuilder/core/components/qrcode_ocr/component.py

@@ -173,7 +173,7 @@ def tool_eval(self, name: str, streaming: bool, **kwargs):
                     f"illegal location, expected location is 'true' or 'false', got {location}"
                 )
             req.location = location
-            resp = self._recognize(req, traceid)
+            resp = self._recognize(req, request_id=traceid)
             result[file_name] = [
                 item["text"] for item in proto.Message.to_dict(resp).get("codes_result", [])
             ]

appbuilder/core/components/table_ocr/component.py

@@ -195,7 +195,7 @@ def tool_eval(self, name: str, streaming: bool, **kwargs):
             req = TableOCRRequest()
             req.url = file_url
             req.cell_contents = "false"
-            resp = self._recognize(req, traceid)
+            resp = self._recognize(req, request_id=traceid)
             tables_result = proto.Message.to_dict(resp)["tables_result"]
             markdowns = self.get_table_markdown(tables_result)
             result[file_name] = markdowns

appbuilder/core/components/translate/component.py

@@ -158,7 +158,7 @@ def tool_eval(self, name: str, streaming: bool, **kwargs):
         req.q = text
         to_lang = kwargs.get("to_lang", "en")
         req.to_lang = to_lang
-        results = proto.Message.to_dict(self._translate(req, traceid))["result"]
+        results = proto.Message.to_dict(self._translate(req, request_id=traceid))["result"]
         trans_result = results["trans_result"]
         res = {
             "原文本": "\n ".join(item["src"] for item in trans_result),