paddlex 3.0.0rc0__py3-none-any.whl → 3.0.1__py3-none-any.whl

paddlex/inference/serving/basic_serving/_pipeline_apps/pp_chatocrv3_doc.py

@@ -1,4 +1,4 @@
-# copyright (c) 2024 PaddlePaddle Authors. All Rights Reserve.
+# Copyright (c) 2024 PaddlePaddle Authors. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,18 +14,21 @@
 
 from typing import Any, Dict, List
 
-from fastapi import FastAPI
-
+from .....utils.deps import function_requires_deps, is_dep_available
 from ...infra import utils as serving_utils
 from ...infra.config import AppConfig
-from ...infra.models import ResultResponse
+from ...infra.models import AIStudioResultResponse
 from ...schemas import pp_chatocrv3_doc as schema
 from .._app import create_app, primary_operation
 from ._common import common
 from ._common import ocr as ocr_common
 
+if is_dep_available("fastapi"):
+    from fastapi import FastAPI
+
 
-def create_pipeline_app(pipeline: Any, app_config: AppConfig) -> FastAPI:
+@function_requires_deps("fastapi")
+def create_pipeline_app(pipeline: Any, app_config: AppConfig) -> "FastAPI":
     app, ctx = create_app(
         pipeline=pipeline, app_config=app_config, app_aiohttp_session=True
     )
@@ -39,7 +42,7 @@ def create_pipeline_app(pipeline: Any, app_config: AppConfig) -> FastAPI:
     )
     async def _analyze_images(
         request: schema.AnalyzeImagesRequest,
-    ) -> ResultResponse[schema.AnalyzeImagesResult]:
+    ) -> AIStudioResultResponse[schema.AnalyzeImagesResult]:
         pipeline = ctx.pipeline
 
         log_id = serving_utils.generate_log_id()
@@ -51,7 +54,6 @@ def create_pipeline_app(pipeline: Any, app_config: AppConfig) -> FastAPI:
             images,
             use_doc_orientation_classify=request.useDocOrientationClassify,
             use_doc_unwarping=request.useDocUnwarping,
-            use_general_ocr=request.useGeneralOcr,
             use_seal_recognition=request.useSealRecognition,
             use_table_recognition=request.useTableRecognition,
             layout_threshold=request.layoutThreshold,
@@ -105,7 +107,7 @@ def create_pipeline_app(pipeline: Any, app_config: AppConfig) -> FastAPI:
             )
             visual_info.append(item["visual_info"])
 
-        return ResultResponse[schema.AnalyzeImagesResult](
+        return AIStudioResultResponse[schema.AnalyzeImagesResult](
             logId=log_id,
             result=schema.AnalyzeImagesResult(
                 layoutParsingResults=layout_parsing_results,
@@ -121,7 +123,7 @@ def create_pipeline_app(pipeline: Any, app_config: AppConfig) -> FastAPI:
     )
     async def _build_vector_store(
         request: schema.BuildVectorStoreRequest,
-    ) -> ResultResponse[schema.BuildVectorStoreResult]:
+    ) -> AIStudioResultResponse[schema.BuildVectorStoreResult]:
         pipeline = ctx.pipeline
 
         kwargs: Dict[str, Any] = {
@@ -139,7 +141,7 @@ def create_pipeline_app(pipeline: Any, app_config: AppConfig) -> FastAPI:
             **kwargs,
         )
 
-        return ResultResponse[schema.BuildVectorStoreResult](
+        return AIStudioResultResponse[schema.BuildVectorStoreResult](
             logId=serving_utils.generate_log_id(),
             result=schema.BuildVectorStoreResult(vectorInfo=vector_info),
         )
@@ -151,7 +153,7 @@ def create_pipeline_app(pipeline: Any, app_config: AppConfig) -> FastAPI:
     )
     async def _chat(
         request: schema.ChatRequest,
-    ) -> ResultResponse[schema.ChatResult]:
+    ) -> AIStudioResultResponse[schema.ChatResult]:
         pipeline = ctx.pipeline
 
         kwargs: Dict[str, Any] = dict(
@@ -181,7 +183,7 @@ def create_pipeline_app(pipeline: Any, app_config: AppConfig) -> FastAPI:
             **kwargs,
         )
 
-        return ResultResponse[schema.ChatResult](
+        return AIStudioResultResponse[schema.ChatResult](
             logId=serving_utils.generate_log_id(),
             result=schema.ChatResult(
                 chatResult=result["chat_res"],

paddlex/inference/serving/basic_serving/_pipeline_apps/pp_chatocrv4_doc.py

@@ -1,4 +1,4 @@
-# copyright (c) 2024 PaddlePaddle Authors. All Rights Reserve.
+# Copyright (c) 2024 PaddlePaddle Authors. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,18 +14,21 @@
 
 from typing import Any, Dict, List
 
-from fastapi import FastAPI
-
+from .....utils.deps import function_requires_deps, is_dep_available
 from ...infra import utils as serving_utils
 from ...infra.config import AppConfig
-from ...infra.models import ResultResponse
+from ...infra.models import AIStudioResultResponse
 from ...schemas import pp_chatocrv4_doc as schema
 from .._app import create_app, primary_operation
 from ._common import common
 from ._common import ocr as ocr_common
 
+if is_dep_available("fastapi"):
+    from fastapi import FastAPI
+
 
-def create_pipeline_app(pipeline: Any, app_config: AppConfig) -> FastAPI:
+@function_requires_deps("fastapi")
+def create_pipeline_app(pipeline: Any, app_config: AppConfig) -> "FastAPI":
     app, ctx = create_app(
         pipeline=pipeline, app_config=app_config, app_aiohttp_session=True
     )
@@ -39,7 +42,7 @@ def create_pipeline_app(pipeline: Any, app_config: AppConfig) -> FastAPI:
     )
     async def _analyze_images(
         request: schema.AnalyzeImagesRequest,
-    ) -> ResultResponse[schema.AnalyzeImagesResult]:
+    ) -> AIStudioResultResponse[schema.AnalyzeImagesResult]:
         pipeline = ctx.pipeline
 
         log_id = serving_utils.generate_log_id()
@@ -51,7 +54,7 @@ def create_pipeline_app(pipeline: Any, app_config: AppConfig) -> FastAPI:
             images,
             use_doc_orientation_classify=request.useDocOrientationClassify,
             use_doc_unwarping=request.useDocUnwarping,
-            use_general_ocr=request.useGeneralOcr,
+            use_textline_orientation=request.useTextlineOrientation,
             use_seal_recognition=request.useSealRecognition,
             use_table_recognition=request.useTableRecognition,
             layout_threshold=request.layoutThreshold,
@@ -105,7 +108,7 @@ def create_pipeline_app(pipeline: Any, app_config: AppConfig) -> FastAPI:
             )
             visual_info.append(item["visual_info"])
 
-        return ResultResponse[schema.AnalyzeImagesResult](
+        return AIStudioResultResponse[schema.AnalyzeImagesResult](
             logId=log_id,
             result=schema.AnalyzeImagesResult(
                 layoutParsingResults=layout_parsing_results,
@@ -121,7 +124,7 @@ def create_pipeline_app(pipeline: Any, app_config: AppConfig) -> FastAPI:
     )
     async def _build_vector_store(
         request: schema.BuildVectorStoreRequest,
-    ) -> ResultResponse[schema.BuildVectorStoreResult]:
+    ) -> AIStudioResultResponse[schema.BuildVectorStoreResult]:
         pipeline = ctx.pipeline
 
         kwargs: Dict[str, Any] = {
@@ -139,7 +142,7 @@ def create_pipeline_app(pipeline: Any, app_config: AppConfig) -> FastAPI:
             **kwargs,
         )
 
-        return ResultResponse[schema.BuildVectorStoreResult](
+        return AIStudioResultResponse[schema.BuildVectorStoreResult](
             logId=serving_utils.generate_log_id(),
             result=schema.BuildVectorStoreResult(vectorInfo=vector_info),
         )
@@ -151,7 +154,7 @@ def create_pipeline_app(pipeline: Any, app_config: AppConfig) -> FastAPI:
     )
     async def _invoke_mllm(
         request: schema.InvokeMLLMRequest,
-    ) -> ResultResponse[schema.InvokeMLLMResult]:
+    ) -> AIStudioResultResponse[schema.InvokeMLLMResult]:
         pipeline = ctx.pipeline
         aiohttp_session = ctx.aiohttp_session
 
@@ -167,7 +170,7 @@ def create_pipeline_app(pipeline: Any, app_config: AppConfig) -> FastAPI:
             mllm_chat_bot_config=request.mllmChatBotConfig,
         )
 
-        return ResultResponse[schema.InvokeMLLMResult](
+        return AIStudioResultResponse[schema.InvokeMLLMResult](
             logId=serving_utils.generate_log_id(),
             result=schema.InvokeMLLMResult(mllmPredictInfo=mllm_predict_info),
         )
@@ -179,7 +182,7 @@ def create_pipeline_app(pipeline: Any, app_config: AppConfig) -> FastAPI:
     )
     async def _chat(
         request: schema.ChatRequest,
-    ) -> ResultResponse[schema.ChatResult]:
+    ) -> AIStudioResultResponse[schema.ChatResult]:
         pipeline = ctx.pipeline
 
         kwargs: Dict[str, Any] = dict(
@@ -211,7 +214,7 @@ def create_pipeline_app(pipeline: Any, app_config: AppConfig) -> FastAPI:
             **kwargs,
         )
 
-        return ResultResponse[schema.ChatResult](
+        return AIStudioResultResponse[schema.ChatResult](
             logId=serving_utils.generate_log_id(),
             result=schema.ChatResult(
                 chatResult=result["chat_res"],

paddlex/inference/serving/basic_serving/_pipeline_apps/pp_shituv2.py

@@ -1,4 +1,4 @@
-# copyright (c) 2024 PaddlePaddle Authors. All Rights Reserve.
+# Copyright (c) 2024 PaddlePaddle Authors. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,18 +16,21 @@ import asyncio
 from operator import attrgetter
 from typing import Any, Dict, List
 
-from fastapi import FastAPI
-
+from .....utils.deps import function_requires_deps, is_dep_available
 from ....pipelines.components import IndexData
 from ...infra import utils as serving_utils
 from ...infra.config import AppConfig
-from ...infra.models import ResultResponse
+from ...infra.models import AIStudioResultResponse
 from ...schemas import pp_shituv2 as schema
 from .._app import create_app, primary_operation
 from ._common import image_recognition as ir_common
 
+if is_dep_available("fastapi"):
+    from fastapi import FastAPI
+
 
-def create_pipeline_app(pipeline: Any, app_config: AppConfig) -> FastAPI:
+@function_requires_deps("fastapi")
+def create_pipeline_app(pipeline: Any, app_config: AppConfig) -> "FastAPI":
     app, ctx = create_app(
         pipeline=pipeline, app_config=app_config, app_aiohttp_session=True
     )
@@ -41,7 +44,7 @@ def create_pipeline_app(pipeline: Any, app_config: AppConfig) -> FastAPI:
     )
     async def _build_index(
         request: schema.BuildIndexRequest,
-    ) -> ResultResponse[schema.BuildIndexResult]:
+    ) -> AIStudioResultResponse[schema.BuildIndexResult]:
         pipeline = ctx.pipeline
         aiohttp_session = ctx.aiohttp_session
 
@@ -69,7 +72,7 @@ def create_pipeline_app(pipeline: Any, app_config: AppConfig) -> FastAPI:
         index_data_bytes = index_data.to_bytes()
         await serving_utils.call_async(index_storage.set, index_key, index_data_bytes)
 
-        return ResultResponse[schema.BuildIndexResult](
+        return AIStudioResultResponse[schema.BuildIndexResult](
             logId=serving_utils.generate_log_id(),
             result=schema.BuildIndexResult(
                 indexKey=index_key, imageCount=len(index_data.id_map)
@@ -83,7 +86,7 @@ def create_pipeline_app(pipeline: Any, app_config: AppConfig) -> FastAPI:
     )
     async def _add_images_to_index(
         request: schema.AddImagesToIndexRequest,
-    ) -> ResultResponse[schema.AddImagesToIndexResult]:
+    ) -> AIStudioResultResponse[schema.AddImagesToIndexResult]:
         pipeline = ctx.pipeline
         aiohttp_session = ctx.aiohttp_session
 
@@ -111,7 +114,7 @@ def create_pipeline_app(pipeline: Any, app_config: AppConfig) -> FastAPI:
             index_storage.set, request.indexKey, index_data_bytes
         )
 
-        return ResultResponse[schema.AddImagesToIndexResult](
+        return AIStudioResultResponse[schema.AddImagesToIndexResult](
             logId=serving_utils.generate_log_id(),
             result=schema.AddImagesToIndexResult(imageCount=len(index_data.id_map)),
         )
@@ -123,7 +126,7 @@ def create_pipeline_app(pipeline: Any, app_config: AppConfig) -> FastAPI:
     )
     async def _remove_images_from_index(
         request: schema.RemoveImagesFromIndexRequest,
-    ) -> ResultResponse[schema.RemoveImagesFromIndexResult]:
+    ) -> AIStudioResultResponse[schema.RemoveImagesFromIndexResult]:
         pipeline = ctx.pipeline
 
         index_storage = ctx.extra["index_storage"]
@@ -141,7 +144,7 @@ def create_pipeline_app(pipeline: Any, app_config: AppConfig) -> FastAPI:
             index_storage.set, request.indexKey, index_data_bytes
         )
 
-        return ResultResponse[schema.RemoveImagesFromIndexResult](
+        return AIStudioResultResponse[schema.RemoveImagesFromIndexResult](
             logId=serving_utils.generate_log_id(),
             result=schema.RemoveImagesFromIndexResult(
                 imageCount=len(index_data.id_map)
@@ -155,7 +158,7 @@ def create_pipeline_app(pipeline: Any, app_config: AppConfig) -> FastAPI:
     )
     async def _infer(
         request: schema.InferRequest,
-    ) -> ResultResponse[schema.InferResult]:
+    ) -> AIStudioResultResponse[schema.InferResult]:
         pipeline = ctx.pipeline
         aiohttp_session = ctx.aiohttp_session
 
@@ -210,7 +213,7 @@ def create_pipeline_app(pipeline: Any, app_config: AppConfig) -> FastAPI:
         else:
             output_image_base64 = None
 
-        return ResultResponse[schema.InferResult](
+        return AIStudioResultResponse[schema.InferResult](
             logId=serving_utils.generate_log_id(),
             result=schema.InferResult(detectedObjects=objs, image=output_image_base64),
         )

paddlex/inference/serving/basic_serving/_pipeline_apps/pp_structurev3.py

@@ -1,4 +1,4 @@
-# copyright (c) 2024 PaddlePaddle Authors. All Rights Reserve.
+# Copyright (c) 2024 PaddlePaddle Authors. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,18 +14,21 @@
 
 from typing import Any, Dict, List
 
-from fastapi import FastAPI
-
+from .....utils.deps import function_requires_deps, is_dep_available
 from ...infra import utils as serving_utils
 from ...infra.config import AppConfig
-from ...infra.models import ResultResponse
+from ...infra.models import AIStudioResultResponse
 from ...schemas.pp_structurev3 import INFER_ENDPOINT, InferRequest, InferResult
 from .._app import create_app, primary_operation
 from ._common import common
 from ._common import ocr as ocr_common
 
+if is_dep_available("fastapi"):
+    from fastapi import FastAPI
+
 
-def create_pipeline_app(pipeline: Any, app_config: AppConfig) -> FastAPI:
+@function_requires_deps("fastapi")
+def create_pipeline_app(pipeline: Any, app_config: AppConfig) -> "FastAPI":
     app, ctx = create_app(
         pipeline=pipeline, app_config=app_config, app_aiohttp_session=True
     )
@@ -39,7 +42,7 @@ def create_pipeline_app(pipeline: Any, app_config: AppConfig) -> FastAPI:
     )
     async def _infer(
         request: InferRequest,
-    ) -> ResultResponse[InferResult]:
+    ) -> AIStudioResultResponse[InferResult]:
         pipeline = ctx.pipeline
 
         log_id = serving_utils.generate_log_id()
@@ -51,10 +54,11 @@ def create_pipeline_app(pipeline: Any, app_config: AppConfig) -> FastAPI:
             use_doc_orientation_classify=request.useDocOrientationClassify,
             use_doc_unwarping=request.useDocUnwarping,
             use_textline_orientation=request.useTextlineOrientation,
-            use_general_ocr=request.useGeneralOcr,
             use_seal_recognition=request.useSealRecognition,
             use_table_recognition=request.useTableRecognition,
             use_formula_recognition=request.useFormulaRecognition,
+            use_chart_recognition=request.useChartRecognition,
+            use_region_detection=request.useRegionDetection,
             layout_threshold=request.layoutThreshold,
             layout_nms=request.layoutNms,
             layout_unclip_ratio=request.layoutUnclipRatio,
@@ -71,7 +75,10 @@ def create_pipeline_app(pipeline: Any, app_config: AppConfig) -> FastAPI:
             seal_det_box_thresh=request.sealDetBoxThresh,
             seal_det_unclip_ratio=request.sealDetUnclipRatio,
             seal_rec_score_thresh=request.sealRecScoreThresh,
-            use_table_cells_ocr_results=request.useTableCellsOcrResults,
+            use_wired_table_cells_trans_to_html=request.useWiredTableCellsTransToHtml,
+            use_wireless_table_cells_trans_to_html=request.useWirelessTableCellsTransToHtml,
+            use_table_orientation_classify=request.useTableOrientationClassify,
+            use_ocr_results_with_table_cells=request.useOcrResultsWithTableCells,
             use_e2e_wired_table_rec_model=request.useE2eWiredTableRecModel,
             use_e2e_wireless_table_rec_model=request.useE2eWirelessTableRecModel,
         )
@@ -125,7 +132,7 @@ def create_pipeline_app(pipeline: Any, app_config: AppConfig) -> FastAPI:
                 )
             )
 
-        return ResultResponse[InferResult](
+        return AIStudioResultResponse[InferResult](
             logId=log_id,
             result=InferResult(
                 layoutParsingResults=layout_parsing_results,

paddlex/inference/serving/basic_serving/_pipeline_apps/rotated_object_detection.py

@@ -1,4 +1,4 @@
-# copyright (c) 2024 PaddlePaddle Authors. All Rights Reserve.
+# Copyright (c) 2024 PaddlePaddle Authors. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,11 +14,10 @@
 
 from typing import Any, Dict, List
 
-from fastapi import FastAPI
-
+from .....utils.deps import function_requires_deps, is_dep_available
 from ...infra import utils as serving_utils
 from ...infra.config import AppConfig
-from ...infra.models import ResultResponse
+from ...infra.models import AIStudioResultResponse
 from ...schemas.rotated_object_detection import (
     INFER_ENDPOINT,
     InferRequest,
@@ -26,8 +25,12 @@ from ...schemas.rotated_object_detection import (
 )
 from .._app import create_app, primary_operation
 
+if is_dep_available("fastapi"):
+    from fastapi import FastAPI
+
 
-def create_pipeline_app(pipeline: Any, app_config: AppConfig) -> FastAPI:
+@function_requires_deps("fastapi")
+def create_pipeline_app(pipeline: Any, app_config: AppConfig) -> "FastAPI":
     app, ctx = create_app(
         pipeline=pipeline, app_config=app_config, app_aiohttp_session=True
     )
@@ -37,7 +40,7 @@ def create_pipeline_app(pipeline: Any, app_config: AppConfig) -> FastAPI:
         INFER_ENDPOINT,
         "infer",
     )
-    async def _infer(request: InferRequest) -> ResultResponse[InferResult]:
+    async def _infer(request: InferRequest) -> AIStudioResultResponse[InferResult]:
         pipeline = ctx.pipeline
         aiohttp_session = ctx.aiohttp_session
 
@@ -70,7 +73,7 @@ def create_pipeline_app(pipeline: Any, app_config: AppConfig) -> FastAPI:
         else:
             output_image_base64 = None
 
-        return ResultResponse[InferResult](
+        return AIStudioResultResponse[InferResult](
             logId=serving_utils.generate_log_id(),
             result=InferResult(detectedObjects=objects, image=output_image_base64),
         )

paddlex/inference/serving/basic_serving/_pipeline_apps/seal_recognition.py

@@ -1,4 +1,4 @@
-# copyright (c) 2024 PaddlePaddle Authors. All Rights Reserve.
+# Copyright (c) 2024 PaddlePaddle Authors. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,18 +14,21 @@
 
 from typing import Any, Dict, List
 
-from fastapi import FastAPI
-
+from .....utils.deps import function_requires_deps, is_dep_available
 from ...infra import utils as serving_utils
 from ...infra.config import AppConfig
-from ...infra.models import ResultResponse
+from ...infra.models import AIStudioResultResponse
 from ...schemas.seal_recognition import INFER_ENDPOINT, InferRequest, InferResult
 from .._app import create_app, primary_operation
 from ._common import common
 from ._common import ocr as ocr_common
 
+if is_dep_available("fastapi"):
+    from fastapi import FastAPI
+
 
-def create_pipeline_app(pipeline: Any, app_config: AppConfig) -> FastAPI:
+@function_requires_deps("fastapi")
+def create_pipeline_app(pipeline: Any, app_config: AppConfig) -> "FastAPI":
     app, ctx = create_app(
         pipeline=pipeline, app_config=app_config, app_aiohttp_session=True
     )
@@ -37,7 +40,7 @@ def create_pipeline_app(pipeline: Any, app_config: AppConfig) -> FastAPI:
         INFER_ENDPOINT,
         "infer",
     )
-    async def _infer(request: InferRequest) -> ResultResponse[InferResult]:
+    async def _infer(request: InferRequest) -> AIStudioResultResponse[InferResult]:
         pipeline = ctx.pipeline
 
         log_id = serving_utils.generate_log_id()
@@ -92,7 +95,7 @@ def create_pipeline_app(pipeline: Any, app_config: AppConfig) -> FastAPI:
                 )
             )
 
-        return ResultResponse[InferResult](
+        return AIStudioResultResponse[InferResult](
             logId=log_id,
             result=InferResult(
                 sealRecResults=seal_rec_results,

paddlex/inference/serving/basic_serving/_pipeline_apps/semantic_segmentation.py

@@ -1,4 +1,4 @@
-# copyright (c) 2024 PaddlePaddle Authors. All Rights Reserve.
+# Copyright (c) 2024 PaddlePaddle Authors. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,16 +14,19 @@
 
 from typing import Any
 
-from fastapi import FastAPI
-
+from .....utils.deps import function_requires_deps, is_dep_available
 from ...infra import utils as serving_utils
 from ...infra.config import AppConfig
-from ...infra.models import ResultResponse
+from ...infra.models import AIStudioResultResponse
 from ...schemas.semantic_segmentation import INFER_ENDPOINT, InferRequest, InferResult
 from .._app import create_app, primary_operation
 
+if is_dep_available("fastapi"):
+    from fastapi import FastAPI
+
 
-def create_pipeline_app(pipeline: Any, app_config: AppConfig) -> FastAPI:
+@function_requires_deps("fastapi")
+def create_pipeline_app(pipeline: Any, app_config: AppConfig) -> "FastAPI":
     app, ctx = create_app(
         pipeline=pipeline, app_config=app_config, app_aiohttp_session=True
     )
@@ -33,7 +36,7 @@ def create_pipeline_app(pipeline: Any, app_config: AppConfig) -> FastAPI:
         INFER_ENDPOINT,
         "infer",
     )
-    async def _infer(request: InferRequest) -> ResultResponse[InferResult]:
+    async def _infer(request: InferRequest) -> AIStudioResultResponse[InferResult]:
         pipeline = ctx.pipeline
         aiohttp_session = ctx.aiohttp_session
 
@@ -54,7 +57,7 @@ def create_pipeline_app(pipeline: Any, app_config: AppConfig) -> FastAPI:
         else:
             output_image_base64 = None
 
-        return ResultResponse[InferResult](
+        return AIStudioResultResponse[InferResult](
             logId=serving_utils.generate_log_id(),
             result=InferResult(
                 labelMap=label_map, size=size, image=output_image_base64

paddlex/inference/serving/basic_serving/_pipeline_apps/small_object_detection.py

@@ -1,4 +1,4 @@
-# copyright (c) 2024 PaddlePaddle Authors. All Rights Reserve.
+# Copyright (c) 2024 PaddlePaddle Authors. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,16 +14,19 @@
 
 from typing import Any, Dict, List
 
-from fastapi import FastAPI
-
+from .....utils.deps import function_requires_deps, is_dep_available
 from ...infra import utils as serving_utils
 from ...infra.config import AppConfig
-from ...infra.models import ResultResponse
+from ...infra.models import AIStudioResultResponse
 from ...schemas.small_object_detection import INFER_ENDPOINT, InferRequest, InferResult
 from .._app import create_app, primary_operation
 
+if is_dep_available("fastapi"):
+    from fastapi import FastAPI
+
 
-def create_pipeline_app(pipeline: Any, app_config: AppConfig) -> FastAPI:
+@function_requires_deps("fastapi")
+def create_pipeline_app(pipeline: Any, app_config: AppConfig) -> "FastAPI":
     app, ctx = create_app(
         pipeline=pipeline, app_config=app_config, app_aiohttp_session=True
     )
@@ -33,7 +36,7 @@ def create_pipeline_app(pipeline: Any, app_config: AppConfig) -> FastAPI:
         INFER_ENDPOINT,
         "infer",
     )
-    async def _infer(request: InferRequest) -> ResultResponse[InferResult]:
+    async def _infer(request: InferRequest) -> AIStudioResultResponse[InferResult]:
         pipeline = ctx.pipeline
         aiohttp_session = ctx.aiohttp_session
 
@@ -61,7 +64,7 @@ def create_pipeline_app(pipeline: Any, app_config: AppConfig) -> FastAPI:
         else:
             output_image_base64 = None
 
-        return ResultResponse[InferResult](
+        return AIStudioResultResponse[InferResult](
             logId=serving_utils.generate_log_id(),
             result=InferResult(detectedObjects=objects, image=output_image_base64),
         )

paddlex/inference/serving/basic_serving/_pipeline_apps/table_recognition.py

@@ -1,4 +1,4 @@
-# copyright (c) 2024 PaddlePaddle Authors. All Rights Reserve.
+# Copyright (c) 2024 PaddlePaddle Authors. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,18 +14,21 @@
 
 from typing import Any, Dict, List
 
-from fastapi import FastAPI
-
+from .....utils.deps import function_requires_deps, is_dep_available
 from ...infra import utils as serving_utils
 from ...infra.config import AppConfig
-from ...infra.models import ResultResponse
+from ...infra.models import AIStudioResultResponse
 from ...schemas.table_recognition import INFER_ENDPOINT, InferRequest, InferResult
 from .._app import create_app, primary_operation
 from ._common import common
 from ._common import ocr as ocr_common
 
+if is_dep_available("fastapi"):
+    from fastapi import FastAPI
+
 
-def create_pipeline_app(pipeline: Any, app_config: AppConfig) -> FastAPI:
+@function_requires_deps("fastapi")
+def create_pipeline_app(pipeline: Any, app_config: AppConfig) -> "FastAPI":
     app, ctx = create_app(
         pipeline=pipeline, app_config=app_config, app_aiohttp_session=True
     )
@@ -37,7 +40,7 @@ def create_pipeline_app(pipeline: Any, app_config: AppConfig) -> FastAPI:
         INFER_ENDPOINT,
         "infer",
     )
-    async def _infer(request: InferRequest) -> ResultResponse[InferResult]:
+    async def _infer(request: InferRequest) -> AIStudioResultResponse[InferResult]:
         pipeline = ctx.pipeline
 
         log_id = serving_utils.generate_log_id()
@@ -50,17 +53,13 @@ def create_pipeline_app(pipeline: Any, app_config: AppConfig) -> FastAPI:
             use_doc_unwarping=request.useDocUnwarping,
             use_layout_detection=request.useLayoutDetection,
             use_ocr_model=request.useOcrModel,
-            layout_threshold=request.layoutThreshold,
-            layout_nms=request.layoutNms,
-            layout_unclip_ratio=request.layoutUnclipRatio,
-            layout_merge_bboxes_mode=request.layoutMergeBboxesMode,
             text_det_limit_side_len=request.textDetLimitSideLen,
             text_det_limit_type=request.textDetLimitType,
             text_det_thresh=request.textDetThresh,
             text_det_box_thresh=request.textDetBoxThresh,
             text_det_unclip_ratio=request.textDetUnclipRatio,
             text_rec_score_thresh=request.textRecScoreThresh,
-            use_table_cells_ocr_results=request.useTableCellsOcrResults,
+            use_ocr_results_with_table_cells=request.useOcrResultsWithTableCells,
         )
 
         table_rec_results: List[Dict[str, Any]] = []
@@ -94,7 +93,7 @@ def create_pipeline_app(pipeline: Any, app_config: AppConfig) -> FastAPI:
                 )
             )
 
-        return ResultResponse[InferResult](
+        return AIStudioResultResponse[InferResult](
             logId=log_id,
             result=InferResult(
                 tableRecResults=table_rec_results,