Skip to content

Commit 816738a

Browse files
committed
Renamed Security as ServerConfig, given the change in its contents
1 parent db60fa4 commit 816738a

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

src/murfey/server/murfey_db.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
from sqlalchemy.pool import NullPool
99
from sqlmodel import Session, create_engine
1010

11-
from murfey.util.config import Security, get_security_config
11+
from murfey.util.config import ServerConfig, get_security_config
1212

1313

14-
def url(security_config: Security | None = None) -> str:
14+
def url(security_config: ServerConfig | None = None) -> str:
1515
security_config = security_config or get_security_config()
1616
with open(security_config.murfey_db_credentials, "r") as stream:
1717
creds = yaml.safe_load(stream)
@@ -21,7 +21,7 @@ def url(security_config: Security | None = None) -> str:
2121

2222

2323
def get_murfey_db_session(
24-
security_config: Security | None = None,
24+
security_config: ServerConfig | None = None,
2525
) -> Session: # type: ignore
2626
_url = url(security_config)
2727
if security_config and not security_config.sqlalchemy_pooling:

src/murfey/util/config.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ def from_file(config_file_path: Path, instrument: str = "") -> Dict[str, Machine
437437
}
438438

439439

440-
class Security(BaseModel):
440+
class ServerConfig(BaseModel):
441441
# Database connection settings
442442
murfey_db_credentials: str
443443
sqlalchemy_pooling: bool = True
@@ -459,10 +459,10 @@ class Security(BaseModel):
459459
allow_origins: List[str] = ["*"] # Restrict to only certain hostnames
460460

461461

462-
def security_from_file(config_file_path: Path) -> Security:
462+
def security_from_file(config_file_path: Path) -> ServerConfig:
463463
with open(config_file_path, "r") as config_stream:
464464
config = yaml.safe_load(config_stream)
465-
return Security(**config)
465+
return ServerConfig(**config)
466466

467467

468468
class Settings(BaseSettings):
@@ -489,7 +489,7 @@ def get_microscope(machine_config: MachineConfig | None = None) -> str:
489489

490490

491491
@lru_cache(maxsize=1)
492-
def get_security_config() -> Security:
492+
def get_security_config() -> ServerConfig:
493493
if settings.murfey_security_configuration:
494494
return security_from_file(Path(settings.murfey_security_configuration))
495495
if settings.murfey_machine_configuration and os.getenv("BEAMLINE"):
@@ -498,7 +498,7 @@ def get_security_config() -> Security:
498498
]
499499
if machine_config.security_configuration_path:
500500
return security_from_file(machine_config.security_configuration_path)
501-
return Security(
501+
return ServerConfig(
502502
session_validation="",
503503
murfey_db_credentials="",
504504
crypto_key="",

0 commit comments

Comments
 (0)