Merge pull request #1996 from fetchai/develop

Release v0.7.5

.github/workflows/workflow.yml

@@ -187,7 +187,7 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
         python_version: [3.6, 3.7, 3.8, 3.9]
-    timeout-minutes: 40
+    timeout-minutes: 50
     steps:
     - uses: actions/checkout@master
     - uses: actions/setup-python@master

.gitignore

@@ -121,6 +121,7 @@ output_file
 
 !packages/fetchai/contracts/erc1155/build
 !packages/fetchai/contracts/staking_erc20/build
+!packages/fetchai/contracts/oracle/build
 packages/fetchai/connections/p2p_libp2p/libp2p_node
 
 !tests/data/dummy_contract/build

HISTORY.md

@@ -1,5 +1,18 @@
 # Release History
 
+## 0.7.5 (2020-11-25)
+
+- Adds AW3 AEAs
+- Adds basic oracle skills and contracts
+- Replaces usage of Ropsten testnet with Ganache in packages
+- Fixes multiplexer setup when used outside AEA
+- Improves help command output of CLI
+- Adds integration tests for simple skills
+- Adds version check on CLI push
+- Adds integration tests for tac negotiation skills
+- Multiple docs updates based on user feedback
+- Multiple additional tests and test stability fixes
+
 ## 0.7.4 (2020-11-18)
 
 - Replaces error skill handler usage with built in handler

Makefile

@@ -78,17 +78,17 @@ common_checks: security misc_checks lint static docs
 
 .PHONY: test
 test:
-	pytest -rfE --doctest-modules aea packages/fetchai/protocols packages/fetchai/connections packages/fetchai/skills/generic_buyer packages/fetchai/skills/generic_seller packages/fetchai/skills/tac_control packages/fetchai/skills/tac_control_contract packages/fetchai/skills/tac_participation tests/ --cov-report=html --cov-report=xml --cov-report=term-missing --cov-report=term --cov=aea --cov=packages/fetchai/protocols --cov=packages/fetchai/connections --cov=packages/fetchai/skills/generic_buyer --cov=packages/fetchai/skills/generic_seller --cov=packages/fetchai/skills/tac_control --cov=packages/fetchai/skills/tac_control_contract --cov=packages/fetchai/skills/tac_participation --cov-config=.coveragerc
+	pytest -rfE --doctest-modules aea packages/fetchai/protocols packages/fetchai/connections packages/fetchai/skills/generic_buyer packages/fetchai/skills/generic_seller packages/fetchai/skills/tac_control packages/fetchai/skills/tac_control_contract packages/fetchai/skills/tac_participation packages/fetchai/skills/tac_negotiation packages/fetchai/skills/simple_buyer packages/fetchai/skills/simple_data_request packages/fetchai/skills/simple_seller packages/fetchai/skills/simple_service_registration packages/fetchai/skills/simple_service_search tests/ --cov-report=html --cov-report=xml --cov-report=term-missing --cov-report=term --cov=aea --cov=packages/fetchai/protocols --cov=packages/fetchai/connections --cov=packages/fetchai/skills/generic_buyer --cov=packages/fetchai/skills/generic_seller --cov=packages/fetchai/skills/tac_control --cov=packages/fetchai/skills/tac_control_contract --cov=packages/fetchai/skills/tac_participation --cov=packages/fetchai/skills/tac_negotiation --cov=packages/fetchai/skills/simple_buyer --cov=packages/fetchai/skills/simple_data_request --cov=packages/fetchai/skills/simple_seller --cov=packages/fetchai/skills/simple_service_registration --cov=packages/fetchai/skills/simple_service_search --cov-config=.coveragerc
 	find . -name ".coverage*" -not -name ".coveragerc" -exec rm -fr "{}" \;
 
 .PHONY: test-sub
 test-sub:
-	pytest -rfE --doctest-modules aea packages/fetchai/connections packages/fetchai/protocols packages/fetchai/skills/generic_buyer packages/fetchai/skills/generic_seller packages/fetchai/skills/tac_control packages/fetchai/skills/tac_control_contract packages/fetchai/skills/tac_participation  tests/test_$(tdir) --cov=aea.$(dir) --cov-report=html --cov-report=xml --cov-report=term-missing --cov-report=term  --cov-config=.coveragerc
+	pytest -rfE --doctest-modules aea packages/fetchai/connections packages/fetchai/protocols packages/fetchai/skills/generic_buyer packages/fetchai/skills/generic_seller packages/fetchai/skills/tac_control packages/fetchai/skills/tac_control_contract packages/fetchai/skills/tac_participation packages/fetchai/skills/tac_negotiation tests/test_$(tdir) --cov=aea.$(dir) --cov-report=html --cov-report=xml --cov-report=term-missing --cov-report=term  --cov-config=.coveragerc
 	find . -name ".coverage*" -not -name ".coveragerc" -exec rm -fr "{}" \;
 
 .PHONY: test-sub-p
 test-sub-p:
-	pytest -rfE --doctest-modules aea packages/fetchai/connections packages/fetchai/protocols packages/fetchai/skills/generic_buyer packages/fetchai/skills/generic_seller packages/fetchai/skills/tac_control packages/fetchai/skills/tac_control_contract packages/fetchai/skills/tac_participation tests/test_packages/test_$(tdir) --cov=packages.fetchai.$(dir) --cov-report=html --cov-report=xml --cov-report=term-missing --cov-report=term  --cov-config=.coveragerc
+	pytest -rfE --doctest-modules aea packages/fetchai/connections packages/fetchai/protocols packages/fetchai/skills/generic_buyer packages/fetchai/skills/generic_seller packages/fetchai/skills/tac_control packages/fetchai/skills/tac_control_contract packages/fetchai/skills/tac_participation packages/fetchai/skills/tac_negotiation packages/fetchai/skills/simple_buyer packages/fetchai/skills/simple_data_request packages/fetchai/skills/simple_seller packages/fetchai/skills/simple_service_registration packages/fetchai/skills/simple_service_search tests/test_packages/test_$(tdir) --cov=packages.fetchai.$(dir) --cov-report=html --cov-report=xml --cov-report=term-missing --cov-report=term  --cov-config=.coveragerc
 	find . -name ".coverage*" -not -name ".coveragerc" -exec rm -fr "{}" \;
 
 

README.md

@@ -73,6 +73,18 @@ A framework for autonomous economic agent (AEA) development
   </a>
 </p>
 
+## Alternatively: Use Pipx (CLI usage only)
+
+1. Install [PipX](https://github.com/pipxproject/pipx)
+
+2. Install the package from [PyPI](https://pypi.org/project/aea/):
+
+       pipx install aea[all]
+
+3. Run aea cli e.g.:
+
+       aea --help
+
 ## Alternatively: Install from Source
 
 This approach is not recommended!

aea/__version__.py

@@ -22,7 +22,7 @@
 __title__ = "aea"
 __description__ = "Autonomous Economic Agent framework"
 __url__ = "https://github.com/fetchai/agents-aea.git"
-__version__ = "0.7.4"
+__version__ = "0.7.5"
 __author__ = "Fetch.AI Limited"
 __license__ = "Apache-2.0"
 __copyright__ = "2019 Fetch.AI Limited"

aea/cli/add.py

@@ -49,7 +49,7 @@
 @click.pass_context
 @check_aea_project
 def add(click_context, local, remote):
-    """Add a resource to the agent."""
+    """Add a package to the agent."""
     ctx = cast(Context, click_context.obj)
     ctx.set_config("is_local", local and not remote)
     ctx.set_config("is_mixed", not local and not remote)
@@ -59,15 +59,15 @@ def add(click_context, local, remote):
 @click.argument("connection_public_id", type=PublicIdParameter(), required=True)
 @pass_ctx
 def connection(ctx: Context, connection_public_id: PublicId):
-    """Add a connection to the configuration file."""
+    """Add a connection to the agent."""
     add_item(ctx, CONNECTION, connection_public_id)
 
 
 @add.command()
 @click.argument("contract_public_id", type=PublicIdParameter(), required=True)
 @pass_ctx
 def contract(ctx: Context, contract_public_id: PublicId):
-    """Add a contract to the configuration file."""
+    """Add a contract to the agent."""
     add_item(ctx, CONTRACT, contract_public_id)
 
 

aea/cli/add_key.py

@@ -53,7 +53,7 @@
 @click.pass_context
 @check_aea_project
 def add_key(click_context, type_, file, connection):
-    """Add a private key to the wallet."""
+    """Add a private key to the wallet of the agent."""
     _add_private_key(click_context, type_, file, connection)
 
 

aea/cli/config.py

@@ -51,7 +51,7 @@
 @click.pass_context
 @check_aea_project
 def config(click_context):  # pylint: disable=unused-argument
-    """Read or modify a configuration."""
+    """Read or modify a configuration of the agent."""
 
 
 @config.command()

aea/cli/core.py

@@ -72,11 +72,11 @@
     is_flag=True,
     required=False,
     default=False,
-    help="Skip consistency check.",
+    help="Skip consistency checks.",
 )
 @click.pass_context
 def cli(click_context, skip_consistency_check: bool) -> None:
-    """Command-line tool for setting up an Autonomous Economic Agent."""
+    """Command-line tool for setting up an Autonomous Economic Agent (AEA)."""
     verbosity_option = click_context.meta.pop("verbosity")
     click_context.obj = Context(cwd=".", verbosity=verbosity_option)
     click_context.obj.set_config("skip_consistency_check", skip_consistency_check)

aea/cli/create.py

@@ -74,7 +74,7 @@ def create(
     local: bool,
     empty: bool,
 ):
-    """Create an agent."""
+    """Create a new agent."""
     ctx = cast(Context, click_context.obj)
     create_aea(ctx, agent_name, local, author=author, empty=empty)
 

aea/cli/eject.py

@@ -80,7 +80,7 @@
 @click.pass_context
 @check_aea_project
 def eject(click_context: click.core.Context, quiet: bool, with_symlinks: bool):
-    """Eject an installed item."""
+    """Eject a vendor package of the agent."""
     click_context.obj.set_config("quiet", quiet)
     click_context.obj.set_config("with_symlinks", with_symlinks)
     set_cli_author(click_context)
@@ -90,7 +90,7 @@ def eject(click_context: click.core.Context, quiet: bool, with_symlinks: bool):
 @click.argument("public_id", type=PublicIdParameter(), required=True)
 @pass_ctx
 def connection(ctx: Context, public_id: PublicId):
-    """Eject an installed connection."""
+    """Eject a vendor connection."""
     quiet = ctx.config.get("quiet")
     with_symlinks = ctx.config.get("with_symlinks")
     _eject_item(ctx, CONNECTION, public_id, quiet=quiet, with_symlinks=with_symlinks)
@@ -100,7 +100,7 @@ def connection(ctx: Context, public_id: PublicId):
 @click.argument("public_id", type=PublicIdParameter(), required=True)
 @pass_ctx
 def contract(ctx: Context, public_id: PublicId):
-    """Eject an installed contract."""
+    """Eject a vendor contract."""
     quiet = ctx.config.get("quiet")
     with_symlinks = ctx.config.get("with_symlinks")
     _eject_item(ctx, CONTRACT, public_id, quiet=quiet, with_symlinks=with_symlinks)
@@ -110,7 +110,7 @@ def contract(ctx: Context, public_id: PublicId):
 @click.argument("public_id", type=PublicIdParameter(), required=True)
 @pass_ctx
 def protocol(ctx: Context, public_id: PublicId):
-    """Eject an installed protocol."""
+    """Eject a vendor protocol."""
     quiet = ctx.config.get("quiet")
     with_symlinks = ctx.config.get("with_symlinks")
     _eject_item(ctx, PROTOCOL, public_id, quiet=quiet, with_symlinks=with_symlinks)
@@ -120,7 +120,7 @@ def protocol(ctx: Context, public_id: PublicId):
 @click.argument("public_id", type=PublicIdParameter(), required=True)
 @pass_ctx
 def skill(ctx: Context, public_id: PublicId):
-    """Eject an installed skill."""
+    """Eject a vendor skill."""
     quiet = ctx.config.get("quiet")
     with_symlinks = ctx.config.get("with_symlinks")
     _eject_item(ctx, SKILL, public_id, quiet=quiet, with_symlinks=with_symlinks)

aea/cli/fetch.py

@@ -56,7 +56,7 @@
 @click.argument("public-id", type=PublicIdParameter(), required=True)
 @click.pass_context
 def fetch(click_context, public_id, alias, local, remote):
-    """Fetch Agent from Registry."""
+    """Fetch an agent from the registry."""
     ctx = cast(Context, click_context.obj)
     is_mixed = not local and not remote
     ctx.set_config("is_local", local and not remote)

aea/cli/fingerprint.py

@@ -46,7 +46,7 @@
 @click.group()
 @click.pass_context
 def fingerprint(click_context: click.core.Context):  # pylint: disable=unused-argument
-    """Fingerprint a resource."""
+    """Fingerprint a non-vendor package of the agent."""
 
 
 @fingerprint.command()

aea/cli/freeze.py

@@ -31,7 +31,7 @@
 @click.pass_context
 @check_aea_project
 def freeze(click_context):
-    """Get the dependencies."""
+    """Get the dependencies of the agent."""
     deps = _get_deps(click_context)
     for dependency in deps:
         click.echo(dependency)

aea/cli/generate.py

@@ -37,7 +37,7 @@
 @click.pass_context
 @check_aea_project
 def generate(click_context: click.core.Context):  # pylint: disable=unused-argument
-    """Generate a resource for the agent."""
+    """Generate a package for the agent."""
 
 
 @generate.command()

aea/cli/generate_key.py

@@ -43,7 +43,7 @@
     required=False,
 )
 def generate_key(type_, file):
-    """Generate private keys."""
+    """Generate a private key and place it in a file."""
     _generate_private_key(type_, file)
 
 

aea/cli/generate_wealth.py

@@ -43,7 +43,7 @@
 @click.pass_context
 @check_aea_project
 def generate_wealth(click_context, sync, type_):
-    """Generate wealth for address on test network."""
+    """Generate wealth for the agent on a test network."""
     ctx = cast(Context, click_context.obj)
     _try_generate_wealth(ctx, type_, sync)
 

aea/cli/get_address.py

@@ -39,7 +39,7 @@
 @click.pass_context
 @check_aea_project
 def get_address(click_context, type_):
-    """Get the address associated with the private key."""
+    """Get the address associated with a private key of the agent."""
     ctx = cast(Context, click_context.obj)
     address = _try_get_address(ctx, type_)
     click.echo(address)

aea/cli/get_multiaddress.py

@@ -73,7 +73,7 @@ def get_multiaddress(
     port_field: str,
     uri_field: str,
 ):
-    """Get the multiaddress associated with a private key or connection."""
+    """Get the multiaddress associated with a private key or connection of the agent."""
     address = _try_get_multiaddress(
         click_context,
         ledger_id,

aea/cli/get_wealth.py

@@ -43,7 +43,7 @@
 @click.pass_context
 @check_aea_project
 def get_wealth(click_context, type_):
-    """Get the wealth associated with the private key."""
+    """Get the wealth associated with the private key of the agent."""
     ctx = cast(Context, click_context.obj)
     wealth = _try_get_wealth(ctx, type_)
     click.echo(wealth)

aea/cli/install.py

@@ -43,7 +43,7 @@
 @click.pass_context
 @check_aea_project
 def install(click_context, requirement: Optional[str]):
-    """Install the dependencies."""
+    """Install the dependencies of the agent."""
     ctx = cast(Context, click_context.obj)
     do_install(ctx, requirement)
 

aea/cli/interact.py

@@ -68,7 +68,7 @@
 @click.pass_context
 @check_aea_project
 def interact(click_context: click.core.Context):  # pylint: disable=unused-argument
-    """Interact with a running AEA via the stub connection."""
+    """Interact with the running agent via the stub connection."""
     click.echo("Starting AEA interaction channel...")
     _run_interaction_channel()
 

aea/cli/list.py

@@ -42,13 +42,13 @@
 @click.pass_context
 @check_aea_project
 def list_command(click_context):  # pylint: disable=unused-argument
-    """List the installed resources."""
+    """List the installed packages of the agent."""
 
 
 @list_command.command(name="all")
 @pass_ctx
 def all_command(ctx: Context):
-    """List all the installed items."""
+    """List all the installed packages."""
     for item_type in ITEM_TYPES:
         details = list_agent_items(ctx, item_type)
         if not details:

aea/cli/login.py

@@ -26,17 +26,17 @@
 from aea.cli.utils.config import update_cli_config
 
 
-@click.command(name="login", help="Login to Registry account.")
+@click.command(name="login", help="Login to the registry account.")
 @click.argument("username", type=str, required=True)
 @click.option("--password", type=str, required=True, prompt=True, hide_input=True)
 def login(username, password):
-    """Login to Registry account."""
+    """Login to the registry account."""
     do_login(username, password)
 
 
 def do_login(username: str, password: str):
     """
-    Login to Registry account and save auth token in config.
+    Login to the registry account and save auth token in config.
 
     :param username: str username.
     :param password: str password.

aea/cli/logout.py

@@ -26,9 +26,9 @@
 from aea.cli.utils.config import update_cli_config
 
 
-@click.command(name="logout", help="Logout from Registry account.")
+@click.command(name="logout", help="Logout from the registry account.")
 def logout():
-    """Logout from Registry account command."""
+    """Logout from the registry account."""
     click.echo("Logging out...")
     do_logout()
     click.echo("Successfully logged out.")

aea/cli/publish.py

@@ -57,7 +57,7 @@
 @click.pass_context
 @check_aea_project
 def publish(click_context, local, remote):  # pylint: disable=unused-argument
-    """Publish Agent to Registry."""
+    """Publish the agent to the registry."""
     ctx = cast(Context, click_context.obj)
     _validate_pkp(ctx.agent_config.private_key_paths)
     _validate_config(ctx)