From 2e81fc188faab6c424db66482119624f3d9735cb Mon Sep 17 00:00:00 2001 From: Felix Stupp Date: Sat, 8 Jul 2023 10:23:14 +0200 Subject: [PATCH] models: Extract db into own file to prevent circular dependency --- server/entertainment_decider/models/__init__.py | 5 ++++- server/entertainment_decider/models/db.py | 4 ++++ server/entertainment_decider/models/entities.py | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 server/entertainment_decider/models/db.py diff --git a/server/entertainment_decider/models/__init__.py b/server/entertainment_decider/models/__init__.py index ec23195..09844f8 100644 --- a/server/entertainment_decider/models/__init__.py +++ b/server/entertainment_decider/models/__init__.py @@ -8,6 +8,10 @@ from .custom_types import ( SafeStr, ) +from .db import ( + db, +) + from .entities import ( CollectionStats, CollectionUriMapping, @@ -20,7 +24,6 @@ from .entities import ( Tag, Tagable, TagKey, - db, ) from .predefined_tags import ( diff --git a/server/entertainment_decider/models/db.py b/server/entertainment_decider/models/db.py new file mode 100644 index 0000000..909ea0d --- /dev/null +++ b/server/entertainment_decider/models/db.py @@ -0,0 +1,4 @@ +from pony import orm + + +db = orm.Database() diff --git a/server/entertainment_decider/models/entities.py b/server/entertainment_decider/models/entities.py index 4a87957..6e81f0b 100644 --- a/server/entertainment_decider/models/entities.py +++ b/server/entertainment_decider/models/entities.py @@ -18,13 +18,13 @@ import requests from pony import orm from .custom_types import Query +from .db import db from .thumbnails import THUMBNAIL_ALLOWED_TYPES, THUMBNAIL_HEADERS from .extras import ( UriHolder, ) from ..preferences.tag_protocol import TagableProto, TagProto -db = orm.Database() T = TypeVar("T")