From 1dee6766e8f52a753ff79a3ecfe8f46dd3f07cdb Mon Sep 17 00:00:00 2001 From: Mic Bowman Date: Tue, 5 Mar 2024 17:35:18 -0800 Subject: [PATCH] Small updates for PR feedback Added documentation (client/docs/collection.md). Added entrypoint for a collection command. Updated types. Signed-off-by: Mic Bowman --- client/docs/collection.md | 141 +++++++++++++++++++++++ client/pdo/client/commands/collection.py | 16 ++- client/pdo/client/scripts/EntryPoints.py | 4 + client/setup.py | 1 + 4 files changed, 158 insertions(+), 4 deletions(-) create mode 100644 client/docs/collection.md diff --git a/client/docs/collection.md b/client/docs/collection.md new file mode 100644 index 00000000..1cf1802e --- /dev/null +++ b/client/docs/collection.md @@ -0,0 +1,141 @@ + + +# Contract Collection Files # + +**THIS FILE DESCRIBES AN EXPERIMENTAL FACILITY FOR PDO** + +Often a contract is meaningful only in the context of other +contracts. For example, an asset issuer contract object may depend +upon an asset type contract object. The type object is necessary to +establish trust in the scope of the asset being issued. + +In order to simplify sharing, a contract collection file packages +information about a collection of contracts and their relationship to +each other into a single bundle. The file that is created includes a +context file that describes the relationships between the contracts +and a list of contract description files that can be used to operate +on the contract objects. + +## What's the Problem ## + +Ultimately, the contract collection file operations are designed to +simplify sharing of complex sets of inter-related contracts. + +Currently, context files are the means through which relationships +between contract objects are captured. For example, the following +context file uses context relative links to describe the relationship +between an asset type, a vetting organization, and an asset issuer. In +this case, the blue marble issuer depends on specific asset type and +vetting contract object. That is, many operations on the blue marble +issuer contract object require operations on the corresponding asset +type and vetting contract objects. + +``` +[marbles.blue.asset_type] +identity = "blue_type" +source = "@{ContractFamily.Exchange.asset_type.source}" +name = "blue marble" +description = "blue marble asset type" +link = "http://" + +[marbles.blue.vetting] +identity = "blue_vetting" +source = "@{ContractFamily.Exchange.vetting.source}" +asset_type_context = "@{..asset_type}" + +[marbles.blue.issuer] +identity = "blue_issuer" +source = "${ContractFamily.Exchange.issuer.source}" +asset_type_context = "@{..asset_type}" +vetting_context = "@{..vetting}" +``` + +When the asset type, vetting organization and issuer contracts have +been created, common PDO tools will add a reference to the contract +description file (the `save_file` attribute). + +``` +[marbles.blue.asset_type] +identity = "blue_type" +source = "@{ContractFamily.Exchange.asset_type.source}" +name = "blue marble" +description = "blue marble asset type" +link = "http://" +save_file = "asset_type_5057b384b77f99cd.pdo" + +[marbles.blue.vetting] +identity = "blue_vetting" +source = "@{ContractFamily.Exchange.vetting.source}" +asset_type_context = "@{..asset_type}" +save_file = "vetting_6e3338599072eecd.pdo" + +[marbles.blue.issuer] +identity = "blue_issuer" +source = "${ContractFamily.Exchange.issuer.source}" +asset_type_context = "@{..asset_type}" +vetting_context = "@{..vetting}" +save_file = "issuer_contract_6926ae75188c1954.pdo" +``` + +Contract collection file operations are intended to provide a simple +way to share complete collections of contract object and the +relationships between them. + +## Format of the Contract Collection File ## + +A contract collection file is a compressed archive that includes a +collection of contract description files and a context file that +describes the relationships between the contract objects in the +description files. + +The context file, `context.toml`, is a TOML formatted file that +captures the relative relationships between the contract objects. All +context relative paths (e.g. `@{..vetting}`) must be resolved within +the context defined in `context.toml`. In addition, the context +contains a list of the high level contexts to simplify enumeration of +the objects in the context file. + +Each of the contract description files is stored separately in the +bundle. While the operations provided by PDO currently attach unique +identifiers to the file names, ultimately the file names should not be +assumed to be globally unique. + +## Export a Contract Collection File ## + +The function `export_contract_collection` creates a contract collection file: +``` + export_contract_collection(context, context_paths, contract_cache, export_file) +``` + + * **context**: current context + * **context_paths** : list of path expressions to retrieve values from a context + * **contract_cache** : name of the directory where contract save files are stored + * **export_file** : name of the file where the contract family will be written + +```python + export_contract_collection( + context.get_context('marbles.blue'), + ['asset_type', 'vetting', 'issuer'], + '__contract_cache__', + 'blue_marble_collection.zip') +``` + +## Import a Contract Collection File ## + +The function `import_contract_collection` creates a context and save +contract save files from a contract collection file: +``` +import_contract_collection(context_file_name, contract_cache, import_file) +``` + + * **context_file_name** : name of the file to save imported context + * **contract_cache** : name of the directory where contract save files are stored + * **import_file** : name of the contract collection file to import + +```python + import_contract_collection('blue_marble.toml', '__contract_cache__', 'blue_marble_collection.zip') + context.LoadContextFile(state, bindings, 'blue_marble.toml', prefix='marbles.blue') +``` diff --git a/client/pdo/client/commands/collection.py b/client/pdo/client/commands/collection.py index cf7771af..272c1d02 100644 --- a/client/pdo/client/commands/collection.py +++ b/client/pdo/client/commands/collection.py @@ -12,6 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. +# collections are a package for sharing multiple, interrelated +# contracts. more information is available in the file +# $PDO_SOURCE_ROOT/client/docs/collection.md + import argparse import copy import logging @@ -29,8 +33,8 @@ logger = logging.getLogger(__name__) __all__ = [ - 'export_contract_collection', - 'import_contract_collection', + 'export', + 'import', 'script_command_export', 'script_command_import', 'do_collection', @@ -57,11 +61,15 @@ def __find_contracts__(context : dict) -> typing.List[str] : # ----------------------------------------------------------------- # ----------------------------------------------------------------- @experimental -def export_contract_collection(context, context_paths : typing.List[str], contract_cache : str, export_file : str) : +def export_contract_collection( + context : pbuilder.context.Context, + context_paths : typing.List[str], + contract_cache : str, + export_file : str) : """Export the context and associated contract files to a zip file that can be shared with others who want to use the contract - @type context: pdo.client.builder.context.Context + @type context: pbuilder.context.Context @param context: current context @param context_paths : list of path expressions to retrieve values from a context @param contract_cache : name of the directory where contract save files are stored diff --git a/client/pdo/client/scripts/EntryPoints.py b/client/pdo/client/scripts/EntryPoints.py index dd8c2461..234fc338 100644 --- a/client/pdo/client/scripts/EntryPoints.py +++ b/client/pdo/client/scripts/EntryPoints.py @@ -22,6 +22,10 @@ warnings.catch_warnings() warnings.simplefilter("ignore") +# ----------------------------------------------------------------- +def run_shell_collection() : + run_shell_command('do_collection', 'pdo.client.commands.collection') + # ----------------------------------------------------------------- def run_shell_context() : run_shell_command('do_context', 'pdo.client.commands.context') diff --git a/client/setup.py b/client/setup.py index 289823dd..0d67b527 100644 --- a/client/setup.py +++ b/client/setup.py @@ -62,6 +62,7 @@ entry_points = { 'console_scripts': [ 'pdo-shell = pdo.client.scripts.ShellCLI:Main', + 'pdo-collection = pdo.client.scripts.EntryPoints:run_shell_collection', 'pdo-contract = pdo.client.scripts.EntryPoints:run_shell_contract', 'pdo-context = pdo.client.scripts.EntryPoints:run_shell_context', 'pdo-ledger = pdo.client.scripts.EntryPoints:run_shell_ledger',