dkg 8.0.1__py3-none-any.whl → 8.0.2__py3-none-any.whl

dkg/modules/asset/asset.py

@@ -406,7 +406,7 @@ class KnowledgeAsset(Module):
             )
 
         knowledge_collection_id = None
-        mint_knowledge_asset_receipt = None
+        mint_knowledge_collection_receipt = None
 
         knowledge_collection_result = (
             self.blockchain_service.create_knowledge_collection(
@@ -433,7 +433,7 @@ class KnowledgeAsset(Module):
             )
         )
         knowledge_collection_id = knowledge_collection_result.knowledge_collection_id
-        mint_knowledge_asset_receipt = knowledge_collection_result.receipt
+        mint_knowledge_collection_receipt = knowledge_collection_result.receipt
 
         ual = format_ual(
             blockchain_id, content_asset_storage_address, knowledge_collection_id
@@ -457,7 +457,7 @@ class KnowledgeAsset(Module):
                         "signatures"
                     ),
                     "operation": {
-                        "mintKnowledgeAsset": mint_knowledge_asset_receipt,
+                        "mintKnowledgeCollection": mint_knowledge_collection_receipt,
                         "publish": get_operation_status_object(
                             publish_operation_result, publish_operation_id
                         ),
@@ -476,7 +476,7 @@ class KnowledgeAsset(Module):
             )
         )
 
-    _submit_knowledge_asset = Method(BlockchainRequest.submit_knowledge_asset)
+    _submit_knowledge_collection = Method(BlockchainRequest.submit_knowledge_collection)
 
     def submit_to_paranet(
         self, ual: UAL, paranet_ual: UAL
@@ -493,7 +493,7 @@ class KnowledgeAsset(Module):
             parsed_paranet_ual["token_id"],
         )
 
-        receipt: TxReceipt = self._submit_knowledge_asset(
+        receipt: TxReceipt = self._submit_knowledge_collection(
             paranet_knowledge_asset_storage,
             paranet_knowledge_asset_token_id,
             knowledge_asset_storage,

dkg/modules/asset/async_asset.py

@@ -420,7 +420,7 @@ class AsyncKnowledgeAsset(AsyncModule):
             )
 
         knowledge_collection_id = None
-        mint_knowledge_asset_receipt = None
+        mint_knowledge_collection_receipt = None
 
         knowledge_collection_result = (
             await self.blockchain_service.create_knowledge_collection(
@@ -447,7 +447,7 @@ class AsyncKnowledgeAsset(AsyncModule):
             )
         )
         knowledge_collection_id = knowledge_collection_result.knowledge_collection_id
-        mint_knowledge_asset_receipt = knowledge_collection_result.receipt
+        mint_knowledge_collection_receipt = knowledge_collection_result.receipt
 
         ual = format_ual(
             blockchain_id, content_asset_storage_address, knowledge_collection_id
@@ -471,15 +471,17 @@ class AsyncKnowledgeAsset(AsyncModule):
                         "signatures"
                     ),
                     "operation": {
-                        "mintKnowledgeAsset": mint_knowledge_asset_receipt,
+                        "mintKnowledgeCollection": mint_knowledge_collection_receipt,
                         "publish": get_operation_status_object(
                             publish_operation_result, publish_operation_id
                         ),
                         "finality": {
-                            "status": "FINALIZED"
-                            if finality_status_result
-                            >= minimum_number_of_finalization_confirmations
-                            else "NOT FINALIZED"
+                            "status": (
+                                "FINALIZED"
+                                if finality_status_result
+                                >= minimum_number_of_finalization_confirmations
+                                else "NOT FINALIZED"
+                            )
                         },
                         "numberOfConfirmations": finality_status_result,
                         "requiredConfirmations": minimum_number_of_finalization_confirmations,
@@ -488,7 +490,7 @@ class AsyncKnowledgeAsset(AsyncModule):
             )
         )
 
-    _submit_knowledge_asset = Method(BlockchainRequest.submit_knowledge_asset)
+    _submit_knowledge_collection = Method(BlockchainRequest.submit_knowledge_collection)
 
     def submit_to_paranet(
         self, ual: UAL, paranet_ual: UAL
@@ -505,7 +507,7 @@ class AsyncKnowledgeAsset(AsyncModule):
             parsed_paranet_ual["token_id"],
         )
 
-        receipt: TxReceipt = self._submit_knowledge_asset(
+        receipt: TxReceipt = self._submit_knowledge_collection(
             paranet_knowledge_asset_storage,
             paranet_knowledge_asset_token_id,
             knowledge_asset_storage,

dkg/modules/graph/async_graph.py

@@ -21,7 +21,7 @@ from rdflib.plugins.sparql.parser import parseQuery
 from dkg.managers.async_manager import AsyncRequestManager
 from dkg.modules.async_module import AsyncModule
 from dkg.types import NQuads
-from dkg.constants import Operations, Status
+from dkg.constants import Status
 from dkg.services.input_service import InputService
 from dkg.services.node_services.async_node_service import AsyncNodeService
 from dkg.types import UAL
@@ -48,8 +48,6 @@ class AsyncGraph(AsyncModule):
 
         arguments = self.input_service.get_query_arguments(options)
 
-        max_number_of_retries = arguments.get("max_number_of_retries")
-        frequency = arguments.get("frequency")
         paranet_ual = arguments.get("paranet_ual")
         repository = arguments.get("repository")
 
@@ -59,12 +57,8 @@ class AsyncGraph(AsyncModule):
         result = await self.node_service.query(
             query, query_type, repository, paranet_ual
         )
-        operation_id = result.get("operationId")
-        operation_result = await self.node_service.get_operation_result(
-            operation_id, Operations.QUERY.value, max_number_of_retries, frequency
-        )
 
-        return operation_result["data"]
+        return result.get("data")
 
     async def publish_finality(self, UAL: UAL, options=None):
         if options is None:

dkg/modules/graph/graph.py

@@ -23,7 +23,7 @@ from dkg.modules.module import Module
 from dkg.types import NQuads
 from dkg.services.node_services.node_service import NodeService
 from dkg.services.input_service import InputService
-from dkg.constants import Operations, Status
+from dkg.constants import Status
 
 
 class Graph(Module):
@@ -43,9 +43,6 @@ class Graph(Module):
         options: dict = {},
     ) -> NQuads:
         arguments = self.input_service.get_query_arguments(options)
-
-        max_number_of_retries = arguments.get("max_number_of_retries")
-        frequency = arguments.get("frequency")
         paranet_ual = arguments.get("paranet_ual")
         repository = arguments.get("repository")
 
@@ -53,12 +50,8 @@ class Graph(Module):
         query_type = parsed_query[1].name.replace("Query", "").upper()
 
         result = self.node_service.query(query, query_type, repository, paranet_ual)
-        operation_id = result.get("operationId")
-        operation_result = self.node_service.get_operation_result(
-            operation_id, Operations.QUERY.value, max_number_of_retries, frequency
-        )
 
-        return operation_result["data"]
+        return result.get("data")
 
     def publish_finality(self, UAL, options=None):
         if options is None:

dkg/modules/paranet/paranet.py

@@ -755,10 +755,6 @@ class Paranet(Module):
             "operation": json.loads(Web3.to_json(receipt)),
         }
 
-    _get_updating_knowledge_asset_states = Method(
-        BlockchainRequest.get_updating_knowledge_asset_states
-    )
-
     def _get_incentives_pool_contract(
         self,
         ual: UAL,

dkg/services/blockchain_services/async_blockchain_service.py

@@ -20,7 +20,7 @@ class AsyncBlockchainService(AsyncModule):
     _increase_allowance = Method(BlockchainRequest.increase_allowance)
     _decrease_allowance = Method(BlockchainRequest.decrease_allowance)
     _create_knowledge_collection = Method(BlockchainRequest.create_knowledge_collection)
-    _mint_knowledge_asset = Method(BlockchainRequest.mint_knowledge_asset)
+    _mint_knowledge_collection = Method(BlockchainRequest.mint_knowledge_collection)
     _get_asset_storage_address = Method(BlockchainRequest.get_asset_storage_address)
     _key_is_operational_wallet = Method(BlockchainRequest.key_is_operational_wallet)
     _time_until_next_epoch = Method(BlockchainRequest.time_until_next_epoch)
@@ -127,7 +127,7 @@ class AsyncBlockchainService(AsyncModule):
                     [Web3.to_bytes(hexstr=x) for x in request.get("vs")],
                 )
             else:
-                receipt = await self._mint_knowledge_asset(
+                receipt = await self._mint_knowledge_collection(
                     paranet_ka_contract,
                     paranet_token_id,
                     list(request.values()),

dkg/services/blockchain_services/blockchain_service.py

@@ -20,7 +20,7 @@ class BlockchainService(Module):
     _increase_allowance = Method(BlockchainRequest.increase_allowance)
     _decrease_allowance = Method(BlockchainRequest.decrease_allowance)
     _create_knowledge_collection = Method(BlockchainRequest.create_knowledge_collection)
-    _mint_knowledge_asset = Method(BlockchainRequest.mint_knowledge_asset)
+    _mint_knowledge_collection = Method(BlockchainRequest.mint_knowledge_collection)
     _get_asset_storage_address = Method(BlockchainRequest.get_asset_storage_address)
     _key_is_operational_wallet = Method(BlockchainRequest.key_is_operational_wallet)
     _time_until_next_epoch = Method(BlockchainRequest.time_until_next_epoch)
@@ -121,7 +121,7 @@ class BlockchainService(Module):
                     [Web3.to_bytes(hexstr=x) for x in request.get("vs")],
                 )
             else:
-                receipt = self._mint_knowledge_asset(
+                receipt = self._mint_knowledge_collection(
                     paranet_ka_contract,
                     paranet_token_id,
                     list(request.values()),

dkg/services/input_service.py

@@ -44,8 +44,6 @@ class InputService:
 
     def get_query_arguments(self, options):
         return {
-            "max_number_of_retries": self.get_max_number_of_retries(options),
-            "frequency": self.get_frequency(options),
             "paranet_ual": self.get_paranet_ual(options),
             "repository": self.get_repository(options),
         }

dkg/utils/blockchain_request.py

@@ -303,14 +303,14 @@ class BlockchainRequest:
             "paranetServiceAddresses": list[Address],
         },
     )
-    submit_knowledge_asset = ContractTransaction(
+    submit_knowledge_collection = ContractTransaction(
         contract="Paranet",
-        function="submitKnowledgeAsset",
+        function="submitKnowledgeCollection",
         args={
-            "paranetKAStorageContract": Address,
-            "paranetKATokenId": int,
-            "knowledgeAssetStorageContract": Address,
-            "knowledgeAssetTokenId": int,
+            "paranetKCStorageContract": Address,
+            "paranetKnowledgeCollectionId": int,
+            "knowledgeCollectionStorageContract": Address,
+            "knowledgeCollectionTokenId": int,
         },
     )
 
@@ -334,9 +334,9 @@ class BlockchainRequest:
         },
     )
 
-    get_updating_knowledge_asset_states = ContractCall(
+    get_updating_knowledge_collection_states = ContractCall(
         contract="ParanetKnowledgeMinersRegistry",
-        function="getUpdatingKnowledgeAssetStates",
+        function="getUpdatingKnowledgeCollectionStates",
         args={
             "miner": Address,
             "paranetId": HexStr,
@@ -412,12 +412,12 @@ class BlockchainRequest:
         },
     )
 
-    mint_knowledge_asset = ContractTransaction(
+    mint_knowledge_collection = ContractTransaction(
         contract="Paranet",
-        function="mintKnowledgeAsset",
+        function="mintKnowledgeCollection",
         args={
-            "paranetKAStorageContract": Address,
-            "paranetKATokenId": int,
+            "paranetKCStorageContract": Address,
+            "paranetKCTokenId": int,
             "knowledgeAssetArgs": dict,
         },
     )

dkg/utils/node_request.py

@@ -94,12 +94,12 @@ class NodeRequest:
 
     query = NodeCall(
         method=HTTPRequestMethod.POST,
-        path="query",
+        path="direct-query",
         data={
             "query": str,
             "type": str,
             "repository": str | None,
-            "paranet_ual": str | None,
+            "paranetUAL": str | None,
         },
     )
 

{dkg-8.0.1.dist-info → dkg-8.0.2.dist-info}/METADATA

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

{dkg-8.0.1.dist-info → dkg-8.0.2.dist-info}/RECORD

@@ -24,12 +24,12 @@ 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=bEZoXl0Depi1ddwtej4nXS742XpxT98VXu_hdgmFPJw,27584
-dkg/modules/asset/async_asset.py,sha256=HFFK5ef_XuWqIWpHp74z975MbyFZAvBDvWuMnItwn8c,28093
+dkg/modules/asset/asset.py,sha256=0zvLhwuTKg5FHwdEPPdmFNS-NmpMZ7xiM2Us1uT8DPY,27619
+dkg/modules/asset/async_asset.py,sha256=Gyk4irLro6YHfTEIdwGxaMUalQMg5j9gjrMolokURk8,28204
 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=IIsRO9vL4L9b2aUJLmhlJ3aGX3-EZsE8QU-5bPCgwnA,4513
-dkg/modules/graph/graph.py,sha256=PVyDxuIwxthTo28gaJHS213JQ0MZaAQaAfMnMmwRtiw,3605
+dkg/modules/graph/async_graph.py,sha256=DZqgJRRwLLgBNEc3vEYrqaOKqNJA0o_vSvuk-lPY0eY,4162
+dkg/modules/graph/graph.py,sha256=2ISaZKHRTBq0RHdGqy8E2NKh1kM9v8VeuHm-cUqHNYc,3259
 dkg/modules/module.py,sha256=_lK4iFgThXNSD_dhM6ZgDrDJdxsRjZgIHGQLLXzOW4s,2575
 dkg/modules/network/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dkg/modules/network/network.py,sha256=a5P9bjbiBVyOaz_Pwycx1IljhgHsE4DM9n2faCIeZtc,2191
@@ -37,7 +37,7 @@ dkg/modules/node/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 dkg/modules/node/async_node.py,sha256=95UgF8mJCCM7kI3vtViKaJQm70Kf75TAfd2zv8m13h0,1617
 dkg/modules/node/node.py,sha256=dWHVFfwkOVsCzaP47Slk46i6Dbuvfx8Dloav1hkGqjc,1495
 dkg/modules/paranet/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dkg/modules/paranet/paranet.py,sha256=KkVGwBcCsNOxVy710wsf4KbY5uqE9izjfU_kol30-tk,27079
+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
@@ -49,9 +49,9 @@ dkg/providers/node/base_node_http.py,sha256=CCkVwyr_iQKCbknVmEpUDXZlQb8C-Z5ndqQd
 dkg/providers/node/node_http.py,sha256=pWrsUC8WZoNrAfLPoMH6wkoHi42jyoKYFid2Pf_meoI,2412
 dkg/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dkg/services/blockchain_services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dkg/services/blockchain_services/async_blockchain_service.py,sha256=7cZZkjC6AwGmtSEuhNVR0hczHo2d-s62PIU955u_y2Q,7187
-dkg/services/blockchain_services/blockchain_service.py,sha256=oe9UqoWihXUJXO27kUlfZKPSQN5bDzI7TIgnd3_E5a4,6942
-dkg/services/input_service.py,sha256=q7cBfvIYMNymCBZw7lK8clv5PmSiY3FZq27EqDtM_Qw,6462
+dkg/services/blockchain_services/async_blockchain_service.py,sha256=DRGJKSAfPSBF_KgDeAOFQbriXUybJjj-a2CRxxhP0Ks,7202
+dkg/services/blockchain_services/blockchain_service.py,sha256=EasHlJvkdsSXSCsHdW2zQmijSu_xmZ_G32bhyB7MaV0,6957
+dkg/services/input_service.py,sha256=KeaKfbGwcXmpthKXeU8ap3l5-yw83hOCG_G0lNkkCf4,6330
 dkg/services/node_services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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
@@ -65,18 +65,18 @@ dkg/types/generics.py,sha256=9ZGFGWp4eN_5bGaWF6COtFMh228ZghjU1CmUok0fuds,907
 dkg/types/network.py,sha256=htNZ00Vrb-wMcR4_XI1tn_-0uVjDqcW7hhdHyjbyq1g,838
 dkg/types/rdf.py,sha256=qm1l7pqTLWBlSmaoQhmBg2qKS16eF83IcOnxuYPdiv8,851
 dkg/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dkg/utils/blockchain_request.py,sha256=TyqGkRAvv5oa7Yhmr9MYkrXkkN5uYh6zR1hoN5JnmKE,12394
+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=pQKGlSbdsdwfe2y0S1zh9c8MEqi_lrsdBf4U_Q6-V2E,7424
 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=muyseSLylibvNepmqz_lHlItnJ2KxB5FB_7CAU-8joY,6511
+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.1.dist-info/LICENSE,sha256=Dr70w2zcW8-jrPGlpTTTlJPL8lR4j2zpDD32tdEFgjY,11375
-dkg-8.0.1.dist-info/METADATA,sha256=iirTrY706O-NKfa57X0aNwlxtRKiOPHh3O3MxTJKekM,10820
-dkg-8.0.1.dist-info/NOTICE,sha256=Rk5toFR2ZqPwVZ3P_P4wE6U1xCnWR9KD3rNBqfPY7h8,368
-dkg-8.0.1.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-dkg-8.0.1.dist-info/RECORD,,
+dkg-8.0.2.dist-info/LICENSE,sha256=Dr70w2zcW8-jrPGlpTTTlJPL8lR4j2zpDD32tdEFgjY,11375
+dkg-8.0.2.dist-info/METADATA,sha256=p6nGObvkqVFMxPMRlcqcp4DoqwE_HUiMBmCYM-UgAPI,10820
+dkg-8.0.2.dist-info/NOTICE,sha256=Rk5toFR2ZqPwVZ3P_P4wE6U1xCnWR9KD3rNBqfPY7h8,368
+dkg-8.0.2.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+dkg-8.0.2.dist-info/RECORD,,