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

dkg/modules/asset/asset.py

@@ -386,24 +386,16 @@ class KnowledgeAsset(Module):
         if token_amount:
             estimated_publishing_cost = token_amount
         else:
-            time_until_next_epoch = self.blockchain_service.time_until_next_epoch()
-            epoch_length = self.blockchain_service.epoch_length()
             stake_weighted_average_ask = (
                 self.blockchain_service.get_stake_weighted_average_ask()
             )
 
             # Convert to integers and perform calculation
             estimated_publishing_cost = (
-                (
-                    int(stake_weighted_average_ask)
-                    * (
-                        int(epochs_num) * int(1e18)
-                        + (int(time_until_next_epoch) * int(1e18)) // int(epoch_length)
-                    )
-                    * int(dataset_size)
-                )
+                int(stake_weighted_average_ask)
+                * int(epochs_num)
+                * int(dataset_size)
                 // 1024
-                // int(1e18)
             )
 
         knowledge_collection_id = None

dkg/modules/asset/async_asset.py

@@ -398,26 +398,16 @@ class AsyncKnowledgeAsset(AsyncModule):
         if token_amount:
             estimated_publishing_cost = token_amount
         else:
-            time_until_next_epoch = (
-                await self.blockchain_service.time_until_next_epoch()
-            )
-            epoch_length = await self.blockchain_service.epoch_length()
             stake_weighted_average_ask = (
                 await self.blockchain_service.get_stake_weighted_average_ask()
             )
 
             # Convert to integers and perform calculation
             estimated_publishing_cost = (
-                (
-                    int(stake_weighted_average_ask)
-                    * (
-                        int(epochs_num) * int(1e18)
-                        + (int(time_until_next_epoch) * int(1e18)) // int(epoch_length)
-                    )
-                    * int(dataset_size)
-                )
+                int(stake_weighted_average_ask)
+                * int(epochs_num)
+                * int(dataset_size)
                 // 1024
-                // int(1e18)
             )
 
         knowledge_collection_id = None

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.dist-info → dkg-8.1.0.dist-info}/METADATA

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

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

@@ -24,8 +24,8 @@ dkg/managers/manager.py,sha256=2fGwzppJR33d3VPRHgZIvlBbcrb5P99_J7BdfaaOSYM,2640
 dkg/method.py,sha256=HG_mI6CXxKznLAN561G2Gqtijm3eliHV6vPxAvz-dGs,5521
 dkg/modules/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dkg/modules/asset/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dkg/modules/asset/asset.py,sha256=IplLU6Rz2rJlCYpfQbPPl4JFvlieU7Vx5-TvoFifB_E,27675
-dkg/modules/asset/async_asset.py,sha256=92YL0JqQ5vXeJbWd3MBIwwYqEX6Y2ksghnED76hrrzs,28260
+dkg/modules/asset/asset.py,sha256=G9CVvf6_sRvugHS-blteCJruW6t_U6rmOQipeMDKMx0,27300
+dkg/modules/asset/async_asset.py,sha256=3uc78_uA7tPKBsMODBAU-AOk0mZ9WumaIBgcG50Aum8,27841
 dkg/modules/async_module.py,sha256=iw4DEU8tUvm0CXErQ1LZ8qGcNMQJmvGhu0poHjoKPaI,2629
 dkg/modules/graph/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dkg/modules/graph/async_graph.py,sha256=4YNTvnRdeuIV2xjr8-MT8h8zVoW6GfTKVc2AwGvsNuY,4196
@@ -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=6U9lLjoXfsayH_AmicNWtmsQ5xdllhTs-L9DsbPYvlU,8994
+dkg/utils/knowledge_collection_tools.py,sha256=qGEZqsAo25J4P0HCwXA6EI37fVsAf7Nne1zEXR0Ot0Y,8776
 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.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,,
+dkg-8.1.0.dist-info/LICENSE,sha256=Dr70w2zcW8-jrPGlpTTTlJPL8lR4j2zpDD32tdEFgjY,11375
+dkg-8.1.0.dist-info/METADATA,sha256=FTb-ym6V2Iic2CON7rFUcWFyygR1HdvIlQonuuIAUos,10820
+dkg-8.1.0.dist-info/NOTICE,sha256=Rk5toFR2ZqPwVZ3P_P4wE6U1xCnWR9KD3rNBqfPY7h8,368
+dkg-8.1.0.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+dkg-8.1.0.dist-info/RECORD,,