Add apply

Author: rrooij

terminusdb_client/client/Client.py

@@ -2012,6 +2012,40 @@ def _convert_diff_document(self, document):
             new_doc = self._conv_to_dict(document)
         return new_doc
 
+    def apply(self,
+              before_version,
+              after_version,
+              branch=None,
+              message=None,
+              author=None):
+        """Diff two different commits and apply changes on branch
+
+        Parameters
+        ----------
+        before_version : string
+            Before branch/commit to compare
+        after_object : string
+            After branch/commit to compare
+        branch : string
+            Branch to apply to. Optional.
+        """
+        self._check_connection()
+        branch = branch if branch else self.branch
+        return json.loads(
+            _finish_response(
+                requests.post(
+                    self._apply_url(branch=branch),
+                    headers=self._default_headers,
+                    json={
+                        "commit_info": self._generate_commit(message, author),
+                        "before_commit": before_version,
+                        "after_commit": after_version,
+                    },
+                    auth=self._auth(),
+                )
+            )
+        )
+
     def diff_object(self, before_object, after_object):
         """Diff two different objects.
 
@@ -2836,14 +2870,16 @@ def _branch_url(self, branch_id: str):
     def _repo_base(self, action: str):
         return self._db_base(action) + f"/{self._repo}"
 
-    def _branch_base(self, action: str):
+    def _branch_base(self, action: str, branch: Optional[str] = None):
         base = self._repo_base(action)
         if self._repo == "_meta":
             return base
         if self._branch == "_commits":
             return base + f"/{self._branch}"
         elif self.ref:
             return base + f"/commit/{self._ref}"
+        elif branch:
+            return base + f"/branch/{branch}"
         else:
             return base + f"/branch/{self._branch}"
         return base
@@ -2916,6 +2952,9 @@ def _squash_url(self):
     def _diff_url(self):
         return self._branch_base("diff")
 
+    def _apply_url(self, branch: Optional[str] = None):
+        return self._branch_base("apply", branch)
+
     def _patch_url(self):
         return self._branch_base("patch")
 

terminusdb_client/tests/integration_tests/test_client.py

@@ -119,7 +119,7 @@ def test_diff_object(docker_url):
     assert diff == {'test': {'@before': 'wew', '@after': 'wow', '@op': 'SwapValue'}}
 
 
-def test_diff_version(docker_url):
+def test_diff_apply_version(docker_url):
     client = Client(docker_url, user_agent=test_user_agent)
     client.connect()
     db_name = "philosophers" + str(random())
@@ -147,6 +147,13 @@ def test_diff_version(docker_url):
     assert diff[0]['@insert']['name'] == 'Plato'
     assert diff[1]['@insert']['name'] == 'Aristotle'
 
+    # Apply the differences to main with apply
+    client.apply("main", "changes", branch='main')
+
+    # Diff again
+    diff_again = client.diff_version("main", "changes")
+    assert len(diff_again) == 0
+
 
 def test_log(docker_url):
     # create client