Refactored import and tests

Author: rjtokenring

src/appslab_modules/core/__init__.py

@@ -0,0 +1 @@
+from .module import get_module_config_file, get_module_compose_file, get_module_linked_resource_file

src/appslab_modules/core/module.py

@@ -0,0 +1,34 @@
+import os
+
+config_file_name = "module_config.yaml"
+compose_config_file_name = "module_compose.yaml"
+
+def get_module_config_file(cls) -> str|None:
+    """Gets the full path of the module_config.yaml file."""
+    return get_module_linked_resource_file(cls, config_file_name)
+
+def get_module_compose_file(cls) -> str|None:
+    """Gets the full path of the module_compose.yaml file, if present."""
+    return get_module_linked_resource_file(cls, compose_config_file_name)
+
+def get_module_linked_resource_file(cls, resource_file_name) -> str|None:
+    """Gets the full path to a config file in the directory containing a class."""
+    try:
+        module = cls.__module__
+        if module == '__main__':
+            directory_path = os.path.dirname(os.path.abspath(__file__))
+        else:
+            module_obj = __import__(module, fromlist=['__file__'])
+            file_path = os.path.abspath(module_obj.__file__)
+            directory_path = os.path.dirname(file_path)
+
+        requested_path = os.path.join(directory_path, resource_file_name)
+        if os.path.exists(requested_path):
+            return requested_path
+        else:
+            return None
+    except AttributeError:
+        # Handle built-in classes or other cases where __file__ is not available
+        return None
+    except ModuleNotFoundError:
+        return None

src/appslab_modules/db_storage/database_storage.py

@@ -1,7 +1,11 @@
 from influxdb_client import InfluxDBClient, Point, WritePrecision
 from influxdb_client.client.write_api import SYNCHRONOUS
+from appslab_modules.core.module import get_module_compose_file
 import yaml
 import time
+import logging
+
+logger = logging.getLogger(__name__)
 
 class _InfluxPersistence:
     def __init__(self, host:str = "db_storage", port:int = 8086):
@@ -17,9 +21,14 @@ def __init__(self, host:str = "db_storage", port:int = 8086):
         self._connect()
 
     def load_default_infra(self):
-        with open("module_compose.yaml", "r") as file:
-            config = yaml.safe_load(file)
-            return config
+        pathfile = get_module_compose_file(self.__class__)
+        if pathfile:
+            with open(pathfile) as f:
+                compose_content = yaml.safe_load(f)
+                logger.info(f"Loading compose file: {compose_content}")
+                return compose_content
+        else:
+            logger.error("Error: Could not find module_compose.yaml")
 
     def _connect(self):
         try:

tests/XXtest_database_storage.py

@@ -1,5 +1,6 @@
 import pytest
 from appslab_modules.db_storage import DatabasePersistence, DatabaseRetrieval  # Assuming this is in database_storage.py
+import time
 
 @pytest.fixture
 def open_influx_database():
@@ -14,10 +15,28 @@ def open_influx_database():
 
 def test_write_and_read_string(open_influx_database):
     """Test writing and reading a string sample."""
-    
+
     db, dbread = open_influx_database
 
     db.write_sample("test_measurement_str", "test_string")
+    time.sleep(1)
     val = dbread.read_last_sample("test_measurement_str")
     assert val[2] == "test_string"
-    assert val[0] == "test_measurement_str"
+    assert val[0] == "test_measurement_str"
+
+def test_write_and_read_integer(open_influx_database):
+    """Test writing and reading an integer sample."""
+    
+    db, dbread = open_influx_database
+
+    db.write_sample("test_measurement", 1111)
+    db.write_sample("test_measurement", 1234)
+    time.sleep(1)
+    val = dbread.read_last_sample("test_measurement")
+    assert val[2] == 1234
+
+def test_read_nonexistent_measurement(open_influx_database):
+    """Test reading a non-existent measurement."""
+    db, dbread = open_influx_database
+    val = dbread.read_last_sample("nonexistent_measurement")
+    assert val == None