Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prepare develop for release v0.5.1 #1494

Merged
merged 1 commit into from
Jul 14, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
# Release History

## 0.5.1 (2020-07-14)

- Adds support for agent name being appended to all log statements
- Adds redesigned GUI
- Extends dialogue api for easier dialogue maintenance
- Resolves blocking logic in oef and gym connections
- Adds full test coverage on aea modules configurations, components and mail
- Adds ping background task for soef connection
- Adds full test coverage for all connection packages
- Multiple docs updates
- Multiple additional tests and test stability fixes

## 0.5.0 (2020-07-06)

- Refactors all connections to be fully async friendly
Expand Down
2 changes: 1 addition & 1 deletion aea/__version__.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
__title__ = "aea"
__description__ = "Autonomous Economic Agent framework"
__url__ = "https://github.com/fetchai/agents-aea.git"
__version__ = "0.5.0"
__version__ = "0.5.1"
__author__ = "Fetch.AI Limited"
__license__ = "Apache-2.0"
__copyright__ = "2019 Fetch.AI Limited"
15 changes: 11 additions & 4 deletions aea/test_tools/test_cases.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

"""This module contains test case classes based on pytest for AEA end-to-end testing."""
import copy
import logging
import os
import random
import shutil
Expand Down Expand Up @@ -61,6 +62,8 @@

from tests.conftest import ROOT_DIR

logger = logging.getLogger(__name__)

FETCHAI_NAME = FetchAICrypto.identifier

CLI_LOG_OPTION = ["-v", "OFF"]
Expand Down Expand Up @@ -659,10 +662,14 @@ def missing_from_output(
if is_terminating:
cls.terminate_agents(process)
if missing_strings != []:
print("Non-empty missing strings, stderr:\n" + cls.stderr[process.pid])
print("=====================")
print("Non-empty missing strings, stdout:\n" + cls.stdout[process.pid])
print("=====================")
logger.info(
"Non-empty missing strings, stderr:\n{}".format(cls.stderr[process.pid])
)
logger.info("=====================")
logger.info(
"Non-empty missing strings, stdout:\n{}".format(cls.stdout[process.pid])
)
logger.info("=====================")
return missing_strings

@classmethod
Expand Down
2 changes: 1 addition & 1 deletion deploy-image/docker-env.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

# Swap the following lines if you want to work with 'latest'
DOCKER_IMAGE_TAG=aea-deploy:0.5.0
DOCKER_IMAGE_TAG=aea-deploy:0.5.1
# DOCKER_IMAGE_TAG=aea-deploy:latest

DOCKER_BUILD_CONTEXT_DIR=..
Expand Down
2 changes: 1 addition & 1 deletion develop-image/docker-env.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

# Swap the following lines if you want to work with 'latest'
DOCKER_IMAGE_TAG=aea-develop:0.5.0
DOCKER_IMAGE_TAG=aea-develop:0.5.1
# DOCKER_IMAGE_TAG=aea-develop:latest

DOCKER_BUILD_CONTEXT_DIR=..
Expand Down
10 changes: 5 additions & 5 deletions docs/aries-cloud-agent-demo.md
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ Add `http_client`, `oef` and `webhook` connections:
``` bash
aea add connection fetchai/http_client:0.4.0
aea add connection fetchai/webhook:0.3.0
aea add connection fetchai/oef:0.5.0
aea add connection fetchai/oef:0.6.0
```

You now need to configure the `webhook` connection.
Expand All @@ -211,15 +211,15 @@ aea config set vendor.fetchai.connections.webhook.config.webhook_url_path /webho
Now you must ensure **Alice_AEA**'s default connection is `oef`.

``` bash
aea config set agent.default_connection fetchai/oef:0.5.0
aea config set agent.default_connection fetchai/oef:0.6.0
```

### Alice_AEA -- Method 2: Fetch the Agent

Alternatively, in the third terminal, fetch **Alice_AEA** and move into its project folder:

``` bash
aea fetch fetchai/aries_alice:0.4.0
aea fetch fetchai/aries_alice:0.5.0
cd aries_alice
```

Expand Down Expand Up @@ -325,7 +325,7 @@ Add `http_client`, `oef` and `webhook` connections:
``` bash
aea add connection fetchai/http_client:0.4.0
aea add connection fetchai/webhook:0.3.0
aea add connection fetchai/oef:0.5.0
aea add connection fetchai/oef:0.6.0
```

You now need to configure the `webhook` connection.
Expand Down Expand Up @@ -355,7 +355,7 @@ aea config set agent.default_connection fetchai/http_client:0.4.0
Alternatively, in the fourth terminal, fetch **Faber_AEA** and move into its project folder:

``` bash
aea fetch fetchai/aries_faber:0.4.0
aea fetch fetchai/aries_faber:0.5.0
cd aries_faber
```

Expand Down
24 changes: 12 additions & 12 deletions docs/car-park-skills.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ Keep it running for all the following.

First, fetch the car detector AEA:
``` bash
aea fetch fetchai/car_detector:0.6.0
aea fetch fetchai/car_detector:0.7.0
cd car_detector
aea install
```
Expand All @@ -76,11 +76,11 @@ The following steps create the car detector from scratch:
``` bash
aea create car_detector
cd car_detector
aea add connection fetchai/oef:0.5.0
aea add connection fetchai/ledger:0.1.0
aea add skill fetchai/carpark_detection:0.5.0
aea add connection fetchai/oef:0.6.0
aea add connection fetchai/ledger:0.2.0
aea add skill fetchai/carpark_detection:0.6.0
aea install
aea config set agent.default_connection fetchai/oef:0.5.0
aea config set agent.default_connection fetchai/oef:0.6.0
```

In `car_detector/aea-config.yaml` replace `ledger_apis: {}` with the following based on the network you want to connect. To connect to Fetchai:
Expand All @@ -92,7 +92,7 @@ ledger_apis:
and add
``` yaml
default_routing:
fetchai/ledger_api:0.1.0: fetchai/ledger:0.1.0
fetchai/ledger_api:0.1.0: fetchai/ledger:0.2.0
```

</p>
Expand All @@ -102,7 +102,7 @@ default_routing:

Then, fetch the car data client AEA:
``` bash
aea fetch fetchai/car_data_buyer:0.6.0
aea fetch fetchai/car_data_buyer:0.7.0
cd car_data_buyer
aea install
```
Expand All @@ -114,11 +114,11 @@ The following steps create the car data client from scratch:
``` bash
aea create car_data_buyer
cd car_data_buyer
aea add connection fetchai/oef:0.5.0
aea add connection fetchai/ledger:0.1.0
aea add skill fetchai/carpark_client:0.5.0
aea add connection fetchai/oef:0.6.0
aea add connection fetchai/ledger:0.2.0
aea add skill fetchai/carpark_client:0.6.0
aea install
aea config set agent.default_connection fetchai/oef:0.5.0
aea config set agent.default_connection fetchai/oef:0.6.0
```

In `car_data_buyer/aea-config.yaml` replace `ledger_apis: {}` with the following based on the network you want to connect.
Expand All @@ -132,7 +132,7 @@ ledger_apis:
and add
``` yaml
default_routing:
fetchai/ledger_api:0.1.0: fetchai/ledger:0.1.0
fetchai/ledger_api:0.1.0: fetchai/ledger:0.2.0
```

</p>
Expand Down
2 changes: 1 addition & 1 deletion docs/cli-vs-programmatic-aeas.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ If you want to create the weather station AEA step by step you can follow this g
Fetch the weather station AEA with the following command :

``` bash
aea fetch fetchai/weather_station:0.6.0
aea fetch fetchai/weather_station:0.7.0
cd weather_station
```

Expand Down
2 changes: 1 addition & 1 deletion docs/config.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ protocols: # The list of protocol public id
- fetchai/default:0.3.0
skills: # The list of skill public ids the AEA project depends on (each public id must satisfy PUBLIC_ID_REGEX).
- fetchai/error:0.3.0
default_connection: fetchai/oef:0.5.0 # The default connection used for envelopes sent by the AEA (must satisfy PUBLIC_ID_REGEX).
default_connection: fetchai/oef:0.6.0 # The default connection used for envelopes sent by the AEA (must satisfy PUBLIC_ID_REGEX).
default_ledger: fetchai # The default ledger identifier the AEA project uses (must satisfy LEDGER_ID_REGEX)
ledger_apis: {} # The ledger api configurations the AEA project uses (keys must satisfy LEDGER_ID_REGEX, values must be dictionaries)
logging_config: # The logging configurations the AEA project uses
Expand Down
2 changes: 1 addition & 1 deletion docs/connect-a-frontend.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ This demo discusses the options we have to connect a front-end to the AEA. The f
The first option we have is to create a `Connection` that will handle the incoming requests from the rest API. In this scenario, the rest API communicates with the AEA and requests are handled by the `HTTP Server` Connection package. The rest API should send CRUD requests to the `HTTP Server` Connection (`fetchai/http_server:0.4.0`) which translates these into Envelopes to be consumed by the correct skill.

## Case 2
The other option we have is to create a stand-alone `Multiplexer` with an `OEF` connection (`fetchai/oef:0.5.0`). In this scenario, the front-end needs to incorporate a Multiplexer with an `OEF` Connection. Then the [OEF communication node](../oef-ledger) can be used to send Envelopes from the AEA to the front-end.
The other option we have is to create a stand-alone `Multiplexer` with an `OEF` connection (`fetchai/oef:0.6.0`). In this scenario, the front-end needs to incorporate a Multiplexer with an `OEF` Connection. Then the [OEF communication node](../oef-ledger) can be used to send Envelopes from the AEA to the front-end.
24 changes: 12 additions & 12 deletions docs/erc1155-skills.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Keep it running for all the following demos.
Fetch the AEA that will deploy the contract.

``` bash
aea fetch fetchai/erc1155_deployer:0.7.0
aea fetch fetchai/erc1155_deployer:0.8.0
cd erc1155_deployer
aea install
```
Expand All @@ -47,18 +47,18 @@ Create the AEA that will deploy the contract.
``` bash
aea create erc1155_deployer
cd erc1155_deployer
aea add connection fetchai/oef:0.5.0
aea add connection fetchai/ledger:0.1.0
aea add skill fetchai/erc1155_deploy:0.7.0
aea add connection fetchai/oef:0.6.0
aea add connection fetchai/ledger:0.2.0
aea add skill fetchai/erc1155_deploy:0.8.0
aea install
aea config set agent.default_connection fetchai/oef:0.5.0
aea config set agent.default_connection fetchai/oef:0.6.0
```

Then update the agent config (`aea-config.yaml`) with the default routing:
``` yaml
default_routing:
fetchai/contract_api:0.1.0: fetchai/ledger:0.1.0
fetchai/ledger_api:0.1.0: fetchai/ledger:0.1.0
fetchai/contract_api:0.1.0: fetchai/ledger:0.2.0
fetchai/ledger_api:0.1.0: fetchai/ledger:0.2.0
```

And change the default ledger:
Expand Down Expand Up @@ -94,18 +94,18 @@ Create the AEA that will get some tokens from the deployer.
``` bash
aea create erc1155_client
cd erc1155_client
aea add connection fetchai/oef:0.5.0
aea add connection fetchai/ledger:0.1.0
aea add connection fetchai/oef:0.6.0
aea add connection fetchai/ledger:0.2.0
aea add skill fetchai/erc1155_client:0.7.0
aea install
aea config set agent.default_connection fetchai/oef:0.5.0
aea config set agent.default_connection fetchai/oef:0.6.0
```

Then update the agent config (`aea-config.yaml`) with the default routing:
``` yaml
default_routing:
fetchai/contract_api:0.1.0: fetchai/ledger:0.1.0
fetchai/ledger_api:0.1.0: fetchai/ledger:0.1.0
fetchai/contract_api:0.1.0: fetchai/ledger:0.2.0
fetchai/ledger_api:0.1.0: fetchai/ledger:0.2.0
```

And change the default ledger:
Expand Down
30 changes: 15 additions & 15 deletions docs/generic-skills-step-by-step.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,16 @@ Follow the <a href="../quickstart/#preliminaries">Preliminaries</a> and <a href=
This step-by-step guide recreates two AEAs already developed by Fetch.ai. You can get the finished AEAs to compare your code against by following the next steps:

``` bash
aea fetch fetchai/generic_seller:0.3.0
aea fetch fetchai/generic_seller:0.4.0
cd generic_seller
aea eject skill fetchai/generic_seller:0.6.0
aea eject skill fetchai/generic_seller:0.7.0
cd ..
```

``` bash
aea fetch fetchai/generic_buyer:0.3.0
aea fetch fetchai/generic_buyer:0.4.0
cd generic_buyer
aea eject skill fetchai/generic_buyer:0.5.0
aea eject skill fetchai/generic_buyer:0.6.0
cd ..
```

Expand Down Expand Up @@ -98,7 +98,7 @@ from packages.fetchai.skills.generic_seller.strategy import GenericStrategy


DEFAULT_SERVICES_INTERVAL = 30.0
LEDGER_API_ADDRESS = "fetchai/ledger:0.1.0"
LEDGER_API_ADDRESS = "fetchai/ledger:0.2.0"


class GenericServiceRegistrationBehaviour(TickerBehaviour):
Expand Down Expand Up @@ -284,7 +284,7 @@ from packages.fetchai.skills.generic_seller.dialogues import (
)
from packages.fetchai.skills.generic_seller.strategy import GenericStrategy

LEDGER_API_ADDRESS = "fetchai/ledger:0.1.0"
LEDGER_API_ADDRESS = "fetchai/ledger:0.2.0"


class GenericFipaHandler(Handler):
Expand Down Expand Up @@ -1424,7 +1424,7 @@ from packages.fetchai.skills.generic_buyer.dialogues import (
from packages.fetchai.skills.generic_buyer.strategy import GenericStrategy

DEFAULT_SEARCH_INTERVAL = 5.0
LEDGER_API_ADDRESS = "fetchai/ledger:0.1.0"
LEDGER_API_ADDRESS = "fetchai/ledger:0.2.0"


class GenericSearchBehaviour(TickerBehaviour):
Expand Down Expand Up @@ -1520,7 +1520,7 @@ from packages.fetchai.skills.generic_buyer.dialogues import (
)
from packages.fetchai.skills.generic_buyer.strategy import GenericStrategy

LEDGER_API_ADDRESS = "fetchai/ledger:0.1.0"
LEDGER_API_ADDRESS = "fetchai/ledger:0.2.0"


class GenericFipaHandler(Handler):
Expand Down Expand Up @@ -3001,7 +3001,7 @@ ledger_apis:
and
``` yaml
default_routing:
fetchai/ledger_api:0.1.0: fetchai/ledger:0.1.0
fetchai/ledger_api:0.1.0: fetchai/ledger:0.2.0
```

#### Fund the buyer AEA
Expand All @@ -3017,10 +3017,10 @@ aea generate-wealth fetchai
Run both AEAs from their respective terminals

``` bash
aea add connection fetchai/oef:0.5.0
aea add connection fetchai/ledger:0.1.0
aea add connection fetchai/oef:0.6.0
aea add connection fetchai/ledger:0.2.0
aea install
aea config set agent.default_connection fetchai/oef:0.5.0
aea config set agent.default_connection fetchai/oef:0.6.0
aea run
```
You will see that the AEAs negotiate and then transact using the Fetch.ai testnet.
Expand Down Expand Up @@ -3078,10 +3078,10 @@ Go to the <a href="https://faucet.metamask.io/"> MetaMask Faucet </a> and reques
Run both AEAs from their respective terminals.

``` bash
aea add connection fetchai/oef:0.5.0
aea add connection fetchai/ledger:0.1.0
aea add connection fetchai/oef:0.6.0
aea add connection fetchai/ledger:0.2.0
aea install
aea config set agent.default_connection fetchai/oef:0.5.0
aea config set agent.default_connection fetchai/oef:0.6.0
aea run
```

Expand Down
Loading