Corrected literals in SELECT and CONSTRUCT queries in the sparqlwrapper backend

tests/backends/test_sparqlwrapper_graphdb.py

@@ -75,18 +75,16 @@ def test_graphdb():
 
     # Test SELECT query
     query_object = (
-        "SELECT ?s ?p ?o WHERE { <http://www.example.org/subject> ?p ?o }"
+        "SELECT ?p ?o WHERE { <http://www.example.org/subject> ?p ?o }"
     )
 
     # Run the query using your triplestore instance.
     result = ts.query(query_object)
 
-    assert set(
-        [
-            ("http://www.example.org/predicate", "a"),
-            ("http://www.example.org/predicate", "1.0"),
-        ]
-    ) == set(result)
+    assert set(result) == {
+        ("http://www.example.org/predicate", Literal("a")),
+        ("http://www.example.org/predicate", Literal(1.0)),
+    }
 
     # Test CONSTRUCT query
     # NB adding the PREFIX just to show that it works.
@@ -100,12 +98,17 @@ def test_graphdb():
 """
 
     # Run the query.
-    result_generator = ts.query(query)
+    results = set(ts.query(query))
+    assert (
+        "http://www.example.org/subject",
+        "http://www.example.org/predicate",
+        Literal("a"),
+    ) in results
     assert (
         "http://www.example.org/subject",
         "http://www.example.org/predicate",
-        "a",
-    ) in result_generator
+        Literal(1.0),
+    ) in results
 
     # Test ASK query
     query = """

tripper/backends/sparqlwrapper.py

@@ -4,6 +4,7 @@
 from typing import TYPE_CHECKING
 
 from tripper import Literal
+from tripper.backends.rdflib import _convert_triples_to_tripper
 from tripper.utils import TripperException
 
 try:
@@ -93,15 +94,15 @@
             ret = self.sparql.queryAndConvert()
             bindings = ret["results"]["bindings"]
             return [
-                tuple(str(convert_json_entrydict(v)) for v in row.values())
+                tuple(convert_json_entrydict(v) for v in row.values())
                 for row in bindings
             ]
         if query_type == "CONSTRUCT":
             self.sparql.setReturnFormat(RDFXML)
             self.sparql.setMethod(POST)
             self.sparql.setQuery(query_object)
             graph = self.sparql.queryAndConvert()
-            return ((str(s), str(p), str(o)) for s, p, o in graph)
+            return _convert_triples_to_tripper(graph)
 
         raise NotImplementedError(
             f"Query type '{query_type}' not implemented."
@@ -224,19 +225,17 @@
             )
 
 
-def convert_json_entrydict(entrydict: "Dict[str, str]") -> str:
+def convert_json_entrydict(entrydict: dict) -> str:
     """Convert SPARQLWrapper json entry dict (representing a single IRI or
     literal) to a tripper type."""
     if entrydict["type"] == "uri":
         return entrydict["value"]
-
     if entrydict["type"] == "literal":
         return Literal(
             entrydict["value"],
             lang=entrydict.get("xml:lang"),
             datatype=entrydict.get("datatype"),
         )
-
     if entrydict["type"] == "bnode":
         return (
             entrydict["value"]