birbnetes/iot-logic
birbnetes/iot-logic
4
0
Fork 0
Code Pull Requests Releases Wiki Activity

Fixed some configurations
Some checks reported errors
continuous-integration/drone/push Build encountered an error
Details

Browse Source
This commit is contained in:
Pünkösd Marcell 2020-09-30 06:01:38 +02:00
parent 876de01e3c
commit 6de17cf962
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/preprocessor/soundpreprocessor.py
View File

@ -32,7 +32,13 @@ class SoundPreProcessor(AbcPreProcessor):
self._temp_means_name = self._temp_model_name + "MEANS" self._temp_means_name = self._temp_model_name + "MEANS"
logging.debug("Fetching model info...") logging.debug("Fetching model info...")
r = requests.get(f"{config.API_URL}/model/svm/$default/details")
if config.SVM_MODEL_ID:
model_id_to_get = config.SVM_MODEL_ID
else:
model_id_to_get = '$default'
r = requests.get(f"{config.API_URL}/model/svm/{model_id_to_get}/details")
r.raise_for_status() r.raise_for_status()
self._model_details = r.json() self._model_details = r.json()
@ -97,7 +103,7 @@ class SoundPreProcessor(AbcPreProcessor):
logging.info("Running classification...") logging.info("Running classification...")
target_id = self._classes.index('chirp') # Might raise ValueError target_id = self._classes.index(config.SVM_TARGET_CLASS_NAME) # Might raise ValueError
feature_vector = (mid_features - self._mean) / self._std feature_vector = (mid_features - self._mean) / self._std
class_id, probability = classifier_wrapper(self._classifier, self._model_details['type'], feature_vector) class_id, probability = classifier_wrapper(self._classifier, self._model_details['type'], feature_vector)

4
src/utils/config.py
View File

@ -27,7 +27,7 @@ MQTT_PORT = int(os.getenv("GUARD_MQTT_PORT", 1883))
MQTT_USERNAME = os.getenv("GUARD_MQTT_USERNAME", None) MQTT_USERNAME = os.getenv("GUARD_MQTT_USERNAME", None)
MQTT_PASSWORD = os.getenv("GUARD_MQTT_PASSWORD", None) MQTT_PASSWORD = os.getenv("GUARD_MQTT_PASSWORD", None)
TARGET_NAME = os.environ.get("TARGET_CLASS_NAME") SVM_TARGET_CLASS_NAME = os.environ.get("SVM_TARGET_CLASS_NAME", "chirp")
MODEL_ID = os.environ.get("MODEL_ID") SVM_MODEL_ID = os.environ.get("SVM_MODEL_ID")
API_URL = os.environ.get("API_URL", "http://localhost:8080") API_URL = os.environ.get("API_URL", "http://localhost:8080")