AEA-245 AEA-244 AEA-225 Adding protocol generator to the CLI tool #605

5A11 · 2020-01-06T14:02:08Z

Proposed changes

Adding the protocol generator form the agents-research repository to the this repository.

Adding protocol generation as an option in the CLI tool.

Fixes #521, #556, #557

Types of changes

What types of changes does your code introduce to agents-aea?
Put an x in the boxes that apply

Bugfix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that would cause existing functionality to not work as expected)

Checklist

Put an x in the boxes that apply.

I have read the CONTRIBUTING doc
I am making a pull request against the develop branch (left side). Also you should start your branch off our develop.
Lint and unit tests pass locally with my changes
I have added tests that prove my fix is effective or that my feature works
I have checked that code coverage does not decrease.
I have checked that the documentation about the aea cli tool works
I have added necessary documentation (if appropriate)
Any dependent changes have been merged and published in downstream modules

Further comments

Work in progress...

…scaffold file

DavidMinarsch

Great work as a first step. Please consider my comments and add some tests for the new command.

aea/cli/core.py

aea/cli/generate.py

aea/protocols/generator.py

…hortening error checking code in protocol template class; replacing 0.1.0 with a constant DEFAULT_VERSION;

DavidMinarsch

Thanks for the changes, spotted a few more suggestions.

aea/cli/generate.py

aea/protocols/generator.py

aea/protocols/sample_protocol_specification.yaml

…otocolConfig object; Addresses second bacth of comments in PR; changing authors->author; license_config->license; moved sample_proto_spec file to new location;

aea/cli/generate.py

aea/protocols/generator.py

…acting its fields using ProtocolConfig objects;

tests/test_cli/test_generate/test_protocols.py

…elCase for class names; list of contents -> dictionary of contents and styled;

…y method

… tests pass; CURRENTLY: 1 test does not pass (commented); Not sure about the validity of TestGenerateProtocolFailsWhenExceptionOccurs, although it passes;

tests/data/generator/two_party_negotiation/__init__.py

DavidMinarsch

Great work on tests! I have some comments re the protocols we generate. We can improve the formatting and make sure they are mypy/flake8 compliant. We need to fix the contents argument. A list won't work as we have a dict elsewhere in speech_acts so there is no ordering.

tests/data/generator/two_party_negotiation/message.py

DavidMinarsch · 2020-01-10T14:43:55Z

tests/data/generator/two_party_negotiation/message.py

+            if message_id == 1:
+                assert target == 0, "target should be 0"
+            else:
+                assert 1 < target < message_id, "target should be between 1 and message_id"


assert 0 < target < message_id, "target should be strictly between 0 and message_id"

Only the first message's target can be 0 (i.e. targets nothing since first move).
The other moves must target an existing one (i.e. 1 < target < message_id).

Yes, but your code excludes target=1 which is a valid target for a message_id > 1

tests/data/generator/two_party_negotiation/serialization.py

tests/test_cli/test_generate/test_protocols.py

DavidMinarsch

LGTM

5A11 added 2 commits January 6, 2020 13:48

Adding protocol generator to the cli tool; small formating update to …

ff92966

…scaffold file

Small changes to the pathing

fee725a

5A11 requested a review from DavidMinarsch January 6, 2020 14:02

5A11 changed the base branch from master to develop January 6, 2020 14:02

DavidMinarsch suggested changes Jan 6, 2020

View reviewed changes

Addressing first batch of comments in PR; removing commented lines; s…

b0930e2

…hortening error checking code in protocol template class; replacing 0.1.0 with a constant DEFAULT_VERSION;

DavidMinarsch reviewed Jan 7, 2020

View reviewed changes

Adds fields extracted from the first yaml proto_spec document to a Pr…

a13935e

…otocolConfig object; Addresses second bacth of comments in PR; changing authors->author; license_config->license; moved sample_proto_spec file to new location;

DavidMinarsch reviewed Jan 8, 2020

View reviewed changes

aea/cli/generate.py Outdated Show resolved Hide resolved

aea/protocols/generator.py Outdated Show resolved Hide resolved

5A11 and others added 3 commits January 8, 2020 17:57

WIP: reading proto_spec yaml file, checking its consistency, and extr…

e280485

…acting its fields using ProtocolConfig objects;

Merge branch 'develop' into add/generator

6ecb821

fix generate and generator and add tests

09aae94

DavidMinarsch reviewed Jan 8, 2020

View reviewed changes

tests/test_cli/test_generate/test_protocols.py Outdated Show resolved Hide resolved

5A11 added 4 commits January 9, 2020 14:25

Modified import for the generated Serialised class; snake_case to Cam…

1e6884c

…elCase for class names; list of contents -> dictionary of contents and styled;

Added 4 tests that pass; changed class field performatives to propert…

3b935dc

…y method

Add check to cli generate for existing directory with same name; Make…

851137c

… tests pass; CURRENTLY: 1 test does not pass (commented); Not sure about the validity of TestGenerateProtocolFailsWhenExceptionOccurs, although it passes;

Addressing flake8 and mypy errors

97e65f8

DavidMinarsch reviewed Jan 10, 2020

View reviewed changes

tests/data/generator/two_party_negotiation/__init__.py Show resolved Hide resolved

DavidMinarsch reviewed Jan 10, 2020

View reviewed changes

5A11 and others added 3 commits January 10, 2020 15:42

Changin contents from List to Dict; Minor formatting;

3a75416

Merge branch 'develop' into add/generator

da5c28d

minor fixes to outstanding issues

17b3e7b

DavidMinarsch approved these changes Jan 11, 2020

View reviewed changes

DavidMinarsch merged commit a473ca3 into develop Jan 11, 2020

DavidMinarsch deleted the add/generator branch January 11, 2020 12:47

DavidMinarsch changed the title ~~Adding protocol generator to the CLI tool~~ AEA-245 AEA-244 AEA-225 Adding protocol generator to the CLI tool Jan 11, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

AEA-245 AEA-244 AEA-225 Adding protocol generator to the CLI tool #605

AEA-245 AEA-244 AEA-225 Adding protocol generator to the CLI tool #605

5A11 commented Jan 6, 2020 •

edited by DavidMinarsch

Loading

DavidMinarsch left a comment

DavidMinarsch left a comment

DavidMinarsch left a comment

DavidMinarsch Jan 10, 2020

5A11 Jan 10, 2020

DavidMinarsch Jan 11, 2020

DavidMinarsch left a comment

AEA-245 AEA-244 AEA-225 Adding protocol generator to the CLI tool #605

AEA-245 AEA-244 AEA-225 Adding protocol generator to the CLI tool #605

Conversation

5A11 commented Jan 6, 2020 • edited by DavidMinarsch Loading

Proposed changes

Types of changes

Checklist

Further comments

DavidMinarsch left a comment

Choose a reason for hiding this comment

DavidMinarsch left a comment

Choose a reason for hiding this comment

DavidMinarsch left a comment

Choose a reason for hiding this comment

DavidMinarsch Jan 10, 2020

Choose a reason for hiding this comment

5A11 Jan 10, 2020

Choose a reason for hiding this comment

DavidMinarsch Jan 11, 2020

Choose a reason for hiding this comment

DavidMinarsch left a comment

Choose a reason for hiding this comment

5A11 commented Jan 6, 2020 •

edited by DavidMinarsch

Loading