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

paddlex/repo_apis/base/model.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,32 +13,24 @@
 # limitations under the License.
 
 
-import os
 import abc
-import inspect
-import functools
 import contextlib
+import functools
+import inspect
+import os
 import tempfile
-import hashlib
-import base64
-from datetime import datetime, timedelta
 
+from ...utils import flags, logging
+from ...utils.cache import get_cache_dir
+from ...utils.device import parse_device
+from ...utils.errors import UnsupportedAPIError, UnsupportedParamError
+from ...utils.misc import CachedProperty as cached_property
 from .config import Config
 from .register import (
-    get_registered_model_info,
-    build_runner_from_model_info,
     build_model_from_model_info,
+    build_runner_from_model_info,
+    get_registered_model_info,
 )
-from ...utils import flags
-from ...utils import logging
-from ...utils.errors import (
-    UnsupportedAPIError,
-    UnsupportedParamError,
-    raise_unsupported_api_error,
-)
-from ...utils.device import parse_device
-from ...utils.misc import CachedProperty as cached_property
-from ...utils.cache import get_cache_dir
 
 __all__ = ["PaddleModel", "BaseModel"]
 

paddlex/repo_apis/base/register.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.

paddlex/repo_apis/base/runner.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,22 +13,22 @@
 # limitations under the License.
 
 
-import os
-import io
-import sys
 import abc
-import shlex
-import locale
 import asyncio
-
-from .utils.arg import CLIArgument
-from .utils.subprocess import run_cmd as _run_cmd, CompletedProcess
+import io
+import locale
+import os
+import shlex
+import sys
 
 from ...utils import logging
-from ...utils.misc import abspath
 from ...utils.device import parse_device
+from ...utils.errors import CalledProcessError, raise_unsupported_api_error
 from ...utils.flags import DRY_RUN
-from ...utils.errors import raise_unsupported_api_error, CalledProcessError
+from ...utils.misc import abspath
+from .utils.arg import CLIArgument
+from .utils.subprocess import CompletedProcess
+from .utils.subprocess import run_cmd as _run_cmd
 
 __all__ = ["BaseRunner", "InferOnlyRunner"]
 
@@ -59,7 +59,6 @@ class BaseRunner(metaclass=abc.ABCMeta):
         For example, download prerequisites and install dependencies.
         """
         # By default we do nothing
-        pass
 
     @abc.abstractmethod
     def train(self, config_path, cli_args, device, ips, save_dir, do_eval=True):

paddlex/repo_apis/base/utils/__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.

paddlex/repo_apis/base/utils/arg.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.

paddlex/repo_apis/base/utils/subprocess.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.

paddlex/repo_manager/__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.
@@ -13,12 +13,5 @@
 # limitations under the License.
 
 
-from .core import (
-    set_parent_dirs,
-    setup,
-    wheel,
-    is_initialized,
-    initialize,
-    get_versions,
-)
+from .core import get_versions, initialize, is_initialized, set_parent_dirs, setup
 from .meta import get_all_repo_names as get_all_supported_repo_names

paddlex/repo_manager/core.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,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import os
 import sys
 from collections import OrderedDict
 
 from ..utils import logging
-from .utils import install_deps_using_pip
 from .meta import get_all_repo_names, get_repo_meta
 from .repo import (
-    build_repo_instance,
     build_repo_group_getter,
     build_repo_group_installer,
+    build_repo_instance,
 )
 
 __all__ = [
     "set_parent_dirs",
     "setup",
-    "wheel",
     "is_initialized",
     "initialize",
     "get_versions",
@@ -99,11 +96,12 @@ def setup(
     platform=None,
     update_repos=False,
     use_local_repos=False,
+    deps_to_replace=None,
 ):
     """setup"""
     if update_repos and use_local_repos:
         logging.error(
-            f"The `--update_repos` and `--use_local_repos` should not be True at the same time. They are global setting for all repos. `--update_repos` means that update all repos to sync with remote, and `--use_local_repos` means that don't update when local repo is exsting."
+            f"The `--update_repos` and `--use_local_repos` should not be True at the same time. They are global setting for all repos. `--update_repos` means that update all repos to sync with remote, and `--use_local_repos` means that don't update when local repo is existing."
         )
         raise Exception()
 
@@ -138,7 +136,7 @@ def setup(
                 except EOFError:
                     logging.warning(
                         "Unable to read from stdin. Please set `--use_local_repos` to \
-                        True or False to apply a global setting for using exsting or re-getting repos."
+                        True or False to apply a global setting for using existing or re-getting repos."
                     )
                     raise
                 remove_existing = remove_existing.lower() in ("y", "yes")
@@ -176,7 +174,7 @@ def setup(
                 uninstall_existing = uninstall_existing.lower() in ("y", "yes")
 
             if uninstall_existing:
-                repo.uninstall()
+                build_repo_group_installer(repo).uninstall()
                 repos_to_install.append(repo)
             else:
                 logging.warning(
@@ -201,31 +199,15 @@ def setup(
         logging.info(installer.get_deps())
 
     logging.info("Now installing the packages...")
-    installer.install(force_reinstall=False, no_deps=no_deps, constraints=constraints)
-    install_deps_using_pip()
+    installer.install(
+        force_reinstall=False,
+        no_deps=no_deps,
+        constraints=constraints,
+        deps_to_replace=deps_to_replace,
+    )
     logging.info("All packages are installed.")
 
 
-def wheel(repo_names, dst_dir="./", fail_fast=False):
-    """wheel"""
-    for repo_name in repo_names:
-        repo = _GlobalContext.build_repo_instance(repo_name)
-        logging.info(f"Now building Wheel for {repo_name}...")
-        try:
-            tgt_dir = os.path.join(dst_dir, repo.pkg_name)
-            if os.path.exists(tgt_dir):
-                raise FileExistsError(f"{tgt_dir} already exists.")
-            repo.wheel(tgt_dir)
-        except Exception as e:
-            logging.warning(
-                f"Failed to build wheel for {repo_name}. We encountered the following error:\n  {str(e)}\n"
-            )
-            if fail_fast:
-                raise
-        else:
-            logging.info(f"Wheel for {repo_name} is built.\n")
-
-
 def initialize(repo_names=None):
     """initialize"""
     if _GlobalContext.is_initialized():

paddlex/repo_manager/meta.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.
@@ -34,19 +34,21 @@ REPO_META = {
         "git_path": "/PaddlePaddle/PaddleSeg.git",
         "platform": "github",
         "branch": "release/2.10",
-        "pkg_name": "paddleseg",
-        "lib_name": "paddleseg",
+        "install_pkg": True,
+        "dist_name": "paddleseg",
+        "import_name": "paddleseg",
         "pdx_pkg_name": "PaddleSeg_api",
         "editable": False,
-        "extra_req_files": ["Matting/requirements.txt"],
+        "extra_pkgs": ["Matting/requirements.txt"],
         "path_env": "PADDLE_PDX_PADDLESEG_PATH",
     },
     "PaddleClas": {
         "git_path": "/PaddlePaddle/PaddleClas.git",
         "platform": "github",
         "branch": "release/2.6",
-        "pkg_name": "paddleclas",
-        "lib_name": "paddleclas",
+        "install_pkg": True,
+        "dist_name": "paddleclas",
+        "import_name": "paddleclas",
         "pdx_pkg_name": "PaddleClas_api",
         # PaddleClas must be installed in non-editable mode, otherwise it throws
         # an Import error.
@@ -57,8 +59,9 @@ REPO_META = {
         "git_path": "/PaddlePaddle/PaddleDetection.git",
         "platform": "github",
         "branch": "release/2.8.1",
-        "pkg_name": "paddledet",
-        "lib_name": "ppdet",
+        "install_pkg": True,
+        "dist_name": "paddledet",
+        "import_name": "ppdet",
         "pdx_pkg_name": "PaddleDetection_api",
         "editable": False,
         "path_env": "PADDLE_PDX_PADDLEDETECTION_PATH",
@@ -67,13 +70,11 @@ REPO_META = {
         "git_path": "/PaddlePaddle/PaddleOCR.git",
         "platform": "github",
         "branch": "main",
-        "pkg_name": "paddleocr",
-        "lib_name": "paddleocr",
+        "install_pkg": False,
         "pdx_pkg_name": "PaddleOCR_api",
-        "editable": False,
-        "extra_req_files": [
+        "extra_pkgs": [
             "ppstructure/kie/requirements.txt",
-            "docs/algorithm/formula_recognition/requirements.txt",
+            "docs/version2.x/algorithm/formula_recognition/requirements.txt",
         ],
         "path_env": "PADDLE_PDX_PADDLEOCR_PATH",
         "requires": ["PaddleNLP"],
@@ -82,8 +83,9 @@ REPO_META = {
         "git_path": "/PaddlePaddle/PaddleTS.git",
         "platform": "github",
         "branch": "release_v1.1",
-        "pkg_name": "paddlets",
-        "lib_name": "paddlets",
+        "install_pkg": True,
+        "dist_name": "paddlets",
+        "import_name": "paddlets",
         "pdx_pkg_name": "PaddleTS_api",
         "editable": False,
         "path_env": "PADDLE_PDX_PADDLETS_PATH",
@@ -93,8 +95,9 @@ REPO_META = {
         "git_path": "/PaddlePaddle/PaddleNLP.git",
         "platform": "github",
         "branch": "release/2.9",
-        "pkg_name": "paddlenlp",
-        "lib_name": "paddlenlp",
+        "install_pkg": True,
+        "dist_name": "paddlenlp",
+        "import_name": "paddlenlp",
         "pdx_pkg_name": "PaddleNLP_api",
         "editable": False,
         "path_env": "PADDLE_PDX_PADDLENLP_PATH",
@@ -103,8 +106,9 @@ REPO_META = {
         "git_path": "/PaddlePaddle/PaddleSpeech.git",
         "platform": "github",
         "branch": "develop",
-        "pkg_name": "paddlespeech",
-        "lib_name": "paddlespeech",
+        "install_pkg": True,
+        "dist_name": "paddlespeech",
+        "import_name": "paddlespeech",
         "pdx_pkg_name": "PaddleSpeech_api",
         "editable": False,
         "path_env": "PADDLE_PDX_PADDLESPEECH_PATH",
@@ -114,8 +118,9 @@ REPO_META = {
         "git_path": "/PaddlePaddle/PARL.git",
         "platform": "github",
         "branch": "develop",
-        "pkg_name": "parl",
-        "lib_name": "parl",
+        "install_pkg": True,
+        "dist_name": "parl",
+        "import_name": "parl",
         "pdx_pkg_name": "PARL_api",
         "editable": False,
         "path_env": "PADDLE_PDX_PARL_PATH",
@@ -124,11 +129,12 @@ REPO_META = {
         "git_path": "/PaddlePaddle/PaddleMIX.git",
         "platform": "github",
         "branch": "develop",
-        "pkg_name": "paddlemix",
-        "lib_name": "paddlemix",
+        "install_pkg": True,
+        "dist_name": "paddlemix",
+        "import_name": "paddlemix",
         "pdx_pkg_name": "PaddleMIX_api",
         "editable": True,
-        "extra_editable": "ppdiffusers",
+        "extra_pkgs": [("ppdiffusers", "ppdiffusers", None, True)],
         "path_env": "PADDLE_PDX_PADDLEMIX_PATH",
         "requires": ["PaddleNLP"],
     },
@@ -136,8 +142,9 @@ REPO_META = {
         "git_path": "/PaddlePaddle/Paddle3D.git",
         "platform": "github",
         "branch": "develop",
-        "pkg_name": "paddle3d",
-        "lib_name": "paddle3d",
+        "install_pkg": True,
+        "dist_name": "paddle3d",
+        "import_name": "paddle3d",
         "pdx_pkg_name": "Paddle3D_api",
         "editable": False,
         "path_env": "PADDLE_PDX_PADDLE3D_PATH",
@@ -148,17 +155,20 @@ REPO_META = {
         "git_path": "/PaddlePaddle/PaddleVideo.git",
         "platform": "github",
         "branch": "develop",
-        "pkg_name": "paddlevideo",
-        "lib_name": "ppvideo",
+        "install_pkg": True,
+        "dist_name": "paddlevideo",
+        "import_name": "ppvideo",
         "pdx_pkg_name": "PaddleVideo_api",
         "editable": False,
-        "extra_req_files": [
-            "requirements_paddlex.txt",
-        ],
+        "main_req_file": "requirements_paddlex.txt",
         "path_env": "PADDLE_PDX_PADDLEVIDEO_PATH",
     },
 }
 
+REPO_DIST_NAMES = {
+    item["dist_name"] for item in REPO_META.values() if "dist_name" in item
+}
+
 
 def get_repo_meta(repo_name):
     """get_repo_meta"""