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

Merge pull request #10 from vertti/fix-persistent-session

Browse Source 
Fix Session lint issues
This commit is contained in:
Michael Egger 2017-09-08 10:48:24 +02:00 committed by GitHub
commit ddc984bd02
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -80,3 +80,4 @@ preprocessor.py
.env .env
.venv .venv
.idea .idea
.vscode

11
persistence.py
View File

@ -2,7 +2,9 @@ from datetime import datetime
from sqlalchemy import Boolean, Column, DateTime, Float, Integer, String, create_engine from sqlalchemy import Boolean, Column, DateTime, Float, Integer, String, create_engine
from sqlalchemy.ext.declarative import declarative_base from sqlalchemy.ext.declarative import declarative_base
from sqlalchemy.orm import scoped_session, sessionmaker from sqlalchemy.orm.scoping import scoped_session
from sqlalchemy.orm.session import sessionmaker
from sqlalchemy.types import Enum from sqlalchemy.types import Enum
from exchange import Exchange, get_exchange_api from exchange import Exchange, get_exchange_api
@ -15,14 +17,13 @@ else:
db_handle = 'sqlite:///tradesv2.sqlite' db_handle = 'sqlite:///tradesv2.sqlite'
engine = create_engine(db_handle, echo=False) engine = create_engine(db_handle, echo=False)
Session = scoped_session(sessionmaker(bind=engine, autoflush=True, autocommit=True)) session = scoped_session(sessionmaker(bind=engine, autoflush=True, autocommit=True))
Session = session()
Base = declarative_base() Base = declarative_base()
class Trade(Base): class Trade(Base):
__tablename__ = 'trades' __tablename__ = 'trades'
query = session.query_property()
query = Session.query_property()
id = Column(Integer, primary_key=True) id = Column(Integer, primary_key=True)
exchange = Column(Enum(Exchange), nullable=False) exchange = Column(Enum(Exchange), nullable=False)

1
rpc/telegram.py
View File

@ -244,7 +244,6 @@ class TelegramHandler(object):
if not get_instance().is_alive(): if not get_instance().is_alive():
TelegramHandler.send_msg('`trader is not running`', bot=bot) TelegramHandler.send_msg('`trader is not running`', bot=bot)
return return
pair_rates = Session.query(Trade.pair, func.sum(Trade.close_profit).label('profit_sum')) \ pair_rates = Session.query(Trade.pair, func.sum(Trade.close_profit).label('profit_sum')) \
.filter(Trade.is_open.is_(False)) \ .filter(Trade.is_open.is_(False)) \
.group_by(Trade.pair) \ .group_by(Trade.pair) \