Merge branch 'mealie-next' into fix/make-mealie-alpha-migrations-more-fault-tolerant

This commit is contained in:
Michael Genson
2024-02-13 14:01:07 -06:00
committed by GitHub
5 changed files with 56 additions and 22 deletions

View File

@@ -1,3 +1,4 @@
import os
from collections.abc import Callable
from pathlib import Path
from time import sleep
@@ -87,7 +88,12 @@ def main():
if max_retry == 0:
raise ConnectionError("Database connection failed - exiting application.")
alembic_cfg = Config(str(PROJECT_DIR / "alembic.ini"))
alembic_cfg_path = os.getenv("ALEMBIC_CONFIG_FILE", default=str(PROJECT_DIR / "alembic.ini"))
if not os.path.isfile(alembic_cfg_path):
raise Exception("Provided alembic config path doesn't exist")
alembic_cfg = Config(alembic_cfg_path)
if db_is_at_head(alembic_cfg):
logger.debug("Migration not needed.")
else:

View File

@@ -1,3 +1,4 @@
import os
import subprocess
import tempfile
from fractions import Fraction
@@ -13,7 +14,7 @@ from . import utils
from .pre_processor import pre_process_string
CWD = Path(__file__).parent
MODEL_PATH = CWD / "model.crfmodel"
MODEL_PATH = os.getenv("CRF_MODEL_PATH", default=CWD / "model.crfmodel")
class CRFConfidence(BaseModel):