Feature/SK-1289 | Added test for store list functionality

.vscode/launch.json

@@ -0,0 +1,23 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "PyTest All",
+            "type": "python",
+            "request": "launch",
+            "module": "pytest",
+            "justMyCode": true
+        },
+        {
+            "args": [
+                "--nf",
+                "--lf"
+            ],
+            "name": "PyTest New and Failing",
+            "type": "python",
+            "request": "launch",
+            "module": "pytest",
+            "justMyCode": true
+        },
+    ]
+}

.vscode/settings.json

@@ -6,4 +6,10 @@
     "python.linting.enabled": true,
     "python.linting.flake8Enabled": true,
     "esbonio.sphinx.confDir": "",
+    "python.testing.pytestArgs": [
+        "fedn/tests",
+        "--color=yes",
+    ],
+    "python.testing.unittestEnabled": false,
+    "python.testing.pytestEnabled": true,
 }

fedn/network/storage/dbconnection.py

@@ -59,7 +59,7 @@ def __new__(cls, *, force_create_new: bool = False) -> "DatabaseConnection":
         """Create a new instance of DatabaseConnection or return the existing singleton instance.
 
         Args:
-            force_create_new (bool): If True, a new instance will be created regardless of the singleton pattern.
+            force_create_new (bool): If True, a new instance will be created regardless of the singleton pattern. Only used for testing purpose.
 
         Returns:
             DatabaseConnection: A new instance if force_create_new is True, otherwise the existing singleton instance.
@@ -72,11 +72,9 @@ def __new__(cls, *, force_create_new: bool = False) -> "DatabaseConnection":
 
         return cls._instance
 
-    def _init_connection(self, statestore_config: dict = None, network_id: dict = None) -> None:
-        if statestore_config is None:
-            statestore_config = get_statestore_config()
-        if network_id is None:
-            network_id = get_network_config()
+    def _init_connection(self) -> None:
+        statestore_config = get_statestore_config()
+        network_id = get_network_config()
 
         if statestore_config["type"] == "MongoDB":
             mdb: Database = self._setup_mongo(statestore_config, network_id)
@@ -123,7 +121,9 @@ def _setup_mongo(self, statestore_config: dict, network_id: str) -> "DatabaseCon
 
     def _setup_sql(self, statestore_config: dict) -> "DatabaseConnection":
         if statestore_config["type"] == "SQLite":
-            engine = create_engine("sqlite:///my_database.db", echo=False)
+            sqlite_config = statestore_config["sqlite_config"]
+            dbname = sqlite_config["dbname"]
+            engine = create_engine(f"sqlite:///{dbname}", echo=False)
         elif statestore_config["type"] == "PostgreSQL":
             postgres_config = statestore_config["postgres_config"]
             username = postgres_config["username"]

fedn/network/storage/statestore/stores/client_store.py

@@ -238,8 +238,10 @@ def list(self, limit: int, skip: int, sort_key: str, sort_order=pymongo.DESCENDI
 
                 stmt = stmt.order_by(sort_obj)
 
-            if limit != 0:
+            if limit:
                 stmt = stmt.offset(skip or 0).limit(limit)
+            elif skip:
+                stmt = stmt.offset(skip)
 
             items = session.scalars(stmt).all()
 

fedn/network/storage/statestore/stores/combiner_store.py

@@ -189,8 +189,10 @@ def list(self, limit: int, skip: int, sort_key: str, sort_order=pymongo.DESCENDI
 
                 stmt = stmt.order_by(sort_obj)
 
-            if limit != 0:
+            if limit:
                 stmt = stmt.offset(skip or 0).limit(limit)
+            elif skip:
+                stmt = stmt.offset(skip)
 
             items = session.scalars(stmt).all()
 

fedn/network/storage/statestore/stores/model_store.py

@@ -334,8 +334,10 @@ def list(self, limit: int, skip: int, sort_key: str, sort_order=pymongo.DESCENDI
 
                 stmt = stmt.order_by(sort_obj)
 
-            if limit != 0:
+            if limit:
                 stmt = stmt.offset(skip or 0).limit(limit)
+            elif skip:
+                stmt = stmt.offset(skip)
 
             items = session.scalars(stmt).all()
 

fedn/network/storage/statestore/stores/package_store.py

@@ -126,18 +126,18 @@ def get(self, id: str) -> Package:
         return from_document(document, response_active)
 
     def _complement(self, item: Package):
-        if "id" not in item or item.id is None:
+        if "id" not in item or item["id"] is None:
             item["id"] = str(uuid.uuid4())
 
-        if "key" not in item or item.key is None:
+        if "key" not in item or item["key"] is None:
             item["key"] = "package_trail"
 
-        if "committed_at" not in item or item.committed_at is None:
+        if "committed_at" not in item or item["committed_at"] is None:
             item["committed_at"] = datetime.now()
 
         extension = item["file_name"].rsplit(".", 1)[1].lower()
 
-        if "storage_file_name" not in item or item.storage_file_name is None:
+        if "storage_file_name" not in item or item["storage_file_name"] is None:
             storage_file_name = secure_filename(f"{str(uuid.uuid4())}.{extension}")
             item["storage_file_name"] = storage_file_name
 
@@ -310,12 +310,13 @@ def __init__(self, Session):
         super().__init__(Session)
 
     def _complement(self, item: Package):
-        if "committed_at" not in item or item.committed_at is None:
+        # TODO: Not complemented the same way as in MongoDBStore
+        if "committed_at" not in item or item["committed_at"] is None:
             item["committed_at"] = datetime.now()
 
         extension = item["file_name"].rsplit(".", 1)[1].lower()
 
-        if "storage_file_name" not in item or item.storage_file_name is None:
+        if "storage_file_name" not in item or item["storage_file_name"] is None:
             storage_file_name = secure_filename(f"{str(uuid.uuid4())}.{extension}")
             item["storage_file_name"] = storage_file_name
 
@@ -374,8 +375,10 @@ def list(self, limit: int, skip: int, sort_key: str, sort_order=pymongo.DESCENDI
 
                 stmt = stmt.order_by(sort_obj)
 
-            if limit != 0:
+            if limit:
                 stmt = stmt.offset(skip or 0).limit(limit)
+            elif skip:
+                stmt = stmt.offset(skip)
 
             items = session.scalars(stmt).all()
 

fedn/network/storage/statestore/stores/prediction_store.py

@@ -123,10 +123,10 @@ def add(self, item: Prediction) -> Tuple[bool, Any]:
                 correlation_id=item.get("correlationId") or item.get("correlation_id"),
                 data=item.get("data"),
                 model_id=item.get("modelId") or item.get("model_id"),
-                receiver_name=receiver.get("name"),
-                receiver_role=receiver.get("role"),
-                sender_name=sender.get("name"),
-                sender_role=sender.get("role"),
+                receiver_name=receiver.get("name") if receiver else None,
+                receiver_role=receiver.get("role") if receiver else None,
+                sender_name=sender.get("name") if sender else None,
+                sender_role=sender.get("role") if sender else None,
                 prediction_id=item.get("predictionId") or item.get("prediction_id"),
                 timestamp=item.get("timestamp"),
             )
@@ -187,8 +187,10 @@ def list(self, limit: int, skip: int, sort_key: str, sort_order=pymongo.DESCENDI
 
                     stmt = stmt.order_by(sort_obj)
 
-            if limit != 0:
+            if limit:
                 stmt = stmt.offset(skip or 0).limit(limit)
+            elif skip:
+                stmt = stmt.offset(skip)
 
             items = session.execute(stmt)
 

fedn/network/storage/statestore/stores/round_store.py

@@ -414,8 +414,10 @@ def list(self, limit: int, skip: int, sort_key: str, sort_order=pymongo.DESCENDI
 
                 stmt = stmt.order_by(sort_obj)
 
-            if limit != 0:
+            if limit:
                 stmt = stmt.offset(skip or 0).limit(limit)
+            if skip:
+                stmt = stmt.offset(skip)
 
             items = session.execute(stmt)
 

fedn/network/storage/statestore/stores/session_store.py

@@ -298,7 +298,6 @@ def add(self, item: Session) -> Tuple[bool, Any]:
             parent_item = SessionModel(
                 id=item["session_id"], status=item["status"], name=item["name"] if "name" in item else None, committed_at=item["committed_at"] or None
             )
-            session.add(parent_item)
 
             session_config = item["session_config"]
 
@@ -311,10 +310,11 @@ def add(self, item: Session) -> Tuple[bool, Any]:
                 clients_required=session_config["clients_required"],
                 validate=session_config["validate"],
                 helper_type=session_config["helper_type"],
-                session_id=parent_item.id,
             )
+            child_item.session = parent_item
 
             session.add(child_item)
+            session.add(parent_item)
             session.commit()
 
             combined_dict = {
@@ -357,8 +357,10 @@ def list(self, limit: int, skip: int, sort_key: str, sort_order=pymongo.DESCENDI
 
                     stmt = stmt.order_by(sort_obj)
 
-            if limit != 0:
+            if limit:
                 stmt = stmt.offset(skip or 0).limit(limit)
+            elif skip:
+                stmt = stmt.offset(skip)
 
             items = session.execute(stmt)
 

fedn/network/storage/statestore/stores/sql/shared.py

@@ -17,7 +17,6 @@ class SessionConfigModel(MyAbstractBase):
     validate: Mapped[bool]
     helper_type: Mapped[str] = mapped_column(String(255))
     model_id: Mapped[str] = mapped_column(ForeignKey("models.id"))
-    session_id: Mapped[str] = mapped_column(ForeignKey("sessions.id"))
     session: Mapped["SessionModel"] = relationship(back_populates="session_config")
 
 
@@ -26,6 +25,7 @@ class SessionModel(MyAbstractBase):
 
     name: Mapped[Optional[str]] = mapped_column(String(255))
     status: Mapped[str] = mapped_column(String(255))
+    session_config_id: Mapped[str] = mapped_column(ForeignKey("session_configs.id"))
     session_config: Mapped["SessionConfigModel"] = relationship(back_populates="session")
     models: Mapped[List["ModelModel"]] = relationship(back_populates="session")
 

fedn/network/storage/statestore/stores/status_store.py

@@ -122,8 +122,8 @@ def add(self, item: Status) -> Tuple[bool, Any]:
 
             status = StatusModel(
                 log_level=item.get("log_level") or item.get("logLevel"),
-                sender_name=sender.get("name"),
-                sender_role=sender.get("role"),
+                sender_name=sender.get("name") if sender else None,
+                sender_role=sender.get("role") if sender else None,
                 status=item.get("status"),
                 timestamp=item.get("timestamp"),
                 type=item.get("type"),
@@ -177,8 +177,10 @@ def list(self, limit: int, skip: int, sort_key: str, sort_order=pymongo.DESCENDI
 
                     stmt = stmt.order_by(sort_obj)
 
-            if limit != 0:
+            if limit:
                 stmt = stmt.offset(skip or 0).limit(limit)
+            elif skip:
+                stmt = stmt.offset(skip)
 
             items = session.execute(stmt)
 

fedn/network/storage/statestore/stores/validation_store.py

@@ -122,10 +122,10 @@ def add(self, item: Validation) -> Tuple[bool, Any]:
                 correlation_id=item.get("correlationId") or item.get("correlation_id"),
                 data=item.get("data"),
                 model_id=item.get("modelId") or item.get("model_id"),
-                receiver_name=receiver.get("name"),
-                receiver_role=receiver.get("role"),
-                sender_name=sender.get("name"),
-                sender_role=sender.get("role"),
+                receiver_name=receiver.get("name") if receiver else None,
+                receiver_role=receiver.get("role") if receiver else None,
+                sender_name=sender.get("name") if sender else None,
+                sender_role=sender.get("role") if sender else None,
                 session_id=item.get("sessionId") or item.get("session_id"),
                 timestamp=item.get("timestamp"),
             )
@@ -190,8 +190,10 @@ def list(self, limit: int, skip: int, sort_key: str, sort_order=pymongo.DESCENDI
 
                     stmt = stmt.order_by(sort_obj)
 
-            if limit != 0:
+            if limit:
                 stmt = stmt.offset(skip or 0).limit(limit)
+            elif skip:
+                stmt = stmt.offset(skip)
 
             items = session.execute(stmt)
 

fedn/tests/stores/conftest.py

@@ -0,0 +1 @@
+from fedn.tests.stores.helpers.database_helper import mongo_connection, sql_connection, postgres_connection

fedn/tests/stores/helpers/database_helper.py

@@ -0,0 +1,72 @@
+import pytest
+from unittest.mock import patch
+
+from fedn.network.storage.dbconnection import DatabaseConnection
+from fedn.tests.stores.helpers.mongo_docker import start_mongodb_container, stop_mongodb_container
+from fedn.tests.stores.helpers.postgres_docker import start_postgres_container, stop_postgres_container
+
+
+def network_id():
+    return "test_network"
+
+@pytest.fixture(scope="package")
+def mongo_connection():
+    _, port = start_mongodb_container()
+
+    def mongo_config():
+        return {
+            "type": "MongoDB",
+            "mongo_config": {
+                "host": "localhost",
+                "port": port,
+                "username": "fedn_admin",
+                "password": "password"
+            }
+        }
+
+    with patch('fedn.network.storage.dbconnection.get_statestore_config', return_value=mongo_config()), \
+         patch('fedn.network.storage.dbconnection.get_network_config', return_value=network_id()):
+        yield DatabaseConnection(force_create_new=True)
+
+    stop_mongodb_container()
+
+@pytest.fixture(scope="package")
+def sql_connection():
+
+
+    def sql_config():
+        return {
+            "type": "SQLite",
+            "sqlite_config": {
+                "dbname": ":memory:",
+            }
+        }
+
+    with patch('fedn.network.storage.dbconnection.get_statestore_config', return_value=sql_config()), \
+         patch('fedn.network.storage.dbconnection.get_network_config', return_value=network_id()):
+        return DatabaseConnection(force_create_new=True)
+
+@pytest.fixture(scope="package")
+def postgres_connection():
+    print("Starting postgres container")
+    _, port = start_postgres_container()
+
+
+
+    def postgres_config():
+        return {
+            "type": "PostgreSQL",
+            "postgres_config": {
+                "username": "fedn_admin",
+                "password": "password",
+                "database": "fedn_db",
+                "host": "localhost",
+                "port": port
+            }
+        }
+
+    with patch('fedn.network.storage.dbconnection.get_statestore_config', return_value=postgres_config()), \
+         patch('fedn.network.storage.dbconnection.get_network_config', return_value=network_id()):
+        yield DatabaseConnection(force_create_new=True)
+    print("Stopping postgres container")
+    stop_postgres_container()