Skip to content

Commit

Permalink
fix: various minor fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
arthurhauer committed Oct 12, 2024
1 parent 88d8393 commit 036b6c3
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 74 deletions.
9 changes: 6 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
/.idea/
.idea/*
*.pyc
venv
__pycache__/
venv/*
__pycache__/*
docs/*
_build/*
.github/*
42 changes: 0 additions & 42 deletions main.py
Original file line number Diff line number Diff line change
@@ -1,48 +1,6 @@
import json
import signal
from threading import Thread
from flask import Flask, request
from application import Application

app = Flask(__name__)

application = None
interface_thread = None

signal.signal(signal.SIGINT, lambda x, y: stop())
signal.signal(signal.SIGTERM, lambda x, y: stop())


def run_app(configuration):
global application
application = Application(configuration)


@app.route('/start', methods=['POST'])
def start():
global application
global interface_thread
if application is not None:
return 'Application already running'
config = request.get_json()
interface_thread = Thread(target=run_app, args=(config,), daemon=True)
interface_thread.start()
return 'Application running'


@app.route('/stop', methods=['GET'])
def stop():
global application
global interface_thread
if application is None:
return 'No application running'

application.dispose()
interface_thread.join()
return 'Application stopped'

# if __name__ == '__main__':
# app.run(debug=True, host='127.0.0.1', port=8001)

if __name__ == '__main__':
configuration_file = open('config/configuration.json', 'r')
Expand Down
5 changes: 3 additions & 2 deletions models/node/gate/gate_node.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import abc
from typing import List, Dict, Final
from typing import List, Final

from models.exception.invalid_parameter_value import InvalidParameterValue
from models.exception.missing_parameter import MissingParameterError
Expand Down Expand Up @@ -56,13 +56,14 @@ def _initialize_buffer_options(self, buffer_options: dict) -> None:
def _run(self, data: FrameworkData, input_name: str) -> None:
self.print(f'Inserting data in input buffer {input_name}')
self._insert_new_input_data(data, input_name)
# self._clear_output_buffer()
gate_bypass_condition_met = self._check_gate_condition()
if not gate_bypass_condition_met:
if self.clear_input_buffer_if_condition_not_met:
self.print('Clearing input buffer because condition was not met')
self._clear_input_buffer()
return
if self.clear_output_buffer_if_condition_met:
self.print('Clearing output buffer because condition was met')
self._clear_output_buffer()
self._insert_new_output_data(self._input_buffer[self.INPUT_SIGNAL], self.OUTPUT_MAIN)

Expand Down
4 changes: 0 additions & 4 deletions models/node/generator/single_run_generator_node.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from abc import ABC

from models.framework_data import FrameworkData
from models.node.generator.generator_node import GeneratorNode

Expand Down Expand Up @@ -35,5 +33,3 @@ def run(self, data: FrameworkData = None, input_name: str = None) -> None:
if self._first_execution:
super().run()
self._first_execution = False
else:
raise Exception("Stop Executing!")
5 changes: 1 addition & 4 deletions models/node/output/display/console.py
Original file line number Diff line number Diff line change
@@ -1,20 +1,17 @@
import csv
import os
from typing import List, Final, Dict

import sys
import time

from models.exception.invalid_parameter_value import InvalidParameterValue
from models.exception.missing_parameter import MissingParameterError
from models.framework_data import FrameworkData
from models.node.output.output_node import OutputNode


class Console(OutputNode):
""" This node displays it's input in the console.
{
"module": "models.node.output.file",
"module": "models.node.output.display",
"type": "Console",
"prefix": "Acuracia = ",
"buffer_options": {
Expand Down
5 changes: 3 additions & 2 deletions models/node/processing/metric.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from typing import Final, List, Any, Dict

import numpy
from sklearn.metrics import *

from models.exception.invalid_parameter_value import InvalidParameterValue
Expand Down Expand Up @@ -118,8 +119,8 @@ def _process(self, data: Dict[str, FrameworkData]) -> Dict[str, FrameworkData]:
:return: The calculated performance metric.
:rtype: Dict[str, FrameworkData]
"""
predicted_labels = data[self.INPUT_PREDICTED].get_data_single_channel()
actual_labels = data[self.INPUT_ACTUAL].get_data_single_channel()[0:data[self.INPUT_PREDICTED].get_data_count()]
predicted_labels = numpy.array(data[self.INPUT_PREDICTED].get_data_single_channel()).repeat(150)
actual_labels = data[self.INPUT_ACTUAL].get_data_single_channel()[0:len(predicted_labels)]
unformatted_metric = self._metric_function(actual_labels, predicted_labels)

calculated_metric = FrameworkData()
Expand Down
25 changes: 8 additions & 17 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,41 +2,32 @@ alabaster==0.7.13
Babel==2.12.1
beautifulsoup4==4.12.2
brainflow==4.6.1
certifi==2022.12.7
certifi==2023.7.22
charset-normalizer==3.1.0
docutils==0.18.1
furo==2023.3.27
idna==3.4
idna==3.7
imagesize==1.4.1
importlib-metadata==6.3.0
Jinja2==3.1.2
Jinja2==3.1.3
joblib==1.2.0
MarkupSafe==2.1.2
mne==0.24.1
nptyping==1.4.4
numpy==1.21.6
packaging==23.1
Pygments==2.15.0
Pygments==2.15.1
PyQt5==5.15.9
PyQt5-Qt5==5.15.2
PyQt5-sip==12.12.0
pyqtgraph==0.12.4
requests==2.28.2
requests==2.31.0
scikit-learn==1.0.2
scipy==1.8.1
scipy==1.10.0-rc1
snowballstemmer==2.2.0
soupsieve==2.4
sphinx==6.1.3
sphinx-basic-ng==1.0.0b1
sphinxcontrib-applehelp==1.0.4
sphinxcontrib-devhelp==1.0.2
sphinxcontrib-htmlhelp==2.0.1
sphinxcontrib-jquery==4.1
sphinxcontrib-jsmath==1.0.1
sphinxcontrib-qthelp==1.0.3
sphinxcontrib-serializinghtml==1.1.5
threadpoolctl==3.1.0
typish==1.9.3
urllib3==1.26.15
urllib3==2.0.7
zipp==3.15.0
pyserial~=3.5
graphviz~=0.20.1

0 comments on commit 036b6c3

Please sign in to comment.