From 2338f017ed4b794cdc4f079863726d6d8c7cf088 Mon Sep 17 00:00:00 2001 From: Hayden Date: Mon, 18 Jan 2021 12:54:27 -0900 Subject: [PATCH] notes hot fix --- mealie/app.py | 4 ++-- mealie/db/sql/db_session.py | 4 +++- mealie/db/sql/recipe_models.py | 6 +++++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/mealie/app.py b/mealie/app.py index 2d65933c765e..9b5aa20c2c52 100644 --- a/mealie/app.py +++ b/mealie/app.py @@ -54,8 +54,8 @@ app.include_router(static_routes.router) # Generate API Documentation -if not PRODUCTION: - generate_api_docs(app) +# if not PRODUCTION: +# generate_api_docs(app) if __name__ == "__main__": logger.info("-----SYSTEM STARTUP-----") diff --git a/mealie/db/sql/db_session.py b/mealie/db/sql/db_session.py index 442d401cba4b..e60ae5d17206 100644 --- a/mealie/db/sql/db_session.py +++ b/mealie/db/sql/db_session.py @@ -15,7 +15,9 @@ def globa_init(db_file: Path): return conn_str = "sqlite:///" + str(db_file.absolute()) - engine = sa.create_engine(conn_str, echo=False) + engine = sa.create_engine( + conn_str, echo=False, connect_args={"check_same_thread": False} + ) __factory = orm.sessionmaker(bind=engine) diff --git a/mealie/db/sql/recipe_models.py b/mealie/db/sql/recipe_models.py index f8b7cf65b71f..561d07c23c19 100644 --- a/mealie/db/sql/recipe_models.py +++ b/mealie/db/sql/recipe_models.py @@ -50,6 +50,10 @@ class Note(SqlAlchemyBase): title = sa.Column(sa.String) text = sa.Column(sa.String) + def __init__(self, title, text) -> None: + self.title = title + self.text = text + def dict(self): return {"title": self.title, "text": self.text} @@ -169,7 +173,7 @@ class RecipeModel(SqlAlchemyBase, BaseMixins): self.categories = [Category(name=cat) for cat in categories] self.tags = [Tag(name=tag) for tag in tags] self.dateAdded = dateAdded - self.notes = [Note(note) for note in notes] + self.notes = [Note(**note) for note in notes] self.rating = rating self.orgURL = orgURL self.extras = [ApiExtras(key=key, value=value) for key, value in extras.items()]