meshtrade 1.0.1__py3-none-any.whl → 1.1.0__py3-none-any.whl

meshtrade/common/__init__.py

@@ -2,8 +2,7 @@
 
 from .config import (
     ACCESS_TOKEN_PREFIX,
-    AUTHORIZATION_HEADER_KEY,
-    BEARER_PREFIX,
+    API_KEY_HEADER,
     COOKIE_HEADER_KEY,
     DEFAULT_GRPC_PORT,
     DEFAULT_GRPC_URL,
@@ -17,10 +16,9 @@ __all__ = [
     "DEFAULT_GRPC_URL",
     "DEFAULT_GRPC_PORT",
     "DEFAULT_TLS",
-    "AUTHORIZATION_HEADER_KEY",
+    "API_KEY_HEADER",
     "COOKIE_HEADER_KEY",
     "GROUP_HEADER_KEY",
-    "BEARER_PREFIX",
     "ACCESS_TOKEN_PREFIX",
     "create_auth_metadata",
     "GRPCClient",

meshtrade/common/config.py

@@ -7,10 +7,9 @@ DEFAULT_GRPC_PORT = 443
 DEFAULT_TLS = True
 
 # gRPC metadata constants
-AUTHORIZATION_HEADER_KEY = "authorization"
+API_KEY_HEADER = "x-api-key"
 COOKIE_HEADER_KEY = "cookie"
 GROUP_HEADER_KEY = "x-group"
-BEARER_PREFIX = "Bearer "
 ACCESS_TOKEN_PREFIX = "AccessToken="
 
 
@@ -18,13 +17,13 @@ def create_auth_metadata(api_key: str, group: str) -> list[tuple[str, str]]:
     """Create authentication metadata for gRPC requests.
 
     Args:
-        api_key: The API key (without Bearer prefix)
+        api_key: The API key
         group: The group resource name in format groups/{group_id}
 
     Returns:
         List of metadata header tuples for authentication
     """
     return [
-        (AUTHORIZATION_HEADER_KEY, f"{BEARER_PREFIX}{api_key}"),
+        (API_KEY_HEADER, api_key),
         (GROUP_HEADER_KEY, group),  # Send full groups/uuid format in header
     ]

meshtrade/iam/api_user/v1/service_pb2_grpc.py

@@ -82,14 +82,6 @@ class ApiUserServiceServicer(object):
     def GetApiUser(self, request, context):
         """
         Retrieves a single API user by its unique identifier.
-
-        Parameters:
-        - name: The resource name in format api_users/{api_user_id}
-
-        Returns:
-        - APIUser: Complete API user resource including metadata and roles
-
-        Authorization: Requires ROLE_IAM_ADMIN or ROLE_IAM_VIEWER
         """
         context.set_code(grpc.StatusCode.UNIMPLEMENTED)
         context.set_details('Method not implemented!')
@@ -102,14 +94,6 @@ class ApiUserServiceServicer(object):
         The API user will be created in the authenticated group context
         and assigned the provided roles. The system generates a unique
         identifier and API key for authentication.
-
-        Parameters:
-        - api_user: APIUser configuration (name field ignored, assigned by system)
-
-        Returns:
-        - APIUser: Newly created API user with generated name and API key
-
-        Authorization: Requires ROLE_IAM_ADMIN
         """
         context.set_code(grpc.StatusCode.UNIMPLEMENTED)
         context.set_details('Method not implemented!')
@@ -121,11 +105,6 @@ class ApiUserServiceServicer(object):
 
         Returns all API users that belong to the current group,
         regardless of their active/inactive state.
-
-        Returns:
-        - ListApiUsersResponse: Collection of API users in the group
-
-        Authorization: Requires ROLE_IAM_ADMIN or ROLE_IAM_VIEWER
         """
         context.set_code(grpc.StatusCode.UNIMPLEMENTED)
         context.set_details('Method not implemented!')
@@ -137,14 +116,6 @@ class ApiUserServiceServicer(object):
 
         Performs substring matching on API user display names
         within the authenticated group context.
-
-        Parameters:
-        - display_name: Substring to search for in display names
-
-        Returns:
-        - SearchApiUsersResponse: Collection of matching API users
-
-        Authorization: Requires ROLE_IAM_ADMIN or ROLE_IAM_VIEWER
         """
         context.set_code(grpc.StatusCode.UNIMPLEMENTED)
         context.set_details('Method not implemented!')
@@ -156,14 +127,6 @@ class ApiUserServiceServicer(object):
 
         Changes the API user state to active, allowing the associated
         API key to be used for authentication and authorization.
-
-        Parameters:
-        - name: The resource name in format api_users/{api_user_id}
-
-        Returns:
-        - APIUser: Updated API user with active state
-
-        Authorization: Requires ROLE_IAM_ADMIN
         """
         context.set_code(grpc.StatusCode.UNIMPLEMENTED)
         context.set_details('Method not implemented!')
@@ -175,14 +138,6 @@ class ApiUserServiceServicer(object):
 
         Changes the API user state to inactive, preventing the associated
         API key from being used for authentication.
-
-        Parameters:
-        - name: The resource name in format api_users/{api_user_id}
-
-        Returns:
-        - APIUser: Updated API user with inactive state
-
-        Authorization: Requires ROLE_IAM_ADMIN
         """
         context.set_code(grpc.StatusCode.UNIMPLEMENTED)
         context.set_details('Method not implemented!')
@@ -194,14 +149,6 @@ class ApiUserServiceServicer(object):
 
         This method is used for authentication flows to lookup
         an API user based on the hash of their API key.
-
-        Parameters:
-        - key_hash: Hash of the API key to lookup
-
-        Returns:
-        - APIUser: Complete API user resource associated with the key
-
-        Authorization: Requires ROLE_IAM_ADMIN or ROLE_IAM_VIEWER
         """
         context.set_code(grpc.StatusCode.UNIMPLEMENTED)
         context.set_details('Method not implemented!')

meshtrade/iam/role/v1/role_pb2.py

@@ -25,7 +25,7 @@ _sym_db = _symbol_database.Default()
 from google.protobuf import descriptor_pb2 as google_dot_protobuf_dot_descriptor__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n meshtrade/iam/role/v1/role.proto\x12\x15meshtrade.iam.role.v1\x1a google/protobuf/descriptor.proto\"=\n\x08RoleList\x12\x31\n\x05roles\x18\x01 \x03(\x0e\x32\x1b.meshtrade.iam.role.v1.RoleR\x05roles*\xe6\x02\n\x04Role\x12\x14\n\x10ROLE_UNSPECIFIED\x10\x00\x12\x17\n\x11ROLE_WALLET_ADMIN\x10\xc0\x84=\x12\x18\n\x12ROLE_WALLET_VIEWER\x10\xc1\x84=\x12\x1b\n\x15ROLE_COMPLIANCE_ADMIN\x10\x80\x89z\x12\x1c\n\x16ROLE_COMPLIANCE_VIEWER\x10\x81\x89z\x12\x15\n\x0eROLE_IAM_ADMIN\x10\xc0\x8d\xb7\x01\x12\x16\n\x0fROLE_IAM_VIEWER\x10\xc1\x8d\xb7\x01\x12\x1e\n\x17ROLE_ISSUANCE_HUB_ADMIN\x10\x80\x92\xf4\x01\x12\x1f\n\x18ROLE_ISSUANCE_HUB_VIEWER\x10\x81\x92\xf4\x01\x12\x19\n\x12ROLE_TRADING_ADMIN\x10\xc0\x96\xb1\x02\x12\x1a\n\x13ROLE_TRADING_VIEWER\x10\xc1\x96\xb1\x02\x12\x18\n\x11ROLE_REPORT_ADMIN\x10\x80\x9b\xee\x02\x12\x19\n\x12ROLE_REPORT_VIEWER\x10\x81\x9b\xee\x02:f\n\x0estandard_roles\x12\x1c.google.protobuf.FileOptions\x18\xd3\x86\x03 \x01(\x0b\x32\x1f.meshtrade.iam.role.v1.RoleListR\rstandardRoles:W\n\x05roles\x12\x1e.google.protobuf.MethodOptions\x18\xd5\x86\x03 \x01(\x0b\x32\x1f.meshtrade.iam.role.v1.RoleListR\x05rolesBN\n\x1c\x63o.meshtrade.api.iam.role.v1Z.github.com/meshtrade/api/go/iam/role/v1;rolev1b\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n meshtrade/iam/role/v1/role.proto\x12\x15meshtrade.iam.role.v1\x1a google/protobuf/descriptor.proto\"=\n\x08RoleList\x12\x31\n\x05roles\x18\x01 \x03(\x0e\x32\x1b.meshtrade.iam.role.v1.RoleR\x05roles*\xec\x02\n\x04Role\x12\x14\n\x10ROLE_UNSPECIFIED\x10\x00\x12\x17\n\x11ROLE_WALLET_ADMIN\x10\xc0\x84=\x12\x18\n\x12ROLE_WALLET_VIEWER\x10\xc1\x84=\x12\x1b\n\x15ROLE_COMPLIANCE_ADMIN\x10\x80\x89z\x12\x1c\n\x16ROLE_COMPLIANCE_VIEWER\x10\x81\x89z\x12\x15\n\x0eROLE_IAM_ADMIN\x10\xc0\x8d\xb7\x01\x12\x16\n\x0fROLE_IAM_VIEWER\x10\xc1\x8d\xb7\x01\x12\x1e\n\x17ROLE_ISSUANCE_HUB_ADMIN\x10\x80\x92\xf4\x01\x12\x1f\n\x18ROLE_ISSUANCE_HUB_VIEWER\x10\x81\x92\xf4\x01\x12\x19\n\x12ROLE_TRADING_ADMIN\x10\xc0\x96\xb1\x02\x12\x1a\n\x13ROLE_TRADING_VIEWER\x10\xc1\x96\xb1\x02\x12\x1b\n\x14ROLE_REPORTING_ADMIN\x10\x80\x9b\xee\x02\x12\x1c\n\x15ROLE_REPORTING_VIEWER\x10\x81\x9b\xee\x02:f\n\x0estandard_roles\x12\x1c.google.protobuf.FileOptions\x18\xd3\x86\x03 \x01(\x0b\x32\x1f.meshtrade.iam.role.v1.RoleListR\rstandardRoles:W\n\x05roles\x12\x1e.google.protobuf.MethodOptions\x18\xd5\x86\x03 \x01(\x0b\x32\x1f.meshtrade.iam.role.v1.RoleListR\x05rolesBN\n\x1c\x63o.meshtrade.api.iam.role.v1Z.github.com/meshtrade/api/go/iam/role/v1;rolev1b\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -34,7 +34,7 @@ if not _descriptor._USE_C_DESCRIPTORS:
   _globals['DESCRIPTOR']._loaded_options = None
   _globals['DESCRIPTOR']._serialized_options = b'\n\034co.meshtrade.api.iam.role.v1Z.github.com/meshtrade/api/go/iam/role/v1;rolev1'
   _globals['_ROLE']._serialized_start=157
-  _globals['_ROLE']._serialized_end=515
+  _globals['_ROLE']._serialized_end=521
   _globals['_ROLELIST']._serialized_start=93
   _globals['_ROLELIST']._serialized_end=154
 # @@protoc_insertion_point(module_scope)

meshtrade/iam/role/v1/role_pb2.pyi

@@ -21,8 +21,8 @@ class Role(int, metaclass=_enum_type_wrapper.EnumTypeWrapper):
     ROLE_ISSUANCE_HUB_VIEWER: _ClassVar[Role]
     ROLE_TRADING_ADMIN: _ClassVar[Role]
     ROLE_TRADING_VIEWER: _ClassVar[Role]
-    ROLE_REPORT_ADMIN: _ClassVar[Role]
-    ROLE_REPORT_VIEWER: _ClassVar[Role]
+    ROLE_REPORTING_ADMIN: _ClassVar[Role]
+    ROLE_REPORTING_VIEWER: _ClassVar[Role]
 ROLE_UNSPECIFIED: Role
 ROLE_WALLET_ADMIN: Role
 ROLE_WALLET_VIEWER: Role
@@ -34,8 +34,8 @@ ROLE_ISSUANCE_HUB_ADMIN: Role
 ROLE_ISSUANCE_HUB_VIEWER: Role
 ROLE_TRADING_ADMIN: Role
 ROLE_TRADING_VIEWER: Role
-ROLE_REPORT_ADMIN: Role
-ROLE_REPORT_VIEWER: Role
+ROLE_REPORTING_ADMIN: Role
+ROLE_REPORTING_VIEWER: Role
 STANDARD_ROLES_FIELD_NUMBER: _ClassVar[int]
 standard_roles: _descriptor.FieldDescriptor
 ROLES_FIELD_NUMBER: _ClassVar[int]

meshtrade/reporting/{income_report → account_report}/v1/__init__.py

@@ -1,4 +1,4 @@
-"""Income Report v1 package."""
+"""Account Report v1 package."""
 
 # ===================================================================
 # AUTO-GENERATED SECTION - ONLY EDIT BELOW THE CLOSING COMMENT BLOCK
@@ -13,16 +13,18 @@
 # ===================================================================
 
 # Generated protobuf imports
+from .fee_entry_pb2 import FeeEntry
+from .income_entry_pb2 import IncomeEntry, IncomeNarrative
+from .trading_statement_entry_pb2 import TradingStatementEntry
 from .disclaimer_pb2 import Disclaimer
-from .entry_pb2 import Entry, Narrative
-from .income_report_pb2 import IncomeReport
-from .service_pb2 import GetExcelIncomeReportRequest, GetExcelIncomeReportResponse, GetIncomeReportRequest
+from .account_report_pb2 import AccountReport
+from .service_pb2 import GetAccountReportRequest, GetExcelAccountReportRequest, GetExcelAccountReportResponse
 
 # Generated service imports
 from .service_meshpy import (
-    IncomeReportService,
-    IncomeReportServiceGRPCClient,
-    IncomeReportServiceGRPCClientInterface,
+    AccountReportService,
+    AccountReportServiceGRPCClient,
+    AccountReportServiceGRPCClientInterface,
 )
 from .service_options_meshpy import ClientOptions
 
@@ -46,15 +48,17 @@ from .service_options_meshpy import ClientOptions
 # Combined auto-generated and manual exports
 __all__ = [
     # Generated exports
+    "AccountReport",
+    "AccountReportService",
+    "AccountReportServiceGRPCClient",
+    "AccountReportServiceGRPCClientInterface",
     "ClientOptions",
     "Disclaimer",
-    "Entry",
-    "GetExcelIncomeReportRequest",
-    "GetExcelIncomeReportResponse",
-    "GetIncomeReportRequest",
-    "IncomeReport",
-    "IncomeReportService",
-    "IncomeReportServiceGRPCClient",
-    "IncomeReportServiceGRPCClientInterface",
-    "Narrative",
+    "FeeEntry",
+    "GetAccountReportRequest",
+    "GetExcelAccountReportRequest",
+    "GetExcelAccountReportResponse",
+    "IncomeEntry",
+    "IncomeNarrative",
+    "TradingStatementEntry",
 ]

meshtrade/reporting/account_report/v1/account_report_pb2.py

@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# NO CHECKED-IN PROTOBUF GENCODE
+# source: meshtrade/reporting/account_report/v1/account_report.proto
+# Protobuf Python Version: 6.31.1
+"""Generated protocol buffer code."""
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import runtime_version as _runtime_version
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
+_runtime_version.ValidateProtobufRuntimeVersion(
+    _runtime_version.Domain.PUBLIC,
+    6,
+    31,
+    1,
+    '',
+    'meshtrade/reporting/account_report/v1/account_report.proto'
+)
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+from google.protobuf import timestamp_pb2 as google_dot_protobuf_dot_timestamp__pb2
+from meshtrade.type.v1 import token_pb2 as meshtrade_dot_type_dot_v1_dot_token__pb2
+from meshtrade.type.v1 import address_pb2 as meshtrade_dot_type_dot_v1_dot_address__pb2
+from meshtrade.reporting.account_report.v1 import fee_entry_pb2 as meshtrade_dot_reporting_dot_account__report_dot_v1_dot_fee__entry__pb2
+from meshtrade.reporting.account_report.v1 import income_entry_pb2 as meshtrade_dot_reporting_dot_account__report_dot_v1_dot_income__entry__pb2
+from meshtrade.reporting.account_report.v1 import trading_statement_entry_pb2 as meshtrade_dot_reporting_dot_account__report_dot_v1_dot_trading__statement__entry__pb2
+from meshtrade.reporting.account_report.v1 import disclaimer_pb2 as meshtrade_dot_reporting_dot_account__report_dot_v1_dot_disclaimer__pb2
+
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n:meshtrade/reporting/account_report/v1/account_report.proto\x12%meshtrade.reporting.account_report.v1\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x1dmeshtrade/type/v1/token.proto\x1a\x1fmeshtrade/type/v1/address.proto\x1a\x35meshtrade/reporting/account_report/v1/fee_entry.proto\x1a\x38meshtrade/reporting/account_report/v1/income_entry.proto\x1a\x43meshtrade/reporting/account_report/v1/trading_statement_entry.proto\x1a\x36meshtrade/reporting/account_report/v1/disclaimer.proto\"\xfd\x06\n\rAccountReport\x12Y\n\x0eincome_entries\x18\x01 \x03(\x0b\x32\x32.meshtrade.reporting.account_report.v1.IncomeEntryR\rincomeEntries\x12P\n\x0b\x66\x65\x65_entries\x18\x02 \x03(\x0b\x32/.meshtrade.reporting.account_report.v1.FeeEntryR\nfeeEntries\x12x\n\x19trading_statement_entries\x18\x03 \x03(\x0b\x32<.meshtrade.reporting.account_report.v1.TradingStatementEntryR\x17tradingStatementEntries\x12G\n\x12reporting_currency\x18\x04 \x01(\x0b\x32\x18.meshtrade.type.v1.TokenR\x11reportingCurrency\x12S\n\x06period\x18\x05 \x01(\x0b\x32;.meshtrade.reporting.account_report.v1.AccountReport.PeriodR\x06period\x12\x43\n\x0fgeneration_date\x18\x06 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\x0egenerationDate\x12%\n\x0e\x61\x63\x63ount_number\x18\x07 \x01(\tR\raccountNumber\x12S\n\x0b\x64isclaimers\x18\x08 \x03(\x0b\x32\x31.meshtrade.reporting.account_report.v1.DisclaimerR\x0b\x64isclaimers\x12\x41\n\x0e\x63lient_address\x18\t \x01(\x0b\x32\x1a.meshtrade.type.v1.AddressR\rclientAddress\x12\x1f\n\x0b\x63lient_name\x18\n \x01(\tR\nclientName\x12\x1c\n\tcopyright\x18\x0b \x01(\tR\tcopyright\x1a\x64\n\x06Period\x12.\n\x04\x66rom\x18\x01 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\x04\x66rom\x12*\n\x02to\x18\x02 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\x02toBx\n,co.meshtrade.api.reporting.account_report.v1ZHgithub.com/meshtrade/api/go/reporting/account_report/v1;account_reportv1b\x06proto3')
+
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtrade.reporting.account_report.v1.account_report_pb2', _globals)
+if not _descriptor._USE_C_DESCRIPTORS:
+  _globals['DESCRIPTOR']._loaded_options = None
+  _globals['DESCRIPTOR']._serialized_options = b'\n,co.meshtrade.api.reporting.account_report.v1ZHgithub.com/meshtrade/api/go/reporting/account_report/v1;account_reportv1'
+  _globals['_ACCOUNTREPORT']._serialized_start=437
+  _globals['_ACCOUNTREPORT']._serialized_end=1330
+  _globals['_ACCOUNTREPORT_PERIOD']._serialized_start=1230
+  _globals['_ACCOUNTREPORT_PERIOD']._serialized_end=1330
+# @@protoc_insertion_point(module_scope)

meshtrade/reporting/account_report/v1/account_report_pb2.pyi

@@ -0,0 +1,48 @@
+import datetime
+
+from google.protobuf import timestamp_pb2 as _timestamp_pb2
+from meshtrade.type.v1 import token_pb2 as _token_pb2
+from meshtrade.type.v1 import address_pb2 as _address_pb2
+from meshtrade.reporting.account_report.v1 import fee_entry_pb2 as _fee_entry_pb2
+from meshtrade.reporting.account_report.v1 import income_entry_pb2 as _income_entry_pb2
+from meshtrade.reporting.account_report.v1 import trading_statement_entry_pb2 as _trading_statement_entry_pb2
+from meshtrade.reporting.account_report.v1 import disclaimer_pb2 as _disclaimer_pb2
+from google.protobuf.internal import containers as _containers
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import message as _message
+from collections.abc import Iterable as _Iterable, Mapping as _Mapping
+from typing import ClassVar as _ClassVar, Optional as _Optional, Union as _Union
+
+DESCRIPTOR: _descriptor.FileDescriptor
+
+class AccountReport(_message.Message):
+    __slots__ = ("income_entries", "fee_entries", "trading_statement_entries", "reporting_currency", "period", "generation_date", "account_number", "disclaimers", "client_address", "client_name", "copyright")
+    class Period(_message.Message):
+        __slots__ = ("to",)
+        FROM_FIELD_NUMBER: _ClassVar[int]
+        TO_FIELD_NUMBER: _ClassVar[int]
+        to: _timestamp_pb2.Timestamp
+        def __init__(self, to: _Optional[_Union[datetime.datetime, _timestamp_pb2.Timestamp, _Mapping]] = ..., **kwargs) -> None: ...
+    INCOME_ENTRIES_FIELD_NUMBER: _ClassVar[int]
+    FEE_ENTRIES_FIELD_NUMBER: _ClassVar[int]
+    TRADING_STATEMENT_ENTRIES_FIELD_NUMBER: _ClassVar[int]
+    REPORTING_CURRENCY_FIELD_NUMBER: _ClassVar[int]
+    PERIOD_FIELD_NUMBER: _ClassVar[int]
+    GENERATION_DATE_FIELD_NUMBER: _ClassVar[int]
+    ACCOUNT_NUMBER_FIELD_NUMBER: _ClassVar[int]
+    DISCLAIMERS_FIELD_NUMBER: _ClassVar[int]
+    CLIENT_ADDRESS_FIELD_NUMBER: _ClassVar[int]
+    CLIENT_NAME_FIELD_NUMBER: _ClassVar[int]
+    COPYRIGHT_FIELD_NUMBER: _ClassVar[int]
+    income_entries: _containers.RepeatedCompositeFieldContainer[_income_entry_pb2.IncomeEntry]
+    fee_entries: _containers.RepeatedCompositeFieldContainer[_fee_entry_pb2.FeeEntry]
+    trading_statement_entries: _containers.RepeatedCompositeFieldContainer[_trading_statement_entry_pb2.TradingStatementEntry]
+    reporting_currency: _token_pb2.Token
+    period: AccountReport.Period
+    generation_date: _timestamp_pb2.Timestamp
+    account_number: str
+    disclaimers: _containers.RepeatedCompositeFieldContainer[_disclaimer_pb2.Disclaimer]
+    client_address: _address_pb2.Address
+    client_name: str
+    copyright: str
+    def __init__(self, income_entries: _Optional[_Iterable[_Union[_income_entry_pb2.IncomeEntry, _Mapping]]] = ..., fee_entries: _Optional[_Iterable[_Union[_fee_entry_pb2.FeeEntry, _Mapping]]] = ..., trading_statement_entries: _Optional[_Iterable[_Union[_trading_statement_entry_pb2.TradingStatementEntry, _Mapping]]] = ..., reporting_currency: _Optional[_Union[_token_pb2.Token, _Mapping]] = ..., period: _Optional[_Union[AccountReport.Period, _Mapping]] = ..., generation_date: _Optional[_Union[datetime.datetime, _timestamp_pb2.Timestamp, _Mapping]] = ..., account_number: _Optional[str] = ..., disclaimers: _Optional[_Iterable[_Union[_disclaimer_pb2.Disclaimer, _Mapping]]] = ..., client_address: _Optional[_Union[_address_pb2.Address, _Mapping]] = ..., client_name: _Optional[str] = ..., copyright: _Optional[str] = ...) -> None: ...

meshtrade/reporting/{income_report → account_report}/v1/disclaimer_pb2.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # NO CHECKED-IN PROTOBUF GENCODE
-# source: meshtrade/reporting/income_report/v1/disclaimer.proto
+# source: meshtrade/reporting/account_report/v1/disclaimer.proto
 # Protobuf Python Version: 6.31.1
 """Generated protocol buffer code."""
 from google.protobuf import descriptor as _descriptor
@@ -15,7 +15,7 @@ _runtime_version.ValidateProtobufRuntimeVersion(
     31,
     1,
     '',
-    'meshtrade/reporting/income_report/v1/disclaimer.proto'
+    'meshtrade/reporting/account_report/v1/disclaimer.proto'
 )
 # @@protoc_insertion_point(imports)
 
@@ -24,14 +24,14 @@ _sym_db = _symbol_database.Default()
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n5meshtrade/reporting/income_report/v1/disclaimer.proto\x12$meshtrade.reporting.income_report.v1\"D\n\nDisclaimer\x12\x14\n\x05title\x18\x01 \x01(\tR\x05title\x12 \n\x0b\x64\x65scription\x18\x02 \x01(\tR\x0b\x64\x65scriptionBu\n+co.meshtrade.api.reporting.income_report.v1ZFgithub.com/meshtrade/api/go/reporting/income_report/v1;income_reportv1b\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n6meshtrade/reporting/account_report/v1/disclaimer.proto\x12%meshtrade.reporting.account_report.v1\"D\n\nDisclaimer\x12\x14\n\x05title\x18\x01 \x01(\tR\x05title\x12 \n\x0b\x64\x65scription\x18\x02 \x01(\tR\x0b\x64\x65scriptionBx\n,co.meshtrade.api.reporting.account_report.v1ZHgithub.com/meshtrade/api/go/reporting/account_report/v1;account_reportv1b\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtrade.reporting.income_report.v1.disclaimer_pb2', _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtrade.reporting.account_report.v1.disclaimer_pb2', _globals)
 if not _descriptor._USE_C_DESCRIPTORS:
   _globals['DESCRIPTOR']._loaded_options = None
-  _globals['DESCRIPTOR']._serialized_options = b'\n+co.meshtrade.api.reporting.income_report.v1ZFgithub.com/meshtrade/api/go/reporting/income_report/v1;income_reportv1'
-  _globals['_DISCLAIMER']._serialized_start=95
-  _globals['_DISCLAIMER']._serialized_end=163
+  _globals['DESCRIPTOR']._serialized_options = b'\n,co.meshtrade.api.reporting.account_report.v1ZHgithub.com/meshtrade/api/go/reporting/account_report/v1;account_reportv1'
+  _globals['_DISCLAIMER']._serialized_start=97
+  _globals['_DISCLAIMER']._serialized_end=165
 # @@protoc_insertion_point(module_scope)

meshtrade/reporting/account_report/v1/fee_entry_pb2.py

@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# NO CHECKED-IN PROTOBUF GENCODE
+# source: meshtrade/reporting/account_report/v1/fee_entry.proto
+# Protobuf Python Version: 6.31.1
+"""Generated protocol buffer code."""
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import runtime_version as _runtime_version
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
+_runtime_version.ValidateProtobufRuntimeVersion(
+    _runtime_version.Domain.PUBLIC,
+    6,
+    31,
+    1,
+    '',
+    'meshtrade/reporting/account_report/v1/fee_entry.proto'
+)
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+from google.protobuf import timestamp_pb2 as google_dot_protobuf_dot_timestamp__pb2
+from meshtrade.type.v1 import amount_pb2 as meshtrade_dot_type_dot_v1_dot_amount__pb2
+
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n5meshtrade/reporting/account_report/v1/fee_entry.proto\x12%meshtrade.reporting.account_report.v1\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x1emeshtrade/type/v1/amount.proto\"\xc7\x02\n\x08\x46\x65\x65\x45ntry\x12\x45\n\x10transaction_date\x18\x01 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\x0ftransactionDate\x12%\n\x0etransaction_id\x18\x02 \x01(\tR\rtransactionId\x12 \n\x0b\x64\x65scription\x18\x03 \x01(\tR\x0b\x64\x65scription\x12\x31\n\x06\x61mount\x18\x04 \x01(\x0b\x32\x19.meshtrade.type.v1.AmountR\x06\x61mount\x12Q\n\x17reported_currency_value\x18\x05 \x01(\x0b\x32\x19.meshtrade.type.v1.AmountR\x15reportedCurrencyValue\x12%\n\x0etoken_currency\x18\x06 \x01(\tR\rtokenCurrencyBx\n,co.meshtrade.api.reporting.account_report.v1ZHgithub.com/meshtrade/api/go/reporting/account_report/v1;account_reportv1b\x06proto3')
+
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtrade.reporting.account_report.v1.fee_entry_pb2', _globals)
+if not _descriptor._USE_C_DESCRIPTORS:
+  _globals['DESCRIPTOR']._loaded_options = None
+  _globals['DESCRIPTOR']._serialized_options = b'\n,co.meshtrade.api.reporting.account_report.v1ZHgithub.com/meshtrade/api/go/reporting/account_report/v1;account_reportv1'
+  _globals['_FEEENTRY']._serialized_start=162
+  _globals['_FEEENTRY']._serialized_end=489
+# @@protoc_insertion_point(module_scope)

meshtrade/reporting/account_report/v1/fee_entry_pb2.pyi

@@ -0,0 +1,26 @@
+import datetime
+
+from google.protobuf import timestamp_pb2 as _timestamp_pb2
+from meshtrade.type.v1 import amount_pb2 as _amount_pb2
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import message as _message
+from collections.abc import Mapping as _Mapping
+from typing import ClassVar as _ClassVar, Optional as _Optional, Union as _Union
+
+DESCRIPTOR: _descriptor.FileDescriptor
+
+class FeeEntry(_message.Message):
+    __slots__ = ("transaction_date", "transaction_id", "description", "amount", "reported_currency_value", "token_currency")
+    TRANSACTION_DATE_FIELD_NUMBER: _ClassVar[int]
+    TRANSACTION_ID_FIELD_NUMBER: _ClassVar[int]
+    DESCRIPTION_FIELD_NUMBER: _ClassVar[int]
+    AMOUNT_FIELD_NUMBER: _ClassVar[int]
+    REPORTED_CURRENCY_VALUE_FIELD_NUMBER: _ClassVar[int]
+    TOKEN_CURRENCY_FIELD_NUMBER: _ClassVar[int]
+    transaction_date: _timestamp_pb2.Timestamp
+    transaction_id: str
+    description: str
+    amount: _amount_pb2.Amount
+    reported_currency_value: _amount_pb2.Amount
+    token_currency: str
+    def __init__(self, transaction_date: _Optional[_Union[datetime.datetime, _timestamp_pb2.Timestamp, _Mapping]] = ..., transaction_id: _Optional[str] = ..., description: _Optional[str] = ..., amount: _Optional[_Union[_amount_pb2.Amount, _Mapping]] = ..., reported_currency_value: _Optional[_Union[_amount_pb2.Amount, _Mapping]] = ..., token_currency: _Optional[str] = ...) -> None: ...

meshtrade/reporting/account_report/v1/income_entry_pb2.py

@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# NO CHECKED-IN PROTOBUF GENCODE
+# source: meshtrade/reporting/account_report/v1/income_entry.proto
+# Protobuf Python Version: 6.31.1
+"""Generated protocol buffer code."""
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import runtime_version as _runtime_version
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
+_runtime_version.ValidateProtobufRuntimeVersion(
+    _runtime_version.Domain.PUBLIC,
+    6,
+    31,
+    1,
+    '',
+    'meshtrade/reporting/account_report/v1/income_entry.proto'
+)
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+from meshtrade.type.v1 import token_pb2 as meshtrade_dot_type_dot_v1_dot_token__pb2
+from meshtrade.type.v1 import amount_pb2 as meshtrade_dot_type_dot_v1_dot_amount__pb2
+from google.protobuf import timestamp_pb2 as google_dot_protobuf_dot_timestamp__pb2
+
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n8meshtrade/reporting/account_report/v1/income_entry.proto\x12%meshtrade.reporting.account_report.v1\x1a\x1dmeshtrade/type/v1/token.proto\x1a\x1emeshtrade/type/v1/amount.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"\x8a\x03\n\x0bIncomeEntry\x12\x1d\n\nasset_name\x18\x01 \x01(\tR\tassetName\x12.\n\x05token\x18\x02 \x01(\x0b\x32\x18.meshtrade.type.v1.TokenR\x05token\x12.\n\x04\x64\x61te\x18\x03 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\x04\x64\x61te\x12 \n\x0b\x64\x65scription\x18\x04 \x01(\tR\x0b\x64\x65scription\x12T\n\tnarrative\x18\x05 \x01(\x0e\x32\x36.meshtrade.reporting.account_report.v1.IncomeNarrativeR\tnarrative\x12\x31\n\x06\x61mount\x18\x06 \x01(\x0b\x32\x19.meshtrade.type.v1.AmountR\x06\x61mount\x12Q\n\x17reported_currency_value\x18\x07 \x01(\x0b\x32\x19.meshtrade.type.v1.AmountR\x15reportedCurrencyValue*l\n\x0fIncomeNarrative\x12 \n\x1cINCOME_NARRATIVE_UNSPECIFIED\x10\x00\x12\x1a\n\x16INCOME_NARRATIVE_YIELD\x10\x01\x12\x1b\n\x17INCOME_NARRATIVE_COUPON\x10\x02\x42x\n,co.meshtrade.api.reporting.account_report.v1ZHgithub.com/meshtrade/api/go/reporting/account_report/v1;account_reportv1b\x06proto3')
+
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtrade.reporting.account_report.v1.income_entry_pb2', _globals)
+if not _descriptor._USE_C_DESCRIPTORS:
+  _globals['DESCRIPTOR']._loaded_options = None
+  _globals['DESCRIPTOR']._serialized_options = b'\n,co.meshtrade.api.reporting.account_report.v1ZHgithub.com/meshtrade/api/go/reporting/account_report/v1;account_reportv1'
+  _globals['_INCOMENARRATIVE']._serialized_start=592
+  _globals['_INCOMENARRATIVE']._serialized_end=700
+  _globals['_INCOMEENTRY']._serialized_start=196
+  _globals['_INCOMEENTRY']._serialized_end=590
+# @@protoc_insertion_point(module_scope)

meshtrade/reporting/{income_report/v1/entry_pb2.pyi → account_report/v1/income_entry_pb2.pyi}

@@ -11,16 +11,16 @@ from typing import ClassVar as _ClassVar, Optional as _Optional, Union as _Union
 
 DESCRIPTOR: _descriptor.FileDescriptor
 
-class Narrative(int, metaclass=_enum_type_wrapper.EnumTypeWrapper):
+class IncomeNarrative(int, metaclass=_enum_type_wrapper.EnumTypeWrapper):
     __slots__ = ()
-    NARRATIVE_UNSPECIFIED: _ClassVar[Narrative]
-    NARRATIVE_YIELD: _ClassVar[Narrative]
-    NARRATIVE_COUPON: _ClassVar[Narrative]
-NARRATIVE_UNSPECIFIED: Narrative
-NARRATIVE_YIELD: Narrative
-NARRATIVE_COUPON: Narrative
+    INCOME_NARRATIVE_UNSPECIFIED: _ClassVar[IncomeNarrative]
+    INCOME_NARRATIVE_YIELD: _ClassVar[IncomeNarrative]
+    INCOME_NARRATIVE_COUPON: _ClassVar[IncomeNarrative]
+INCOME_NARRATIVE_UNSPECIFIED: IncomeNarrative
+INCOME_NARRATIVE_YIELD: IncomeNarrative
+INCOME_NARRATIVE_COUPON: IncomeNarrative
 
-class Entry(_message.Message):
+class IncomeEntry(_message.Message):
     __slots__ = ("asset_name", "token", "date", "description", "narrative", "amount", "reported_currency_value")
     ASSET_NAME_FIELD_NUMBER: _ClassVar[int]
     TOKEN_FIELD_NUMBER: _ClassVar[int]
@@ -33,7 +33,7 @@ class Entry(_message.Message):
     token: _token_pb2.Token
     date: _timestamp_pb2.Timestamp
     description: str
-    narrative: Narrative
+    narrative: IncomeNarrative
     amount: _amount_pb2.Amount
     reported_currency_value: _amount_pb2.Amount
-    def __init__(self, asset_name: _Optional[str] = ..., token: _Optional[_Union[_token_pb2.Token, _Mapping]] = ..., date: _Optional[_Union[datetime.datetime, _timestamp_pb2.Timestamp, _Mapping]] = ..., description: _Optional[str] = ..., narrative: _Optional[_Union[Narrative, str]] = ..., amount: _Optional[_Union[_amount_pb2.Amount, _Mapping]] = ..., reported_currency_value: _Optional[_Union[_amount_pb2.Amount, _Mapping]] = ...) -> None: ...
+    def __init__(self, asset_name: _Optional[str] = ..., token: _Optional[_Union[_token_pb2.Token, _Mapping]] = ..., date: _Optional[_Union[datetime.datetime, _timestamp_pb2.Timestamp, _Mapping]] = ..., description: _Optional[str] = ..., narrative: _Optional[_Union[IncomeNarrative, str]] = ..., amount: _Optional[_Union[_amount_pb2.Amount, _Mapping]] = ..., reported_currency_value: _Optional[_Union[_amount_pb2.Amount, _Mapping]] = ...) -> None: ...

meshtrade/reporting/account_report/v1/income_entry_pb2_grpc.py

@@ -0,0 +1,4 @@
+# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
+"""Client and server classes corresponding to protobuf-defined services."""
+import grpc
+