[P] Add second agent in docker-compose.yaml

[L4] SCRUM-81: implementation data processing function

MapView/config.py

@@ -2,3 +2,5 @@ import os
 
 STORE_HOST = os.environ.get("STORE_HOST") or "localhost"
 STORE_PORT = os.environ.get("STORE_PORT") or 8000
+
+TRACK_ID = int(os.environ.get("TID") or '1')

MapView/datasource.py

@@ -72,8 +72,8 @@ class Datasource:
         )
         new_points = [
             (
-                processed_agent_data.latitude,
                 processed_agent_data.longitude,
+                processed_agent_data.latitude,
                 processed_agent_data.road_state,
                 processed_agent_data.user_id
             )

MapView/domain/accelerometer.py

@@ -2,6 +2,6 @@ from dataclasses import dataclass
 
 @dataclass
 class Accelerometer:
-  x: int
+  x: float
-  y: int
+  y: float
-  z: int
+  z: float

MapView/main.py

@@ -4,6 +4,7 @@ from kivy_garden.mapview import MapMarker, MapView
 from kivy.clock import Clock
 from lineMapLayer import LineMapLayer
 from datasource import Datasource
+import config
 
 line_layer_colors = [
     [1, 0, 0, 1],
@@ -87,7 +88,8 @@ class MapViewApp(App):
             self.car_markers[user_id].lat = lat
             self.car_markers[user_id].lon = lon
 
-        self.mapview.center_on(lat, lon)
+        if user_id == config.TRACK_ID:
+            self.mapview.center_on(lat, lon)
 
     def set_pothole_marker(self, point):
         if isinstance(point, dict):

agent/src/config.py

@@ -1,18 +1,17 @@
 import os
 
-
 def try_parse(type, value: str):
     try:
         return type(value)
     except Exception:
         return None
 
-
-USER_ID = try_parse(int, os.environ.get("USER_ID")) or 1
 # MQTT config
 MQTT_BROKER_HOST = os.environ.get("MQTT_BROKER_HOST") or "mqtt"
 MQTT_BROKER_PORT = try_parse(int, os.environ.get("MQTT_BROKER_PORT")) or 1883
 MQTT_TOPIC = os.environ.get("MQTT_TOPIC") or "agent"
 
-# Delay for sending data to mqtt in seconds
+# Data-related config
+USER_ID = try_parse(int, os.environ.get("USER_ID")) or 1
 DELAY = try_parse(float, os.environ.get("DELAY")) or 1
+GPS_SOURCE = os.environ.get("GPS_SOURCE") or "data/gps.csv"

agent/src/domain/accelerometer.py

@@ -3,6 +3,6 @@ from dataclasses import dataclass
 
 @dataclass
 class Accelerometer:
-    x: int
+    x: float
-    y: int
+    y: float
-    z: int
+    z: float

agent/src/file_datasource.py

@@ -15,6 +15,7 @@ class FileDatasource:
 
     def __init__(
             self,
+            acc_divisor: float,
             accelerometer_filename: str,
             gps_filename: str,
             park_filename: str,
@@ -34,6 +35,8 @@ class FileDatasource:
 
         self._started = False
 
+        self.acc_divisor = acc_divisor
+
     def startReading(self, *args, **kwargs):
         """Must be called before read()"""
         if self._started:
@@ -160,15 +163,14 @@ class FileDatasource:
 
             return row
 
-    @staticmethod
+    def _parse_acc(self, row: List[str]) -> Accelerometer:
-    def _parse_acc(row: List[str]) -> Accelerometer:
         if len(row) < 3:
             raise ValueError(f"Accelerometer row must have 3 values (x,y,z). Got: {row}")
 
         try:
-            x = int(row[0])
+            x = int(row[0]) / self.acc_divisor
-            y = int(row[1])
+            y = int(row[1]) / self.acc_divisor
-            z = int(row[2])
+            z = int(row[2]) / self.acc_divisor
         except ValueError as e:
             raise ValueError(f"Invalid accelerometer values (expected integers): {row}") from e
 

agent/src/main.py

@@ -16,6 +16,8 @@ def connect_mqtt(broker, port):
             print("Failed to connect {broker}:{port}, return code %d\n", rc)
             exit(rc)  # Stop execution
 
+    logging.info(f"Acting as USER_ID = {config.USER_ID}")
+
     client = mqtt_client.Client()
     client.on_connect = on_connect
     client.connect(broker, port)
@@ -29,17 +31,18 @@ def publish(client, topic, datasource):
         data = datasource.read()
         msg = AggregatedDataSchema().dumps(data)
         result = client.publish(topic, msg)
-        logging.info(f"Published to {topic}: {msg[:50]}...")
+        logging.debug(f"Published to {topic}: {msg[:50]}...")
         status = result[0]
         if status != 0:
-            print(f"Failed to send message to topic {topic}")
+            logging.error(f"Failed to send message to topic {topic}")
 
 
 def run():
+    logging.basicConfig(level = logging.INFO)
     # Prepare mqtt client
     client = connect_mqtt(config.MQTT_BROKER_HOST, config.MQTT_BROKER_PORT)
     # Prepare datasource
-    datasource = FileDatasource("data/accelerometer.csv", "data/gps.csv", "data/parking.csv")
+    datasource = FileDatasource(16384.0, "data/accelerometer.csv", config.GPS_SOURCE, "data/parking.csv")
     # Infinity publish data
     publish(client, config.MQTT_TOPIC, datasource)
 

agent/src/schema/accelerometer_schema.py

@@ -2,6 +2,6 @@ from marshmallow import Schema, fields
 
 
 class AccelerometerSchema(Schema):
-    x = fields.Int()
+    x = fields.Float()
-    y = fields.Int()
+    y = fields.Float()
-    z = fields.Int()
+    z = fields.Float()

docker-compose.yaml

@@ -14,8 +14,7 @@ services:
       mqtt_network:
 
 
-  fake_agent:
+  agent1:
-    container_name: agent
     build:
       context: .
       dockerfile: agent/Dockerfile
@@ -26,7 +25,25 @@ services:
       MQTT_BROKER_HOST: "mqtt"
       MQTT_BROKER_PORT: 1883
       MQTT_TOPIC: "agent_data_topic"
-      DELAY: 0.1
+      DELAY: 1.2
+      USER_ID: 2
+    networks:
+      mqtt_network:
+
+  agent2:
+    build:
+      context: .
+      dockerfile: agent/Dockerfile
+    depends_on:
+      - mqtt
+    environment:
+      PYTHONUNBUFFERED: 1
+      MQTT_BROKER_HOST: "mqtt"
+      MQTT_BROKER_PORT: 1883
+      MQTT_TOPIC: "agent_data_topic"
+      GPS_SOURCE: "data/route2.csv"
+      DELAY: 1.0
+      USER_ID: 3
     networks:
       mqtt_network:
 

edge/app/usecases/data_processing.py

@@ -1,6 +1,7 @@
 from app.entities.agent_data import AgentData
 from app.entities.processed_agent_data import ProcessedAgentData
 
+_last_detection_state = {}
 
 def process_agent_data(
     agent_data: AgentData,
@@ -12,8 +13,24 @@ def process_agent_data(
     Returns:
         processed_data_batch (ProcessedAgentData): Processed data containing the classified state of the road surface and agent data.
     """
-    # Implement it
+    user_id = agent_data.user_id
+    road_state = "normal"
+
+    last_detection_state = _last_detection_state.get(user_id, False)
+
+    if (agent_data.accelerometer.z < 0.6):
+        road_state = "pothole"
+    elif (agent_data.accelerometer.z > 1.2):
+        road_state = "bump"
+
+    detection_happened = road_state != "normal"
+
+    if not (not last_detection_state and detection_happened):
+        road_state = "normal"
+
+    _last_detection_state[user_id] = detection_happened
+
     return ProcessedAgentData(
-        road_state="normal",
+        road_state=road_state,
         agent_data=agent_data
     )

store/main.py

@@ -96,7 +96,7 @@ async def create_processed_agent_data(data: List[ProcessedAgentData], user_id: i
         created_records = [dict(row._mapping) for row in result.fetchall()]
         session.commit()
 
-        for record in created_records:
+        for record in sorted(created_records, key = lambda x: x['timestamp']):
             await send_data_to_subscribers(jsonable_encoder(record))
         return created_records
     except Exception as err: