mirror of
https://github.com/paperless-ngx/paperless-ngx.git
synced 2026-02-24 00:59:35 -06:00
Relaxes the typing here
This commit is contained in:
@@ -1,16 +1,13 @@
|
|||||||
import os
|
import os
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from typing import TypeAlias
|
from typing import Any
|
||||||
|
|
||||||
from paperless.settings.parsers import get_choice_from_env
|
from paperless.settings.parsers import get_choice_from_env
|
||||||
from paperless.settings.parsers import get_int_from_env
|
from paperless.settings.parsers import get_int_from_env
|
||||||
from paperless.settings.parsers import parse_dict_from_str
|
from paperless.settings.parsers import parse_dict_from_str
|
||||||
|
|
||||||
# ENGINE/NAME/HOST/USER/PASSWORD (str), PORT (int), OPTIONS (dict)
|
|
||||||
DatabaseConfig: TypeAlias = dict[str, str | int | dict[str, str | int | dict | None]]
|
|
||||||
|
|
||||||
|
def parse_db_settings(data_dir: Path) -> dict[str, dict[str, Any]]:
|
||||||
def parse_db_settings(data_dir: Path) -> dict[str, DatabaseConfig]:
|
|
||||||
"""Parse database settings from environment variables.
|
"""Parse database settings from environment variables.
|
||||||
|
|
||||||
Core connection variables (no deprecation):
|
Core connection variables (no deprecation):
|
||||||
@@ -34,6 +31,9 @@ def parse_db_settings(data_dir: Path) -> dict[str, DatabaseConfig]:
|
|||||||
default="sqlite",
|
default="sqlite",
|
||||||
)
|
)
|
||||||
|
|
||||||
|
db_config: dict[str, Any]
|
||||||
|
base_options: dict[str, Any]
|
||||||
|
|
||||||
match engine:
|
match engine:
|
||||||
case "sqlite":
|
case "sqlite":
|
||||||
db_config = {
|
db_config = {
|
||||||
@@ -84,6 +84,8 @@ def parse_db_settings(data_dir: Path) -> dict[str, DatabaseConfig]:
|
|||||||
"key": os.getenv("PAPERLESS_DBSSLKEY"),
|
"key": os.getenv("PAPERLESS_DBSSLKEY"),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
case _: # pragma: no cover
|
||||||
|
raise NotImplementedError(engine)
|
||||||
|
|
||||||
# Handle port setting for external databases
|
# Handle port setting for external databases
|
||||||
if (
|
if (
|
||||||
|
|||||||
Reference in New Issue
Block a user