Drop versions and permissions check

Author: MarcelGeo

mergin/client.py

@@ -918,7 +918,7 @@ def push_project(self, directory):
         :param directory: Project's directory
         :type directory: String
         """
-        job = push_project_async(self, directory, check_version=True)
+        job = push_project_async(self, directory)
         if job is None:
             return  # there is nothing to push (or we only deleted some files)
         push_project_wait(job)

mergin/client_push.py

@@ -276,7 +276,7 @@ def create_upload_job(
     return job
 
 
-def push_project_async(mc, directory, check_version=False) -> Optional[UploadJob]:
+def push_project_async(mc, directory) -> Optional[UploadJob]:
     """Starts push of a project and returns pending upload job"""
 
     mp = MerginProject(directory)
@@ -289,34 +289,10 @@ def push_project_async(mc, directory, check_version=False) -> Optional[UploadJob
     mp.log.info("--- version: " + mc.user_agent_info())
     mp.log.info(f"--- start push {project_path}")
 
-    try:
-        project_info = mc.project_info(project_path)
-    except ClientError as err:
-        mp.log.error("Error getting project info: " + str(err))
-        mp.log.info("--- push aborted")
-        raise
-    server_version = project_info["version"] if project_info["version"] else "v0"
-
-    mp.log.info(f"got project info: local version {local_version} / server version {server_version}")
-
-    username = mc.username()
-    # permissions field contains information about update, delete and upload privileges of the user
-    # on a specific project. This is more accurate information then "writernames" field, as it takes
-    # into account namespace privileges. So we have to check only "permissions", namely "upload" one
-    if not mc.has_writing_permissions(project_path):
-        mp.log.error(f"--- push {project_path} - username {username} does not have write access")
-        raise ClientError(f"You do not seem to have write access to the project (username '{username}')")
-
-    # DISCUSSION: do we want to check if the project is up to date before pushing? For now, we removed this part
-    if check_version and local_version != server_version:
-        mp.log.error(f"--- push {project_path} - not up to date (local {local_version} vs server {server_version})")
-        raise ClientError(
-            "There is a new version of the project on the server. Please update your local copy."
-            + f"\n\nLocal version: {local_version}\nServer version: {server_version}"
-        )
+    mp.log.info(f"got project info: local version {local_version}")
 
     tmp_dir = tempfile.TemporaryDirectory(prefix="python-api-client-")
-    changes, changes_len = get_push_changes_batch(mc, mp, project_info)
+    changes, changes_len = get_push_changes_batch(mc, mp)
     if not changes_len:
         mp.log.info(f"--- push {project_path} - nothing to do")
         return
@@ -489,11 +465,12 @@ def remove_diff_files(job: UploadJob) -> None:
                 os.remove(diff_file)
 
 
-def get_push_changes_batch(mc, mp: MerginProject, project_info: dict) -> Tuple[dict, int]:
+def get_push_changes_batch(mc, mp: MerginProject) -> Tuple[dict, int]:
     """
     Get changes that need to be pushed to the server.
     """
     changes = mp.get_push_changes()
-    changes = filter_changes(mc, project_info, changes)
+    project_role = mp.project_role()
+    changes = filter_changes(mc, project_role, changes)
 
     return changes, sum(len(v) for v in changes.values())

mergin/editor.py

@@ -14,12 +14,11 @@
 _disallowed_changes: Callable[[dict], bool] = lambda change: is_qgis_file(change["path"])
 
 
-def is_editor_enabled(mc, project_info: dict) -> bool:
+def is_editor_enabled(mc, project_role: str) -> bool:
     """
     The function checks if the server supports editor access, and if the current user's project role matches the expected role name for editors.
     """
     server_support = mc.has_editor_support()
-    project_role = project_info.get("role")
 
     return server_support and project_role == EDITOR_ROLE_NAME
 
@@ -40,7 +39,7 @@ def _apply_editor_filters(changes: Dict[str, List[dict]]) -> Dict[str, List[dict
     return changes
 
 
-def filter_changes(mc, project_info: dict, changes: Dict[str, List[dict]]) -> Dict[str, List[dict]]:
+def filter_changes(mc, project_role: str, changes: Dict[str, List[dict]]) -> Dict[str, List[dict]]:
     """
     Filters the given changes dictionary based on the editor's enabled state.
 
@@ -52,7 +51,7 @@ def filter_changes(mc, project_info: dict, changes: Dict[str, List[dict]]) -> Di
     Returns:
         dict[str, list[dict]]: The filtered changes dictionary.
     """
-    if not is_editor_enabled(mc, project_info):
+    if not is_editor_enabled(mc, project_role):
         return changes
     return _apply_editor_filters(changes)
 

mergin/merginproject.py

@@ -155,6 +155,10 @@ def workspace_name(self) -> str:
         full_name = self.project_full_name()
         slash_index = full_name.index("/")
         return full_name[:slash_index]
+    
+    def project_role(self) -> str:
+        self._read_metadata()
+        return self._metadata.get("role")
 
     def project_id(self) -> str:
         """Returns ID of the project (UUID using 8-4-4-4-12 formatting without braces)

mergin/test/test_client.py

@@ -2639,22 +2639,20 @@ def test_download_failure(mc):
 def test_editor(mc: MerginClient):
     """Test editor handler class and push with editor"""
 
-    project_info = {"role": "editor"}
     if not mc.has_editor_support():
-        assert is_editor_enabled(mc, project_info) is False
+        assert is_editor_enabled(mc, EDITOR_ROLE_NAME) is False
         return
 
     # mock that user is editor
-    project_info["role"] = EDITOR_ROLE_NAME
-    assert is_editor_enabled(mc, project_info) is True
+    assert is_editor_enabled(mc, EDITOR_ROLE_NAME) is True
 
     # unit test for editor methods
     qgs_changeset = {
         "added": [{"path": "/folder/project.new.Qgz"}],
         "updated": [{"path": "/folder/project.updated.Qgs"}],
         "removed": [{"path": "/folder/project.removed.qgs"}],
     }
-    qgs_changeset = filter_changes(mc, project_info, qgs_changeset)
+    qgs_changeset = filter_changes(mc, EDITOR_ROLE_NAME, qgs_changeset)
     assert sum(len(v) for v in qgs_changeset.values()) == 2