lychiyu/freqtrade_origin
1
0
Fork 0
mirror of https://github.com/freqtrade/freqtrade.git synced 2024-11-10 02:12:01 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

custom_data: Simplify and fix a few things

Browse Source
This commit is contained in:
Matthias 2024-02-12 20:05:13 +01:00
parent 9699011cd9
commit 7fd70b82fa
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
freqtrade/persistence/custom_data.py
View File

@ -59,4 +59,4 @@ class CustomData(ModelBase):
if key is not None:
filters.append(CustomData.cd_key.ilike(key))
return CustomData.session.scalars(select(CustomData)).all()
return CustomData.session.scalars(select(CustomData).filter(*filters)).all()

22
freqtrade/persistence/custom_data_middleware.py
View File

@ -1,9 +1,9 @@
import json
import logging
from datetime import datetime
from typing import Any, List, Optional
from freqtrade.persistence.custom_data import CustomData
from freqtrade.util import dt_now
logger = logging.getLogger(__name__)
@ -30,7 +30,7 @@ class CustomDataWrapper:
@staticmethod
def get_custom_data(key: Optional[str] = None,
trade_id: Optional[int] = None) -> List[CustomData]:
trade_id: Optional[int] = None) -> CustomData:
if trade_id is None:
trade_id = 0
@ -73,15 +73,15 @@ class CustomDataWrapper:
custom_data = CustomDataWrapper.get_custom_data(key=key, trade_id=trade_id)
if custom_data:
data_entry = custom_data[0]
data_entry.cd_value = value
data_entry.updated_at = datetime.utcnow()
data_entry.cd_value = value_db
data_entry.updated_at = dt_now()
else:
data_entry = CustomData(
ft_trade_id=trade_id,
cd_key=key,
cd_type=value_type,
cd_value=value,
created_at=datetime.utcnow()
ft_trade_id=trade_id,
cd_key=key,
cd_type=value_type,
cd_value=value_db,
created_at=dt_now()
)
if CustomDataWrapper.use_db and value_db is not None:
@ -97,8 +97,8 @@ class CustomDataWrapper:
if cd_index >= 0:
data_entry.cd_type = value_type
data_entry.cd_value = value
data_entry.updated_at = datetime.utcnow()
data_entry.cd_value = value_db
data_entry.updated_at = dt_now()
CustomDataWrapper.custom_data[cd_index] = data_entry
else: