Merge pull request #1963 from fetchai/develop

Release v0.7.4

Author: DavidMinarsch

.github/workflows/workflow.yml

@@ -60,6 +60,8 @@ jobs:
         run: tox -e mypy
       - name: Golang code style check
         uses: golangci/golangci-lint-action@v1
+        env:
+          ACTIONS_ALLOW_UNSECURE_COMMANDS: true
         with:
           version: v1.28
           working-directory: packages/fetchai/connections/p2p_libp2p/
@@ -211,6 +213,8 @@ jobs:
         brew install protobuf
     - if: matrix.os == 'windows-latest'
       name: Install dependencies (windows-latest)
+      env:
+        ACTIONS_ALLOW_UNSECURE_COMMANDS: true
       run: |
         pip install tox
         echo "::add-path::C:\Program Files (x86)\Windows Kits\10\bin\10.0.18362.0\x64"

HISTORY.md

@@ -1,5 +1,22 @@
 # Release History
 
+## 0.7.4 (2020-11-18)
+
+- Replaces error skill handler usage with built in handler
+- Extends MultiAgentManager to support persistence between runs
+- Replaces usage of Ropsten testnet with Ganache
+- Adds support for symlink creation during scaffold and add
+- Makes contract interface loading extensible
+- Adds support for PEP561
+- Adds integration tests for launcher command
+- Adds support for storage of unique page address in SOEF
+- Fixes publish command bug on Windows
+- Refactors constants usage throughout
+- Adds support for profiling on aea run
+- Multiple stability improvements to core async modules
+- Multiple docs updates based on user feedback
+- Multiple additional tests and test stability fixes
+
 ## 0.7.3 (2020-11-12)
 
 - Extends AW AEAs

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.3"
+__version__ = "0.7.4"
 __author__ = "Fetch.AI Limited"
 __license__ = "Apache-2.0"
 __copyright__ = "2019 Fetch.AI Limited"

aea/aea.py

@@ -30,7 +30,6 @@
     List,
     Optional,
     Sequence,
-    TYPE_CHECKING,
     Tuple,
     Type,
     cast,
@@ -48,6 +47,7 @@
 from aea.exceptions import AEAException, _StopRuntime
 from aea.helpers.exception_policy import ExceptionPolicyEnum
 from aea.helpers.logging import AgentLoggerAdapter, get_logger
+from aea.helpers.temp_error_handler import ErrorHandler
 from aea.identity.base import Identity
 from aea.mail.base import Envelope
 from aea.protocols.base import Message, Protocol
@@ -56,12 +56,6 @@
 from aea.skills.base import Behaviour, Handler
 
 
-if TYPE_CHECKING:
-    from packages.fetchai.skills.error.handlers import (  # noqa: F401 # pragma: nocover
-        ErrorHandler,
-    )
-
-
 class AEA(Agent):
     """This class implements an autonomous economic agent."""
 
@@ -252,28 +246,16 @@ def get_multiplexer_setup_options(self) -> Optional[Dict]:
             default_connection=self.context.default_connection,
         )
 
-    def _get_error_handler(self) -> Handler:
+    @staticmethod
+    def _get_error_handler() -> Type[ErrorHandler]:
         """Get error handler."""
-
-        # temporary hack
-        from packages.fetchai.protocols.default.message import (  # noqa: F811 # pylint: disable=import-outside-toplevel
-            DefaultMessage,
-        )
-        from packages.fetchai.skills.error import (  # noqa: F811 # pylint: disable=import-outside-toplevel
-            PUBLIC_ID as ERROR_SKILL_PUBLIC_ID,
-        )
-
-        handler = self.resources.get_handler(
-            DefaultMessage.protocol_id, ERROR_SKILL_PUBLIC_ID
-        )
-        if handler is None:
-            self.logger.warning("ErrorHandler not initialized. Stopping AEA!")
-            raise _StopRuntime()
+        handler = ErrorHandler
         return handler
 
     def _get_msg_and_handlers_for_envelope(
         self, envelope: Envelope
     ) -> Tuple[Optional[Message], List[Handler]]:
+        """Get the msg and its handlers."""
         protocol = self.resources.get_protocol(envelope.protocol_id)
 
         msg, handlers = self._handle_decoding(envelope, protocol)
@@ -283,25 +265,19 @@ def _get_msg_and_handlers_for_envelope(
     def _handle_decoding(
         self, envelope: Envelope, protocol: Optional[Protocol]
     ) -> Tuple[Optional[Message], List[Handler]]:
-        error_handler = self._get_error_handler()
-
-        # temporary hack
-        from packages.fetchai.skills.error.handlers import (  # noqa: F811 # pylint: disable=import-outside-toplevel
-            ErrorHandler,
-        )
 
-        error_handler = cast(ErrorHandler, error_handler)
+        handler = self._get_error_handler()
 
         if protocol is None:
-            error_handler.send_unsupported_protocol(envelope)
+            handler.send_unsupported_protocol(envelope, self.logger)
             return None, []  # Tuple[Optional[Message], List[Handler]]
 
         handlers = self.filter.get_active_handlers(
             protocol.public_id, envelope.skill_id
         )
 
         if len(handlers) == 0:
-            error_handler.send_unsupported_skill(envelope)
+            handler.send_unsupported_skill(envelope, self.logger)
             return None, []
 
         if isinstance(envelope.message, Message):
@@ -314,7 +290,7 @@ def _handle_decoding(
             return msg, handlers
         except Exception as e:  # pylint: disable=broad-except  # thats ok, because we send the decoding error back
             self.logger.warning("Decoding error. Exception: {}".format(str(e)))
-            error_handler.send_decoding_error(envelope)
+            handler.send_decoding_error(envelope, self.logger)
             return None, []
 
     def handle_envelope(self, envelope: Envelope) -> None:

aea/aea_builder.py

@@ -43,33 +43,40 @@
     ComponentType,
     ConnectionConfig,
     ContractConfig,
-    DEFAULT_AEA_CONFIG_FILE,
     Dependencies,
     PackageType,
     ProtocolConfig,
     PublicId,
     SkillConfig,
 )
 from aea.configurations.constants import (
+    CONNECTIONS,
+    DEFAULT_AEA_CONFIG_FILE,
     DEFAULT_CONNECTION,
+    DEFAULT_ENV_DOTFILE,
     DEFAULT_LEDGER,
     DEFAULT_PROTOCOL,
+    DEFAULT_REGISTRY_NAME,
 )
 from aea.configurations.constants import (
     DEFAULT_SEARCH_SERVICE_ADDRESS as _DEFAULT_SEARCH_SERVICE_ADDRESS,
 )
 from aea.configurations.constants import (
     DEFAULT_SKILL,
+    FETCHAI,
+    PROTOCOLS,
     SIGNING_PROTOCOL,
+    SKILLS,
     STATE_UPDATE_PROTOCOL,
+    VENDOR,
 )
 from aea.configurations.loader import ConfigLoader, load_component_configuration
 from aea.configurations.pypi import is_satisfiable, merge_dependencies
 from aea.crypto.helpers import verify_or_create_private_keys
 from aea.crypto.ledger_apis import DEFAULT_CURRENCY_DENOMINATIONS
 from aea.crypto.wallet import Wallet
 from aea.decision_maker.base import DecisionMakerHandler
-from aea.exceptions import AEAException
+from aea.exceptions import AEAException, AEAValidationError
 from aea.helpers.base import find_topological_order, load_env_file, load_module
 from aea.helpers.exception_policy import ExceptionPolicyEnum
 from aea.helpers.install_dependency import install_dependency
@@ -81,7 +88,6 @@
 PathLike = Union[os.PathLike, Path, str]
 
 _default_logger = logging.getLogger(__name__)
-DEFAULT_ENV_DOTFILE = ".env"
 
 
 class _DependenciesManager:
@@ -281,7 +287,7 @@ class AEABuilder(WithLogger):  # pylint: disable=too-many-public-methods
     """
 
     DEFAULT_LEDGER = DEFAULT_LEDGER
-    DEFAULT_CONNECTION = DEFAULT_CONNECTION
+    DEFAULT_CONNECTION = PublicId.from_str(DEFAULT_CONNECTION)
     DEFAULT_CURRENCY_DENOMINATIONS = DEFAULT_CURRENCY_DENOMINATIONS
     DEFAULT_AGENT_ACT_PERIOD = 0.05  # seconds
     DEFAULT_EXECUTION_TIMEOUT = 0
@@ -297,7 +303,9 @@ class AEABuilder(WithLogger):  # pylint: disable=too-many-public-methods
     # pylint: disable=attribute-defined-outside-init
 
     def __init__(
-        self, with_default_packages: bool = True, registry_dir: str = "packages"
+        self,
+        with_default_packages: bool = True,
+        registry_dir: str = DEFAULT_REGISTRY_NAME,
     ):
         """
         Initialize the builder.
@@ -516,24 +524,27 @@ def set_search_service_address(
     def _add_default_packages(self) -> None:
         """Add default packages."""
         # add default protocol
+        default_protocol = PublicId.from_str(DEFAULT_PROTOCOL)
         self.add_protocol(
-            Path(self.registry_dir, "fetchai", "protocols", DEFAULT_PROTOCOL.name)
+            Path(self.registry_dir, FETCHAI, PROTOCOLS, default_protocol.name)
         )
         # add signing protocol
+        signing_protocol = PublicId.from_str(SIGNING_PROTOCOL)
         self.add_protocol(
-            Path(self.registry_dir, "fetchai", "protocols", SIGNING_PROTOCOL.name)
+            Path(self.registry_dir, FETCHAI, PROTOCOLS, signing_protocol.name)
         )
         # add state update protocol
+        state_update_protocol = PublicId.from_str(STATE_UPDATE_PROTOCOL)
         self.add_protocol(
-            Path(self.registry_dir, "fetchai", "protocols", STATE_UPDATE_PROTOCOL.name)
+            Path(self.registry_dir, FETCHAI, PROTOCOLS, state_update_protocol.name)
         )
-
         # add stub connection
         self.add_connection(
-            Path(self.registry_dir, "fetchai", "connections", DEFAULT_CONNECTION.name)
+            Path(self.registry_dir, FETCHAI, CONNECTIONS, self.DEFAULT_CONNECTION.name)
         )
         # add error skill
-        self.add_skill(Path(self.registry_dir, "fetchai", "skills", DEFAULT_SKILL.name))
+        default_skill = PublicId.from_str(DEFAULT_SKILL)
+        self.add_skill(Path(self.registry_dir, FETCHAI, SKILLS, default_skill.name))
 
     def _check_can_remove(self, component_id: ComponentId) -> None:
         """
@@ -1156,7 +1167,7 @@ def find_component_directory_from_component_id(
         # search in vendor first
         vendor_package_path = (
             aea_project_directory
-            / "vendor"
+            / VENDOR
             / component_id.public_id.author
             / component_id.component_type.to_plural()
             / component_id.public_id.name
@@ -1185,13 +1196,13 @@ def _try_to_load_agent_configuration_file(aea_project_path: Path) -> None:
                 agent_configuration = loader.load(fp)
                 logging.config.dictConfig(agent_configuration.logging_config)  # type: ignore
         except FileNotFoundError:  # pragma: nocover
-            raise Exception(
+            raise ValueError(
                 "Agent configuration file '{}' not found in the current directory.".format(
                     DEFAULT_AEA_CONFIG_FILE
                 )
             )
         except jsonschema.exceptions.ValidationError:  # pragma: nocover
-            raise Exception(
+            raise AEAValidationError(
                 "Agent configuration file '{}' is invalid. Please check the documentation.".format(
                     DEFAULT_AEA_CONFIG_FILE
                 )
@@ -1345,9 +1356,9 @@ def _find_import_order(
             if component_id not in dependency_to_supported_dependencies:
                 dependency_to_supported_dependencies[component_id] = set()
             if isinstance(configuration, SkillConfig):
-                dependencies, component_type = configuration.skills, "skills"
+                dependencies, component_type = configuration.skills, SKILLS
             elif isinstance(configuration, ConnectionConfig):
-                dependencies, component_type = configuration.connections, "connections"
+                dependencies, component_type = configuration.connections, CONNECTIONS
             else:
                 raise AEAException("Not a valid configuration type.")  # pragma: nocover
             for dependency in dependencies:

aea/agent.py

@@ -25,6 +25,7 @@
 from typing import Any, Callable, Dict, List, Optional, Tuple, Type
 
 from aea.abstract_agent import AbstractAgent
+from aea.configurations.constants import CONNECTIONS
 from aea.connections.base import Connection
 from aea.exceptions import AEAException
 from aea.helpers.logging import WithLogger
@@ -116,7 +117,7 @@ def get_multiplexer_setup_options(self) -> Optional[Dict]:
 
         :return: dict of kwargs
         """
-        return {"connections": self.active_connections}
+        return {CONNECTIONS: self.active_connections}
 
     @property
     def identity(self) -> Identity: