Extracted Shedpi module utils

Aiky30 · Dec 8, 2024 · 67cebaa · 67cebaa
1 parent c1f3be6
commit 67cebaa
Show file tree

Hide file tree

Showing 20 changed files with 29 additions and 253 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -41,3 +41,4 @@ tomli==2.0.1
 typing_extensions==4.7.1
 urllib3==2.2.1
 virtualenv==20.25.0
+shed-pi-module-utils==0.1.2
diff --git a/shedpi_hub_dashboard/tests/integration/test_module_reading_submission.py b/shedpi_hub_dashboard/tests/integration/test_module_reading_submission.py
@@ -6,14 +6,14 @@
 from shed_pi_module_utils.data_submission import (
     ReadingSubmissionService,
 )
+from shed_pi_module_utils.shed_pi_components.ds18b20 import (
+    TempProbe,
+)
 
 from shedpi_hub_dashboard.models import DeviceModuleReading
 from shedpi_hub_dashboard.tests.utils.factories import (
     DeviceModuleFactory,
 )
-from shedpi_module_utils.shedpi_components.ds18b20 import (
-    TempProbe,
-)
 
 
 @patch("standalone_modules.temperature_module.temperature_probe.Path")
@@ -33,7 +33,7 @@ def test_temperature_module_reading_submission(mocked_path, live_server):
     # Override the serviuce url
     submission_service.base_url = live_server.url
 
-    probe = TempProbe(submission_service=submission_service)
+    probe = TempProbe()
     # Override the module id
     probe.device_id = device_module.id
 

diff --git a/shedpi_module_utils/README.md b/shedpi_module_utils/README.md
diff --git a/shedpi_module_utils/__init__.py b/shedpi_module_utils/__init__.py
diff --git a/shedpi_module_utils/pyproject.toml b/shedpi_module_utils/pyproject.toml
diff --git a/shedpi_module_utils/shedpi_components/__init__.py b/shedpi_module_utils/shedpi_components/__init__.py
diff --git a/shedpi_module_utils/shedpi_components/ds18b20.py b/shedpi_module_utils/shedpi_components/ds18b20.py
diff --git a/shedpi_module_utils/shedpi_module_utils/__init__.py b/shedpi_module_utils/shedpi_module_utils/__init__.py
diff --git a/shedpi_module_utils/shedpi_module_utils/base_protocol.py b/shedpi_module_utils/shedpi_module_utils/base_protocol.py
diff --git a/shedpi_module_utils/shedpi_module_utils/data_submission.py b/shedpi_module_utils/shedpi_module_utils/data_submission.py
diff --git a/shedpi_module_utils/shedpi_module_utils/utils.py b/shedpi_module_utils/shedpi_module_utils/utils.py
diff --git a/shedpi_module_utils/tests/__init__.py b/shedpi_module_utils/tests/__init__.py
diff --git a/shedpi_module_utils/tests/integration/__init__.py b/shedpi_module_utils/tests/integration/__init__.py
diff --git a/shedpi_module_utils/tests/integration/test_module_data_submission.py b/shedpi_module_utils/tests/integration/test_module_data_submission.py
diff --git a/shedpi_module_utils/tests/unit/__init__.py b/shedpi_module_utils/tests/unit/__init__.py
diff --git a/shedpi_module_utils/tests/utils.py b/shedpi_module_utils/tests/utils.py
diff --git a/standalone_modules/rpi/device_protocol.py b/standalone_modules/rpi/device_protocol.py
@@ -1,6 +1,6 @@
 import time
 
-from shed_pi_module_utils import BaseProtocol
+from shed_pi_module_utils.base_protocol import BaseProtocol
 from shed_pi_module_utils.data_submission import (
     ReadingSubmissionService,
 )

diff --git a/standalone_modules/shed_pi_example_device_installation/device_protocol.py b/standalone_modules/shed_pi_example_device_installation/device_protocol.py
@@ -1,12 +1,12 @@
 import time
 
-from shed_pi_module_utils import BaseProtocol
+from shed_pi_module_utils.base_protocol import BaseProtocol
 from shed_pi_module_utils.data_submission import (
     ReadingSubmissionService,
 )
+from shed_pi_module_utils.shed_pi_components.ds18b20 import TempProbe
 from shed_pi_module_utils.utils import check_arch_is_arm, logger
 
-from shedpi_module_utils.shedpi_components.ds18b20 import TempProbe
 from standalone_modules.rpi.device import RPIDevice
 
 TIME_TO_SLEEP = 60  # time in seconds

diff --git a/standalone_modules/shedpi_module_am2320/tests/unit/test_probe.py b/standalone_modules/shedpi_module_am2320/tests/unit/test_probe.py
@@ -1,8 +1,7 @@
 from unittest.mock import Mock, patch
 
 import pytest
-
-from shedpi_module_utils.shedpi_components import AM2320
+from shed_pi_module_utils.shedpi_components import AM2320
 
 
 @patch("shedpi_components.AM2302.posix")

diff --git a/standalone_modules/temperature_module/device_protocol.py b/standalone_modules/temperature_module/device_protocol.py
@@ -1,11 +1,11 @@
 import time
 
+import requests
 from shed_pi_module_utils import BaseProtocol
 from shed_pi_module_utils.data_submission import (
     ReadingSubmissionService,
 )
 from shed_pi_module_utils.utils import check_arch_is_arm, logger
-
 from shedpi_module_utils.shedpi_components.ds18b20 import TempProbe
 
 TIME_TO_SLEEP = 60  # time in seconds
@@ -16,10 +16,29 @@ def __init__(self, submission_service: ReadingSubmissionService):
         # Installed modules
         self.temp_probe = TempProbe(submission_service=submission_service)
         self.submission_delay = TIME_TO_SLEEP
+        self.submission_service = submission_service
+        self.device_id: int = None
 
     def stop(self):
         return False
 
+    def submit_reading(self) -> requests.Response:
+        """
+        Submits a reading to an external endpoint
+
+        :return:
+        """
+        probe_1_temp = self.temp_probe.read_temp()
+
+        # FIXME: Should this be a float or a string? Broke the test
+        data = {"temperature": str(probe_1_temp)}
+
+        response = self.submission_service.submit(
+            device_module_id=self.device_id, data=data
+        )
+
+        return response
+
     def run(self):
         while not self.stop():
             self.temp_probe.submit_reading()