dkg 8.0.3__tar.gz → 8.0.12__tar.gz

{dkg-8.0.3 → dkg-8.0.12}/PKG-INFO

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

{dkg-8.0.3 → dkg-8.0.12}/dkg/constants.py

@@ -35,6 +35,18 @@ CHUNK_BYTE_SIZE = 32
 
 MAX_FILE_SIZE = 10000000
 
+ESCAPE_MAP = {
+    "\a": r"\a",
+    "\b": r"\b",
+    "\f": r"\f",
+    "\n": r"\n",
+    "\r": r"\r",
+    "\t": r"\t",
+    "\v": r"\v",
+    '"': r"\"",
+    "'": r"'",
+}
+
 
 class DefaultParameters(Enum):
     ENVIRONMENT: str = "mainnet"
@@ -63,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"
@@ -102,12 +104,6 @@ BLOCKCHAINS = {
             "rpc": "http://localhost:9545",
         },
     },
-    "devnet": {
-        "base:84532": {
-            "hub": "0xE043daF4cC8ae2c720ef95fc82574a37a429c40A",
-            "rpc": "https://sepolia.base.org",
-        }
-    },
     "testnet": {
         "base:84532": {
             "hub": "0xf21CE8f8b01548D97DCFb36869f1ccB0814a4e05",
@@ -140,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-8.0.3 → dkg-8.0.12}/dkg/modules/asset/asset.py

@@ -209,6 +209,7 @@ class KnowledgeAsset(Module):
         blockchain_id = self.manager.blockchain_provider.blockchain_id
 
         dataset = {}
+        content = kc_tools.escape_literal_dict(content)
         public_content = dataset.get("public")
         private_content = dataset.get("private")
         if isinstance(content, str):

{dkg-8.0.3 → dkg-8.0.12}/dkg/modules/asset/async_asset.py

@@ -240,6 +240,7 @@ class AsyncKnowledgeAsset(AsyncModule):
         blockchain_id = self.manager.blockchain_provider.blockchain_id
 
         dataset = {}
+        content = kc_tools.escape_literal_dict(content)
         public_content = dataset.get("public")
         private_content = dataset.get("private")
         if isinstance(content, str):

{dkg-8.0.3 → dkg-8.0.12}/dkg/modules/graph/async_graph.py

@@ -57,6 +57,7 @@ class AsyncGraph(AsyncModule):
         result = await self.node_service.query(
             query, query_type, repository, paranet_ual
         )
+        result.encoding = "utf-8"
 
         return result.get("data")
 

{dkg-8.0.3 → dkg-8.0.12}/dkg/modules/graph/graph.py

@@ -50,6 +50,7 @@ class Graph(Module):
         query_type = parsed_query[1].name.replace("Query", "").upper()
 
         result = self.node_service.query(query, query_type, repository, paranet_ual)
+        result.encoding = "utf-8"
 
         return result.get("data")
 

{dkg-8.0.3 → dkg-8.0.12}/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-8.0.3 → dkg-8.0.12}/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-8.0.3 → dkg-8.0.12}/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-8.0.3 → dkg-8.0.12}/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-8.0.3 → dkg-8.0.12}/dkg/utils/knowledge_collection_tools.py

@@ -1,9 +1,10 @@
 from typing import Literal
+import codecs
 from dkg.constants import CHUNK_BYTE_SIZE
 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
+from dkg.constants import DEFAULT_RDF_FORMAT, DEFAULT_CANON_ALGORITHM, ESCAPE_MAP
 from rdflib import Graph, BNode, URIRef, Literal as RDFLiteral
 from uuid import uuid4
 from web3 import Web3
@@ -96,7 +97,9 @@ def split_into_chunks(quads, chunk_size_bytes=32):
     while start < len(encoded_bytes):
         end = min(start + chunk_size_bytes, len(encoded_bytes))
         chunk = encoded_bytes[start:end]
-        chunks.append(chunk.decode("utf-8"))  # Decode bytes back to string
+        chunks.append(
+            codecs.decode(chunk, "utf-8", errors="replace")
+        )  # Decode bytes back to string
         start = end
 
     return chunks
@@ -246,3 +249,20 @@ def solidity_packed_sha256(types: list[str], values: list) -> str:
     sha256_hash = hashlib.sha256(packed_data).hexdigest()
 
     return f"0x{sha256_hash}"
+
+
+def escape_literal_string(s):
+    for char, replacement in ESCAPE_MAP.items():
+        s = s.replace(char, replacement)
+    return s
+
+
+def escape_literal_dict(obj):
+    if isinstance(obj, dict):
+        return {k: escape_literal_dict(v) for k, v in obj.items()}
+    elif isinstance(obj, list):
+        return [escape_literal_dict(i) for i in obj]
+    elif isinstance(obj, str):
+        return escape_literal_string(s=obj)
+    else:
+        return obj

{dkg-8.0.3 → dkg-8.0.12}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "dkg"
-version = "8.0.3"
+version = "8.0.12"
 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"