Merge pull request #13 from SiriDB/development

Development

Author: timoj

CHANGELOG.md

@@ -0,0 +1,29 @@
+
+# Change Log
+All notable changes to this project will be documented in this file.
+ 
+The format is based on [Keep a Changelog](http://keepachangelog.com/)
+and this project adheres to [Semantic Versioning](http://semver.org/).
+ 
+## [Unreleased] - yyyy-mm-dd
+ 
+
+ 
+## [0.1.0-beta2.0] - 2021-03-04
+  
+Migration: config file changed, all siridb related config is in a seperate settings.enodo file in the root of the data folder you give up within the conf file.
+ 
+### Added
+
+- FFE model for faster forcasting and anomaly detection
+- Static rules (min/max thresholds)
+- Environment variable support
+ 
+### Changed
+  
+- Siridb connection settings moved to `settings.enodo file`, these settings can be changed during runtime
+ 
+### Fixed
+ 
+- Bug with listener handshake
+- Cleanup

lib/logging.py

@@ -11,8 +11,6 @@ def prepare_logger(log_level_label):
     ch = logging.StreamHandler()
     ch.setLevel(logging.DEBUG)
     formatter = logging.Formatter(
-        # fmt='[%(levelname)1.1s %(asctime)s %(module)s:%(lineno)d] ' +
-        #     '%(message)s',
         fmt='[%(levelname)1.1s %(asctime)s hub] ' +
             '%(message)s',
         datefmt='%y%m%d %H:%M:%S',

lib/socket/socketserver.py

@@ -61,7 +61,7 @@ async def _handle_client_connection(self, reader, writer):
                     if 'client_type' in client_data:
                         if client_data.get('client_type') == 'listener':
                             await ClientManager.listener_connected(writer.get_extra_info('peername'), writer,
-                                                    client_data.get('version', None))
+                                                    client_data)
                             logging.info(f'New listener with id: {client_id}')
                         elif client_data.get('client_type') == 'worker':
                             supported_jobs_and_models = client_data.get('jobs_and_models')

readme.md

@@ -23,6 +23,9 @@ To get the Enodo Hub setup you need to following the following steps:
 2. Setup a .conf file file `python3 main.py --create_config` There will be made a `default.conf` next to the main.py.
 3. Fill in the `default.conf` file
 4. Call `python3 main.py --config=default.conf` to start the hub.
+5. Fill `in settings.endo` file, which you can find in the data folder by the path set in the conf file with key: `enodo_base_save_path`
+6. Restart Hub
+7. You can also setup the config by environment variables. These names are identical to those in the default.conf file, except all uppercase.
 
 ## API's
 

requirements.txt

@@ -5,7 +5,7 @@ aiohttp_cors==0.7.0
 jinja2==2.11.3
 marshmallow==3.10.0
 psutil==5.8.0
-python-enodo==0.1.5
+python-enodo==0.1.7
 python-socketio==5.0.4
 qpack==0.0.17
 siridb-connector==2.0.5

version.py

@@ -1 +1 @@
-VERSION = '0.1.0-beta1.1'
+VERSION = '0.1.0-beta2.0'