Merge pull request #380 from fetchai/feat/bump_aea

Bumps to new aea version 0.1.2 and fixes

HISTORY.rst

@@ -29,3 +29,11 @@ Release History
 - Updated to OEF SDK version 0.6.7
 - Transition to AEA architecture and extraction of AEA framework.
 - Updated to AEA version 0.1.1
+
+0.1.5 (2019-09-16)
+-------------------
+
+- Bump to latest oef image 0.7
+- Bump to latest aea version 0.1.2
+- Static type checking with Mypy
+- Test/bug fixes

Makefile

@@ -19,6 +19,7 @@ clean-test:
 	rm -fr htmlcov/
 	rm -fr .hypothesis
 	rm -fr .pytest_cache
+	rm -fr .mypy_cache/
 	find . -name 'log.txt' -exec rm -fr {} +
 	find . -name 'log.*.txt' -exec rm -fr {} +
 

Pipfile

@@ -36,7 +36,7 @@ sphinxcontrib-apidoc = "*"
 sphinx = "*"
 wtforms = "*"
 visdom = "*"
-aea = {index = "test-pypi",version = "==0.1.1"}
+aea = {index = "test-pypi",version = "==0.1.2"}
 colorlog = "*"
 
 [requires]

sandbox/oef_healthcheck.py

@@ -25,7 +25,7 @@
 import logging
 
 from aea.crypto.base import Crypto
-from aea.channel.oef import OEFMailBox
+from aea.channels.oef import OEFMailBox
 
 logger = logging.getLogger(__name__)
 

tac/__version__.py

@@ -23,7 +23,7 @@
 __title__ = 'tac'
 __description__ = 'Trading Agent Competition agents'
 __url__ = 'https://github.com/fetchai/agents-tac.git'
-__version__ = '0.1.4'
+__version__ = '0.1.5'
 __author__ = 'Fetch.AI Limited'
 __license__ = 'Apache 2.0'
 __copyright__ = '2019 Fetch.AI Limited'

tac/agents/controller/agent.py

@@ -31,7 +31,7 @@
 
 import dateutil.parser
 from aea.agent import Agent
-from aea.channel.oef import OEFMailBox
+from aea.channels.oef import OEFMailBox
 from aea.mail.base import Envelope
 
 from tac.agents.controller.base.handlers import OEFHandler, GameHandler, AgentMessageDispatcher
@@ -270,7 +270,7 @@ def main(
             base_good_endowment=base_good_endowment,
             lower_bound_factor=lower_bound_factor,
             upper_bound_factor=upper_bound_factor,
-            start_time=dateutil.parser.parse(start_time),
+            start_time=dateutil.parser.parse(str(start_time)),
             registration_timeout=registration_timeout,
             competition_timeout=competition_timeout,
             inactivity_timeout=inactivity_timeout,

tac/agents/controller/base/handlers.py

@@ -388,7 +388,7 @@ def is_game_running(self) -> bool:
 
         :return: Return True if there is a game running, False otherwise.
         """
-        return self.current_game is not None
+        return self._current_game is not None
 
     def start_competition(self):
         """Create a game and send the game setting to every registered agent."""

tac/agents/participant/v1/agent.py

@@ -25,7 +25,7 @@
 from typing import Optional
 
 from aea.agent import Agent
-from aea.channel.oef import OEFMailBox
+from aea.channels.oef import OEFMailBox
 from aea.mail.base import Envelope
 from tac.agents.participant.v1.base.game_instance import GameInstance
 from tac.agents.participant.v1.base.handlers import ControllerHandler, DialogueHandler, OEFHandler

tac/agents/participant/v1/base/dialogues.py

@@ -29,9 +29,9 @@
 import logging
 from typing import Any, Dict, List, Optional
 
-from aea.dialogue.base import DialogueLabel
-from aea.dialogue.base import Dialogue as BaseDialogue
-from aea.dialogue.base import Dialogues as BaseDialogues
+from aea.helpers.dialogue.base import DialogueLabel
+from aea.helpers.dialogue.base import Dialogue as BaseDialogue
+from aea.helpers.dialogue.base import Dialogues as BaseDialogues
 from aea.mail.base import Address
 from aea.protocols.base.message import Message
 from aea.protocols.fipa.message import FIPAMessage

tac/agents/participant/v1/base/game_instance.py

@@ -24,7 +24,7 @@
 import random
 from typing import Any, List, Optional, Set, Tuple, Dict, Union, Sequence, cast
 
-from aea.channel.oef import MailStats
+from aea.channels.oef import MailStats
 from aea.mail.base import Address
 from aea.protocols.oef.models import Description, Query
 from aea.protocols.tac.message import TACMessage

tac/agents/participant/v1/base/helpers.py

@@ -22,7 +22,7 @@
 import logging
 from typing import Dict, List, Set, Sequence
 
-from aea.dialogue.base import DialogueLabel
+from aea.helpers.dialogue.base import DialogueLabel
 from aea.mail.base import Address
 from aea.protocols.oef.models import DataModel, Attribute, Description, Query, Constraint, Or
 from tac.platform.game.base import TransactionId

tac/agents/participant/v1/base/states.py

@@ -30,9 +30,9 @@
 import pprint
 from typing import Dict, List
 
+from aea.helpers.state.base import AgentState as BaseAgentState
+from aea.helpers.state.base import WorldState as BaseWorldState
 from aea.mail.base import Address
-from aea.state.base import AgentState as BaseAgentState
-from aea.state.base import WorldState as BaseWorldState
 from tac.agents.participant.v1.base.price_model import GoodPriceModel
 from tac.platform.game.helpers import logarithmic_utility
 from tac.platform.game.base import Transaction

tac/agents/participant/v1/base/stats_manager.py

@@ -27,7 +27,7 @@
 
 import numpy as np
 
-from aea.channel.oef import MailStats
+from aea.channels.oef import MailStats
 
 
 class EndState(Enum):

tac/agents/participant/v2/agent.py

@@ -25,7 +25,7 @@
 from typing import Optional
 
 from aea.agent import Agent
-from aea.channel.oef import OEFMailBox
+from aea.channels.oef import OEFMailBox
 from aea.mail.base import Envelope
 from tac.gui.dashboards.agent import AgentDashboard
 

templates/v1/advanced.py

@@ -25,8 +25,8 @@
 import logging
 from typing import List, Optional, Set
 
+from aea.helpers.state.base import WorldState
 from aea.protocols.oef.models import Description
-from aea.state.base import WorldState
 from tac.agents.participant.v1.base.strategy import RegisterAs, SearchFor, Strategy
 from tac.agents.participant.v1.examples.baseline import BaselineAgent
 from tac.gui.dashboards.agent import AgentDashboard

templates/v1/expert.py

@@ -26,7 +26,7 @@
 from typing import Optional
 
 from aea.agent import Agent
-from aea.mail.oef import OEFMailBox
+from aea.channels.oef import OEFMailBox
 
 logger = logging.getLogger(__name__)
 

tests/common.py

@@ -19,7 +19,7 @@
 
 """This module contains an OEF agent for testing."""
 
-from aea.channel.oef import OEFMailBox
+from aea.channels.oef import OEFMailBox
 
 
 class TOEFAgent(OEFMailBox):

tests/test_agent/test_agent_state.py

@@ -24,7 +24,7 @@
 from threading import Thread
 
 from aea.agent import Agent, AgentState
-from aea.channel.oef import OEFMailBox
+from aea.channels.oef import OEFMailBox
 
 
 class TAgent(Agent):

tests/test_agent/test_misc.py

@@ -23,7 +23,7 @@
 from unittest.mock import MagicMock
 
 from aea.agent import Agent
-from aea.channel.oef import OEFMailBox
+from aea.channels.oef import OEFMailBox
 
 
 class TAgent(Agent):

tests/test_mail.py

@@ -20,7 +20,7 @@
 """This module contains tests for the mail module."""
 import time
 
-from aea.channel.oef import OEFMailBox
+from aea.channels.oef import OEFMailBox
 from aea.crypto.base import Crypto
 from aea.mail.base import Envelope
 from aea.protocols.default.message import DefaultMessage