Merge remote-tracking branch 'origin/v8/develop' into publish_tests

Author: Bojan131

.github/workflows/checks.yml

@@ -0,0 +1,32 @@
+name: Python Tests
+
+on:
+  push:
+    branches: ["**"]
+  pull_request:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.11'
+
+      - name: Install Poetry
+        run: |
+          curl -sSL https://install.python-poetry.org | python3 -
+          echo "$HOME/.local/bin" >> $GITHUB_PATH
+
+      - name: Install dependencies
+        run: |
+          poetry install
+
+      - name: Run tests
+        run: |
+          poetry run make run-test

.gitignore

@@ -130,5 +130,4 @@ dmypy.json
 
 # Pyre type checker
 .pyre/
-.repor
 .report

Makefile

@@ -17,10 +17,14 @@ ruff:
 	ruff check --fix
 	ruff format
 
+run-test:
+	pytest
+
 help:
 	@echo "Available commands:"
 	@echo "  install   - Install dependencies and set up pre-commit hooks"
 	@echo "  ruff      - Format code and fix linting issues using ruff"
+	@echo "  run-test  - Run tests"
 	@echo "  demo      - Run /examples/demo.py file"
 	@echo "  async-demo - Run /examples/async_demo.py file"
 	@echo "  paranet-demo - Run /examples/paranets_demo.py file"
@@ -212,4 +216,4 @@ test-base-node29-mainnet:
 	NODE_TO_TEST="Node 29" PYTHONUNBUFFERED=1 PYTHONPATH=. poetry run python -u -m pytest -o log_cli=true -o log_cli_level=INFO -s --json-report --json-report-file=.report/mainnet_base.json --html=.report/mainnet_base.html --self-contained-html tests/mainnet/Base_Mainnet.py
 
 test-base-node30-mainnet:
-	NODE_TO_TEST="Node 30" PYTHONUNBUFFERED=1 PYTHONPATH=. poetry run python -u -m pytest -o log_cli=true -o log_cli_level=INFO -s --json-report --json-report-file=.report/mainnet_base.json --html=.report/mainnet_base.html --self-contained-html tests/mainnet/Base_Mainnet.py
+	NODE_TO_TEST="Node 30" PYTHONUNBUFFERED=1 PYTHONPATH=. poetry run python -u -m pytest -o log_cli=true -o log_cli_level=INFO -s --json-report --json-report-file=.report/mainnet_base.json --html=.report/mainnet_base.html --self-contained-html tests/mainnet/Base_Mainnet.py

dkg/utils/knowledge_collection_tools.py

@@ -5,7 +5,7 @@
 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 replace_blank_node(term):
 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)

poetry.lock

@@ -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,11 +24,28 @@ python-dotenv = "^1.0.1"
 [tool.poetry.group.dev.dependencies]
 ruff = "^0.8.4"
 pre-commit = "^4.0.1"
-pytest = "^7.4.0"
+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"
+]