wip

Author: aucampia

pyproject.toml

@@ -78,5 +78,7 @@ filterwarnings = [
 ]
 # log_cli = true
 # log_cli_level = "DEBUG"
+log_format = "%(asctime)s %(levelname)-8s %(name)-12s %(filename)s:%(lineno)s:%(funcName)s %(message)s"
+log_date_format = "%Y-%m-%dT%H:%M:%S"
 log_cli_format = "%(asctime)s %(levelname)-8s %(name)-12s %(filename)s:%(lineno)s:%(funcName)s %(message)s"
 log_cli_date_format = "%Y-%m-%dT%H:%M:%S"

rdflib/plugins/sparql/results/csvresults.py

@@ -83,5 +83,7 @@ def serialize(self, stream: IO, encoding: str = "utf-8", **kwargs):
     def serializeTerm(self, term, encoding):
         if term is None:
             return ""
+        elif isinstance(term, BNode):
+            return f"_:{term}"
         else:
             return term

rdflib/term.py

@@ -597,6 +597,12 @@ def __new__(
         datatype: Optional[str] = None,
         normalize: Optional[bool] = None,
     ) -> "Literal":
+        # logging.debug(
+        #     "lexical_or_value = %r, datatype = %s, lang = %s",
+        #     lexical_or_value,
+        #     datatype,
+        #     lang,
+        # )
 
         if lang == "":
             lang = None  # no empty lang-tags in RDF
@@ -674,6 +680,13 @@ def __new__(
         inst._value = value
         inst._ill_formed = ill_formed
 
+        # logging.debug(
+        #     "inst = %s, value = %s, ill_formed = %s",
+        #     inst,
+        #     value,
+        #     ill_formed,
+        # )
+
         return inst
 
     def normalize(self) -> "Literal":

test/data/suites/w3c/sparql11/construct/constructwhere04.rq

@@ -2,4 +2,4 @@ PREFIX : <http://example.org/>
 
 CONSTRUCT 
 FROM <data.ttl>
-WHERE { ?s ?p ?o }
+WHERE { ?s ?p ?o }

test/test_sparql/test_result.py

@@ -16,6 +16,7 @@
     Iterator,
     Mapping,
     Optional,
+    Pattern,
     Sequence,
     Set,
     TextIO,
@@ -29,8 +30,9 @@
 from pyparsing import ParseException
 
 from rdflib.graph import Graph
+from rdflib.namespace import Namespace
 from rdflib.query import Result, ResultRow
-from rdflib.term import Identifier, Literal, Node, Variable
+from rdflib.term import BNode, Identifier, Literal, Node, Variable
 
 BindingsType = Sequence[Mapping[Variable, Identifier]]
 ParseOutcomeType = Union[BindingsType, Type[Exception]]
@@ -75,6 +77,43 @@ def test_select_result_parse(
         assert parse_outcome == parsed_result.bindings
 
 
+EGSCHEME = Namespace("example:")
+
+
+@pytest.mark.parametrize(
+    ("node", "format", "expected_result"),
+    [
+        (BNode(), "csv", re.compile(r"^_:.*$")),
+        (BNode("a"), "csv", "_:a"),
+        (Literal("x11"), "csv", "x11"),
+    ],
+)
+def test_xsv_serialize(
+    node: Identifier, format: str, expected_result: Union[Pattern[str], str]
+) -> None:
+    graph = Graph()
+    graph.add((EGSCHEME.checkSubject, EGSCHEME.checkPredicate, node))
+    result = graph.query(
+        f"""
+    PREFIX egscheme: <{EGSCHEME}>
+    SELECT ?o {{
+        egscheme:checkSubject egscheme:checkPredicate ?o
+    }}
+    """
+    )
+    assert len(result.bindings) == 1
+    with BytesIO() as bio:
+        result.serialize(bio, format=format)
+        result_text = bio.getvalue().decode("utf-8")
+    result_lines = result_text.splitlines()
+    assert len(result_lines) == 2
+    logging.debug("result_lines[1] = %r", result_lines[1])
+    if isinstance(expected_result, str):
+        assert expected_result == result_lines[1]
+    else:
+        assert expected_result.match(result_lines[1])
+
+
 @pytest.fixture(scope="module")
 def select_result(rdfs_graph: Graph) -> Result:
     query = """

test/test_w3c_spec/test_sparql_w3c.py

@@ -1,5 +1,7 @@
 from __future__ import print_function
 
+import logging
+import os
 import sys
 from io import TextIOWrapper
 from pathlib import PurePath
@@ -379,7 +381,10 @@ def skip(reason="(none)"):
             return
 
         # eval test - carry out query
+        logging.debug("cwd = %s, base = %s", os.getcwd(), urljoin(query, "."))
+        logging.debug("g = %s", g.serialize(format="turtle"))
         res2 = g.query(bopen_read_close(query_path), base=urljoin(query, "."))
+        logging.debug("g = %s", g.serialize(format="turtle"))
 
         if resfile.endswith("ttl"):
             resg = Graph()
@@ -411,7 +416,7 @@ def skip(reason="(none)"):
 
                 else:
                     res = Result.parse(f, format="xml")
-
+        logging.debug("here ...")
         if not DETAILEDASSERT:
             eq(res.type, res2.type, "Types do not match")
             if res.type == "SELECT":
@@ -422,6 +427,7 @@ def skip(reason="(none)"):
             elif res.type == "ASK":
                 eq(res.askAnswer, res2.askAnswer, "Ask answer does not match")
             elif res.type in ("DESCRIBE", "CONSTRUCT"):
+                logging.debug("res2.graph = %s", res2.graph.serialize(format="turtle"))
                 assert isomorphic(res.graph, res2.graph), "graphs are not isomorphic!"
             else:
                 raise Exception("Unknown result type: %s" % res.type)
@@ -452,6 +458,8 @@ def skip(reason="(none)"):
                     % (res.askAnswer, res2.askAnswer),
                 )
             elif res.type in ("DESCRIBE", "CONSTRUCT"):
+                logging.debug("res.graph = %s", res2.graph.serialize(format="turtle"))
+                logging.debug("res2.graph = %s", res2.graph.serialize(format="turtle"))
                 assert isomorphic(res.graph, res2.graph), "graphs are not isomorphic!"
             else:
                 raise Exception("Unknown result type: %s" % res.type)