Bump version 1.0.5 -> 1.0.6 (#9)

* chore: fix files names in Makefile

* docs: change name of Glossary section to Main PEAK concepts

* chore: change makefile argument

* chore: formatted code with black and isort

* fix: DF gourp hierarchy behavior when removing nodes

* fix: cli not recognizing clones argument

* chore: fix graphs in dashboard in data_extraction example

* chore: bump version 1.0.2 -> 1.0.3

* chore: change random data to more realistic data in data_extration example

* fix: 500 http error when requesting the group data through api

* chore: add command to makefile

* refact: change behaviour execution method name

* chore: format with black and isort

* fix: group tagging

* chore: fix group tagging example

* chore: change file paths format from windows to linux

* chore: added env var to makefile

* refact: changed logger level from error to exception in bootloader

* fix: missing time atribute in message's metadata sent by Synchronizer

* fix: typo in logger and wrong graph name sent to DF

* fix: wait_for method in behaviors not allowing to add template

* docs: clarified some text and added recent academic publications

* chore: balck and isort

* chore: bump version 1.0.3 -> 1.0.4

* refact: simplified graph creation

* fix: drivers import

* fix: modbusdriver update

* refact: add CreateGraph behaviour to the agents

* refact: remove unnucessary behaviours

* docs: add and correct website pages

* docs: correct docstrings

* docs: correct peak module docstring

* refact: change agents structure

* refact: simplefied the PEAK's agent  and behaviour structure

* refact: deleted unecessary module

* refect: remove properties model

* refact: remove properties from the agent creation process

* refact: correct agent structure from SyncAgent and Synchronizer

Corrected docs as well.

* fix: inexisting imports from init

* docs: fix example import

* docs: change 'single agent' example folder name

* fix: agent print statements writing in terminal

The stdout of each agent is redirected to the agent log file.
The main process of PEAK logs usefull information in the terminal.

* chores: isort and black

* docs: corrected examples and added images

* docs: corrected the code of the examples

* docs:  correct example 4 and 5

* refact: the core agents and behaviours, and the cli commands

* refact: bootloader waits for agents asynchronously

* chore: format code with isort, autoflake and black

* chore: update pyproject.toml

* chore: update makefile

* chore: remove import headers from isort

* chore: format code using isort, black autoflake

* chore: bump version 1.0.4 -> 1.0.5

* chore: update makefile

* chore: format code

* fix: DF agent rest api ip address

* chore: bump version 1.0.5 -> 1.0.6

* feat: add docker for xmpp server and peak

* docs: fix badges links README.md

Signed-off-by: Bruno Ribeiro <[email protected]>

---------

Signed-off-by: Bruno Ribeiro <[email protected]>

README.md

@@ -1,6 +1,12 @@
 # PEAK: Python-based framework for heterogenous agent communities
 
-![DOI](https://img.shields.io/static/v1?link=https://doi.org/10.1007/978-3-031-18050-7_7&link=https://doi.org/10.1007/978-3-031-18050-7_7&label=DOI&message=978-3-031-18050-7&color=blue) ![PyPI - Python Version](https://img.shields.io/pypi/pyversions/peak-mas) ![PyPI](https://img.shields.io/pypi/v/peak-mas) ![GitHub](https://img.shields.io/github/license/gecad-group/peak-mas) ![powered by](https://img.shields.io/static/v1?label=powered%20by&message=GECAD&color=177985&labelColor=de5d4a&?link=http://gecad.isep.ipp.pt&link=http://gecad.isep.ipp.pt/) ![code style](https://img.shields.io/badge/code%20style-black-black) ![imports isort](https://img.shields.io/static/v1?label=imports&message=isort&color=blue&labelColor=orange)
+[![DOI](https://img.shields.io/badge/DOI-10.1007%2F978--3--031--18050--7__7-blue)](https://link.springer.com/chapter/10.1007/978-3-031-18050-7_7)
+[![PyPI - Python Version](https://img.shields.io/pypi/pyversions/peak-mas)](https://pypi.org/project/peak-mas/)
+[![PyPI](https://img.shields.io/pypi/v/peak-mas)](https://pypi.org/project/peak-mas/)
+[![GitHub](https://img.shields.io/github/license/gecad-group/peak-mas)](https://github.com/gecad-group/peak-mas)
+[![powered by](https://img.shields.io/static/v1?label=powered%20by&message=GECAD&color=177985&labelColor=de5d4a)](https://www.gecad.isep.ipp.pt/GECAD/Pages/Presentation/Home.aspx)
+[![code style](https://img.shields.io/badge/code%20style-black-black)](https://github.com/psf/black)
+[![imports isort](https://img.shields.io/static/v1?label=imports&message=isort&color=blue&labelColor=orange)](https://pycqa.github.io/isort/)
 
 PEAK is a multi-agent system framework which helps the users develop, monitor, analyze and maintain ecosystem of heterogeneous agent communities. This ecosystem is  where various multi-agent systems can coexist, interact and share resources between them. 
 This framework is based on <a href="https://spade-mas.readthedocs.io/en/latest/" target="_blank">SPADE</a>.

docker/Dockerfile

@@ -0,0 +1,5 @@
+FROM python:3.9.6
+
+RUN pip install peak-mas
+
+CMD [ "peak", "df", "-d", "localhost", "-l", "debug"]

compose.yaml → docker/compose.yaml

@@ -1,16 +1,7 @@
 # Services: MySQL database, Prosody server and the PEAK's Directory Facilitator agent
 services:
-  database:
-    image: mysql
-    command: --default-authentication-plugin=mysql_native_password
-    restart: always
-    environment:
-      MYSQL_ROOT_PASSWORD: root
-      MYSQL_DATABASE: prosody
-    volumes:
-      - './mysql:/var/lib/mysql'
-
   server:
+    container_name: peak-prosody
     image: unclev/prosody-docker-extended
     restart: unless-stopped
     ports:
@@ -21,8 +12,11 @@ services:
       - './server/log:/var/log/prosody'
       - './server/modules:/usr/lib/prosody/modules-community'
 
-  # df:
-    # build: .
-    # ports: 
-    #   - 10000:10000
-    # restart: unless-stopped
+  df:
+    container_name: peak-df
+    depends_on:
+      - server
+    build: .
+    ports: 
+      - 10000:10000
+    restart: unless-stopped

docker/server/config/migrator.cfg.lua

@@ -0,0 +1,52 @@
+local data_path = '/var/lib/prosody';
+
+local vhost = {
+	"accounts",
+	"account_details",
+	"roster",
+	"vcard",
+	"private",
+	"blocklist",
+	"privacy",
+	"archive-archive",
+	"offline-archive",
+	"pubsub_nodes",
+	-- "pubsub_*-archive",
+	"pep",
+	-- "pep_*-archive",
+}
+local muc = {
+	"persistent",
+	"config",
+	"state",
+	"muc_log-archive",
+};
+
+input {
+	hosts = {
+		["example.com"] = vhost;
+		["conference.example.com"] = muc;
+	};
+	type = "internal";
+	path = data_path;
+}
+
+output {
+	type = "sql";
+	driver = "SQLite3";
+	database = data_path.."/prosody.sqlite";
+}
+
+--[[
+
+input {
+	type = "internal";
+	path = data_path;
+}
+output {
+	type = "sql";
+	driver = "SQLite3";
+	database = data_path.."/prosody.sqlite";
+}
+
+]]

prosody.cfg.lua → docker/server/config/prosody.cfg.lua

@@ -80,8 +80,7 @@ authentication = "internal_hashed"
 
 log = {
     -- Log files (change 'info' to 'debug' for debug logs):
-    info = "/var/log/prosody/prosody.log";
-    error = "/var/log/prosody/prosody.err";
+    { levels = { "info" }; to = "console"; };
     -- Syslog:
     { levels = { "error" }; to = "syslog"; };
 }

pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "peak-mas"
-version = "1.0.5"
+version = "1.0.6"
 description = "Python-based framework for heterogeneous agent communities"
 readme = "README.md"
 authors = [{ name = "Bruno Ribeiro", email = "[email protected]" }]
@@ -42,7 +42,11 @@ Github = "https://github.com/gecad-group/peak-mas"
 peak = "peak.__main__:main"
 
 [tool.bumpver]
+<<<<<<< HEAD
+current_version = "1.0.6"
+=======
 current_version = "1.0.5"
+>>>>>>> c44c1575441dd99761c340421d4a575601813158
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message  = "chore: bump version {old_version} -> {new_version}"
 commit          = true

src/peak/__init__.py

@@ -20,4 +20,4 @@
 
 __author__ = "Bruno Ribeiro"
 __email__ = "[email protected]"
-__version__ = "1.0.5"
+__version__ = "1.0.6"

src/peak/agents.py

@@ -446,7 +446,7 @@ async def setup(self):
             cors.add(route)
 
         # Start web API
-        self.web.start(port=self.port)
+        self.web.start("0.0.0.0", port=self.port)
         self.logger.info("REST API running on port " + self.port)
 
     async def get_groups(self, request):