Merge pull request #375 from fetchai/develop

Develop

.gitignore

@@ -129,6 +129,7 @@ tac/gui/.visdom_env/
 
 sandbox/TAC
 sandbox/data
+simulation/v1/data/
 
 *.pem
 !tests/data/priv.pem`

HISTORY.rst

@@ -23,3 +23,9 @@ Release History
 - Improved documentation by adding detailed guides
 - Added more tools/features to support the developer (e.g. the launcher app)
 
+0.1.4 (2019-09-05)
+-------------------
+
+- Updated to OEF SDK version 0.6.7
+- Transition to AEA architecture and extraction of AEA framework.
+- Updated to AEA version 0.1.1

Pipfile

@@ -18,22 +18,25 @@ tox-pipenv = "*"
 pytest-cov = "*"
 docker = "*"
 flake8-docstrings = "*"
+pygments = "*"
 
 [packages]
+fetchai-ledger-api = {git = "https://github.com/fetchai/ledger-api-py.git"}
+base58 = "*"
+cryptography = "*"
+flask-restful = "*"
+nbsphinx = "*"
 numpy = "*"
 matplotlib = "*"
+oef = {index = "test-pypi",version = "==0.6.7"}
 python-dateutil = "*"
-visdom = "*"
-cryptography = "*"
-base58 = "*"
-fetchai-ledger-api = {git = "https://github.com/fetchai/ledger-api-py.git",
-oef = {version="*", index="test-pypi"}
 sphinxcontrib-mermaid = "*"
 sphinxcontrib-apidoc = "*"
 sphinx = "*"
-nbsphinx = "*"
-flask-restful = "*"
 wtforms = "*"
+visdom = "*"
+aea = {index = "test-pypi",version = "==0.1.1"}
+colorlog = "*"
 
 [requires]
 python_version = "3.7"

docker-agent-image/Dockerfile

@@ -0,0 +1,15 @@
+FROM python:3.7-alpine
+
+RUN apk add --no-cache make git bash
+RUN apk add --no-cache gcc musl-dev python3-dev libffi-dev openssl-dev  # cryptography: https://cryptography.io/en/latest/installation/#alpine
+RUN apk add --update --no-cache py3-numpy py3-scipy py3-pillow py3-zmq
+
+#   # https://stackoverflow.com/a/57485724
+ENV PYTHONPATH "$PYTHONPATH:/usr/lib/python3.7/site-packages"
+
+RUN pip install --upgrade pip
+RUN pip install protobuf colorlog graphviz # other oef dependences
+RUN pip install --index-url https://test.pypi.org/simple/ oef==0.6.4  --no-deps
+RUN pip install --index-url https://test.pypi.org/simple/ aea==0.1.1  --no-deps
+
+ENTRYPOINT []

docker-agent-image/README.md

@@ -0,0 +1,45 @@
+# Docker agent image
+
+Lightweight Docker image for agent execution, based on [`python:3.7-alpine`](https://hub.docker.com/r/jfloff/alpine-python/).
+
+## Build
+
+From the root of the repository:
+
+    ./docker-agent-image/scripts/docker-build.sh
+
+## Run
+
+    ./docker-agent-image/scripts/docker-run.sh -- sh
+
+## Example
+
+- run an OEF Node:
+```
+curl https://raw.githubusercontent.com/fetchai/oef-search-pluto/master/scripts/node_config.json > node_config.json
+
+docker run -it -v $(pwd):/config -v $(pwd):/app/fetch-logs \
+  -p 20000:20000 -p 10000:10000 \
+  -p 40000:40000 -p 7500 \
+  fetchai/oef-search:latest /config/node_config.json
+```
+- Run a Visdom server:
+```
+pipenv shell
+python -m visdom.server
+```
+- Run the controller: 
+```
+./docker-agent-image/scripts/docker-run.sh --network host -- sh
+python tac/agents/controller/agent.py --nb-agents 2  --dashboard 
+```
+- Run Agent 1: 
+```
+./docker-agent-image/scripts/docker-run.sh --network host -- sh
+python templates/v1/basic.py --name agent1 
+```
+- Run Agent 2: 
+```
+./docker-agent-image/scripts/docker-run.sh --network host -- sh
+python templates/v1/basic.py --name agent2 
+```

docker-agent-image/docker-env.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+DOCKER_IMAGE_TAG=docker-agent-image/dev:v0.0.1
+DOCKER_BUILD_CONTEXT_DIR=..
+DOCKERFILE=./Dockerfile
+WORKDIR=/build

docker-agent-image/scripts

@@ -0,0 +1 @@
+../docker-images/scripts