Merge pull request #2672 from fetchai/develop

release 1.1.1

Author: solarw

.spelling

@@ -226,6 +226,7 @@ CosmPy
 dockerised
 Mermaid-JS
 darglint
+aea-cli-ipfs
  - docs/language-agnostic-definition.md
 fetchai
 protocol_id

HISTORY.md

@@ -1,5 +1,22 @@
 # Release History
 
+## 1.1.1 (2021-12-15)
+
+AEA:
+- Updates the protocol generator to generate protocols that satisfy linter constraints
+
+Plugins:
+ - aea-cli-ipfs plugin small update
+
+Packages:
+- Fixes fetchai/p2p_libp2p connection to address a slow DHT lookup problem
+- Updates protocols with the latest protocol generator
+- Updates random beacon agent so it produces block data instead of the (now deprecated feature of the test-net) random beacon data
+
+Misc
+- Bumps go library versions
+- Various fixes and improvements
+
 ## 1.1.0 (2021-10-13)
 
 AEA:

Makefile

@@ -46,7 +46,7 @@ lint:
 	isort aea benchmark examples packages plugins scripts tests
 	flake8 aea benchmark examples packages plugins scripts tests
 	vulture aea scripts/whitelist.py --exclude "*_pb2.py"
-	darglint aea benchmark examples libs packages/fetchai/connections packages/fetchai/contracts packages/fetchai/skills plugins scripts
+	darglint aea benchmark examples libs packages plugins scripts
 
 .PHONY: pylint
 pylint:

aea/__version__.py

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

aea/manager/manager.py

@@ -281,7 +281,9 @@ def stop_event_thread() -> None:
             t.start()
             loop = asyncio.get_event_loop()
             aea.runtime.set_loop(loop)
-            aea.start()
+            aea.runtime.start()
+            loop.run_until_complete(aea.runtime.wait_completed())
+
         except BaseException as e:  # pylint: disable=broad-except
             print(
                 f"Exception in agent subprocess task at {datetime.datetime.now()}:\n{format_exc()}"
@@ -291,8 +293,8 @@ def stop_event_thread() -> None:
             run_stop_thread = False
             if t:
                 t.join(10)
-
-        result_queue.put(r)
+            result_queue.put(r)
+            aea.logger.debug("process task stopped")
 
     def stop(self) -> None:
         """Stop the task."""

aea/protocols/generator/base.py

@@ -746,6 +746,7 @@ def _message_class_str(self) -> str:
         cls_str += self.indent + ":param dialogue_reference: the dialogue reference.\n"
         cls_str += self.indent + ":param target: the message target.\n"
         cls_str += self.indent + ":param performative: the message performative.\n"
+        cls_str += self.indent + ":param **kwargs: extra options.\n"
         cls_str += self.indent + '"""\n'
 
         cls_str += self.indent + "super().__init__(\n"
@@ -965,7 +966,10 @@ def _valid_replies_str(self) -> str:
 
         :return: the `valid replies` dictionary string
         """
-        valid_replies_str = self.indent + "VALID_REPLIES = {\n"
+        valid_replies_str = (
+            self.indent
+            + "VALID_REPLIES: Dict[Message.Performative, FrozenSet[Message.Performative]] = {\n"
+        )
         self._change_indent(1)
         for performative in sorted(self.spec.reply.keys()):
             valid_replies_str += (
@@ -1067,7 +1071,7 @@ def _dialogue_class_str(self) -> str:
         # Imports
         cls_str += self.indent + "from abc import ABC\n"
         cls_str += (
-            self.indent + "from typing import Callable, FrozenSet, Type, cast\n\n"
+            self.indent + "from typing import Callable, Dict, FrozenSet, Type, cast\n\n"
         )
         cls_str += self.indent + "from aea.common import Address\n"
         cls_str += self.indent + "from aea.protocols.base import Message\n"
@@ -1111,11 +1115,11 @@ def _dialogue_class_str(self) -> str:
         )
         cls_str += (
             self.indent
-            + "INITIAL_PERFORMATIVES = frozenset({"
+            + "INITIAL_PERFORMATIVES: FrozenSet[Message.Performative] = frozenset({"
             + initial_performatives_str
             + "})\n"
             + self.indent
-            + "TERMINAL_PERFORMATIVES = frozenset({"
+            + "TERMINAL_PERFORMATIVES: FrozenSet[Message.Performative] = frozenset({"
             + terminal_performatives_str
             + "})\n"
             + self._valid_replies_str()
@@ -1153,7 +1157,7 @@ def _dialogue_class_str(self) -> str:
             self.indent
             + ":param role: the role of the agent this dialogue is maintained for\n"
         )
-        cls_str += self.indent + ":return: None\n"
+        cls_str += self.indent + ":param message_class: the message class used\n"
         cls_str += self.indent + '"""\n'
         cls_str += self.indent + "Dialogue.__init__(\n"
         cls_str += self.indent + "self,\n"
@@ -1216,7 +1220,11 @@ def _dialogue_class_str(self) -> str:
             self.indent
             + ":param self_address: the address of the entity for whom dialogues are maintained\n"
         )
-        cls_str += self.indent + ":return: None\n"
+        cls_str += self.indent + ":param dialogue_class: the dialogue class used\n"
+        cls_str += (
+            self.indent
+            + ":param role_from_first_message: the callable determining role from first message\n"
+        )
         cls_str += self.indent + '"""\n'
         cls_str += self.indent + "Dialogues.__init__(\n"
         self._change_indent(1)
@@ -1303,7 +1311,6 @@ def _custom_types_module_str(self) -> str:
                     _camel_case_to_snake_case(custom_type)
                 )
             )
-            cls_str += self.indent + ":return: None\n"
             cls_str += self.indent + '"""\n'
             cls_str += self.indent + "raise NotImplementedError\n\n"
             self._change_indent(-1)

deploy-image/Dockerfile

@@ -16,7 +16,7 @@ RUN apk add --no-cache go
 
 # aea installation
 RUN pip install --upgrade pip
-RUN pip install --upgrade --force-reinstall aea[all]==1.1.0
+RUN pip install --upgrade --force-reinstall aea[all]==1.1.1
 
 # directories and aea cli config
 COPY /.aea /home/.aea

develop-image/docker-env.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Swap the following lines if you want to work with 'latest'
-DOCKER_IMAGE_TAG=fetchai/aea-develop:1.1.0
+DOCKER_IMAGE_TAG=fetchai/aea-develop:1.1.1
 # DOCKER_IMAGE_TAG=aea-develop:latest
 
 DOCKER_BUILD_CONTEXT_DIR=..

docs/aggregation-demo.md

@@ -19,7 +19,7 @@ Repeat the following process four times in four different terminals (for each {`
 Fetch the aggregator AEA:
 ``` bash
 agent_name="agg$i"
-aea fetch fetchai/simple_aggregator:0.4.0 --alias $agent_name
+aea fetch fetchai/simple_aggregator:0.5.0 --alias $agent_name
 cd $agent_name
 aea install
 aea build
@@ -34,15 +34,15 @@ Create the AEA.
 agent_name="agg$i"
 aea create agent_name
 cd agent_name
-aea add connection fetchai/http_client:0.23.0
-aea add connection fetchai/http_server:0.22.0
-aea add connection fetchai/p2p_libp2p:0.25.0
-aea add connection fetchai/soef:0.26.0
-aea add connection fetchai/prometheus:0.8.0
-aea add skill fetchai/advanced_data_request:0.6.0
-aea add skill fetchai/simple_aggregation:0.2.0
-
-aea config set agent.default_connection fetchai/p2p_libp2p:0.25.0
+aea add connection fetchai/http_client:0.24.0
+aea add connection fetchai/http_server:0.23.0
+aea add connection fetchai/p2p_libp2p:0.26.0
+aea add connection fetchai/soef:0.27.0
+aea add connection fetchai/prometheus:0.9.0
+aea add skill fetchai/advanced_data_request:0.7.0
+aea add skill fetchai/simple_aggregation:0.3.0
+
+aea config set agent.default_connection fetchai/p2p_libp2p:0.26.0
 aea install
 aea build
 ```
@@ -126,8 +126,8 @@ aea config set vendor.fetchai.connections.http_server.config.port $((8000+i))
 
 To publish the aggregated value to an oracle smart contract, add the ledger connection and simple oracle skill to one of the aggregators:
 ``` bash
-aea add connection fetchai/ledger:0.19.0
-aea add skill fetchai/simple_oracle:0.14.0
+aea add connection fetchai/ledger:0.20.0
+aea add skill fetchai/simple_oracle:0.15.0
 ```
 
 Configure the simple oracle skill for the `fetchai` ledger:

docs/api/protocols/default/custom_types.md

@@ -29,10 +29,6 @@ The protocol buffer object in the error_code_protobuf_object argument is matched
 - `error_code_protobuf_object`: the protocol buffer object whose type corresponds with this class.
 - `error_code_object`: an instance of this class to be encoded in the protocol buffer object.
 
-**Returns**:
-
-None
-
 <a name="packages.fetchai.protocols.default.custom_types.ErrorCode.decode"></a>
 #### decode