fix: fix several bugs, now service call is working

Author: Arondondon

snet/sdk/__init__.py

@@ -10,7 +10,7 @@
 from google.protobuf import symbol_database as _symbol_database
 
 from snet.sdk.exceptions import NoGroupsFoundError, GroupNotFoundError, ServiceMetadataMismatchError
-from snet.sdk.registry.models import StorageType
+from snet.sdk.registry.models import StorageType, FileURI
 from snet.sdk.registry.organization_metadata import OrganizationMetadata
 from snet.sdk.registry.registry_contract import RegistryContract
 from snet.sdk.registry.service_metadata import ServiceMetadata, Group
@@ -75,15 +75,18 @@ def create_service_client(
         options=None,
         concurrent_calls: int = 1,
     ):
-
-        # Create and instance of the Config object,
-        # so we can create an instance of ClientLibGenerator
+        service_metadata = self._enhance_service_metadata(org_id, service_id)
         lib_generator = ClientLibGenerator(self.storage_provider, org_id, service_id)
 
-        # Download the proto file and generate stubs if needed
+        if service_metadata.service_api_source is not None:
+            service_api_source = service_metadata.service_api_source
+        else:
+            service_api_source = service_metadata.model_ipfs_hash
+        service_api_source = FileURI.from_raw_uri(service_api_source)
+
         force_update = config.FORCE_UPDATE
         if force_update:
-            lib_generator.generate_client_library()
+            lib_generator.generate_client_library(service_api_source)
         else:
             path_to_pb_files = lib_generator.proto_dir
             pb_2_file_name = find_file_by_keyword(
@@ -94,7 +97,7 @@ def create_service_client(
             )
             if not pb_2_file_name or not pb_2_grpc_file_name:
                 print("Generating client library...")
-                lib_generator.generate_client_library()
+                lib_generator.generate_client_library(service_api_source)
 
         if options is None:
             options = dict()
@@ -104,7 +107,6 @@ def create_service_client(
         if payment_strategy is None:
             payment_strategy = payment_strategy_type.value()
 
-        service_metadata = self._enhance_service_metadata(org_id, service_id)
         group = self._get_service_group(org_id, service_id, service_metadata, group_name)
 
         service_stubs = self.get_service_stub(lib_generator)
@@ -249,7 +251,9 @@ def update_organization(
         organization_metadata: OrganizationMetadata,
         storage_type: StorageType = StorageType.IPFS,
     ) -> bool:
-        metadata_uri = self.storage_provider.publish_organization_metadata(organization_metadata, storage_type)
+        metadata_uri = self.storage_provider.publish_organization_metadata(
+            organization_metadata, storage_type
+        )
         receipt = self.registry_contract.update_org_metadata(self.account, org_id, metadata_uri)
 
         return receipt["status"] != 0

snet/sdk/client_lib_generator.py

@@ -1,6 +1,7 @@
 import os
 from pathlib import Path
 
+from snet.sdk.registry.models import FileURI
 from snet.sdk.registry.storage_provider import StorageProvider
 from snet.sdk.utils.utils import compile_proto
 
@@ -20,9 +21,9 @@ def __init__(
         self.proto_dir: Path = proto_dir if proto_dir else Path.home().joinpath(".snet")
         self.generate_directories_by_params()
 
-    def generate_client_library(self) -> None:
+    def generate_client_library(self, service_api_source: FileURI) -> None:
         try:
-            self.receive_proto_files()
+            self.receive_proto_files(service_api_source)
             compilation_result = compile_proto(
                 entry_path=self.proto_dir,
                 codegen_dir=self.proto_dir,
@@ -35,8 +36,8 @@ def generate_client_library(self) -> None:
                     f'in org with id "{self.org_id}" '
                     f"generated at {self.proto_dir}"
                 )
-        except Exception as e:
-            print(str(e))
+        except Exception:
+            raise Exception("Error while proto compilation!")
 
     def generate_directories_by_params(self) -> None:
         if not self.proto_dir.is_absolute():
@@ -47,13 +48,7 @@ def create_service_client_libraries_path(self) -> None:
         self.proto_dir = self.proto_dir.joinpath(self.org_id, self.service_id, self.language)
         self.proto_dir.mkdir(parents=True, exist_ok=True)
 
-    def receive_proto_files(self) -> None:
-        metadata = self._metadata_provider.fetch_service_metadata(
-            org_id=self.org_id, service_id=self.service_id
-        )
-        service_api_source = metadata.get("service_api_source") or metadata.get("model_ipfs_hash")
-
-        # Receive proto files
+    def receive_proto_files(self, service_api_source: FileURI) -> None:
         if self.proto_dir.exists():
             self._metadata_provider.fetch_and_extract_proto(service_api_source, self.proto_dir)
         else:

snet/sdk/mpe/mpe_contract.py

@@ -69,6 +69,6 @@ def channel_extend_and_add_funds(self, account: Account, channel_id, expiration,
         )
 
     def _fund_escrow_account(self, account: Account, amount):
-        current_escrow_balance = self.balance(account.address)
+        current_escrow_balance = self.balance(account)
         if amount > current_escrow_balance:
             self.deposit(account, amount - current_escrow_balance)

snet/sdk/registry/storage_provider.py

@@ -44,9 +44,8 @@ def fetch_service_metadata(self, metadata_uri: FileURI) -> ServiceMetadata:
 
         return service_metadata
 
-    def fetch_and_extract_proto(self, service_api_source, proto_dir) -> None:
-        tar_uri = FileURI.from_raw_uri(service_api_source)
-        spec_tar = self._get_from_storage(tar_uri)
+    def fetch_and_extract_proto(self, service_api_source: FileURI, proto_dir) -> None:
+        spec_tar = self._get_from_storage(service_api_source, decode=False)
         self._safe_extract_proto(spec_tar, proto_dir)
 
     def publish_organization_metadata(