Skip to content

Commit a2ccb68

Browse files
luotao1luotao1
authored
Merge branch 'develop' into fix/hpi-cpu-threads-sync
2 parents 044d266 + 3d5e3a0 commit a2ccb68

File tree

78 files changed

+543
-171
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+543
-171
lines changed

‎.github/workflows/deploy_docs.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Develop Docs
22
on:
33
push:
44
branches: #设置更新哪个分支会更新站点
5-
- release/3.3
5+
- release/3.4
66
permissions:
77
contents: write
88
jobs:
@@ -27,5 +27,5 @@ jobs:
2727
- run: pip install mike mkdocs-material jieba mkdocs-git-revision-date-localized-plugin mkdocs-git-committers-plugin-2 mkdocs-git-authors-plugin mkdocs-static-i18n mkdocs-minify-plugin
2828
- run: |
2929
git fetch origin gh-pages --depth=1
30-
mike deploy --push --update-aliases 3.3 latest
30+
mike deploy --push --update-aliases 3.4 latest
3131
mike set-default --push latest

‎.pre-commit-config.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,3 +72,4 @@ repos:
7272
files: ^paddlex/.*\.py$
7373
additional_dependencies:
7474
- stdlib-list==0.10.0
75+
- setuptools

‎.precommit/check_imports.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
"langchain_community": "langchain-community",
5757
"langchain_core": "langchain-core",
5858
"langchain_openai": "langchain-openai",
59+
"langchain_text_splitters": "langchain-text-splitters",
5960
"lxml": "lxml",
6061
"matplotlib": "matplotlib",
6162
"modelscope": "modelscope",

‎deploy/hps/sdk/pipelines/OCR/server/model_repo/ocr/1/model.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ def initialize(self, args):
4848
self.context = {}
4949
self.context["file_storage"] = None
5050
self.context["return_img_urls"] = False
51+
self.context["url_expires_in"] = -1
5152
self.context["max_num_input_imgs"] = _DEFAULT_MAX_NUM_INPUT_IMGS
5253
self.context["max_output_img_size"] = _DEFAULT_MAX_OUTPUT_IMG_SIZE
5354
if self.app_config.extra:
@@ -59,6 +60,8 @@ def initialize(self, args):
5960
self.context["return_img_urls"] = self.app_config.extra[
6061
"return_img_urls"
6162
]
63+
if "url_expires_in" in self.app_config.extra:
64+
self.context["url_expires_in"] = self.app_config.extra["url_expires_in"]
6265
if "max_num_input_imgs" in self.app_config.extra:
6366
self.context["max_num_input_imgs"] = self.app_config.extra[
6467
"max_num_input_imgs"
@@ -274,6 +277,7 @@ def _postprocess(self, images, data_info, visualize_enabled, preds, log_id, inpu
274277
filename_template=f"{{key}}_{i}.jpg",
275278
file_storage=self.context["file_storage"],
276279
return_urls=self.context["return_img_urls"],
280+
url_expires_in=self.context["url_expires_in"],
277281
max_img_size=self.context["max_output_img_size"],
278282
)
279283
else:

‎deploy/hps/sdk/pipelines/OCR/version.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.2.5
1+
0.2.6

‎deploy/hps/sdk/pipelines/PP-ChatOCRv3-doc/server/model_repo/chatocr-visual/1/model.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ def initialize(self, args):
3333
self.context = {}
3434
self.context["file_storage"] = None
3535
self.context["return_img_urls"] = False
36+
self.context["url_expires_in"] = -1
3637
self.context["max_num_input_imgs"] = _DEFAULT_MAX_NUM_INPUT_IMGS
3738
self.context["max_output_img_size"] = _DEFAULT_MAX_OUTPUT_IMG_SIZE
3839
if self.app_config.extra:
@@ -44,6 +45,8 @@ def initialize(self, args):
4445
self.context["return_img_urls"] = self.app_config.extra[
4546
"return_img_urls"
4647
]
48+
if "url_expires_in" in self.app_config.extra:
49+
self.context["url_expires_in"] = self.app_config.extra["url_expires_in"]
4750
if "max_num_input_imgs" in self.app_config.extra:
4851
self.context["max_num_input_imgs"] = self.app_config.extra[
4952
"max_num_input_imgs"
@@ -142,6 +145,7 @@ def run(self, input, log_id):
142145
filename_template=f"{{key}}_{i}.jpg",
143146
file_storage=self.context["file_storage"],
144147
return_urls=self.context["return_img_urls"],
148+
url_expires_in=self.context["url_expires_in"],
145149
max_img_size=self.context["max_output_img_size"],
146150
)
147151
else:

‎deploy/hps/sdk/pipelines/PP-ChatOCRv3-doc/version.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.3.2
1+
0.3.3

‎deploy/hps/sdk/pipelines/PP-ChatOCRv4-doc/server/model_repo/chatocr-visual/1/model.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ def initialize(self, args):
3333
self.context = {}
3434
self.context["file_storage"] = None
3535
self.context["return_img_urls"] = False
36+
self.context["url_expires_in"] = -1
3637
self.context["max_num_input_imgs"] = _DEFAULT_MAX_NUM_INPUT_IMGS
3738
self.context["max_output_img_size"] = _DEFAULT_MAX_OUTPUT_IMG_SIZE
3839
if self.app_config.extra:
@@ -44,6 +45,8 @@ def initialize(self, args):
4445
self.context["return_img_urls"] = self.app_config.extra[
4546
"return_img_urls"
4647
]
48+
if "url_expires_in" in self.app_config.extra:
49+
self.context["url_expires_in"] = self.app_config.extra["url_expires_in"]
4750
if "max_num_input_imgs" in self.app_config.extra:
4851
self.context["max_num_input_imgs"] = self.app_config.extra[
4952
"max_num_input_imgs"
@@ -143,6 +146,7 @@ def run(self, input, log_id):
143146
filename_template=f"{{key}}_{i}.jpg",
144147
file_storage=self.context["file_storage"],
145148
return_urls=self.context["return_img_urls"],
149+
url_expires_in=self.context["url_expires_in"],
146150
max_img_size=self.context["max_output_img_size"],
147151
)
148152
else:

‎deploy/hps/sdk/pipelines/PP-ChatOCRv4-doc/version.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.4.2
1+
0.4.3

‎deploy/hps/sdk/pipelines/PP-DocTranslation/server/model_repo/doctrans-visual/1/model.py‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,10 @@
3030
class TritonPythonModel(BaseTritonPythonModel):
3131
def initialize(self, args):
3232
super().initialize(args)
33-
34-
self.pipeline.inintial_visual_predictor(self.pipeline.config)
35-
3633
self.context = {}
3734
self.context["file_storage"] = None
3835
self.context["return_img_urls"] = False
36+
self.context["url_expires_in"] = -1
3937
self.context["max_num_input_imgs"] = _DEFAULT_MAX_NUM_INPUT_IMGS
4038
self.context["max_output_img_size"] = _DEFAULT_MAX_OUTPUT_IMG_SIZE
4139
if self.app_config.extra:
@@ -47,6 +45,8 @@ def initialize(self, args):
4745
self.context["return_img_urls"] = self.app_config.extra[
4846
"return_img_urls"
4947
]
48+
if "url_expires_in" in self.app_config.extra:
49+
self.context["url_expires_in"] = self.app_config.extra["url_expires_in"]
5050
if "max_num_input_imgs" in self.app_config.extra:
5151
self.context["max_num_input_imgs"] = self.app_config.extra[
5252
"max_num_input_imgs"
@@ -151,6 +151,7 @@ def run(self, input, log_id):
151151
filename_template=f"markdown_{i}/{{key}}",
152152
file_storage=self.context["file_storage"],
153153
return_urls=self.context["return_img_urls"],
154+
url_expires_in=self.context["url_expires_in"],
154155
max_img_size=self.context["max_output_img_size"],
155156
)
156157
md_flags = md_data["page_continuation_flags"]
@@ -165,6 +166,7 @@ def run(self, input, log_id):
165166
filename_template=f"{{key}}_{i}.jpg",
166167
file_storage=self.context["file_storage"],
167168
return_urls=self.context["return_img_urls"],
169+
url_expires_in=self.context["url_expires_in"],
168170
max_img_size=self.context["max_output_img_size"],
169171
)
170172
else:

0 commit comments

Comments
 (0)