Merge remote-tracking branch 'origin/push-v2-integration' into changes_limits

Author: MarcelGeo

mergin/client_push.py

@@ -22,7 +22,7 @@
 import time
 from typing import List, Tuple, Optional, ByteString
 
-from .local_changes import ChangesValidationError, FileChange, LocalPojectChanges
+from .local_changes import ChangesValidationError, FileChange, LocalProjectChanges
 
 from .common import (
     MAX_UPLOAD_VERSIONED_SIZE,
@@ -140,10 +140,10 @@ class UploadJob:
     """Keeps all the important data about a pending upload job"""
 
     def __init__(
-        self, version: str, changes: LocalPojectChanges, transaction_id: Optional[str], mp: MerginProject, mc, tmp_dir
+        self, version: str, changes: LocalProjectChanges, transaction_id: Optional[str], mp: MerginProject, mc, tmp_dir
     ):
         self.version = version
-        self.changes: LocalPojectChanges = changes  # dictionary of local changes to the project
+        self.changes: LocalProjectChanges = changes  # dictionary of local changes to the project
         self.transaction_id = transaction_id  # ID of the transaction assigned by the server
         self.total_size = 0  # size of data to upload (in bytes)
         self.transferred_size = 0  # size of data already uploaded (in bytes)
@@ -186,7 +186,7 @@ def update_chunks_from_items(self):
         Update chunks in LocalProjectChanges from the upload queue items.
         Used just before finalizing the transaction to set the server_chunk_id in v2 API.
         """
-        self.changes.update_chunks([(item.chunk_id, item.server_chunk_id) for item in self.upload_queue_items])
+        self.changes.update_chunk_ids([(item.chunk_id, item.server_chunk_id) for item in self.upload_queue_items])
 
 
 def _do_upload(item: UploadQueueItem, job: UploadJob):
@@ -231,7 +231,7 @@ def create_upload_chunks(mc, mp: MerginProject, local_changes: List[FileChange])
 
 
 def create_upload_job(
-    mc, mp: MerginProject, changes: LocalPojectChanges, tmp_dir: tempfile.TemporaryDirectory
+    mc, mp: MerginProject, changes: LocalProjectChanges, tmp_dir: tempfile.TemporaryDirectory
 ) -> Optional[UploadJob]:
     """
     Prepare transaction and create an upload job for the project using the v1 API.
@@ -479,7 +479,7 @@ def remove_diff_files(job: UploadJob) -> None:
                 os.remove(diff_file)
 
 
-def get_push_changes_batch(mc, mp: MerginProject) -> Tuple[LocalPojectChanges, int]:
+def get_push_changes_batch(mc, mp: MerginProject) -> Tuple[LocalProjectChanges, int]:
     """
     Get changes that need to be pushed to the server.
     """
@@ -488,7 +488,7 @@ def get_push_changes_batch(mc, mp: MerginProject) -> Tuple[LocalPojectChanges, i
     changes = filter_changes(mc, project_role, changes)
 
     try:
-        local_changes = LocalPojectChanges(
+        local_changes = LocalProjectChanges(
             added=[FileChange(**change) for change in changes["added"]],
             updated=[FileChange(**change) for change in changes["updated"]],
             removed=[FileChange(**change) for change in changes["removed"]],

mergin/local_changes.py

@@ -41,6 +41,7 @@ class FileChange:
     chunks: List[str] = field(default_factory=list)
     # optional diff information for geopackage files with geodiff metadata
     diff: Optional[dict] = None
+    # File path to be used for reading a file by creating and uploading file in chunks
     upload_file: Optional[str] = None
     # some functions (MerginProject.compare_file_sets) are adding version to the change from project info
     version: Optional[str] = None
@@ -59,6 +60,7 @@ def get_diff(self) -> Optional[FileDiffChange]:
             )
 
     def to_server_data(self) -> dict:
+        """Convert the FileChange instance to a dictionary format suitable for server payload."""
         result = {
             "path": self.path,
             "checksum": self.checksum,
@@ -75,7 +77,7 @@ def to_server_data(self) -> dict:
 
 
 @dataclass
-class LocalPojectChanges:
+class LocalProjectChanges:
     added: List[FileChange] = field(default_factory=list)
     updated: List[FileChange] = field(default_factory=list)
     removed: List[FileChange] = field(default_factory=list)
@@ -132,7 +134,7 @@ def _map_unique_chunks(self, change_chunks: List[str], server_chunks: List[Tuple
                     seen.add(server_chunk_id)
         return mapped
 
-    def update_chunks(self, server_chunks: List[Tuple[str, str]]) -> None:
+    def update_chunk_ids(self, server_chunks: List[Tuple[str, str]]) -> None:
         """
         Map chunk ids to chunks returned from server (server_chunk_id).
 

mergin/test/test_local_changes.py

@@ -2,11 +2,11 @@
 import pytest
 from unittest.mock import patch
 
-from ..local_changes import ChangesValidationError, FileChange, LocalPojectChanges, MAX_UPLOAD_CHANGES
+from ..local_changes import ChangesValidationError, FileChange, LocalProjectChanges, MAX_UPLOAD_CHANGES
 
 
 def test_local_changes_from_dict():
-    """Test generating LocalChanges from a dictionary."""
+    """Test generating LocalProjectChanges from a dictionary."""
     changes_dict = {
         "added": [{"path": "file1.txt", "checksum": "abc123", "size": 1024, "mtime": datetime.now()}],
         "updated": [{"path": "file2.txt", "checksum": "xyz789", "size": 2048, "mtime": datetime.now()}],
@@ -37,7 +37,7 @@ def test_local_changes_from_dict():
     updated = [FileChange(**file) for file in changes_dict["updated"]]
     removed = [FileChange(**file) for file in changes_dict["removed"]]
 
-    local_changes = LocalPojectChanges(added=added, updated=updated, removed=removed)
+    local_changes = LocalProjectChanges(added=added, updated=updated, removed=removed)
 
     # Assertions
     assert len(local_changes.added) == 1
@@ -74,7 +74,7 @@ def test_local_changes_to_server_payload():
     updated = [FileChange(path="file2.txt", checksum="xyz789", size=2048, mtime=datetime.now())]
     removed = [FileChange(path="file3.txt", checksum="lmn456", size=512, mtime=datetime.now())]
 
-    local_changes = LocalPojectChanges(added=added, updated=updated, removed=removed)
+    local_changes = LocalProjectChanges(added=added, updated=updated, removed=removed)
     server_request = local_changes.to_server_payload()
 
     assert "added" in server_request
@@ -85,33 +85,33 @@ def test_local_changes_to_server_payload():
     assert server_request["removed"][0]["path"] == "file3.txt"
 
 
-def test_local_changes_update_chunks():
+def test_local_changes_update_chunk_ids():
     """Test the update_chunks method of LocalChanges."""
     added = [
         FileChange(path="file1.txt", checksum="abc123", size=1024, mtime=datetime.now(), chunks=["abc123"]),
         FileChange(path="file2.txt", checksum="abc123", size=1024, mtime=datetime.now(), chunks=["abc123"]),
     ]
     updated = [FileChange(path="file2.txt", checksum="xyz789", size=2048, mtime=datetime.now(), chunks=["xyz789"])]
 
-    local_changes = LocalPojectChanges(added=added, updated=updated)
+    local_changes = LocalProjectChanges(added=added, updated=updated)
     chunks = [("abc123", "chunk1"), ("abc123", "chunk1"), ("xyz789", "chunk2")]
 
-    local_changes.update_chunks(chunks)
+    local_changes.update_chunk_ids(chunks)
 
     assert local_changes.added[0].chunks == ["chunk1"]
     assert local_changes.added[1].chunks == ["chunk1"]
     assert local_changes.updated[0].chunks == ["chunk2"]
 
 
 def test_local_changes_get_upload_changes():
-    """Test the get_upload_changes method of LocalChanges."""
+    """Test the get_upload_changes method of LocalProjectChanges."""
     # Create sample LocalChange instances
     added = [FileChange(path="file1.txt", checksum="abc123", size=1024, mtime=datetime.now())]
     updated = [FileChange(path="file2.txt", checksum="xyz789", size=2048, mtime=datetime.now())]
     removed = [FileChange(path="file3.txt", checksum="lmn456", size=512, mtime=datetime.now())]
 
     # Initialize LocalChanges with added, updated, and removed changes
-    local_changes = LocalPojectChanges(added=added, updated=updated, removed=removed)
+    local_changes = LocalProjectChanges(added=added, updated=updated, removed=removed)
 
     # Call get_upload_changes
     upload_changes = local_changes.get_upload_changes()
@@ -143,7 +143,7 @@ def test_local_changes_post_init_validation_media():
     # Initialize LocalProjectChanges
     with patch("mergin.local_changes.MAX_UPLOAD_MEDIA_SIZE", SIZE_LIMIT_BYTES):
         with pytest.raises(ChangesValidationError, match="Some files exceed") as err:
-            LocalPojectChanges(added=added, updated=updated)
+            LocalProjectChanges(added=added, updated=updated)
             print(err.value.invalid_changes)
     assert len(err.value.invalid_changes) == 1
     assert "file2.jpg" == err.value.invalid_changes[0].path
@@ -179,14 +179,14 @@ def test_local_changes_post_init_validation_gpgkg():
     # Initialize LocalProjectChanges
     with patch("mergin.local_changes.MAX_UPLOAD_VERSIONED_SIZE", SIZE_LIMIT_BYTES):
         with pytest.raises(ChangesValidationError) as err:
-            LocalPojectChanges(added=added, updated=updated)
+            LocalProjectChanges(added=added, updated=updated)
     assert len(err.value.invalid_changes) == 1
     assert "file2.gpkg" == err.value.invalid_changes[0].path
     assert err.value.invalid_changes[0].size == LARGE_FILE_SIZE
 
 
 def test_local_changes_post_init():
-    """Test the __post_init__ method of LocalChanges."""
+    """Test the __post_init__ method of LocalProjectChanges."""
     # Define constants
     ADDED_COUNT = 80
     UPDATED_COUNT = 21
@@ -204,7 +204,7 @@ def test_local_changes_post_init():
     ]
 
     # Initialize LocalProjectChanges
-    local_changes = LocalPojectChanges(added=added, updated=updated)
+    local_changes = LocalProjectChanges(added=added, updated=updated)
 
     # Assertions
     assert len(local_changes.added) == ADDED_COUNT  # All added changes are included