Merge pull request #296 from valory-xyz/revert-load-aea-package-behav…

…iour

Revert "fix: attach modules to their parent when loading aea package modules in sys.modules"

.github/workflows/workflow.yml

@@ -322,8 +322,10 @@ jobs:
           wget https://github.com/protocolbuffers/protobuf/releases/download/v3.19.4/protoc-3.19.4-linux-x86_64.zip
           unzip protoc-3.19.4-linux-x86_64.zip -d protoc
           sudo mv protoc/bin/protoc /usr/local/bin/protoc
-      - name: Async integration tests
+      - name: Framework integration tests
         run: tox -e py3.10 -- -m 'integration and not unstable and not ledger and not profiling'
+      - name: Packages integration tests
+        run: tox -e packages-py3.10 -- -m 'integration and not unstable and not ledger and not profiling'
 
   profiling_checks:
     continue-on-error: True
@@ -354,7 +356,7 @@ jobs:
           wget https://github.com/protocolbuffers/protobuf/releases/download/v3.19.4/protoc-3.19.4-linux-x86_64.zip
           unzip protoc-3.19.4-linux-x86_64.zip -d protoc
           sudo mv protoc/bin/protoc /usr/local/bin/protoc
-      - name: Async integration tests
+      - name: Framework integration tests
         run: tox -e py3.10 -- -m 'profiling'
 
   integration_checks_ledger:
@@ -379,8 +381,10 @@ jobs:
           sudo apt-get autoremove
           sudo apt-get autoclean
           pip install tox
-      - name: Integration tests
+      - name: Framework integration tests
         run: tox -e py3.10 -- -m 'integration and not unstable and ledger and not profiling'
+      - name: Packages integration tests
+        run: tox -e packages-py3.10 -- -m 'integration and not unstable and ledger and not profiling'
 
   platform_checks:
     continue-on-error: True
@@ -478,10 +482,13 @@ jobs:
           ipfs init
 
       - if: True
-        name: Unit tests
+        name: Framework unit tests
         run: |
           tox -e py${{ matrix.python_version }} -- -m 'not integration and not unstable and not profiling'
-      - name: Plugin tests
+      - name: Packages unit tests
+        run: |
+          tox -e packages-py${{ matrix.python_version }} -- -m 'not integration and not unstable and not profiling'
+      - name: Plugin unit tests
         run: |
           tox -e plugins-py${{ matrix.python_version }} -- -m 'not integration and not unstable and not profiling'
 
@@ -546,6 +553,7 @@ jobs:
         run: |
           tox -e py3.10-cov -- --ignore=tests/test_docs --ignore=tests/test_examples --ignore=tests/test_packages/test_skills_integration -m 'not unstable'
           tox -e plugins-py3.10-cov -- --cov-append -m 'not unstable'
+          tox -e packages-py3.10-cov -- --cov-append -m 'not unstable'
         continue-on-error: true
       - name: Show full coverage report
         run: |

HISTORY.md

@@ -1,5 +1,16 @@
 # Release History - open AEA
 
+## 1.18.0.post1 (2022-09-06)
+
+AEA:
+- Reverts a problematic package loading logic introduced in `1.18.0`
+
+Tests:
+- Fixes flaky tests
+
+Chores:
+- Restructures CI to avoid environment cross-effects between the package and framework tests
+
 ## 1.18.0 (2022-09-04)
 
 AEA:

aea/__version__.py

@@ -23,7 +23,7 @@
 __title__ = "open-aea"
 __description__ = "Open Autonomous Economic Agent framework (without vendor lock-in)"
 __url__ = "https://github.com/valory-xyz/open-aea.git"
-__version__ = "1.18.0"
+__version__ = "1.18.0.post1"
 __author__ = "Valory AG"
 __license__ = "Apache-2.0"
 __copyright__ = "2021 Valory AG, 2019 Fetch.AI Limited"

aea/components/base.py

@@ -339,22 +339,15 @@ def perform_load_aea_package(
 
     prefix_root_module = types.ModuleType(prefix_root)
     prefix_root_module.__path__ = None  # type: ignore
-    actual_prefix_root_module = sys.modules.get(prefix_root, prefix_root_module)
-    sys.modules[prefix_root] = actual_prefix_root_module
+    sys.modules[prefix_root] = sys.modules.get(prefix_root, prefix_root_module)
     author_module = types.ModuleType(prefix_author)
     author_module.__path__ = None  # type: ignore
-    actual_prefix_author_module = sys.modules.get(prefix_author, author_module)
-    sys.modules[prefix_author] = actual_prefix_author_module
-    setattr(actual_prefix_root_module, author, actual_prefix_author_module)
+    sys.modules[prefix_author] = sys.modules.get(prefix_author, author_module)
     prefix_pkg_type_module = types.ModuleType(prefix_pkg_type)
     prefix_pkg_type_module.__path__ = None  # type: ignore
-    actual_prefix_pkg_type_module = sys.modules.get(
+    sys.modules[prefix_pkg_type] = sys.modules.get(
         prefix_pkg_type, prefix_pkg_type_module
     )
-    sys.modules[prefix_pkg_type] = actual_prefix_pkg_type_module
-    setattr(
-        actual_prefix_author_module, package_type_plural, actual_prefix_pkg_type_module
-    )
 
     prefix_pkg = prefix_pkg_type + f".{package_name}"
 
@@ -373,10 +366,3 @@ def perform_load_aea_package(
         sys.modules[import_path] = module
         _default_logger.debug(f"loading {import_path}: {module}")
         spec.loader.exec_module(module)  # type: ignore
-
-        # attach child module to parent module
-        import_path_parts = import_path.split(".")
-        parent_module_import_path = ".".join(import_path_parts[:-1])
-        module_name = import_path_parts[-1]
-        parent_module = sys.modules[parent_module_import_path]
-        setattr(parent_module, module_name, module)

aea/configurations/constants.py

@@ -29,7 +29,7 @@
 _COSMOS_IDENTIFIER = "cosmos"
 SIGNING_PROTOCOL = "open_aea/signing:latest"
 SIGNING_PROTOCOL_WITH_HASH = (
-    "open_aea/signing:1.0.0:bafybeihjlpgjm5vkg6kxm66a5k2r357dadnsjfpddta2mzd2bshstv6vdi"
+    "open_aea/signing:1.0.0:bafybeiambqptflge33eemdhis2whik67hjplfnqwieoa6wblzlaf7vuo44"
 )
 DEFAULT_LEDGER = _ETHEREUM_IDENTIFIER
 PRIVATE_KEY_PATH_SCHEMA = "{}_private_key.txt"

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 open-aea[all]==1.18.0 "open-aea-cli-ipfs<2.0.0,>=1.18.0"
+RUN pip install --upgrade --force-reinstall open-aea[all]==1.18.0.post1 "open-aea-cli-ipfs<2.0.0,>=1.18.0"
 
 # directories and aea cli config
 WORKDIR /home/agents

deploy-image/README.md

@@ -11,7 +11,7 @@ The example uses the `fetchai/my_first_aea` project. You will likely want to mod
 Install subversion, then download the example directory to your local working directory
 
 ``` bash
-svn checkout https://github.com/valory-xyz/open-aea/tags/v1.18.0/packages packages
+svn checkout https://github.com/valory-xyz/open-aea/tags/v1.18.0.post1/packages packages
 ```
 
 ### Modify scripts

deploy-image/build.sh

@@ -2,7 +2,7 @@
 set -e
 
 # setup the agent
-aea fetch open_aea/my_first_aea:0.1.0:bafybeia2h6uk25aktvzwle3nbdex7iqkf4nktgp2w2b6qbqqj3za7h7d24 --remote
+aea fetch open_aea/my_first_aea:0.1.0:bafybeidqq73k63tr5baafodg3w5xy3g5so45k5wn2rpo7plkeiq3ojdxfu --remote
 cd my_first_aea/
 aea install
 aea build

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=valory/open-aea-develop:1.18.0
+DOCKER_IMAGE_TAG=valory/open-aea-develop:1.18.0.post1
 # DOCKER_IMAGE_TAG=valory/open-aea-develop:latest
 
 DOCKER_BUILD_CONTEXT_DIR=..

docs/echo_demo.md

@@ -7,7 +7,7 @@ This demo assumes you have followed the setup guide.
 The fastest way to have your first AEA is to fetch one that already exists!
 
 ``` bash
-aea fetch open_aea/my_first_aea:0.1.0:bafybeia2h6uk25aktvzwle3nbdex7iqkf4nktgp2w2b6qbqqj3za7h7d24 --remote
+aea fetch open_aea/my_first_aea:0.1.0:bafybeidqq73k63tr5baafodg3w5xy3g5so45k5wn2rpo7plkeiq3ojdxfu --remote
 cd my_first_aea
 ```
 ### Install AEA dependencies

docs/gym-skill.md

@@ -19,7 +19,7 @@ Follow the <a href="../quickstart/#preliminaries">Preliminaries</a> and <a href=
 
 First, fetch the gym AEA:
 ``` bash
-aea fetch open_aea/gym_aea:0.1.0:bafybeiee4piv344vdkrcqgpdx5xfoftgzxabebvpgcxv3oc66bpla5bpzm --remote
+aea fetch open_aea/gym_aea:0.1.0:bafybeigeyp52amdtgluqd4t3djdieawk7l4fyysfqdui6j4vsvfdxmdqwq --remote
 cd gym_aea
 aea install
 ```

docs/http-echo-demo.md

@@ -16,7 +16,7 @@ The easiest way to get started with the http server is to use our pre-built exam
 
 ``` bash
 pipenv shell
-aea fetch open_aea/http_echo:0.1.0:bafybeibin53i74qbwvyeehgvjrfcxbpfoj5aahj4a57uxu64a6anihjiqe --remote
+aea fetch open_aea/http_echo:0.1.0:bafybeicht2yw5sfe7xi5uvxo2w2n3jewjqvtpesyjidwfrjhvgpze4tumm --remote
 cd http_echo
 aea generate-key ethereum; aea add-key ethereum
 aea install

docs/quickstart.md

@@ -168,7 +168,7 @@ This is a simple demo that introduces you to the main components of an AEA.
 The fastest way to have your first AEA is to fetch one that already exists!
 
 ``` bash
-aea fetch open_aea/my_first_aea:0.1.0:bafybeia2h6uk25aktvzwle3nbdex7iqkf4nktgp2w2b6qbqqj3za7h7d24 --remote
+aea fetch open_aea/my_first_aea:0.1.0:bafybeidqq73k63tr5baafodg3w5xy3g5so45k5wn2rpo7plkeiq3ojdxfu --remote
 cd my_first_aea
 ```
 ### Install AEA dependencies

examples/tac_deploy/Dockerfile

@@ -19,7 +19,7 @@ RUN apk add --no-cache go
 
 # aea installation
 RUN python -m pip install --upgrade pip
-RUN pip install --upgrade --force-reinstall aea[all]==1.18.0
+RUN pip install --upgrade --force-reinstall aea[all]==1.18.0.post1
 
 # directories and aea cli config
 COPY /.aea /home/.aea

packages/fetchai/agents/error_test/aea-config.yaml

@@ -8,7 +8,7 @@ fingerprint:
   README.md: bafybeig75bdp2xp2k44ohxt277etnzeqhwdkwsjfciz7upwgymawmfo2vm
 fingerprint_ignore_patterns: []
 connections:
-- fetchai/stub:0.21.0:bafybeidrjbyak3nfgch3acwjvvjbpetjhqtxvcoecmvz7zlvghzycc37dq
+- fetchai/stub:0.21.0:bafybeieqlozydyvdxmjxhqygwq27djecpiftoqwlcpcr4qpotomwnh66yy
 contracts: []
 protocols: []
 skills:

packages/fetchai/agents/gym_aea/aea-config.yaml

@@ -9,15 +9,15 @@ fingerprint:
   README.md: bafybeiadln5ca6tu6rzbsgjpeluf6nz5efxl3u223c3vxwgf2iynkj5n6q
 fingerprint_ignore_patterns: []
 connections:
-- fetchai/gym:0.19.0:bafybeibenubxl7lamgct2kqlkjbqfpjdvmgsen5jjj6cxaeullesxacxay
+- fetchai/gym:0.19.0:bafybeiak5qnlo4b6ai5ep5cp5tyw26dyv5finwjcbwo3aryhtjqmdl2keu
 contracts: []
 protocols:
-- fetchai/default:1.0.0:bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy
-- fetchai/gym:1.0.0:bafybeid7qvjuxpojaehi74krfilwq2gvu2uuqxlxypxudwbee3kbtayip4
-- fetchai/state_update:1.0.0:bafybeib736dqbkd43sz5hpb3yd4kviv2b4g2okirknn3vsdo5tlykuu4bu
-- open_aea/signing:1.0.0:bafybeihjlpgjm5vkg6kxm66a5k2r357dadnsjfpddta2mzd2bshstv6vdi
+- fetchai/default:1.0.0:bafybeihzesahyayexkhk26fg7rqnjuqaab3bmcijtjekvskvs4xw6ecyuu
+- fetchai/gym:1.0.0:bafybeihpjm2sgnrpuwaqicikw4aybltm7xrjmf7cscpp2cy2xdoi6pekbq
+- fetchai/state_update:1.0.0:bafybeidtndlmppst6l6iughpflqbbbkzditixo2fy2dncxfkb5apkx5y4m
+- open_aea/signing:1.0.0:bafybeiambqptflge33eemdhis2whik67hjplfnqwieoa6wblzlaf7vuo44
 skills:
-- fetchai/gym:0.20.0:bafybeif774uxl33jeg6lk5rov4bkmq5vn6ryvtochyah3czvo56rgvfnzu
+- fetchai/gym:0.20.0:bafybeiebnyx6r7hqiw4226jdlwijtknhomxdspjpypso6tm64a7kpyrcjq
 default_connection: fetchai/gym:0.19.0
 default_ledger: fetchai
 required_ledgers:

packages/fetchai/agents/my_first_aea/aea-config.yaml

@@ -8,14 +8,14 @@ fingerprint:
   README.md: bafybeiftiqiqpxn7ghrurhepquzqzk3su3x6wanlnolt2uj772fzgz574m
 fingerprint_ignore_patterns: []
 connections:
-- fetchai/stub:0.21.0:bafybeidrjbyak3nfgch3acwjvvjbpetjhqtxvcoecmvz7zlvghzycc37dq
+- fetchai/stub:0.21.0:bafybeieqlozydyvdxmjxhqygwq27djecpiftoqwlcpcr4qpotomwnh66yy
 contracts: []
 protocols:
-- fetchai/default:1.0.0:bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy
-- fetchai/state_update:1.0.0:bafybeib736dqbkd43sz5hpb3yd4kviv2b4g2okirknn3vsdo5tlykuu4bu
-- open_aea/signing:1.0.0:bafybeihjlpgjm5vkg6kxm66a5k2r357dadnsjfpddta2mzd2bshstv6vdi
+- fetchai/default:1.0.0:bafybeihzesahyayexkhk26fg7rqnjuqaab3bmcijtjekvskvs4xw6ecyuu
+- fetchai/state_update:1.0.0:bafybeidtndlmppst6l6iughpflqbbbkzditixo2fy2dncxfkb5apkx5y4m
+- open_aea/signing:1.0.0:bafybeiambqptflge33eemdhis2whik67hjplfnqwieoa6wblzlaf7vuo44
 skills:
-- fetchai/echo:0.19.0:bafybeice3v5erl4rdm3fjtakyfckm4wjq3accn5ajzkhjnyhbtfqm2cana
+- fetchai/echo:0.19.0:bafybeibd4jkjml3vpqt3in7adk34ijoge5ufzquobpb4ugaxxo6c7nq55e
 default_connection: fetchai/stub:0.21.0
 default_ledger: fetchai
 required_ledgers:

packages/fetchai/connections/gym/connection.yaml

@@ -14,7 +14,7 @@ fingerprint:
 fingerprint_ignore_patterns: []
 connections: []
 protocols:
-- fetchai/gym:1.0.0:bafybeid7qvjuxpojaehi74krfilwq2gvu2uuqxlxypxudwbee3kbtayip4
+- fetchai/gym:1.0.0:bafybeihpjm2sgnrpuwaqicikw4aybltm7xrjmf7cscpp2cy2xdoi6pekbq
 class_name: GymConnection
 config:
   env: ''

packages/fetchai/connections/http_client/connection.yaml

@@ -15,7 +15,7 @@ fingerprint:
 fingerprint_ignore_patterns: []
 connections: []
 protocols:
-- fetchai/http:1.0.0:bafybeig7ilrz5b5a62kweohjoexdpdqmlw3zytwoyrlnqmpomgttf7f33e
+- fetchai/http:1.0.0:bafybeib3f4rgld3v2r7ubb4qlfaev7y4azm6ndw4x2of4lp73nfmmiabeu
 class_name: HTTPClientConnection
 config:
   host: 127.0.0.1

packages/fetchai/connections/http_server/connection.yaml

@@ -19,7 +19,7 @@ fingerprint:
 fingerprint_ignore_patterns: []
 connections: []
 protocols:
-- fetchai/http:1.0.0:bafybeig7ilrz5b5a62kweohjoexdpdqmlw3zytwoyrlnqmpomgttf7f33e
+- fetchai/http:1.0.0:bafybeib3f4rgld3v2r7ubb4qlfaev7y4azm6ndw4x2of4lp73nfmmiabeu
 class_name: HTTPServerConnection
 config:
   api_spec_path: null

packages/fetchai/connections/ledger/connection.yaml

@@ -19,7 +19,7 @@ fingerprint_ignore_patterns: []
 connections: []
 protocols:
 - fetchai/contract_api:1.0.0:bafybeierqtg3fi2t4mn4dbz2xmwfqd4qeuz5rwxqp4ew6jzz24bxjbytpi
-- fetchai/ledger_api:1.0.0:bafybeiftily2ogosdp3gkbvlq2wahn66svkpaxdyu2a2br36uu7jkemd4i
+- fetchai/ledger_api:1.0.0:bafybeiaht5xpstevcoyxxsqx5icthtnoq7f3fif5mlr2zczhy4ie63xura
 class_name: LedgerConnection
 config:
   ledger_apis:

packages/fetchai/connections/local/connection.yaml

@@ -15,9 +15,9 @@ fingerprint:
 fingerprint_ignore_patterns: []
 connections: []
 protocols:
-- fetchai/default:1.0.0:bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy
-- fetchai/fipa:1.0.0:bafybeib7mzgyjcfr7c4gcx24aeral7ldoqjb23qvsd266gnp66anftqt5q
-- fetchai/oef_search:1.0.0:bafybeihdy3p7hjlh2vjkehfer5gfgjvqb666faupv4e7hgnxpgz2r7rwai
+- fetchai/default:1.0.0:bafybeihzesahyayexkhk26fg7rqnjuqaab3bmcijtjekvskvs4xw6ecyuu
+- fetchai/fipa:1.0.0:bafybeih27chr3b3anjeq26yd5c2p3hypp4sijzdu6yrorpwwxnvkeoa2ei
+- fetchai/oef_search:1.0.0:bafybeifiec4jvsa6mcbmasjno3bwvjwwwubyp25hjqwe7gjfksgvwgdisq
 class_name: OEFLocalConnection
 config: {}
 excluded_protocols: []

packages/fetchai/connections/stub/connection.yaml

@@ -16,7 +16,7 @@ fingerprint_ignore_patterns:
 - ./input_file
 connections: []
 protocols:
-- fetchai/default:1.0.0:bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy
+- fetchai/default:1.0.0:bafybeihzesahyayexkhk26fg7rqnjuqaab3bmcijtjekvskvs4xw6ecyuu
 class_name: StubConnection
 config:
   input_file: ./input_file

packages/fetchai/protocols/default/protocol.yaml

@@ -15,7 +15,8 @@ fingerprint:
   dialogues.py: bafybeihzqqwczdvfzskslup72mpmzumic7irvgz274olbuqbdjm3hdnj4q
   message.py: bafybeigryznjuxefo5htam6xrrn7e6hfkki7h2sbaaxg22omcp4mhb7bf4
   serialization.py: bafybeiefqupq73s7eczkga2t5yd622owcm6elj7fa4fm5hq236j3avwhpy
-  tests/test_default.py: bafybeifs7l25vsssonkusml5eveuihxbxrbm3t6boidyny33tyvf2q4kky
+  tests/__init__.py: bafybeibkpidjsf6nzsd7fgkjzj2mf63xcwb5kua5esbo35x3ojef7dyhm4
+  tests/test_default.py: bafybeiedwbugubenec4cebkqsbdmwqiggljzj27z4uydhwvekhrf7fuw4e
 fingerprint_ignore_patterns: []
 dependencies:
   protobuf: {}

packages/fetchai/protocols/default/tests/__init__.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# ------------------------------------------------------------------------------
+#
+#   Copyright 2022 Valory AG
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+#
+# ------------------------------------------------------------------------------
+
+"""This package contains the tests of the default protocol package."""

packages/fetchai/protocols/default/tests/test_default.py

@@ -19,6 +19,7 @@
 # ------------------------------------------------------------------------------
 
 """This module contains the tests of the messages module."""
+# pylint: skip-file
 
 from typing import Type
 from unittest import mock

packages/fetchai/protocols/fipa/protocol.yaml

@@ -15,7 +15,8 @@ fingerprint:
   fipa_pb2.py: bafybeicgs4xb5aggw7pv5szdcp7jjdvii3hec3savyt2amsjkfjkd4ywja
   message.py: bafybeib2wjkf5ku5oomvti2mxved4qceqsw4e2p3hb4vlafz6zvfvgseou
   serialization.py: bafybeift53kcwwj77jkpk2tqfqg3wkwyo7ok3ceywrevg76mpbstxq4gpi
-  tests/test_fipa.py: bafybeibqub5htwh4ippkhrwt2pjzt3pbm35nyikroqa5jc2yz4talcndsq
+  tests/__init__.py: bafybeiejmbkzylap7xuv3wbduwwewybasdt6bxq3l3fkaoxazij2rgfre4
+  tests/test_fipa.py: bafybeihh37hqvueezb56enmpxbithkmboomitt3cxaent6lnlin7ijq5py
 fingerprint_ignore_patterns: []
 dependencies:
   protobuf: {}

packages/fetchai/protocols/fipa/tests/__init__.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# ------------------------------------------------------------------------------
+#
+#   Copyright 2022 Valory AG
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+#
+# ------------------------------------------------------------------------------
+
+"""This package contains the tests of the default fipa package."""

packages/fetchai/protocols/fipa/tests/test_fipa.py

@@ -19,6 +19,7 @@
 # ------------------------------------------------------------------------------
 
 """This module contains the tests of the fipa protocol package."""
+# pylint: skip-file
 
 import logging
 from typing import Any, Optional, Type