dkg 8.0.14__py3-none-any.whl → 8.1.1rc1__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

@@ -207,7 +207,10 @@ def group_nquads_by_subject(nquads_list: list[str], sort: bool = False):
 
     # Return grouped quads (sorted if requested)
     grouped_items = sorted(grouped.items()) if sort else grouped.items()
-    return [quads for _, quads in grouped_items]
+    if sort:
+        return [sorted(quads) for _, quads in grouped_items]
+    else:
+        return [quads for _, quads in grouped_items]
 
 
 def calculate_number_of_chunks(quads, chunk_size_bytes=CHUNK_BYTE_SIZE):

{dkg-8.0.14.dist-info → dkg-8.1.1rc1.dist-info}/METADATA

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

{dkg-8.0.14.dist-info → dkg-8.1.1rc1.dist-info}/RECORD

@@ -8,13 +8,13 @@ dkg/data/interfaces/AskStorage.json,sha256=hHWq3e0Kx8Cs3PKD4HL2xYRQ8DXRTxTL06QXq
 dkg/data/interfaces/Chronos.json,sha256=aIpCUgJ8omHidyt0GPkj02COT1LW8Tu66qDm7iquQJk,3595
 dkg/data/interfaces/Hub.json,sha256=ZcaePz10ff2Vm7VP-vWP63xLOuE0EE8jNruWvWmMjLw,12611
 dkg/data/interfaces/IdentityStorage.json,sha256=OqyEB1WMj_pC7AHq-3y-I2MJL7xmuTek4asQ2TETTqo,7459
-dkg/data/interfaces/KnowledgeCollection.json,sha256=ywC0fuvxWdFsDm-l67udpzDCKGf23pD3UsxEEqifHus,11922
+dkg/data/interfaces/KnowledgeCollection.json,sha256=UnnjBtVg5CU0Ha1M-hYCUw2YT-9tmFfnETBGwbrsIQI,10283
 dkg/data/interfaces/KnowledgeCollectionStorage.json,sha256=DN1gMEUU57jTFf9uSiHOLmRbmhghlzW5qnVALwBOQ4M,45342
-dkg/data/interfaces/Paranet.json,sha256=y5k59RKwtoG00cnmPEoaGD6Qf2Ytxq7XIgrvMj6WaUc,28705
-dkg/data/interfaces/ParanetIncentivesPoolFactory.json,sha256=F4eLqBHhAIGnaOGdxyWYpA23IzaQ0AN9-2maVD-fW8E,4253
-dkg/data/interfaces/ParanetKnowledgeMinersRegistry.json,sha256=PmvMZJsIahb1r01SYTdsFwHw73McpEqa9DdcZaVqkaw,19144
+dkg/data/interfaces/Paranet.json,sha256=vSmKb6Rj9oWg1lj6J-dY0WwaEAEQvOdgIUZYzoZDDrk,38909
+dkg/data/interfaces/ParanetIncentivesPoolFactory.json,sha256=HoD6ErIjFXaNfHjmbqGQKHspG-xOtOen_M0dOCNEilk,5780
+dkg/data/interfaces/ParanetKnowledgeMinersRegistry.json,sha256=BMU8xGUNrutj5X4OkjKPMGsm6v1Zi-7km7iR7OFRavg,18825
 dkg/data/interfaces/ParanetNeuroIncentivesPool.json,sha256=a4h0FfQp3RgMpOhHgSWTEaig7jQ2OoVrm--VG9QkKvY,21944
-dkg/data/interfaces/ParanetsRegistry.json,sha256=ruV9Qva7Voan9rSs67wwlWxPPBqAAND87tGtTiSZI98,34391
+dkg/data/interfaces/ParanetsRegistry.json,sha256=rpFtTjnve4h7pQ9-73RKAYjHNMovIrgAOzpFzZy6qX0,35557
 dkg/data/interfaces/Token.json,sha256=hp79eZJDoGqOTSclAv13pIJpMhqr7aBH8jbiQTlA7VU,13289
 dkg/dataclasses.py,sha256=pOV0LzuNOTDsr48JGq_2H6BD7ISS4ZxOn2HGl9MjSyM,1906
 dkg/exceptions.py,sha256=LiEhCVKw-jCJcyCNRjHZGKxZoljOKwLNV-9q7EPZkak,3756
@@ -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=qGEZqsAo25J4P0HCwXA6EI37fVsAf7Nne1zEXR0Ot0Y,8776
+dkg/utils/knowledge_collection_tools.py,sha256=Hqg15j84C1OcL04Vj3FY9q73LvENLQdEaf6Cd_Ll05M,8864
 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.14.dist-info/LICENSE,sha256=Dr70w2zcW8-jrPGlpTTTlJPL8lR4j2zpDD32tdEFgjY,11375
-dkg-8.0.14.dist-info/METADATA,sha256=KnPQYF84DahhRYTXoH3vd478uHS7KeF829qLuSZDiV0,10821
-dkg-8.0.14.dist-info/NOTICE,sha256=Rk5toFR2ZqPwVZ3P_P4wE6U1xCnWR9KD3rNBqfPY7h8,368
-dkg-8.0.14.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-dkg-8.0.14.dist-info/RECORD,,
+dkg-8.1.1rc1.dist-info/LICENSE,sha256=Dr70w2zcW8-jrPGlpTTTlJPL8lR4j2zpDD32tdEFgjY,11375
+dkg-8.1.1rc1.dist-info/METADATA,sha256=L6RhAWhs29gRI2Qzn6G7HHCpkd4HVc9TztnbXrRWXEc,10823
+dkg-8.1.1rc1.dist-info/NOTICE,sha256=Rk5toFR2ZqPwVZ3P_P4wE6U1xCnWR9KD3rNBqfPY7h8,368
+dkg-8.1.1rc1.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+dkg-8.1.1rc1.dist-info/RECORD,,