Merge pull request #345 from terminusdb/triples

Restore triples functions

Author: Matthijs van Otterdijk

terminusdb_client/client/Client.py

@@ -788,10 +788,6 @@ def get_triples(self, graph_type: str) -> str:
         -------
         str
         """
-
-        ### TODO: make triples works again
-        raise InterfaceError("get_triples is temporary not avaliable in this version")
-
         self._check_connection()
         self._validate_graph_type(graph_type)
         result = requests.get(
@@ -801,15 +797,16 @@ def get_triples(self, graph_type: str) -> str:
         )
         return json.loads(_finish_response(result))
 
-    def update_triples(self, graph_type: str, turtle, commit_msg: str) -> None:
-        """Updates the contents of the specified graph with the triples encoded in turtle format Replaces the entire graph contents
+    def update_triples(self, graph_type: str, content: str, commit_msg: str) -> None:
+        """Updates the contents of the specified graph with the triples encoded in turtle format.
+           Replaces the entire graph contents
 
         Parameters
         ----------
         graph_type : str
             Graph type, either "instance" or "schema".
-        turtle
-            Valid set of triples in Turtle format.
+        content
+            Valid set of triples in Turtle or Trig format.
         commit_msg : str
             Commit message.
 
@@ -818,34 +815,30 @@ def update_triples(self, graph_type: str, turtle, commit_msg: str) -> None:
         InterfaceError
             if the client does not connect to a database
         """
-        ### TODO: make triples works again
-        raise InterfaceError(
-            "update_triples is temporary not avaliable in this version"
-        )
-
         self._check_connection()
         self._validate_graph_type(graph_type)
-        params = {"commit_info": self._generate_commit(commit_msg)}
-        params["turtle"] = turtle
+        params = {"commit_info": self._generate_commit(commit_msg),
+                  "turtle": content,
+                  }
         result = requests.post(
             self._triples_url(graph_type),
             headers=self._default_headers,
-            params=params,
+            json=params,
             auth=self._auth(),
         )
         return json.loads(_finish_response(result))
 
     def insert_triples(
-        self, graph_type: str, turtle, commit_msg: Optional[str] = None
+        self, graph_type: str, content: str, commit_msg: Optional[str] = None
     ) -> None:
         """Inserts into the specified graph with the triples encoded in turtle format.
 
         Parameters
         ----------
         graph_type : str
             Graph type, either "instance" or "schema".
-        turtle
-            Valid set of triples in Turtle format.
+        content
+            Valid set of triples in Turtle or Trig format.
         commit_msg : str
             Commit message.
 
@@ -854,19 +847,15 @@ def insert_triples(
         InterfaceError
             if the client does not connect to a database
         """
-        ### TODO: make triples works again
-        raise InterfaceError(
-            "insert_triples is temporary not avaliable in this version"
-        )
-
         self._check_connection()
         self._validate_graph_type(graph_type)
-        params = {"commit_info": self._generate_commit(commit_msg)}
-        params["turtle"] = turtle
+        params = {"commit_info": self._generate_commit(commit_msg),
+                  "turtle": content
+                  }
         result = requests.put(
             self._triples_url(graph_type),
             headers=self._default_headers,
-            params=params,
+            json=params,
             auth=self._auth(),
         )
         return json.loads(_finish_response(result))

terminusdb_client/tests/integration_tests/test_client.py

@@ -166,6 +166,91 @@ def test_log(docker_url):
     assert log[0]['@type'] == 'InitialCommit'
 
 
+def test_get_triples(docker_url):
+    client = Client(docker_url, user_agent=test_user_agent, team="admin")
+    client.connect()
+    db_name = "testDB" + str(random())
+    client.create_database(db_name, team="admin")
+    client.connect(db=db_name)
+    # Add a philosopher schema
+    schema = {"@type": "Class",
+              "@id": "Philosopher",
+              "name": "xsd:string"
+              }
+    # Add schema and Socrates
+    client.insert_document(schema, graph_type="schema")
+    schema_triples = client.get_triples(graph_type='schema')
+    assert "<schema#Philosopher>\n  a sys:Class ;\n  <schema#name> xsd:string ." in schema_triples
+
+
+def test_update_triples(docker_url):
+    ttl = """
+@base <terminusdb:///schema#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix woql: <http://terminusdb.com/schema/woql#> .
+@prefix json: <http://terminusdb.com/schema/json#> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix xdd: <http://terminusdb.com/schema/xdd#> .
+@prefix vio: <http://terminusdb.com/schema/vio#> .
+@prefix sys: <http://terminusdb.com/schema/sys#> .
+@prefix api: <http://terminusdb.com/schema/api#> .
+@prefix owl: <http://www.w3.org/2002/07/owl#> .
+@prefix doc: <data/> .
+
+<schema#Philosopher>
+  a sys:Class ;
+  <schema#name> xsd:string .
+
+<terminusdb://context>
+  a sys:Context ;
+  sys:base "terminusdb:///data/"^^xsd:string ;
+  sys:schema "terminusdb:///schema#"^^xsd:string .
+"""
+    client = Client(docker_url, user_agent=test_user_agent, team="admin")
+    client.connect()
+    db_name = "testDB" + str(random())
+    client.create_database(db_name, team="admin")
+    client.connect(db=db_name)
+    client.update_triples(graph_type='schema', content=ttl, commit_msg="Update triples")
+    client.insert_document({"name": "Socrates"})
+    assert len(list(client.get_all_documents())) == 1
+
+
+def test_insert_triples(docker_url):
+    ttl = """
+@base <terminusdb:///schema#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix woql: <http://terminusdb.com/schema/woql#> .
+@prefix json: <http://terminusdb.com/schema/json#> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix xdd: <http://terminusdb.com/schema/xdd#> .
+@prefix vio: <http://terminusdb.com/schema/vio#> .
+@prefix sys: <http://terminusdb.com/schema/sys#> .
+@prefix api: <http://terminusdb.com/schema/api#> .
+@prefix owl: <http://www.w3.org/2002/07/owl#> .
+@prefix doc: <data/> .
+
+<schema#Philosopher>
+  a sys:Class ;
+  <schema#name> xsd:string .
+
+<terminusdb://context>
+  a sys:Context ;
+  sys:base "terminusdb:///data/"^^xsd:string ;
+  sys:schema "terminusdb:///schema#"^^xsd:string .
+"""
+    client = Client(docker_url, user_agent=test_user_agent, team="admin")
+    client.connect()
+    db_name = "testDB" + str(random())
+    client.create_database(db_name, team="admin")
+    client.connect(db=db_name)
+    client.insert_triples(graph_type='schema', content=ttl, commit_msg="Insert triples")
+    client.insert_document({"name": "Socrates"})
+    assert len(list(client.get_all_documents())) == 1
+
+
 def test_get_database(docker_url):
     client = Client(docker_url, user_agent=test_user_agent, team="admin")
     client.connect()