dpdispatcher 0.6.7__tar.gz → 0.6.9__tar.gz

{dpdispatcher-0.6.7 → dpdispatcher-0.6.9}/.github/workflows/test-bohrium.yml

@@ -30,7 +30,7 @@ jobs:
         BOHRIUM_PASSWORD: ${{ secrets.BOHRIUM_PASSWORD }}
         BOHRIUM_PROJECT_ID: ${{ secrets.BOHRIUM_PROJECT_ID }}
         BOHRIUM_ACCESS_KEY: ${{ secrets.BOHRIUM_ACCESS_KEY }}
-    - uses: codecov/codecov-action@v4
+    - uses: codecov/codecov-action@v5
       env:
         CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
   remove_label:

{dpdispatcher-0.6.7 → dpdispatcher-0.6.9}/.github/workflows/test.yml

@@ -16,7 +16,7 @@ jobs:
           - '3.11'
           - '3.12'
         platform:
-          - ubuntu-latest
+          - ubuntu-22.04
           - macos-latest
           - windows-latest
         exclude:  # Apple Silicon ARM64 does not support Python < v3.8
@@ -31,10 +31,12 @@ jobs:
       uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
-    - run: curl -LsSf https://astral.sh/uv/install.sh | sh
-      if: matrix.platform != 'windows-latest'
-    - run: powershell -c "irm https://astral.sh/uv/install.ps1 | iex"
-      if: matrix.platform == 'windows-latest'
+    - uses: astral-sh/setup-uv@v5
+      with:
+        enable-cache: true
+        cache-dependency-glob: |
+          **/requirements*.txt
+          **/pyproject.toml
     - run: uv pip install --system .[test] coverage
     - name: Test
       run: |
@@ -42,7 +44,7 @@ jobs:
         python -m coverage run -p --source=./dpdispatcher -m dpdispatcher -h
         python -m coverage combine
         python -m coverage report
-    - uses: codecov/codecov-action@v4
+    - uses: codecov/codecov-action@v5
       env:
         CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
   pass:

{dpdispatcher-0.6.7 → dpdispatcher-0.6.9}/.pre-commit-config.yaml

@@ -2,7 +2,7 @@
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v5.0.0
     hooks:
       - id: trailing-whitespace
         exclude: "^tests/"
@@ -18,7 +18,7 @@ repos:
   # Python
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.6.2
+    rev: v0.9.3
     hooks:
       - id: ruff
         args: ["--fix"]
@@ -31,7 +31,7 @@ repos:
         args: ["--write"]
   # Python inside docs
   - repo: https://github.com/asottile/blacken-docs
-    rev: 1.18.0
+    rev: 1.19.1
     hooks:
       - id: blacken-docs
   # markdown, yaml

{dpdispatcher-0.6.7 → dpdispatcher-0.6.9}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: dpdispatcher
-Version: 0.6.7
+Version: 0.6.9
 Summary: Generate HPC scheduler systems jobs input scripts, submit these scripts to HPC systems, and poke until they finish
 Author: DeepModeling
 License:                    GNU LESSER GENERAL PUBLIC LICENSE
@@ -195,9 +195,9 @@ Requires-Dist: tomli>=1.1.0; python_version < "3.11"
 Provides-Extra: docs
 Requires-Dist: sphinx; extra == "docs"
 Requires-Dist: myst-parser; extra == "docs"
-Requires-Dist: sphinx_rtd_theme>=1.0.0rc1; extra == "docs"
+Requires-Dist: sphinx-book-theme; extra == "docs"
 Requires-Dist: numpydoc; extra == "docs"
-Requires-Dist: deepmodeling_sphinx>=0.1.1; extra == "docs"
+Requires-Dist: deepmodeling-sphinx>=0.3.0; extra == "docs"
 Requires-Dist: dargs>=0.3.1; extra == "docs"
 Requires-Dist: sphinx-argparse<0.5.0; extra == "docs"
 Provides-Extra: cloudserver
@@ -212,6 +212,7 @@ Provides-Extra: gui
 Requires-Dist: dpgui; extra == "gui"
 Provides-Extra: test
 Requires-Dist: dpgui; extra == "test"
+Dynamic: license-file
 
 # DPDispatcher
 
@@ -221,7 +222,7 @@ Requires-Dist: dpgui; extra == "test"
 [![Documentation Status](https://readthedocs.org/projects/dpdispatcher/badge/)](https://dpdispatcher.readthedocs.io/)
 
 DPDispatcher is a Python package used to generate HPC (High-Performance Computing) scheduler systems (Slurm/PBS/LSF/Bohrium) jobs input scripts, submit them to HPC systems, and poke until they finish.
-​
+
 DPDispatcher will monitor (poke) until these jobs finish and download the results files (if these jobs are running on remote systems connected by SSH).
 
 For more information, check the [documentation](https://dpdispatcher.readthedocs.io/).

{dpdispatcher-0.6.7 → dpdispatcher-0.6.9}/README.md

@@ -6,7 +6,7 @@
 [![Documentation Status](https://readthedocs.org/projects/dpdispatcher/badge/)](https://dpdispatcher.readthedocs.io/)
 
 DPDispatcher is a Python package used to generate HPC (High-Performance Computing) scheduler systems (Slurm/PBS/LSF/Bohrium) jobs input scripts, submit them to HPC systems, and poke until they finish.
-​
+
 DPDispatcher will monitor (poke) until these jobs finish and download the results files (if these jobs are running on remote systems connected by SSH).
 
 For more information, check the [documentation](https://dpdispatcher.readthedocs.io/).

{dpdispatcher-0.6.7 → dpdispatcher-0.6.9}/doc/conf.py

@@ -20,7 +20,7 @@ from datetime import date
 # -- Project information -----------------------------------------------------
 
 project = "DPDispatcher"
-copyright = "2020-%d, Deep Modeling" % date.today().year
+copyright = f"2020-{date.today().year}, Deep Modeling"
 author = "DeepModeling"
 
 
@@ -33,7 +33,7 @@ extensions = [
     "deepmodeling_sphinx",
     "dargs.sphinx",
     "myst_parser",
-    "sphinx_rtd_theme",
+    "sphinx_book_theme",
     "sphinx.ext.viewcode",
     "sphinx.ext.intersphinx",
     "numpydoc",
@@ -55,7 +55,7 @@ exclude_patterns = ["_build", "Thumbs.db", ".DS_Store"]
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
 #
-html_theme = "sphinx_rtd_theme"
+html_theme = "sphinx_book_theme"
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,

{dpdispatcher-0.6.7 → dpdispatcher-0.6.9}/doc/machine.rst

@@ -1,7 +1,7 @@
 Machine parameters
 ======================================
 .. note::
-   One can load, modify, and export the input file by using our effective web-based tool `DP-GUI <https://deepmodeling.com/dpgui/input/dpdispatcher-machine>`_ online or hosted using the :ref:`command line interface <cli>` :code:`dpdisp gui`. All parameters below can be set in DP-GUI. By clicking "SAVE JSON", one can download the input file.
+   One can load, modify, and export the input file by using our effective web-based tool `DP-GUI <https://dpgui.deepmodeling.com/input/dpdispatcher-machine>`_ online or hosted using the :ref:`command line interface <cli>` :code:`dpdisp gui`. All parameters below can be set in DP-GUI. By clicking "SAVE JSON", one can download the input file.
 
 .. dargs::
    :module: dpdispatcher.arginfo

{dpdispatcher-0.6.7 → dpdispatcher-0.6.9}/doc/resources.rst

@@ -1,7 +1,7 @@
 Resources parameters
 ======================================
 .. note::
-   One can load, modify, and export the input file by using our effective web-based tool `DP-GUI <https://deepmodeling.com/dpgui/input/dpdispatcher-resources>`_ online or hosted using the :ref:`command line interface <cli>` :code:`dpdisp gui`. All parameters below can be set in DP-GUI. By clicking "SAVE JSON", one can download the input file for.
+   One can load, modify, and export the input file by using our effective web-based tool `DP-GUI <https://dpgui.deepmodeling.com/input/dpdispatcher-resources>`_ online or hosted using the :ref:`command line interface <cli>` :code:`dpdisp gui`. All parameters below can be set in DP-GUI. By clicking "SAVE JSON", one can download the input file for.
 
 .. dargs::
    :module: dpdispatcher.arginfo

{dpdispatcher-0.6.7 → dpdispatcher-0.6.9}/doc/task.rst

@@ -1,7 +1,7 @@
 Task parameters
 ======================================
 .. note::
-   One can load, modify, and export the input file by using our effective web-based tool `DP-GUI <https://deepmodeling.com/dpgui/input/dpdispatcher-task>`_ online or hosted using the :ref:`command line interface <cli>` :code:`dpdisp gui`. All parameters below can be set in DP-GUI. By clicking "SAVE JSON", one can download the input file.
+   One can load, modify, and export the input file by using our effective web-based tool `DP-GUI <https://dpgui.deepmodeling.com/input/dpdispatcher-task>`_ online or hosted using the :ref:`command line interface <cli>` :code:`dpdisp gui`. All parameters below can be set in DP-GUI. By clicking "SAVE JSON", one can download the input file.
 
 .. dargs::
    :module: dpdispatcher.arginfo

{dpdispatcher-0.6.7 → dpdispatcher-0.6.9}/dpdispatcher/_version.py

@@ -1,8 +1,13 @@
-# file generated by setuptools_scm
+# file generated by setuptools-scm
 # don't change, don't track in version control
+
+__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+
 TYPE_CHECKING = False
 if TYPE_CHECKING:
-    from typing import Tuple, Union
+    from typing import Tuple
+    from typing import Union
+
     VERSION_TUPLE = Tuple[Union[int, str], ...]
 else:
     VERSION_TUPLE = object
@@ -12,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.6.7'
-__version_tuple__ = version_tuple = (0, 6, 7)
+__version__ = version = '0.6.9'
+__version_tuple__ = version_tuple = (0, 6, 9)

{dpdispatcher-0.6.7 → dpdispatcher-0.6.9}/dpdispatcher/base_context.py

@@ -102,8 +102,7 @@ class BaseContext(metaclass=ABCMeta):
         exit_status, stdin, stdout, stderr = self.block_call(cmd)
         if exit_status != 0:
             raise RuntimeError(
-                "Get error code %d in calling %s with job: %s . message: %s"
-                % (
+                "Get error code {} in calling {} with job: {} . message: {}".format(
                     exit_status,
                     cmd,
                     self.submission.submission_hash,

{dpdispatcher-0.6.7 → dpdispatcher-0.6.9}/dpdispatcher/contexts/ssh_context.py

@@ -90,8 +90,7 @@ class SSHSession:
         while not self._check_alive():
             if count == max_check:
                 raise RuntimeError(
-                    "cannot connect ssh after %d failures at interval %d s"
-                    % (max_check, sleep_time)
+                    f"cannot connect ssh after {max_check} failures at interval {sleep_time} s"
                 )
             dlog.info("connection check failed, try to reconnect to " + self.hostname)
             self._setup_ssh()
@@ -450,7 +449,9 @@ class SSHContext(BaseContext):
         self.init_local_root = local_root
         self.init_remote_root = remote_root
         self.temp_local_root = os.path.abspath(local_root)
-        assert os.path.isabs(remote_root), "remote_root must be a abspath"
+        assert os.path.isabs(os.path.realpath(remote_root)), (
+            "remote_root must be a abspath"
+        )
         self.temp_remote_root = remote_root
         self.remote_profile = remote_profile
         self.remote_root = None

{dpdispatcher-0.6.7 → dpdispatcher-0.6.9}/dpdispatcher/machines/JH_UniScheduler.py

@@ -39,7 +39,7 @@ class JH_UniScheduler(Machine):
         custom_gpu_line = resources.kwargs.get("custom_gpu_line", None)
         if not custom_gpu_line:
             script_header_dict["JH_UniScheduler_number_gpu_line"] = (
-                "" f"#JSUB -gpgpu {resources.gpu_per_node}"
+                f"#JSUB -gpgpu {resources.gpu_per_node}"
             )
         else:
             script_header_dict["JH_UniScheduler_number_gpu_line"] = custom_gpu_line
@@ -105,8 +105,7 @@ class JH_UniScheduler(Machine):
         elif ret != 0:
             # just retry when any unknown error raised.
             raise RetrySignal(
-                "Get error code %d in checking status with job: %s . message: %s"
-                % (ret, job.job_hash, err_str)
+                f"Get error code {ret} in checking status with job: {job.job_hash} . message: {err_str}"
             )
         status_out = stdout.read().decode("utf-8").split("\n")
         if len(status_out) < 2:

{dpdispatcher-0.6.7 → dpdispatcher-0.6.9}/dpdispatcher/machines/distributed_shell.py

@@ -181,8 +181,7 @@ class DistributedShell(Machine):
         if ret != 0:
             err_str = stderr.decode("utf-8")
             raise RuntimeError(
-                "Command %s fails to execute, error message:%s\nreturn code %d\n"
-                % (cmd, err_str, ret)
+                f"Command {cmd} fails to execute, error message:{err_str}\nreturn code {ret}\n"
             )
         job_id = int(stdout.decode("utf-8").strip())
 
@@ -200,8 +199,7 @@ class DistributedShell(Machine):
         if ret != 0:
             err_str = stderr.decode("utf-8")
             raise RuntimeError(
-                "Command fails to execute, error message:%s\nreturn code %d\n"
-                % (err_str, ret)
+                f"Command fails to execute, error message:{err_str}\nreturn code {ret}\n"
             )
 
         if_job_exists = bool(stdout.decode("utf-8").strip())

{dpdispatcher-0.6.7 → dpdispatcher-0.6.9}/dpdispatcher/machines/lsf.py

@@ -129,8 +129,7 @@ class LSF(Machine):
         elif ret != 0:
             # just retry when any unknown error raised.
             raise RetrySignal(
-                "Get error code %d in checking status with job: %s . message: %s"
-                % (ret, job.job_hash, err_str)
+                f"Get error code {ret} in checking status with job: {job.job_hash} . message: {err_str}"
             )
         status_out = stdout.read().decode("utf-8").split("\n")
         if len(status_out) < 2:

{dpdispatcher-0.6.7 → dpdispatcher-0.6.9}/dpdispatcher/machines/pbs.py

@@ -87,8 +87,7 @@ class PBS(Machine):
                     return JobStatus.terminated
             else:
                 raise RuntimeError(
-                    "status command %s fails to execute. erro info: %s return code %d"
-                    % (command, err_str, ret)
+                    f"status command {command} fails to execute. erro info: {err_str} return code {ret}"
                 )
         status_line = stdout.read().decode("utf-8").split("\n")[-2]
         status_word = status_line.split()[-2]
@@ -138,8 +137,7 @@ class Torque(PBS):
                     return JobStatus.terminated
             else:
                 raise RuntimeError(
-                    "status command %s fails to execute. erro info: %s return code %d"
-                    % (command, err_str, ret)
+                    f"status command {command} fails to execute. erro info: {err_str} return code {ret}"
                 )
         status_line = stdout.read().decode("utf-8").split("\n")[-2]
         status_word = status_line.split()[-2]
@@ -261,6 +259,7 @@ class SGE(PBS):
         pass
 
     def check_status(self, job):
+        ### https://softpanorama.org/HPC/Grid_engine/Queues/queue_states.shtml
         job_id = job.job_id
         status_line = None
         if job_id == "":
@@ -294,10 +293,12 @@ class SGE(PBS):
         else:
             status_word = status_line.split()[4]
             # dlog.info (status_word)
-            if status_word in ["qw"]:
+            if status_word in ["qw", "hqw", "t"]:
                 return JobStatus.waiting
-            elif status_word in ["r"]:
+            elif status_word in ["r", "Rr"]:
                 return JobStatus.running
+            elif status_word in ["Eqw", "dr", "dt"]:
+                return JobStatus.terminated
             else:
                 return JobStatus.unknown
 

{dpdispatcher-0.6.7 → dpdispatcher-0.6.9}/dpdispatcher/machines/shell.py

@@ -43,8 +43,7 @@ class Shell(Machine):
         if ret != 0:
             err_str = stderr.read().decode("utf-8")
             raise RuntimeError(
-                "status command %s fails to execute\nerror message:%s\nreturn code %d\n"
-                % (cmd, err_str, ret)
+                f"status command {cmd} fails to execute\nerror message:{err_str}\nreturn code {ret}\n"
             )
         job_id = int(stdout.read().decode("utf-8").strip())
         self.context.write_file(job_id_name, str(job_id))
@@ -80,8 +79,7 @@ class Shell(Machine):
         if ret != 0:
             err_str = stderr.read().decode("utf-8")
             raise RuntimeError(
-                "status command %s fails to execute\nerror message:%s\nreturn code %d\n"
-                % (cmd, err_str, ret)
+                f"status command {cmd} fails to execute\nerror message:{err_str}\nreturn code {ret}\n"
             )
 
         if_job_exists = bool(stdout.read().decode("utf-8").strip())

{dpdispatcher-0.6.7 → dpdispatcher-0.6.9}/dpdispatcher/machines/slurm.py

@@ -97,8 +97,7 @@ class Slurm(Machine):
             ):
                 # server network error, retry 3 times
                 raise RetrySignal(
-                    "Get error code %d in submitting with job: %s . message: %s"
-                    % (ret, job.job_hash, err_str)
+                    f"Get error code {ret} in submitting with job: {job.job_hash} . message: {err_str}"
                 )
             elif (
                 "Job violates accounting/QOS policy" in err_str
@@ -109,8 +108,7 @@ class Slurm(Machine):
                 # job number exceeds, skip the submitting
                 return ""
             raise RuntimeError(
-                "command %s fails to execute\nerror message:%s\nreturn code %d\n"
-                % (command, err_str, ret)
+                f"command {command} fails to execute\nerror message:{err_str}\nreturn code {ret}\n"
             )
         subret = stdout.readlines()
         # --parsable
@@ -145,13 +143,11 @@ class Slurm(Machine):
             ):
                 # retry 3 times
                 raise RetrySignal(
-                    "Get error code %d in checking status with job: %s . message: %s"
-                    % (ret, job.job_hash, err_str)
+                    f"Get error code {ret} in checking status with job: {job.job_hash} . message: {err_str}"
                 )
             raise RuntimeError(
-                "status command %s fails to execute."
-                "job_id:%s \n error message:%s\n return code %d\n"
-                % (command, job_id, err_str, ret)
+                f"status command {command} fails to execute."
+                f"job_id:{job_id} \n error message:{err_str}\n return code {ret}\n"
             )
         status_line = stdout.read().decode("utf-8").split("\n")[-2]
         status_word = status_line.split()[-1]
@@ -255,7 +251,7 @@ class SlurmJobArray(Slurm):
             return super().gen_script_header(job) + "\n#SBATCH --array={}".format(
                 ",".join(map(str, job_array))
             )
-        return super().gen_script_header(job) + "\n#SBATCH --array=0-%d" % (
+        return super().gen_script_header(job) + "\n#SBATCH --array=0-%s" % (
             math.ceil(len(job.job_task_list) / slurm_job_size) - 1
         )
 
@@ -333,13 +329,11 @@ class SlurmJobArray(Slurm):
             ):
                 # retry 3 times
                 raise RetrySignal(
-                    "Get error code %d in checking status with job: %s . message: %s"
-                    % (ret, job.job_hash, err_str)
+                    f"Get error code {ret} in checking status with job: {job.job_hash} . message: {err_str}"
                 )
             raise RuntimeError(
-                "status command %s fails to execute."
-                "job_id:%s \n error message:%s\n return code %d\n"
-                % (command, job_id, err_str, ret)
+                f"status command {command} fails to execute."
+                f"job_id:{job_id} \n error message:{err_str}\n return code {ret}\n"
             )
         status_lines = stdout.read().decode("utf-8").split("\n")[:-1]
         status = []

{dpdispatcher-0.6.7 → dpdispatcher-0.6.9}/dpdispatcher/submission.py

@@ -55,7 +55,6 @@ class Submission:
         *,
         task_list=[],
     ):
-        # self.submission_list = submission_list
         self.local_root = None
         self.work_base = work_base
         self._abs_work_base = os.path.abspath(work_base)
@@ -324,8 +323,7 @@ class Submission:
         kwargs = {**{"clean": False}, **kwargs}
         if kwargs["clean"]:
             dlog.warning(
-                "Using async submission with `clean=True`, "
-                "job may fail in queue system"
+                "Using async submission with `clean=True`, job may fail in queue system"
             )
         loop = asyncio.get_event_loop()
         wrapped_submission = functools.partial(self.run_submission, **kwargs)
@@ -515,12 +513,9 @@ class Submission:
     def submission_from_json(cls, json_file_name="submission.json"):
         with open(json_file_name) as f:
             submission_dict = json.load(f)
-        # submission_dict = machine.context.read_file(json_file_name)
         submission = cls.deserialize(submission_dict=submission_dict, machine=None)
         return submission
 
-    # def check_if_recover()
-
     def try_recover_from_json(self):
         submission_file_name = f"{self.submission_hash}.json"
         if_recover = self.machine.context.check_file_exists(submission_file_name)
@@ -545,7 +540,6 @@ class Submission:
                     f"machine.context.remote_root:{self.machine.context.remote_root}; "
                     f"submission.work_base:{submission.work_base};"
                 )
-                # self = submission.bind_machine(machine=self.machine)
             else:
                 print(self.serialize())
                 print(submission.serialize())
@@ -759,7 +753,6 @@ class Job:
         self.fail_count = 0
         self.job_uuid = uuid.uuid4()
 
-        # self.job_hash = self.get_hash()
         self.job_hash = self.get_hash()
         self.script_file_name = self.job_hash + ".sub"
 

{dpdispatcher-0.6.7 → dpdispatcher-0.6.9}/dpdispatcher/utils/dpcloudserver/client.py

@@ -278,7 +278,11 @@ class Client:
             return ""
         resp = requests.get(url, headers={"Range": f"bytes={self.last_log_offset}-"})
         self.last_log_offset += len(resp.content)
-        return resp.content.decode("utf-8")
+        try:
+            return resp.content.decode("utf-8")
+        except Exception as e:
+            dlog.error(f"Error decoding job log: {e}", stack_info=ENABLE_STACK)
+            return ""
 
     def _get_job_log(self, job_id):
         ret = self.get(

{dpdispatcher-0.6.7 → dpdispatcher-0.6.9}/dpdispatcher/utils/hdfs_cli.py

@@ -28,7 +28,7 @@ class HDFS:
                 )
         except Exception as e:
             raise RuntimeError(
-                f"Cannot check existence of hdfs uri[{uri}] " f"with cmd[{cmd}]"
+                f"Cannot check existence of hdfs uri[{uri}] with cmd[{cmd}]"
             ) from e
 
     @staticmethod
@@ -48,9 +48,7 @@ class HDFS:
                     f"with cmd[{cmd}]; ret[{ret}] output[{out}] stderr[{err}]"
                 )
         except Exception as e:
-            raise RuntimeError(
-                f"Cannot remove hdfs uri[{uri}] " f"with cmd[{cmd}]"
-            ) from e
+            raise RuntimeError(f"Cannot remove hdfs uri[{uri}] with cmd[{cmd}]") from e
 
     @staticmethod
     def mkdir(uri):
@@ -70,7 +68,7 @@ class HDFS:
                 )
         except Exception as e:
             raise RuntimeError(
-                f"Cannot mkdir of hdfs uri[{uri}] " f"with cmd[{cmd}]"
+                f"Cannot mkdir of hdfs uri[{uri}] with cmd[{cmd}]"
             ) from e
 
     @staticmethod
@@ -80,7 +78,7 @@ class HDFS:
         """
         # Make sure local_path is accessible
         if not os.path.exists(local_path) or not os.access(local_path, os.R_OK):
-            raise RuntimeError(f"try to access local_path[{local_path}] " "but failed")
+            raise RuntimeError(f"try to access local_path[{local_path}] but failed")
         cmd = f"hadoop fs -copyFromLocal -f {local_path} {to_uri}"
         try:
             ret, out, err = run_cmd_with_all_output(cmd)
@@ -132,9 +130,7 @@ class HDFS:
                     f"cmd [{cmd}] ret[{ret}] output[{out}] stderr[{err}]"
                 )
         except Exception as e:
-            raise RuntimeError(
-                f"Cannot read text from uri[{uri}]" f"cmd [{cmd}]"
-            ) from e
+            raise RuntimeError(f"Cannot read text from uri[{uri}]cmd [{cmd}]") from e
 
     @staticmethod
     def move(from_uri, to_uri):
@@ -151,6 +147,5 @@ class HDFS:
                 )
         except Exception as e:
             raise RuntimeError(
-                f"Cannot move from_uri[{from_uri}] to "
-                f"to_uri[{to_uri}] with cmd[{cmd}]"
+                f"Cannot move from_uri[{from_uri}] to to_uri[{to_uri}] with cmd[{cmd}]"
             ) from e

{dpdispatcher-0.6.7 → dpdispatcher-0.6.9}/dpdispatcher/utils/utils.py

@@ -191,7 +191,7 @@ def retry(
             else:
                 # raise all exceptions
                 raise RuntimeError(
-                    "Failed to run %s for %d times" % (func.__name__, current_retry)
+                    f"Failed to run {func.__name__} for {current_retry} times"
                 ) from errors[-1]
 
         return wrapper

{dpdispatcher-0.6.7 → dpdispatcher-0.6.9}/dpdispatcher.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: dpdispatcher
-Version: 0.6.7
+Version: 0.6.9
 Summary: Generate HPC scheduler systems jobs input scripts, submit these scripts to HPC systems, and poke until they finish
 Author: DeepModeling
 License:                    GNU LESSER GENERAL PUBLIC LICENSE
@@ -195,9 +195,9 @@ Requires-Dist: tomli>=1.1.0; python_version < "3.11"
 Provides-Extra: docs
 Requires-Dist: sphinx; extra == "docs"
 Requires-Dist: myst-parser; extra == "docs"
-Requires-Dist: sphinx_rtd_theme>=1.0.0rc1; extra == "docs"
+Requires-Dist: sphinx-book-theme; extra == "docs"
 Requires-Dist: numpydoc; extra == "docs"
-Requires-Dist: deepmodeling_sphinx>=0.1.1; extra == "docs"
+Requires-Dist: deepmodeling-sphinx>=0.3.0; extra == "docs"
 Requires-Dist: dargs>=0.3.1; extra == "docs"
 Requires-Dist: sphinx-argparse<0.5.0; extra == "docs"
 Provides-Extra: cloudserver
@@ -212,6 +212,7 @@ Provides-Extra: gui
 Requires-Dist: dpgui; extra == "gui"
 Provides-Extra: test
 Requires-Dist: dpgui; extra == "test"
+Dynamic: license-file
 
 # DPDispatcher
 
@@ -221,7 +222,7 @@ Requires-Dist: dpgui; extra == "test"
 [![Documentation Status](https://readthedocs.org/projects/dpdispatcher/badge/)](https://dpdispatcher.readthedocs.io/)
 
 DPDispatcher is a Python package used to generate HPC (High-Performance Computing) scheduler systems (Slurm/PBS/LSF/Bohrium) jobs input scripts, submit them to HPC systems, and poke until they finish.
-​
+
 DPDispatcher will monitor (poke) until these jobs finish and download the results files (if these jobs are running on remote systems connected by SSH).
 
 For more information, check the [documentation](https://dpdispatcher.readthedocs.io/).

{dpdispatcher-0.6.7 → dpdispatcher-0.6.9}/dpdispatcher.egg-info/requires.txt

@@ -23,9 +23,9 @@ bohrium-sdk
 [docs]
 sphinx
 myst-parser
-sphinx_rtd_theme>=1.0.0rc1
+sphinx-book-theme
 numpydoc
-deepmodeling_sphinx>=0.1.1
+deepmodeling-sphinx>=0.3.0
 dargs>=0.3.1
 sphinx-argparse<0.5.0
 

{dpdispatcher-0.6.7 → dpdispatcher-0.6.9}/pyproject.toml

@@ -51,9 +51,9 @@ dpdisp = "dpdispatcher.dpdisp:main"
 docs = [
     'sphinx',
     'myst-parser',
-    'sphinx_rtd_theme>=1.0.0rc1',
+    'sphinx-book-theme',
     'numpydoc',
-    'deepmodeling_sphinx>=0.1.1',
+    'deepmodeling-sphinx>=0.3.0',
     'dargs>=0.3.1',
     'sphinx-argparse<0.5.0',
 ]