dkg 8.0.13__tar.gz → 8.0.14__tar.gz

{dkg-8.0.13 → dkg-8.0.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: dkg
-Version: 8.0.13
+Version: 8.0.14
 Summary: Python library for interacting with the OriginTrail Decentralized Knowledge Graph
 License: Apache-2.0
 Author: Uladzislau Hubar

{dkg-8.0.13 → dkg-8.0.14}/dkg/utils/knowledge_collection_tools.py

@@ -5,7 +5,7 @@ from dkg.exceptions import DatasetInputFormatNotSupported, InvalidDataset
 from dkg.types import JSONLD, NQuads
 from pyld import jsonld
 from dkg.constants import DEFAULT_RDF_FORMAT, DEFAULT_CANON_ALGORITHM, ESCAPE_MAP
-from rdflib import Graph, BNode, URIRef, Literal as RDFLiteral
+from rdflib import Graph, BNode, URIRef, Dataset
 from rdflib.exceptions import ParserError as RDFParserError
 from uuid import uuid4
 from web3 import Web3
@@ -182,16 +182,13 @@ def generate_missing_ids_for_blank_nodes(nquads_list: list[str] | None) -> list[
 def group_nquads_by_subject(nquads_list: list[str], sort: bool = False):
     grouped = {}
 
-    # Process each quad in original order
-    for nquad in nquads_list:
-        if not nquad.strip():  # Skip empty lines
-            continue
+    all_nquads = "\n".join(nquad for nquad in nquads_list if nquad.strip())
 
-        # Parse single quad
-        g = Graph()
-        g.parse(data=nquad, format="nquads")
-        quad = next(iter(g))
-        subject, predicate, obj = quad
+    d = Dataset()
+    d.parse(data=all_nquads, format="nquads")
+
+    for quad in d:
+        subject, predicate, obj, graph = quad
 
         # Get subject key
         subject_key = (
@@ -204,11 +201,8 @@ def group_nquads_by_subject(nquads_list: list[str], sort: bool = False):
         if subject_key not in grouped:
             grouped[subject_key] = []
 
-        # Format object
-        object_value = f'"{obj}"' if isinstance(obj, RDFLiteral) else f"<{obj}>"
-
         # Add quad to group
-        quad_string = f"{subject_key} <{predicate}> {object_value} ."
+        quad_string = f"{subject.n3()} {predicate.n3()} {obj.n3()} ."
         grouped[subject_key].append(quad_string)
 
     # Return grouped quads (sorted if requested)

{dkg-8.0.13 → dkg-8.0.14}/pyproject.toml

@@ -1,11 +1,12 @@
 [tool.poetry]
 name = "dkg"
-version = "8.0.13"
+version = "8.0.14"
 description = "Python library for interacting with the OriginTrail Decentralized Knowledge Graph"
 authors = ["Uladzislau Hubar <hubar.uladzislau@gmail.com>, Zvonimir Sculac <zvonimir.sculac@origin-trail.com>"]
 license = "Apache-2.0"
 readme = "README.md"
 
+
 [tool.poetry.dependencies]
 python = "^3.10"
 pyyaml = "^6.0.2"
@@ -23,10 +24,28 @@ python-dotenv = "^1.0.1"
 [tool.poetry.group.dev.dependencies]
 ruff = "^0.8.4"
 pre-commit = "^4.0.1"
+pytest = "^8.0"
+pytest-cov = "^4.0"
+
 
 [tools.setuptools]
 packages = ["dkg"]
 
+
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
+
+
+[tool.pytest.ini_options]
+minversion = "8.0"
+addopts = "-ra"
+testpaths = [
+    "test"
+]
+
+
+python_files = [
+    "test_*.py",
+    "*_test.py"
+]