Merge pull request #26 from deepmodeling/master

fetch origin master

Author: thangckt

.github/workflows/copilot-setup-steps.yml

@@ -26,10 +26,10 @@ jobs:
     # If you do not check out your code, Copilot will do this for you.
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: "3.11"
 

.github/workflows/pyright.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v5
-    - uses: actions/setup-python@v5
+    - uses: actions/setup-python@v6
       with:
         python-version: '3.11'
     - run: pip install uv

.github/workflows/release.yml

@@ -18,7 +18,7 @@ jobs:
     steps:
     - uses: actions/checkout@v5
     - name: Setup python
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: 3.x
         architecture: x64

.github/workflows/test-bohrium.yml

@@ -20,7 +20,7 @@ jobs:
       with:
         ref: "${{ github.event.pull_request.merge_commit_sha }}"
     - name: Set up Python 3.12
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: '3.12'
         cache: 'pip'

.github/workflows/test.yml

@@ -28,14 +28,14 @@ jobs:
             platform: macos-latest
         include:  # So run those legacy versions on Intel CPUs
           - python-version: "3.7"
-            platform: macos-13
+            platform: macos-15-intel
     steps:
     - uses: actions/checkout@v5
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: ${{ matrix.python-version }}
-    - uses: astral-sh/setup-uv@v6
+    - uses: astral-sh/setup-uv@v7
       with:
         enable-cache: true
         cache-dependency-glob: |

.github/copilot-instructions.md renamed to AGENTS.md

@@ -138,9 +138,9 @@ def rsync(
 
     cmd = [
         "rsync",
-        # -a: archieve
-        # -z: compress
-        "-az",
+        # -r: recursive, -l: links, -p: perms, -t: times, -D: devices/specials
+        # -z: compress (exclude -o: owner, -g: group to avoid permission issues)
+        "-rlptDz",
         "-e",
         ssh_cmd_str,
         "-q",

dpdispatcher/utils/utils.py

@@ -0,0 +1,87 @@
+import os
+import sys
+import unittest
+from unittest.mock import patch
+
+sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), "..")))
+__package__ = "tests"
+
+from dpdispatcher.utils.utils import rsync
+
+
+class TestRsyncFlags(unittest.TestCase):
+    """Test rsync function flags to ensure correct options are used."""
+
+    @patch("dpdispatcher.utils.utils.run_cmd_with_all_output")
+    def test_rsync_flags_exclude_owner_group(self, mock_run_cmd):
+        """Test that rsync uses flags that exclude owner and group preservation."""
+        # Mock successful command execution
+        mock_run_cmd.return_value = (0, "", "")
+
+        # Call rsync function
+        rsync("source_file", "dest_file", key_filename="test_key")
+
+        # Verify the command was called
+        mock_run_cmd.assert_called_once()
+
+        # Get the command that was executed
+        called_cmd = mock_run_cmd.call_args[0][0]
+
+        # Verify the command contains the correct flags
+        self.assertIn("-rlptDz", called_cmd)
+        self.assertNotIn("-az", called_cmd)
+
+        # Verify rsync command structure
+        self.assertIn("rsync", called_cmd)
+        self.assertIn("source_file", called_cmd)
+        self.assertIn("dest_file", called_cmd)
+        self.assertIn("-e", called_cmd)
+        self.assertIn("-q", called_cmd)
+
+    @patch("dpdispatcher.utils.utils.run_cmd_with_all_output")
+    def test_rsync_with_proxy_command_flags(self, mock_run_cmd):
+        """Test that rsync uses correct flags even with proxy command."""
+        # Mock successful command execution
+        mock_run_cmd.return_value = (0, "", "")
+
+        # Call rsync function with proxy command
+        rsync(
+            "source_file",
+            "dest_file",
+            key_filename="test_key",
+            proxy_command="ssh -W target:22 jump_host",
+        )
+
+        # Verify the command was called
+        mock_run_cmd.assert_called_once()
+
+        # Get the command that was executed
+        called_cmd = mock_run_cmd.call_args[0][0]
+
+        # Verify the command contains the correct flags
+        self.assertIn("-rlptDz", called_cmd)
+        self.assertNotIn("-az", called_cmd)
+
+    @patch("dpdispatcher.utils.utils.run_cmd_with_all_output")
+    def test_rsync_error_handling(self, mock_run_cmd):
+        """Test that rsync properly handles errors."""
+        # Mock failed command execution
+        mock_run_cmd.return_value = (
+            23,
+            "",
+            "rsync: chown failed: Operation not permitted",
+        )
+
+        # Call rsync function and expect RuntimeError
+        with self.assertRaises(RuntimeError) as context:
+            rsync("source_file", "dest_file")
+
+        # Verify error message contains the command and error
+        self.assertIn("Failed to run", str(context.exception))
+        self.assertIn(
+            "rsync: chown failed: Operation not permitted", str(context.exception)
+        )
+
+
+if __name__ == "__main__":
+    unittest.main()