dkg 8.0.11__py3-none-any.whl → 8.0.13__py3-none-any.whl

dkg/constants.py

@@ -75,19 +75,9 @@ class OutputTypes(Enum):
     JSONLD: str = "JSON-LD"
 
 
-class Environments(Enum):
-    DEVELOPMENT: str = "development"
-    DEVNET: str = "devnet"
-    TESTNET: str = "testnet"
-    MAINNET: str = "mainnet"
-
-
 class BlockchainIds(Enum):
     HARDHAT_1: str = "hardhat1:31337"
     HARDHAT_2: str = "hardhat2:31337"
-    BASE_DEVNET: str = "base:84532"
-    GNOSIS_DEVNET: str = "gnosis:10200"
-    NEUROWEB_DEVNET: str = "otp:2160"
     BASE_TESTNET: str = "base:84532"
     GNOSIS_TESTNET: str = "gnosis:10200"
     NEUROWEB_TESTNET: str = "otp:20430"
@@ -114,12 +104,6 @@ BLOCKCHAINS = {
             "rpc": "http://localhost:9545",
         },
     },
-    "devnet": {
-        "base:84532": {
-            "hub": "0xE043daF4cC8ae2c720ef95fc82574a37a429c40A",
-            "rpc": "https://sepolia.base.org",
-        }
-    },
     "testnet": {
         "base:84532": {
             "hub": "0xf21CE8f8b01548D97DCFb36869f1ccB0814a4e05",
@@ -152,11 +136,6 @@ BLOCKCHAINS = {
 
 DEFAULT_PROXIMITY_SCORE_FUNCTIONS_PAIR_IDS = {
     "development": {"hardhat1:31337": 2, "hardhat2:31337": 2, "otp:2043": 2},
-    "devnet": {
-        "otp:2160": 2,
-        "gnosis:10200": 2,
-        "base:84532": 2,
-    },
     "testnet": {
         "otp:20430": 2,
         "gnosis:10200": 2,

dkg/providers/blockchain/async_blockchain.py

@@ -27,7 +27,7 @@ from dkg.exceptions import (
     AccountMissing,
     NetworkNotSupported,
 )
-from dkg.types import URI, Address, Environment, Wei
+from dkg.types import URI, Address, Wei
 from web3.contract import Contract
 from web3.contract.contract import ContractFunction
 from web3.types import TxReceipt
@@ -39,13 +39,12 @@ from dkg.providers.blockchain.base_blockchain import BaseBlockchainProvider
 class AsyncBlockchainProvider(BaseBlockchainProvider):
     def __init__(
         self,
-        environment: Environment,
         blockchain_id: str,
         rpc_uri: URI | None = None,
         gas_price: Wei | None = None,
         verify: bool = True,
     ):
-        super().__init__(environment, blockchain_id, rpc_uri, gas_price)
+        super().__init__(blockchain_id, rpc_uri, gas_price)
 
         ssl_context = None if verify else False
         self.w3 = AsyncWeb3(

dkg/providers/blockchain/base_blockchain.py

@@ -8,7 +8,7 @@ from dkg.exceptions import (
     EnvironmentNotSupported,
     RPCURINotDefined,
 )
-from dkg.types import URI, DataHexStr, Environment, Wei
+from dkg.types import URI, DataHexStr, Wei
 from eth_account.signers.local import LocalAccount
 from eth_typing import ABI, ABIFunction
 from web3.logs import DISCARD
@@ -21,27 +21,26 @@ class BaseBlockchainProvider:
 
     def __init__(
         self,
-        environment: Environment,
         blockchain_id: str,
         rpc_uri: URI | None = None,
         gas_price: Wei | None = None,
     ):
-        if environment not in BLOCKCHAINS.keys():
-            raise EnvironmentNotSupported(f"Environment {environment} isn't supported!")
-
-        self.environment = environment
-        self.rpc_uri = rpc_uri
-        self.blockchain_id = (
-            blockchain_id
-            if blockchain_id in BLOCKCHAINS[self.environment].keys()
-            else None
-        )
+        self.environment = None
+        for env_name, chains_in_env in BLOCKCHAINS.items():
+            if blockchain_id in chains_in_env:
+                self.environment = env_name
+                break
+
+        if self.environment is None:
+            raise EnvironmentNotSupported(
+                f"Could not derive environment for blockchain_id: {blockchain_id}. "
+                "Ensure it's defined in BLOCKCHAINS constant."
+            )
 
-        if self.rpc_uri is None and self.blockchain_id is not None:
-            self.blockchain_id = blockchain_id
-            self.rpc_uri = self.rpc_uri or BLOCKCHAINS[self.environment][
-                self.blockchain_id
-            ].get("rpc", None)
+        self.blockchain_id = blockchain_id
+        self.rpc_uri = rpc_uri or BLOCKCHAINS[self.environment][self.blockchain_id].get(
+            "rpc", None
+        )
 
         if self.rpc_uri is None:
             raise RPCURINotDefined(

dkg/providers/blockchain/blockchain.py

@@ -26,7 +26,7 @@ from dkg.exceptions import (
     AccountMissing,
     NetworkNotSupported,
 )
-from dkg.types import URI, Address, Environment, Wei
+from dkg.types import URI, Address, Wei
 from web3 import Web3
 from web3.contract import Contract
 from web3.contract.contract import ContractFunction
@@ -37,13 +37,12 @@ from dkg.providers.blockchain.base_blockchain import BaseBlockchainProvider
 class BlockchainProvider(BaseBlockchainProvider):
     def __init__(
         self,
-        environment: Environment,
         blockchain_id: str,
         rpc_uri: URI | None = None,
         gas_price: Wei | None = None,
         verify: bool = True,
     ):
-        super().__init__(environment, blockchain_id, rpc_uri, gas_price)
+        super().__init__(blockchain_id, rpc_uri, gas_price)
 
         self.w3 = Web3(
             Web3.HTTPProvider(self.rpc_uri, request_kwargs={"verify": verify})

dkg/types/blockchain.py

@@ -50,7 +50,7 @@ ABIElement = ABIFunction | ABIEvent | ABIError
 ABI = list[ABIElement]
 
 
-Environment = Literal["development", "devnet", "testnet", "mainnet"]
+Environment = Literal["development", "testnet", "mainnet"]
 
 
 class AgreementData(NamedTuple):

dkg/utils/knowledge_collection_tools.py

@@ -6,6 +6,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.exceptions import ParserError as RDFParserError
 from uuid import uuid4
 from web3 import Web3
 import math
@@ -154,29 +155,26 @@ def generate_missing_ids_for_blank_nodes(nquads_list: list[str] | None) -> list[
 
         return term  # Return IRIs or Literals unchanged
 
-    # Create a temporary graph for parsing individual quads
-    result = []
-
-    # Process each N-Quad string individually to maintain order
-    for nquad in nquads_list:
-        if not nquad.strip():
-            continue
+    all_nquads = "\n".join(nquad for nquad in nquads_list if nquad.strip())
 
-        # Parse single N-Quad
-        g = Graph()
-        g.parse(data=nquad, format="nquads")
+    # Create a single Dataset
+    g = Graph()
+    try:
+        g.parse(data=all_nquads, format="nt")
+    except RDFParserError:
+        raise UnsupportedJSONLD(nquads_list)
 
-        # Get the triple and replace blank nodes
-        for s, p, o in g:
-            updated_quad = (
-                replace_blank_node(s),
-                replace_blank_node(p),
-                replace_blank_node(o),
-            )
-            # Format as N-Quad string
-            result.append(
-                f"{updated_quad[0].n3()} {updated_quad[1].n3()} {updated_quad[2].n3()} ."
-            )
+    # Process all quads
+    result = []
+    for s, p, o in g:
+        updated_quad = (
+            replace_blank_node(s),
+            replace_blank_node(p),
+            replace_blank_node(o),
+        )
+        result.append(
+            f"{updated_quad[0].n3()} {updated_quad[1].n3()} {updated_quad[2].n3()} ."
+        )
 
     return result
 
@@ -266,3 +264,44 @@ def escape_literal_dict(obj):
         return escape_literal_string(s=obj)
     else:
         return obj
+
+
+# Used when JSON-LD parsing fails due to quads being passed instead of triples
+class UnsupportedJSONLD(Exception):
+    def __init__(self, nquads_list):
+        self.nquads_list = nquads_list
+        self.message = f"""
+Unsupported JSON-LD input detected
+
+After parsing the JSON-LD input, the parser detected creation of new named graphs.
+The DKG does not support custom named graphs.
+
+Problematic Quads:
+
+{self.find_problematic_quads()}
+
+Full Parsed N-Quads Array:
+
+{self.format_nquads_list()}
+
+"""
+        super().__init__(self.message)
+
+    def __str__(self):
+        return f"{self.__class__.__name__}: {self.message}"
+
+    def format_nquads_list(self):
+        return "\n".join(nquad.strip() for nquad in self.nquads_list)
+
+    def find_problematic_quads(self):
+        problematic = []
+        g = Graph()
+        for quad in self.nquads_list:
+            if not quad.strip():
+                continue
+            try:
+                g.parse(data=quad, format="nt")
+            except RDFParserError:
+                problematic.append(quad)
+
+        return "\n".join(f"{i + 1}. {quad}" for i, quad in enumerate(problematic))

{dkg-8.0.11.dist-info → dkg-8.0.13.dist-info}/METADATA

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

{dkg-8.0.11.dist-info → dkg-8.0.13.dist-info}/RECORD

@@ -3,7 +3,7 @@ dkg/assertion.py,sha256=-KIVT3LHlOHegGg68_KceC5O2r8B_povbofRjmLguVQ,2507
 dkg/clients/__init__.py,sha256=qKQ8TIbst7UZpJEpEJOZslgEX5EB0PU_H7cwk5-UDso,84
 dkg/clients/async_dkg.py,sha256=PM0suu8BFUhhS8_K_zoPTxKEXn5J1AFCwyB-JP-hLmc,4013
 dkg/clients/dkg.py,sha256=QTLm5nfeW0gx_t2e8JMO5gcIJaPvmy1L7ZOy7dSfhkc,3786
-dkg/constants.py,sha256=Zjr7N4cQr-9Kcut3KyYWiITXgsYyAM13TvKdDNbu4lY,5307
+dkg/constants.py,sha256=PBX3AEK0bBeiG7sHBY65cZllo74q-H8hclqNbl4fj90,4776
 dkg/data/interfaces/AskStorage.json,sha256=hHWq3e0Kx8Cs3PKD4HL2xYRQ8DXRTxTL06QXqFyqlns,6773
 dkg/data/interfaces/Chronos.json,sha256=aIpCUgJ8omHidyt0GPkj02COT1LW8Tu66qDm7iquQJk,3595
 dkg/data/interfaces/Hub.json,sha256=ZcaePz10ff2Vm7VP-vWP63xLOuE0EE8jNruWvWmMjLw,12611
@@ -40,9 +40,9 @@ dkg/modules/paranet/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 dkg/modules/paranet/paranet.py,sha256=YulI-sP65sOlBYyUVbA008JByvy-bqnOnWt7vXsf5Kk,26959
 dkg/providers/__init__.py,sha256=mOHuyl44mpuLnXv920CJ1lsbSTlxNLCwK4xXeQsfv3s,251
 dkg/providers/blockchain/__init__.py,sha256=Vg5XQ9Fw5m0CQvpMTH5atgPIKKcnknX9peShsmOOtGg,158
-dkg/providers/blockchain/async_blockchain.py,sha256=c32RaNP7Qpo7aqP7ZVigkRiKKhb1B57Y4pwItzs9Md0,8766
-dkg/providers/blockchain/base_blockchain.py,sha256=VOF3qfwsfJJ3ykBEXDF6yOkKqWG0m-cLFsNC3K3pdPI,3647
-dkg/providers/blockchain/blockchain.py,sha256=HxLXkkK1vT_EsMfeIUZUubz6oktMECN19FUdsOAyArk,7906
+dkg/providers/blockchain/async_blockchain.py,sha256=GpMTGKhsqB_m2f6InUAwiRJNisKQErgVSot869TnTV0,8706
+dkg/providers/blockchain/base_blockchain.py,sha256=AW3PlcgfEthvHxxCcv0USXtnOmIixnjK9rg-HpfHuxA,3591
+dkg/providers/blockchain/blockchain.py,sha256=-CoUpc1lRLiVpCWmYVI7dUOn_goreSqSkz0DZq66GAI,7846
 dkg/providers/node/__init__.py,sha256=Nx2m3bbwDa4y0gAR1WUKhxmw36F-TscKaZj1CKqlEF4,148
 dkg/providers/node/async_node_http.py,sha256=dBge8pS9Pnk8N4TTgKeewmWWJnSOgU48rQVbm5ZKKsc,2804
 dkg/providers/node/base_node_http.py,sha256=CCkVwyr_iQKCbknVmEpUDXZlQb8C-Z5ndqQdW-fQR0E,763
@@ -56,7 +56,7 @@ dkg/services/node_services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 dkg/services/node_services/async_node_service.py,sha256=AGwpEIbL6HbqcL1Y8FjIwNynQyvvhQaBZdwZtu9X-BQ,5478
 dkg/services/node_services/node_service.py,sha256=gqCm-PXB0dWwqWw6OxD3AZ3oiS-z6dhxG_l4LDXv3OA,4811
 dkg/types/__init__.py,sha256=YewW48fOBq-FtecY12Tlr_0vGDuNc2uzpIiM-WERzBU,704
-dkg/types/blockchain.py,sha256=hsBpFLgpcEmgODLK0g_cUW1AB69ZZYeX4AcW6wpAMtA,1682
+dkg/types/blockchain.py,sha256=T-A7PEa7v99RuCcmwzkOubQPJG4TXZHHjCgYr09lM7U,1672
 dkg/types/dkg_node.py,sha256=uGjaYUO4D55sHJrL_3aOL3Nul3RlAo_aL4HLoSrQxr0,838
 dkg/types/encoding.py,sha256=gOtt9XLoxs6TE7rOCrAx-aCOdsDdaTVn3bxu9HPavxc,915
 dkg/types/evm.py,sha256=gN2hSq4MQzobWE3YAiTZPcv5b65AVyUEQut8hWPnx68,971
@@ -68,15 +68,15 @@ dkg/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dkg/utils/blockchain_request.py,sha256=CMz3sNRhfmYirm0-VUK2HTpbRfgc1gtG2SoPIuRYKb0,12446
 dkg/utils/decorators.py,sha256=uUh0xI9wv1gE6JF44eYEfUPGSFEBLR6Ua5D9Dhc3s10,1566
 dkg/utils/knowledge_asset_tools.py,sha256=uehOshzaYg03hDU8RSIV_k2mNaASVgqyyErzj6GwBxw,81
-dkg/utils/knowledge_collection_tools.py,sha256=hPCFcIdyWDCgfbo5uPQizvfin0hHvEElAYpvKYVDIBs,7951
+dkg/utils/knowledge_collection_tools.py,sha256=6U9lLjoXfsayH_AmicNWtmsQ5xdllhTs-L9DsbPYvlU,8994
 dkg/utils/merkle.py,sha256=924kloBAnCXydteVtWMj_QLP5CRJf2GbHMZ-lbIK0KE,5141
 dkg/utils/metadata.py,sha256=483OroYwGNfZ_cCXfH3-xUrZgiR4mjjo9iU_Ie5RYRs,1658
 dkg/utils/node_request.py,sha256=wppF8Xf0RkuAAcURcYgyjGAdMsXm0L5YEem8wFGE2g8,6517
 dkg/utils/rdf.py,sha256=AvlcxZEeP58UbaGGvPX_ss69O-tgTXOJ9y9COZqVgkw,2973
 dkg/utils/string_transformations.py,sha256=eR51fVwTF9QKxEqXo9_1Bfw_k8iQajdXD6rKuTvhs70,972
 dkg/utils/ual.py,sha256=g7PFyS4Sbwjmwkq-eB20uRULEC2wlPGZr31BVQjs5OQ,1569
-dkg-8.0.11.dist-info/LICENSE,sha256=Dr70w2zcW8-jrPGlpTTTlJPL8lR4j2zpDD32tdEFgjY,11375
-dkg-8.0.11.dist-info/METADATA,sha256=gIDVZmuZ6j9G-UKdH1IUcsT4tGDDhmSPEIAwRUV-d6U,10821
-dkg-8.0.11.dist-info/NOTICE,sha256=Rk5toFR2ZqPwVZ3P_P4wE6U1xCnWR9KD3rNBqfPY7h8,368
-dkg-8.0.11.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-dkg-8.0.11.dist-info/RECORD,,
+dkg-8.0.13.dist-info/LICENSE,sha256=Dr70w2zcW8-jrPGlpTTTlJPL8lR4j2zpDD32tdEFgjY,11375
+dkg-8.0.13.dist-info/METADATA,sha256=p4WHsfUDVtn17p--zUboDCgjn2iuEoOPwRfSUc-9xEg,10821
+dkg-8.0.13.dist-info/NOTICE,sha256=Rk5toFR2ZqPwVZ3P_P4wE6U1xCnWR9KD3rNBqfPY7h8,368
+dkg-8.0.13.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+dkg-8.0.13.dist-info/RECORD,,