settings can now be done via the config.env file

using the dotenv format

apiserver/config/__init__.py

-from .settings import Settings
+from .settings import ApiserverSettings
\ No newline at end of file

apiserver/config/settings.py

@@ -5,10 +5,9 @@ DEFAULT_JSON_FILEPATH: str = "./app/data"
 ## Additional Settings can be made available by adding them as properties to this class
 # At launch they will be read from environment variables (case-INsensitive)
 
-class Settings(BaseSettings):
-    datacatalog_apiserver_host: str = "0.0.0.0"
-    datacatalog_apiserver_port: int = 80
-    datacatalog_apiserver_json_storage_path: str = DEFAULT_JSON_FILEPATH
+class ApiserverSettings(BaseSettings):
+    json_storage_path: str = DEFAULT_JSON_FILEPATH
 
     class Config:
-        env_file = "config.env"
+        env_prefix: str = "datacatalog_apiserver_"
\ No newline at end of file
+        env_file: str = "config.env"
\ No newline at end of file

apiserver/main.py

@@ -11,12 +11,12 @@ from .storage import AbstractLocationDataStorageAdapter
 from .storage import LocationData
 from .storage import LocationDataType
 
-from .config import Settings
+from .config import ApiserverSettings
 
 from enum import Enum
 
 
-settings = Settings()
+settings = ApiserverSettings()
 
 app = FastAPI(
     title="API-Server for the Data Catalogue"

apiserver/storage/JsonFileStorageAdapter.py

@@ -4,7 +4,7 @@ import uuid
 
 from .LocationStorage import AbstractLocationDataStorageAdapter, LocationData, LocationDataType
 
-from apiserver.config import Settings
+from apiserver.config import ApiserverSettings
 
 from typing import List
 
@@ -23,9 +23,9 @@ class StoredData:
 class JsonFileStorageAdapter(AbstractLocationDataStorageAdapter):
     data_dir: str
 
-    def __init__(self, settings: Settings):
+    def __init__(self, settings: ApiserverSettings):
         AbstractLocationDataStorageAdapter.__init__(self)
-        self.data_dir = settings.datacatalog_apiserver_json_storage_path
+        self.data_dir = settings.json_storage_path
         if not (os.path.exists(self.data_dir) and os.path.isdir(self.data_dir)):
             raise Exception('Data Directory \"' + self.data_dir + '\" does not exist.')
 

apiserver_tests/context.py

@@ -2,5 +2,5 @@ import os
 import sys
 sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..')))
 
-import apiserver
+import apiserver as apiserver
 import apiserver.storage as storage
\ No newline at end of file

apiserver_tests/test_responsiveness.py

@@ -6,7 +6,6 @@ from fastapi.testclient import TestClient
 from context import apiserver
 from context import storage
 
-
 client = TestClient(apiserver.app)
 
 # get root

apiserver/config/config.env → config.env

+# contains Settings that can be loaded via pydantic settings .env support
 DATACATALOG_APISERVER_HOST="0.0.0.0",
 DATACATALOG_APISERVER_PORT=80
 DATACATALOG_APISERVER_JSON_STORAGE_PATH="./app/data"
\ No newline at end of file