move all Databases into the database folder to not have storeage and Database when they are all Databases

server/Server.py

@@ -3,12 +3,12 @@ from quart_common.web.env import env_bool, env_int
 from server.Files import read_file
 
 from server.game_state_store import GameStateStoreBuilder
-
 from snakes import SnakeBuilder
 
-from server.storage import StorageLoader
-from server.database import GameplayDatabase
-
+from server.database import (
+  GameplayDatabase,
+  StorageLoader,
+)
 from server.metrics import (
   MetricsStoreBuilder,
   MetricsCollector,

server/blueprints/battlesnake.py

@@ -4,7 +4,7 @@ import json, time, os
 from quart import Blueprint, request, jsonify
 
 from quart_common.web.logger import await_log
-from server.storage import StorageLoader
+from server.database import StorageLoader
 from server.GameBoard import GameBoard
 
 if TYPE_CHECKING:

server/database/__init__.py

@@ -1 +1,10 @@
 from .GameplayDatabase import GameplayDatabase
+from .LocalStorage import LocalStorage
+from .EdgeDB import EdgeDB
+
+class StorageLoader:
+  @classmethod
+  def build(self, selected_storage:str) -> LocalStorage|EdgeDB:
+    storage_module = __import__(f"server.storage.{selected_storage}", fromlist=[selected_storage])
+    storage_class = getattr(storage_module, selected_storage)
+    return storage_class

server/storage/__init__.py

@@ -1,9 +0,0 @@
-from .LocalStorage import LocalStorage
-from .EdgeDB import EdgeDB
-
-class StorageLoader:
-  @classmethod
-  def build(self, selected_storage:str) -> LocalStorage|EdgeDB:
-    storage_module = __import__(f"server.storage.{selected_storage}", fromlist=[selected_storage])
-    storage_class = getattr(storage_module, selected_storage)
-    return storage_class