Реалізовую базовий FileReader та переношу sleep до FileDatasource.read()

updated compose file

.gitea/workflows/testing.yaml

@@ -0,0 +1,25 @@
+name: Test Agent
+on: [push]
+jobs:
+  test-agent-run:
+    runs-on: debian-x86_64
+    steps:
+      - name: Fetch the repository
+        run: git clone --branch ${{ gitea.ref_name }} --depth 1 ${{ gitea.server_url }}/${{ gitea.repository }}
+
+      - name: Build containers
+        run: docker-compose -f docker-compose-test.yaml build
+        working-directory: sem8-iot-test/agent/docker
+
+      - name: Start MQTT broker
+        run: docker-compose -f docker-compose-test.yaml up -d mqtt
+        working-directory: sem8-iot-test/agent/docker
+
+      - name: Start agent
+        run: docker-compose -f docker-compose-test.yaml run fake_agent
+        working-directory: sem8-iot-test/agent/docker
+
+      - name: Clean up
+        if: always()
+        run: docker-compose -f docker-compose-test.yaml down
+        working-directory: sem8-iot-test/agent/docker

.gitignore

@@ -1,2 +0,0 @@
-agent/docker/mosquitto/data/
-agent/docker/mosquitto/log/

agent/docker/docker-compose-test.yaml

@@ -0,0 +1,34 @@
+version: "3.3"
+#name: "road_vision"
+services:
+  mqtt:
+    image: eclipse-mosquitto
+    container_name: mqtt
+    volumes:
+      - ./mosquitto:/mosquitto
+      - ./mosquitto/data:/mosquitto/data
+      - ./mosquitto/log:/mosquitto/log
+    ports:
+      - 1883:1883
+      - 9001:9001
+    networks:
+      mqtt_network:
+
+
+  fake_agent:
+    container_name: agent
+    build: ../
+    depends_on:
+      - mqtt
+    environment:
+      MQTT_BROKER_HOST: "mqtt"
+      MQTT_BROKER_PORT: 1883
+      MQTT_TOPIC: "agent_data_topic"
+      DELAY: 0.1
+      MAX_SENDS: 30
+    networks:
+      mqtt_network:
+
+
+networks:
+  mqtt_network:

agent/docker/docker-compose.yaml

@@ -1,5 +1,5 @@
-version: "3.9"
+version: "3.3"
-name: "road_vision"
+#name: "road_vision"
 services:
   mqtt:
     image: eclipse-mosquitto

agent/src/config.py

@@ -16,3 +16,6 @@ MQTT_TOPIC = os.environ.get("MQTT_TOPIC") or "agent"
 
 # Delay for sending data to mqtt in seconds
 DELAY = try_parse(float, os.environ.get("DELAY")) or 1
+
+# Testing switches for CI/CD
+MAX_SENDS = try_parse(int, os.environ.get("MAX_SENDS"))

agent/src/file_datasource.py

@@ -68,7 +68,7 @@ class FileDatasource:
         return AggregatedData(
             accelerometer=acc,
             gps=gps,
-            timestamp=datetime.utcnow(),
+            time=datetime.utcnow(),
             user_id=config.USER_ID,
         )
 
@@ -203,16 +203,9 @@ class FileDatasource:
     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}")
-
+        x = int(float(row[0]))
-        try:
+        y = int(float(row[1]))
-            x = int(row[0])
+        z = int(float(row[2]))
-            y = int(row[1])
-            z = int(row[2])
-        except ValueError as e:
-            raise ValueError(
-                f"Invalid accelerometer values (expected integers): {row}"
-            ) from e
-
         return Accelerometer(x=x, y=y, z=z)
 
     @staticmethod

agent/src/main.py

@@ -22,9 +22,13 @@ def connect_mqtt(broker, port):
     return client
 
 
-def publish(client, topic, datasource):
+def publish(client, topic, datasource, max_sends = None):
     datasource.startReading()
+
+    i = 0
     while True:
+        i += 1
+
         data = datasource.read()
         msg = AggregatedDataSchema().dumps(data)
         result = client.publish(topic, msg)
@@ -32,6 +36,10 @@ def publish(client, topic, datasource):
         if status != 0:
             print(f"Failed to send message to topic {topic}")
 
+        if max_sends and i >= max_sends:
+            # display test success
+            exit(0)
+
 
 def run():
     # Prepare mqtt client
@@ -39,7 +47,7 @@ def run():
     # Prepare datasource
     datasource = FileDatasource("data/accelerometer.csv", "data/gps.csv")
     # Infinity publish data
-    publish(client, config.MQTT_TOPIC, datasource)
+    publish(client, config.MQTT_TOPIC, datasource, getattr(config, "MAX_SENDS", None))
 
 
 if __name__ == "__main__":

edge/docker/docker-compose.yaml

@@ -13,6 +13,7 @@ services:
       - 19001:9001
     networks:
       mqtt_network:
+    user: 1000:1000
 
 
   edge: