paddlex 3.0.0rc0__py3-none-any.whl → 3.0.0rc1__py3-none-any.whl

paddlex/inference/utils/io/__init__.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,23 +14,23 @@
 
 
 from .readers import (
-    ReaderType,
-    ImageReader,
-    VideoReader,
+    AudioReader,
     CSVReader,
+    ImageReader,
     PDFReader,
+    ReaderType,
+    VideoReader,
     YAMLReader,
-    AudioReader,
 )
 from .writers import (
-    WriterType,
-    ImageWriter,
-    TextWriter,
-    JsonWriter,
     CSVWriter,
     HtmlWriter,
+    ImageWriter,
+    JsonWriter,
+    MarkdownWriter,
+    TextWriter,
+    VideoWriter,
+    WriterType,
     XlsxWriter,
     YAMLWriter,
-    VideoWriter,
-    MarkdownWriter,
 )

paddlex/inference/utils/io/readers.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.
@@ -15,19 +15,21 @@
 
 import enum
 import itertools
-import cv2
-import fitz
-from PIL import Image, ImageOps
-import pandas as pd
+import random
+
 import numpy as np
+import pandas as pd
 import yaml
-import soundfile
-import random
-import platform
-import importlib
+from PIL import Image, ImageOps
 
-from ....utils import logging
+from ....utils.deps import class_requires_deps, is_dep_available
 
+if is_dep_available("opencv-contrib-python"):
+    import cv2
+if is_dep_available("PyMuPDF"):
+    import fitz
+if is_dep_available("soundfile"):
+    import soundfile
 
 __all__ = [
     "ReaderType",
@@ -215,14 +217,15 @@ class _BaseReaderBackend(object):
 class _ImageReaderBackend(_BaseReaderBackend):
     """_ImageReaderBackend"""
 
-    pass
-
 
+@class_requires_deps("opencv-contrib-python")
 class OpenCVImageReaderBackend(_ImageReaderBackend):
     """OpenCVImageReaderBackend"""
 
-    def __init__(self, flags=cv2.IMREAD_COLOR):
+    def __init__(self, flags=None):
         super().__init__()
+        if flags is None:
+            flags = cv2.IMREAD_COLOR
         self.flags = flags
 
     def read_file(self, in_path):
@@ -241,6 +244,7 @@ class PILImageReaderBackend(_ImageReaderBackend):
         return ImageOps.exif_transpose(Image.open(in_path))
 
 
+@class_requires_deps("PyMuPDF", "opencv-contrib-python")
 class PDFReaderBackend(_BaseReaderBackend):
 
     def __init__(self, rotate=0, zoom_x=2.0, zoom_y=2.0):
@@ -269,6 +273,7 @@ class _VideoReaderBackend(_BaseReaderBackend):
         raise NotImplementedError
 
 
+@class_requires_deps("opencv-contrib-python")
 class OpenCVVideoReaderBackend(_VideoReaderBackend):
     """OpenCVVideoReaderBackend"""
 
@@ -358,7 +363,9 @@ class DecordVideoReaderBackend(_VideoReaderBackend):
 
         # XXX(gaotingquan): There is a confict with `paddle` when import `decord` globally.
         try:
-            self.decord_module = importlib.import_module("decord")
+            import decord
+
+            self.decord_module = decord
         except ModuleNotFoundError():
             raise Exception(
                 "Please install `decord` manually, otherwise, the related model cannot work. It can be automatically installed only on `x86_64`. Refers: `https://github.com/dmlc/decord`."
@@ -442,8 +449,6 @@ class CSVReader(_BaseReader):
 class _CSVReaderBackend(_BaseReaderBackend):
     """_CSVReaderBackend"""
 
-    pass
-
 
 class PandasCSVReaderBackend(_CSVReaderBackend):
     """PandasCSVReaderBackend"""
@@ -483,9 +488,8 @@ class AudioReader(_BaseReader):
 class _AudioReaderBackend(_BaseReaderBackend):
     """_AudioReaderBackend"""
 
-    pass
-
 
+@class_requires_deps("soundfile")
 class WAVReaderBackend(_AudioReaderBackend):
     """PandasCSVReaderBackend"""
 

paddlex/inference/utils/io/style.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.
@@ -12,23 +12,28 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from openpyxl.cell import cell
-from openpyxl.styles import (
-    Font,
-    Alignment,
-    PatternFill,
-    NamedStyle,
-    Border,
-    Side,
-    Color,
-)
-from openpyxl.styles.fills import FILL_SOLID
-from openpyxl.styles.numbers import FORMAT_CURRENCY_USD_SIMPLE, FORMAT_PERCENTAGE
-from openpyxl.styles.colors import BLACK
+
+from ....utils.deps import class_requires_deps, function_requires_deps, is_dep_available
+
+if is_dep_available("openpyxl"):
+    from openpyxl.cell import cell
+    from openpyxl.styles import (
+        Alignment,
+        Border,
+        Color,
+        Font,
+        NamedStyle,
+        PatternFill,
+        Side,
+    )
+    from openpyxl.styles.colors import BLACK
+    from openpyxl.styles.fills import FILL_SOLID
+    from openpyxl.styles.numbers import FORMAT_CURRENCY_USD_SIMPLE, FORMAT_PERCENTAGE
 
 FORMAT_DATE_MMDDYYYY = "mm/dd/yyyy"
 
 
+@function_requires_deps("openpyxl")
 def colormap(color):
     """
     Convenience for looking up known colors
@@ -65,6 +70,7 @@ def get_side(style, name):
 known_styles = {}
 
 
+@function_requires_deps("openpyxl")
 def style_dict_to_named_style(style_dict, number_format=None):
     """
     Change css style (stored in a python dictionary) to openpyxl NamedStyle
@@ -303,6 +309,7 @@ def _element_to_string(el):
     return text + string + "\n" + tail
 
 
+@class_requires_deps("openpyxl")
 class TableCell(Element):
     """
     This class maps to the `<td>` element of the html table.

paddlex/inference/utils/io/tablepyxl.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,12 +14,17 @@
 
 from __future__ import absolute_import
 
-from lxml import html
-from openpyxl import Workbook
-from openpyxl.utils import get_column_letter
-from premailer import Premailer
+from ....utils.deps import function_requires_deps, is_dep_available
 from .style import Table
 
+if is_dep_available("lxml"):
+    from lxml import html
+if is_dep_available("openpyxl"):
+    from openpyxl import Workbook
+    from openpyxl.utils import get_column_letter
+if is_dep_available("premailer"):
+    from premailer import Premailer
+
 
 def string_to_int(s):
     """
@@ -30,6 +35,7 @@ def string_to_int(s):
     return 0
 
 
+@function_requires_deps("lxml")
 def get_Tables(doc):
     """
     Find all the tables in the doc
@@ -41,6 +47,7 @@ def get_Tables(doc):
     return [Table(table) for table in tree.xpath("//table")]
 
 
+@function_requires_deps("openpyxl")
 def write_rows(worksheet, elem, row, column=1):
     """
     Writes every tr child element of elem to a row in the worksheet
@@ -100,6 +107,7 @@ def table_to_sheet(table, wb):
     insert_table(table, ws, 1, 1)
 
 
+@function_requires_deps("openpyxl", "premailer")
 def document_to_workbook(doc, wb=None, base_url=None):
     """
     Takes a string representation of an html document and writes one sheet for

paddlex/inference/utils/io/writers.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.
@@ -13,18 +13,21 @@
 # limitations under the License.
 
 
-import os
 import enum
 import json
 from pathlib import Path
 
-import cv2
 import numpy as np
-from PIL import Image
 import pandas as pd
 import yaml
+from PIL import Image
+
+from ....utils.deps import class_requires_deps, is_dep_available
 from .tablepyxl import document_to_xl
 
+if is_dep_available("opencv-contrib-python"):
+    import cv2
+
 
 __all__ = [
     "WriterType",
@@ -303,9 +306,8 @@ class XlsxWriterBackend(_BaseWriterBackend):
 class _ImageWriterBackend(_BaseWriterBackend):
     """_ImageWriterBackend"""
 
-    pass
-
 
+@class_requires_deps("opencv-contrib-python")
 class OpenCVImageWriterBackend(_ImageWriterBackend):
     """OpenCVImageWriterBackend"""
 
@@ -344,9 +346,8 @@ class PILImageWriterBackend(_ImageWriterBackend):
 class _VideoWriterBackend(_BaseWriterBackend):
     """_VideoWriterBackend"""
 
-    pass
-
 
+@class_requires_deps("opencv-contrib-python")
 class OpenCVVideoWriterBackend(_VideoWriterBackend):
     """OpenCVImageWriterBackend"""
 
@@ -429,8 +430,6 @@ class CSVWriter(_BaseWriter):
 class _CSVWriterBackend(_BaseWriterBackend):
     """_CSVWriterBackend"""
 
-    pass
-
 
 class PandasCSVWriterBackend(_CSVWriterBackend):
     """PILImageWriterBackend"""

paddlex/inference/utils/model_paths.py

@@ -0,0 +1,48 @@
+# 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.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from os import PathLike
+from pathlib import Path
+from typing import Tuple, TypedDict, Union
+
+from ...constants import MODEL_FILE_PREFIX
+
+
+class ModelPaths(TypedDict, total=False):
+    paddle: Tuple[Path, Path]
+    onnx: Path
+    om: Path
+
+
+def get_model_paths(
+    model_dir: Union[str, PathLike],
+    model_file_prefix: str = MODEL_FILE_PREFIX,
+) -> ModelPaths:
+    model_dir = Path(model_dir)
+    model_paths: ModelPaths = {}
+    pd_model_path = None
+    if (model_dir / f"{model_file_prefix}.json").exists():
+        pd_model_path = model_dir / f"{model_file_prefix}.json"
+    elif (model_dir / f"{model_file_prefix}.pdmodel").exists():
+        pd_model_path = model_dir / f"{model_file_prefix}.pdmodel"
+    if pd_model_path and (model_dir / f"{model_file_prefix}.pdiparams").exists():
+        model_paths["paddle"] = (
+            pd_model_path,
+            model_dir / f"{model_file_prefix}.pdiparams",
+        )
+    if (model_dir / f"{model_file_prefix}.onnx").exists():
+        model_paths["onnx"] = model_dir / f"{model_file_prefix}.onnx"
+    if (model_dir / f"{model_file_prefix}.om").exists():
+        model_paths["om"] = model_dir / f"{model_file_prefix}.om"
+    return model_paths

paddlex/inference/utils/{new_ir_blacklist.py → new_ir_blocklist.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.
@@ -15,7 +15,6 @@
 NEWIR_BLOCKLIST = [
     "PP-YOLOE_seg-S",
     "PatchTST_ad",
-    "TimesNet_ad",
     "Nonstationary_ad",
     "DLinear_ad",
     "Co-Deformable-DETR-R50",