Skip to content

Commit

Permalink
Merge pull request #267 from digital-asset/python-auto-codegen-fixes
Browse files Browse the repository at this point in the history
python: Changes to the manually-written typing files to make gen easier
  • Loading branch information
da-tanabe committed Aug 4, 2021
2 parents 3026b6b + 8ea7f52 commit 598f371
Show file tree
Hide file tree
Showing 11 changed files with 49 additions and 51 deletions.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 3 additions & 4 deletions python/dazl/_gen/com/daml/ledger/api/v1/commands_pb2.pyi

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 6 additions & 7 deletions python/dazl/_gen/com/daml/ledger/api/v1/event_pb2.pyi

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 8 additions & 9 deletions python/dazl/_gen/com/daml/ledger/api/v1/package_service_pb2.pyi

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 6 additions & 9 deletions python/dazl/_gen/com/daml/ledger/api/v1/value_pb2.pyi

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 10 additions & 3 deletions python/dazl/ledger/grpc/codec_aio.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
from ...damlast.protocols import SymbolLookup
from ...damlast.util import module_local_name, module_name, package_local_name, package_ref
from ...ledger.aio import PackageService
from ...prim import ContractData, ContractId
from ...prim import ContractData, ContractId, Party
from ...values import Context
from ...values.protobuf import ProtobufDecoder, ProtobufEncoder, set_value
from ..aio import PackageLoader
Expand Down Expand Up @@ -251,7 +251,12 @@ async def decode_created_event(self, event: G_CreatedEvent) -> CreateEvent:
key = await self.decode_value(template.key.type, event.contract_key)

return CreateEvent(
cid, cdata, event.signatories, event.observers, event.agreement_text.value, key
cid,
cdata,
tuple(Party(p) for p in event.signatories),
tuple(Party(p) for p in event.observers),
event.agreement_text.value,
key,
)

async def decode_archived_event(self, event: G_ArchivedEvent) -> ArchiveEvent:
Expand Down Expand Up @@ -351,7 +356,9 @@ def decode_identifier(identifier: G_Identifier) -> TypeConName:

@staticmethod
def decode_party_info(party_details: G_PartyDetails) -> PartyInfo:
return PartyInfo(party_details.party, party_details.display_name, party_details.is_local)
return PartyInfo(
Party(party_details.party), party_details.display_name, party_details.is_local
)

async def _look_up_choice(
self, template_id: Any, choice_name: str
Expand Down
6 changes: 4 additions & 2 deletions python/dazl/protocols/v1/grpc.py
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,9 @@ async def active_contracts(self, contract_filter: "ContractFilter") -> "Sequence
if pkg_refs:
with LOG.info_timed(f"ACS load {len(pkg_refs)} new package(s)"):
# Preload packages that are DIRECTLY referenced by packages in the message
await gather(*(self.ledger.package_loader.load(pkg_ref) for pkg_ref in pkg_refs))
await gather(
*(self.ledger.package_loader.load(PackageRef(pkg_ref)) for pkg_ref in pkg_refs)
)

with LOG.info_timed("ACS transform the message"):
# Now load all the events. Note that do_with_retry is still required because the
Expand Down Expand Up @@ -346,7 +348,7 @@ def __init__(self, connection: "GRPCv1Connection", ledger_id: str):
def package_ids(self) -> "AbstractSet[PackageRef]":
request = G_ListPackagesRequest(ledger_id=self.ledger_id)
response = self.connection.package_service.ListPackages(request)
return frozenset(response.package_ids)
return frozenset([PackageRef(p) for p in response.package_ids])

def package_bytes(self, package_id: "PackageRef") -> bytes:
request = G_GetPackageRequest(ledger_id=self.ledger_id, package_id=package_id)
Expand Down
2 changes: 1 addition & 1 deletion python/dazl/protocols/v1/pb_parse_event.py
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ def serialize_transaction_filter(
if contract_filter.party_groups is not None:
parties.extend(contract_filter.party_groups)

filters_by_party = {}
filters_by_party = {} # type: Dict[str, txf_pb2.Filters]
for party in parties:
if identifiers is not None:
filters_by_party[party] = txf_pb2.Filters(
Expand Down

0 comments on commit 598f371

Please sign in to comment.