Merge pull request #172 from sucuicong/master

表格文字识别、条形码/二维码识别、身份证混贴识别、手写文字识别支持function call 简化OCR识别内容

appbuilder/core/components/handwrite_ocr/component.py

@@ -120,12 +120,7 @@ def tool_eval(self, name: str, streaming: bool, **kwargs):
             req.detect_direction = "true"
             req.detect_alteration = "true"
             response = self._recognize(req)
-            out = HandwriteOCROutMsg()
-            out.direction = response.direction
-            [out.contents.append(
-                Content(text=w.words))
-                for w in response.words_result]
-            result[file_name] = out.dict()
+            result[file_name] = [w.words for w in response.words_result]
 
         if streaming:
             yield json.dumps(result, ensure_ascii=False)

appbuilder/core/components/qrcode_ocr/component.py

@@ -167,7 +167,7 @@ def tool_eval(self, name: str, streaming: bool, **kwargs):
                 raise InvalidRequestArgumentError("location must be a string with value 'true' or 'false'")
             req.location = location
             resp = self._recognize(req)
-            result[file_name] = proto.Message.to_dict(resp)["codes_result"]
+            result[file_name] = [item["text"] for item in proto.Message.to_dict(resp).get("codes_result", [])]
         if streaming:
             yield json.dumps(result, ensure_ascii=False)
         else: