From e405d312bc8603b8b46d8b5cd551fab9e2d4f0ae Mon Sep 17 00:00:00 2001 From: Bruno Ribeiro <59573315+brunus-reberes@users.noreply.github.com> Date: Mon, 8 May 2023 17:21:56 +0100 Subject: [PATCH] New version 1.0.7 (#10) * 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 * fix: pyproject.toml merge confilct * fix: sys path missing terminal current directory * chore: bump version 1.0.6 -> 1.0.7 --- pyproject.toml | 8 ++------ src/peak/__init__.py | 2 +- src/peak/__main__.py | 4 +++- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index c8ca00e..df86d22 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta" [project] name = "peak-mas" -version = "1.0.6" +version = "1.0.7" description = "Python-based framework for heterogeneous agent communities" readme = "README.md" authors = [{ name = "Bruno Ribeiro", email = "brgri@isep.ipp.pt" }] @@ -42,11 +42,7 @@ 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 +current_version = "1.0.7" version_pattern = "MAJOR.MINOR.PATCH" commit_message = "chore: bump version {old_version} -> {new_version}" commit = true diff --git a/src/peak/__init__.py b/src/peak/__init__.py index bd9e041..7210e16 100644 --- a/src/peak/__init__.py +++ b/src/peak/__init__.py @@ -20,4 +20,4 @@ __author__ = "Bruno Ribeiro" __email__ = "brgri@isep.ipp.pt" -__version__ = "1.0.6" +__version__ = "1.0.7" diff --git a/src/peak/__main__.py b/src/peak/__main__.py index b484fdd..2a137a7 100644 --- a/src/peak/__main__.py +++ b/src/peak/__main__.py @@ -1,4 +1,5 @@ import logging +import os import sys from argparse import ArgumentParser from pathlib import Path @@ -8,6 +9,7 @@ from peak import __version__ as version from peak.cli import df, mas +sys.path.append(os.getcwd()) _logger = logging.getLogger(peak_name) @@ -19,7 +21,7 @@ def main(args=None): ) _logger.addHandler(handler) try: - _main() + _main(args) except Exception as e: _logger.critical(e, exc_info=1) except KeyboardInterrupt: