diff --git a/src/murfey/server/murfey_db.py b/src/murfey/server/murfey_db.py index 2d0d52cf..2afdb854 100644 --- a/src/murfey/server/murfey_db.py +++ b/src/murfey/server/murfey_db.py @@ -15,6 +15,8 @@ def url(security_config: Security | None = None) -> str: security_config = security_config or get_security_config() with open(security_config.murfey_db_credentials, "r") as stream: creds = yaml.safe_load(stream) + if security_config.db == "sqlite": + return f"sqlite:///{creds['database']}" f = Fernet(security_config.crypto_key.encode("ascii")) p = f.decrypt(creds["password"].encode("ascii")) return f"postgresql+psycopg2://{creds['username']}:{p.decode()}@{creds['host']}:{creds['port']}/{creds['database']}" diff --git a/src/murfey/util/config.py b/src/murfey/util/config.py index 6280bb7e..c0d62beb 100644 --- a/src/murfey/util/config.py +++ b/src/murfey/util/config.py @@ -228,6 +228,7 @@ class Security(BaseModel): # Murfey database settings murfey_db_credentials: Path crypto_key: str + db: str = "postgres" sqlalchemy_pooling: bool = True # ISPyB settings