Merge pull request #285 from MerginMaps/integrate-py-client-v2-project-version

add support for v2 project response from project versions

Author: MarcelGeo

.gitignore

@@ -13,3 +13,4 @@ htmlcov
 deps
 venv
 .vscode/settings.json
+debug.py

mergin/merginproject.py

@@ -141,9 +141,11 @@ def project_full_name(self) -> str:
         """Returns fully qualified project name: <workspace>/<name>"""
         self._read_metadata()
         if self.is_old_metadata:
-            return self._metadata["name"]
-        else:
-            return f"{self._metadata['namespace']}/{self._metadata['name']}"
+            return self._metadata.get("name")
+        workspace = self._metadata.get("workspace", {})
+        if workspace:
+            return f"{workspace.get('name')}/{self._metadata['name']}"
+        return f"{self._metadata.get('namespace')}/{self._metadata['name']}"
 
     def project_name(self) -> str:
         """Returns only project name, without its workspace name"""
@@ -193,7 +195,11 @@ def workspace_id(self) -> int:
                 "The project directory has been created with an old version of the Mergin Maps client. "
                 "Please delete the project directory and re-download the project."
             )
-        return self._metadata["workspace_id"]
+
+        workspace = self._metadata.get("workspace", {})
+        if workspace:
+            return workspace.get("id")
+        return self._metadata.get("workspace_id")
 
     def version(self) -> str:
         """Returns project version (e.g. "v123")"""

mergin/test/test_data/v2_metadata.json

@@ -0,0 +1,34 @@
+{
+  "created_at": "2025-12-04T15:51:55Z",
+  "files": [
+    {
+      "checksum": "22afdbbf504087ea0ff7f1a2aeca2e265cc01bb5",
+      "mtime": "2025-12-04T15:52:09Z",
+      "path": "qgs_project.qgs",
+      "size": 72024
+    },
+    {
+      "checksum": "7f46f5d1a160a71aff5450f55853b0d552958f58",
+      "mtime": "2025-12-04T15:52:09Z",
+      "path": "photo.jpg",
+      "size": 5646973
+    },
+    {
+      "checksum": "3a8c54469e4fe498faffe66f4671fb9b0e6c0221",
+      "mtime": "2025-12-04T15:54:21Z",
+      "path": "data.gpkg",
+      "size": 126976
+    }
+  ],
+  "id": "e5cd45e5-8250-422a-ac16-e8c771689fd8",
+  "name": "diff_8dfb",
+  "public": false,
+  "role": "owner",
+  "size": 5845973,
+  "updated_at": "2025-12-04T15:54:21Z",
+  "version": "v101",
+  "workspace": {
+    "id": 1,
+    "name": "my-workspace"
+  }
+}

mergin/test/test_mergin_project.py

@@ -0,0 +1,73 @@
+import os
+import shutil
+import json
+import tempfile
+import pytest
+from mergin.merginproject import MerginProject
+
+TEST_DATA_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "test_data")
+
+
+def test_project_metadata():
+
+    with tempfile.TemporaryDirectory() as tmp_dir:
+        test_project = "test_project_metadata"
+        api_user = "test_user"
+        project_dir = os.path.join(tmp_dir, test_project)
+
+        # prepare local project
+        shutil.copytree(TEST_DATA_DIR, project_dir)
+        # copy metadata in old format
+        os.makedirs(os.path.join(project_dir, ".mergin"), exist_ok=True)
+        metadata_file = os.path.join(project_dir, "old_metadata.json")
+
+        # rewrite metadata namespace
+        with open(metadata_file, "r") as f:
+            metadata = json.load(f)
+
+        project_metadata_file = os.path.join(project_dir, ".mergin", "mergin.json")
+        with open(project_metadata_file, "w") as f:
+            json.dump(metadata, f, indent=2)
+
+        # verify we have correct metadata
+        mp = MerginProject(project_dir)
+        assert mp.project_full_name() == metadata.get("name")
+        project_name = metadata.get("name").split("/")[1]
+        workspace_name = metadata.get("name").split("/")[0]
+        assert mp.project_name() == project_name
+        assert mp.workspace_name() == workspace_name
+        assert mp.version() == metadata.get("version")
+
+        # copy metadata in new format
+        metadata_file = os.path.join(project_dir, "new_metadata.json")
+        with open(metadata_file, "r") as f:
+            metadata = json.load(f)
+        metadata["namespace"] = api_user
+        with open(project_metadata_file, "w") as f:
+            json.dump(metadata, f, indent=2)
+
+        # verify we have correct metadata
+        mp = MerginProject(project_dir)
+        project_name = metadata.get("name")
+        workspace_name = metadata.get("namespace")
+        assert mp.project_full_name() == f"{workspace_name}/{project_name}"
+        assert mp.project_name() == project_name
+        assert mp.workspace_name() == workspace_name
+        assert mp.version() == metadata.get("version")
+
+        # copy metadata in new format (v2)
+        metadata_file = os.path.join(project_dir, "v2_metadata.json")
+        with open(metadata_file, "r") as f:
+            metadata = json.load(f)
+        with open(project_metadata_file, "w") as f:
+            json.dump(metadata, f, indent=2)
+
+        # verify we have correct metadata
+        mp = MerginProject(project_dir)
+        project_name = metadata.get("name")
+        workspace_name = metadata.get("workspace").get("name")
+        assert mp.project_full_name() == f"{workspace_name}/{project_name}"
+        assert mp.project_name() == project_name
+        assert mp.workspace_name() == workspace_name
+        assert mp.version() == metadata.get("version")
+        assert mp.files() == metadata.get("files")