adelorenzo/stable
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

keep Trade.session private

Browse Source
This commit is contained in:
Matthias 2023-03-02 06:55:33 +01:00
parent 8103656ae1
commit 103bd9e2f2
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
freqtrade/commands/db_commands.py
View File

@ -20,7 +20,7 @@ def start_convert_db(args: Dict[str, Any]) -> None:
config = setup_utils_configuration(args, RunMode.UTIL_NO_EXCHANGE)
init_db(config['db_url'])
session_target = Trade.session
session_target = Trade._session
init_db(config['db_url_from'])
logger.info("Starting db migration.")

12
freqtrade/persistence/models.py
View File

@ -54,12 +54,12 @@ def init_db(db_url: str) -> None:
# https://docs.sqlalchemy.org/en/13/orm/contextual.html#thread-local-scope
# Scoped sessions proxy requests to the appropriate thread-local session.
# We should use the scoped_session object - not a seperately initialized version
Trade.session = scoped_session(sessionmaker(bind=engine, autoflush=False))
Order.session = Trade.session
PairLock.session = Trade.session
Trade.query = Trade.session.query_property()
Order.query = Trade.session.query_property()
PairLock.query = Trade.session.query_property()
Trade._session = scoped_session(sessionmaker(bind=engine, autoflush=False))
Order._session = Trade._session
PairLock._session = Trade._session
Trade.query = Trade._session.query_property()
Order.query = Trade._session.query_property()
PairLock.query = Trade._session.query_property()
previous_tables = inspect(engine).get_table_names()
ModelBase.metadata.create_all(engine)

2
freqtrade/persistence/pairlock.py
View File

@ -15,7 +15,7 @@ class PairLock(ModelBase):
"""
__tablename__ = 'pairlocks'
query: ClassVar[_QueryDescriptorType]
session: ClassVar[SessionType]
_session: ClassVar[SessionType]
id: Mapped[int] = mapped_column(primary_key=True)

4
freqtrade/persistence/trade_model.py
View File

@ -37,7 +37,7 @@ class Order(ModelBase):
"""
__tablename__ = 'orders'
query: ClassVar[_QueryDescriptorType]
session: ClassVar[SessionType]
_session: ClassVar[SessionType]
# Uniqueness should be ensured over pair, order_id
# its likely that order_id is unique per Pair on some exchanges.
@ -1179,7 +1179,7 @@ class Trade(ModelBase, LocalTrade):
"""
__tablename__ = 'trades'
query: ClassVar[_QueryDescriptorType]
session: ClassVar[SessionType]
_session: ClassVar[SessionType]
use_db: bool = True

6
tests/persistence/test_migrations.py
View File

@ -21,8 +21,8 @@ spot, margin, futures = TradingMode.SPOT, TradingMode.MARGIN, TradingMode.FUTURE
def test_init_create_session(default_conf):
# Check if init create a session
init_db(default_conf['db_url'])
assert hasattr(Trade, 'session')
assert 'scoped_session' in type(Trade.session).__name__
assert hasattr(Trade, '_session')
assert 'scoped_session' in type(Trade._session).__name__
def test_init_custom_db_url(default_conf, tmpdir):
@ -34,7 +34,7 @@ def test_init_custom_db_url(default_conf, tmpdir):
init_db(default_conf['db_url'])
assert Path(filename).is_file()
r = Trade.session.execute(text("PRAGMA journal_mode"))
r = Trade._session.execute(text("PRAGMA journal_mode"))
assert r.first() == ('wal',)