Psion-fanatic/platypush
1
0
Fork 0
forked from platypush/platypush
Code Pull requests Activity

Encapsulate _get_session in EntityManager

Browse source
This commit is contained in:
Fabio Manganiello 2022-11-12 15:14:10 +01:00
parent 8450129858
commit bfeb0a08c4
Signed by untrusted user: blacklight
GPG key ID: D90FBA7F76362774
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
platypush/entities/_engine.py
View file

@ -8,7 +8,7 @@ from typing import Iterable, List, Optional
from sqlalchemy import and_, or_
from sqlalchemy.orm import Session, make_transient
from platypush.context import get_bus
from platypush.context import get_bus, get_plugin
from platypush.message.event.entities import EntityUpdateEvent
from ._base import Entity, db_url
@ -32,12 +32,10 @@ class EntitiesEngine(Thread):
'by_name_and_plugin': {},
}
def _get_db(self):
from platypush.context import get_plugin
def _get_session(self):
db = get_plugin('db')
assert db
return db
return db.get_session(engine=db_url)
def _get_cached_entity(self, entity: Entity) -> Optional[dict]:
if entity.id:
@ -98,7 +96,7 @@ class EntitiesEngine(Thread):
self._cache_entities(new_entity)
def _init_entities_cache(self):
with self._get_db().get_session(engine=db_url) as session:
with self._get_session() as session:
entities = session.query(Entity).all()
for entity in entities:
make_transient(entity)
@ -249,7 +247,7 @@ class EntitiesEngine(Thread):
return list(new_entities.values())
def _process_entities(self, *entities: Entity):
with self._get_db().get_session(engine=db_url) as session:
with self._get_session() as session:
# Ensure that the internal IDs are set to null before the merge
for e in entities:
e.id = None # type: ignore