fixes

Author: feijooso

app/exceptions/deviating_parameters.py

@@ -1,4 +1,4 @@
-class DeviatingParametersError(Exception):
+class DeviatedParametersError(Exception):
     def __init__(self, parameters):
         self.parameters = parameters
         super().__init__(f"Out of range parameters: {self.parameters}")

app/resources/parser.py

@@ -1,7 +1,7 @@
 import pandas as pd
 from datetime import datetime
 
-file_path = 'app/resources/cleaned_plants_dataset.csv'
+file_path = 'resources/plants_dataset.csv'
 df = pd.read_csv(file_path)
 DELTA = 5
 
@@ -33,7 +33,7 @@ def check_t_rule(register, day_value, night_value):
     1: (is_in_range, (200, 350)),
     2: (is_in_range, (200, 350)),
     3: (is_in_range, (75, 200)),
-    4: (is_in_range, (25, 30)),
+    4: (is_in_range, (25, 75)),
 }
 
 
@@ -43,33 +43,42 @@ def parse_values(string):
 
 
 # asumimos register: nombre_planta, humedad, luz, temperatura
-def rules(register):
-    plant_data = df[df['Botanical_Name'] == register["plant_name"]]
+def apply_rules(register, plant_name):
+    plant_data = df[df['Botanical_Name'] == plant_name]
     h_value = plant_data['H'].values[0]
     l_value = plant_data['L'].values[0]
     t_value = plant_data['T'].values[0]
+    print("h_value", h_value)
+    print("l_value", l_value)
+    print("t_value", t_value)
 
     parameters = []
 
     t_values = parse_values(t_value)
     h_values = parse_values(h_value)
     l_values = parse_values(l_value)
 
+    print("h_values", h_values)
+    print("l_values", l_values)
+    print("t_values", t_values)
+
     for t_value in t_values:
-        if apply_temperature_rule(t_value, register["temperature"]):
+        if apply_temperature_rule(t_value, register.temperature):
             parameters.append('temperature')
             break
 
     for l_value in l_values:
-        if apply_light_rule(l_value, register["light"]):
+        if apply_light_rule(l_value, register.light):
             parameters.append('light')
             break
 
     for h_value in h_values:
-        if apply_humidity_rule(l_value, register["humidity"]):
+        if apply_humidity_rule(h_value, register.humidity):
             parameters.append('humidity')
             break
 
+    return parameters
+
 
 def apply_temperature_rule(rule, register):
     rule_function, rule_values = TEMP_RULES_MAP.get(rule, None)
@@ -78,13 +87,13 @@ def apply_temperature_rule(rule, register):
 
 
 def apply_light_rule(rule, register):
-    rule_function, rule_values = HUMIDITY_RULES_MAP.get(rule, None)
+    rule_function, rule_values = LIGHT_RULES_MAP.get(rule, None)
     if rule_function:
         return not rule_function(register, *rule_values)
 
 
 def apply_humidity_rule(rule, register):
-    rule_function, rule_values = LIGHT_RULES_MAP.get(rule, None)
+    rule_function, rule_values = HUMIDITY_RULES_MAP.get(rule, None)
     if rule_function:
         return not rule_function(register, *rule_values)
 

app/resources/cleaned_plants_dataset.csv renamed to app/resources/plants_dataset.csv

@@ -4,7 +4,7 @@
 import pydantic
 import logging
 from exceptions.invalid_insertion import InvalidInsertionError
-from exceptions.deviating_parameters import DeviatingParametersError
+from exceptions.deviating_parameters import DeviatedParametersError
 from exceptions.empty_package import EmptyPackageError
 from exceptions.row_not_found import RowNotFoundError
 from pydantic import ValidationError
@@ -16,18 +16,17 @@
 from ..common.middleware import Middleware
 from database.models.measurement import Measurement
 from database.database import SQLAlchemyClient
+from resources.parser import apply_rules
 
 Base = declarative_base(metadata=MetaData(schema='dev'))
 
 logger = logging.getLogger("rabbitmq_consumer")
-
+logging.getLogger("pika").setLevel(logging.WARNING)
 
 dbUrl = os.environ.get("DATABASE_URL")
 engine = create_engine(dbUrl, echo=True, future=True)
 session = Session(engine)
 
-# logger_messages.py
-
 
 class Consumer:
     def __init__(self, queue_name):
@@ -57,16 +56,16 @@ def send_notification(self, id_user, message):
         logger.info(f"[ ID_USER: {id_user} ]")
         logger.info("TO DO - For Step #2 & Step #4 from Ticket HAN-14")
 
-    def apply_rules(self, measurement_from_rabbit, device_plant):
-        logger.info("TO DO - Step #3 from Ticket HAN-14")
-        logger.info("TO DO - Step #4 from Ticket HAN-14")
+    def apply_rules(self, measurement):
+        # TODO: FIND PLANT TYPE NAME GIVEN PLANT TYPE
+        deviated_parameters = apply_rules(measurement, "Acorus calamus")
+        if len(deviated_parameters) > 0:
+            raise DeviatedParametersError(deviated_parameters)
+
 
-        # ...This is an example, the exception can be much more personalized...
-        # raise DeviatingParametersError(["temperature", "humidity"])
     def save_measurement(self, measurement_from_rabbit, device_plant):
         logger.info("TO DO - Step #5 from Ticket HAN-14")
 
-        # Indentation fixed (4 spaces)
         measurement_from_db = Measurement(
             id_plant=device_plant.id_plant,
             plant_type=device_plant.plant_type,
@@ -98,7 +97,7 @@ def __callback(self, body):
 
             device_plant = self.obtain_device_plant(measurement)
             self.check_package(measurement)
-            self.apply_rules(measurement, device_plant)
+            self.apply_rules(measurement)
         except (pydantic.errors.PydanticUserError,
                 ValidationError,
                 json.JSONDecodeError) as err:
@@ -117,7 +116,7 @@ def __callback(self, body):
             self.send_notification(device_plant.id_user, err)
 
             measurement = None  # For not saving the measurement.
-        except DeviatingParametersError as err:
+        except DeviatedParametersError as err:
             logger.warn(LoggerMessages.DEVIATING_PARAMETERS)
             logger.debug(LoggerMessages.ERROR_DETAILS.format(err, body))
 

app/service/rabbitmq/consumer.py

@@ -3,6 +3,7 @@ uvicorn==0.25.0
 python-dotenv
 flake8
 psycopg2
+pandas
 
 ### RabbitMQ ###
 pika