From 185396e93b35b9e9056d0664d6e31b75f081dd83 Mon Sep 17 00:00:00 2001 From: debugtalk Date: Sun, 16 Oct 2022 09:32:56 +0800 Subject: [PATCH] change: add ocr response logID --- hrp/internal/version/VERSION | 2 +- hrp/pkg/uixt/ocr_vedem.go | 18 +++++++++++++++++- httprunner/__init__.py | 2 +- pyproject.toml | 2 +- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/hrp/internal/version/VERSION b/hrp/internal/version/VERSION index 64efb591..d9e3391e 100644 --- a/hrp/internal/version/VERSION +++ b/hrp/internal/version/VERSION @@ -1 +1 @@ -v4.3.0-beta-10131119 \ No newline at end of file +v4.3.0-beta-10160931 \ No newline at end of file diff --git a/hrp/pkg/uixt/ocr_vedem.go b/hrp/pkg/uixt/ocr_vedem.go index f160c274..82d142dc 100644 --- a/hrp/pkg/uixt/ocr_vedem.go +++ b/hrp/pkg/uixt/ocr_vedem.go @@ -71,7 +71,11 @@ func (s *veDEMOCRService) getOCRResult(imageBuf []byte) ([]OCRResult, error) { req.Header.Add("Content-Type", bodyWriter.FormDataContentType()) resp, err := client.Do(req) if err != nil { - return nil, fmt.Errorf("http reqeust OCR server error: %v", err) + var logID string + if resp != nil { + logID = getLogID(resp.Header) + } + return nil, fmt.Errorf("http reqeust veDEM OCR server error: %v, logID: %s", err, logID) } defer resp.Body.Close() @@ -93,6 +97,18 @@ func (s *veDEMOCRService) getOCRResult(imageBuf []byte) ([]OCRResult, error) { return ocrResult.OCRResult, nil } +func getLogID(header http.Header) string { + if len(header) == 0 { + return "" + } + + logID, ok := header["X-Tt-Logid"] + if !ok || len(logID) == 0 { + return "" + } + return logID[0] +} + func (s *veDEMOCRService) FindText(text string, imageBuf []byte, index ...int) (rect image.Rectangle, err error) { if len(index) == 0 { index = []int{0} // index not specified diff --git a/httprunner/__init__.py b/httprunner/__init__.py index fad89a02..f2195b32 100644 --- a/httprunner/__init__.py +++ b/httprunner/__init__.py @@ -1,4 +1,4 @@ -__version__ = "v4.3.0-beta-10131119" +__version__ = "v4.3.0-beta-10160931" __description__ = "One-stop solution for HTTP(S) testing." diff --git a/pyproject.toml b/pyproject.toml index 216a12d5..921a4bc8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "httprunner" -version = "v4.3.0-beta-10131119" +version = "v4.3.0-beta-10160931" description = "One-stop solution for HTTP(S) testing." license = "Apache-2.0" readme = "README.md"