From d175ab495b39a9a249274b97ea52292840592283 Mon Sep 17 00:00:00 2001
From: Matthias <xmatthias@outlook.com>
Date: Tue, 28 Feb 2023 07:03:22 +0100
Subject: [PATCH] Move SessionType to base module

---
 freqtrade/persistence/base.py        | 4 +++-
 freqtrade/persistence/models.py      | 5 ++---
 freqtrade/persistence/pairlock.py    | 3 +--
 freqtrade/persistence/trade_model.py | 3 +--
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/freqtrade/persistence/base.py b/freqtrade/persistence/base.py
index 2fed715d7..98e483c90 100644
--- a/freqtrade/persistence/base.py
+++ b/freqtrade/persistence/base.py
@@ -1,6 +1,8 @@
 
-from sqlalchemy.orm import DeclarativeBase
+from sqlalchemy.orm import DeclarativeBase, Session, scoped_session
 
 
+SessionType = scoped_session[Session]
+
 class ModelBase(DeclarativeBase):
     pass
diff --git a/freqtrade/persistence/models.py b/freqtrade/persistence/models.py
index b94be950a..98d1d7a8a 100644
--- a/freqtrade/persistence/models.py
+++ b/freqtrade/persistence/models.py
@@ -6,11 +6,11 @@ from typing import Any, Dict
 
 from sqlalchemy import create_engine, inspect
 from sqlalchemy.exc import NoSuchModuleError
-from sqlalchemy.orm import Session, scoped_session, sessionmaker
+from sqlalchemy.orm import scoped_session, sessionmaker
 from sqlalchemy.pool import StaticPool
 
 from freqtrade.exceptions import OperationalException
-from freqtrade.persistence.base import ModelBase
+from freqtrade.persistence.base import ModelBase, SessionType
 from freqtrade.persistence.migrations import check_migrate
 from freqtrade.persistence.pairlock import PairLock
 from freqtrade.persistence.trade_model import Order, Trade
@@ -20,7 +20,6 @@ logger = logging.getLogger(__name__)
 
 
 _SQL_DOCS_URL = 'http://docs.sqlalchemy.org/en/latest/core/engines.html#database-urls'
-SessionType = scoped_session[Session]
 
 
 def init_db(db_url: str) -> None:
diff --git a/freqtrade/persistence/pairlock.py b/freqtrade/persistence/pairlock.py
index b10d74693..d5a8d7ae1 100644
--- a/freqtrade/persistence/pairlock.py
+++ b/freqtrade/persistence/pairlock.py
@@ -6,8 +6,7 @@ from sqlalchemy.orm import Mapped, Query, mapped_column
 from sqlalchemy.orm.scoping import _QueryDescriptorType
 
 from freqtrade.constants import DATETIME_PRINT_FORMAT
-from freqtrade.persistence.base import ModelBase
-from freqtrade.persistence.models import SessionType
+from freqtrade.persistence.base import ModelBase, SessionType
 
 
 class PairLock(ModelBase):
diff --git a/freqtrade/persistence/trade_model.py b/freqtrade/persistence/trade_model.py
index 0f85528e0..ce7d56745 100644
--- a/freqtrade/persistence/trade_model.py
+++ b/freqtrade/persistence/trade_model.py
@@ -17,8 +17,7 @@ from freqtrade.enums import ExitType, TradingMode
 from freqtrade.exceptions import DependencyException, OperationalException
 from freqtrade.exchange import amount_to_contract_precision, price_to_precision
 from freqtrade.leverage import interest
-from freqtrade.persistence.base import ModelBase
-from freqtrade.persistence.models import SessionType
+from freqtrade.persistence.base import ModelBase, SessionType
 from freqtrade.util import FtPrecise