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

Fix some minor custom-data bugs

Browse Source
This commit is contained in:
Matthias 2024-02-13 07:06:32 +01:00
parent 6a6e3aacf3
commit 304f52ab79
2 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
freqtrade/persistence/custom_data.py
View File

@ -32,7 +32,7 @@ class _CustomData(ModelBase):
__table_args__ = (UniqueConstraint('ft_trade_id', 'cd_key', name="_trade_id_cd_key"),)
id = mapped_column(Integer, primary_key=True)
ft_trade_id = mapped_column(Integer, ForeignKey('trades.id'), index=True, default=0)
ft_trade_id = mapped_column(Integer, ForeignKey('trades.id'), index=True)
trade = relationship("Trade", back_populates="custom_data")
@ -84,7 +84,15 @@ class CustomDataWrapper:
@staticmethod
def _convert_custom_data(data: _CustomData) -> _CustomData:
if data.cd_type not in CustomDataWrapper.unserialized_types:
if data.cd_type in CustomDataWrapper.unserialized_types:
data.value = data.cd_value
if data.cd_type == 'bool':
data.value = data.cd_value.lower() == 'true'
elif data.cd_type == 'int':
data.value = int(data.cd_value)
elif data.cd_type == 'float':
data.value = float(data.cd_value)
else:
data.value = json.loads(data.cd_value)
return data
@ -101,15 +109,18 @@ class CustomDataWrapper:
_CustomData.session.query(_CustomData).filter(_CustomData.ft_trade_id == trade_id).delete()
@staticmethod
def get_custom_data(key: Optional[str] = None,
trade_id: Optional[int] = None) -> List[_CustomData]:
def get_custom_data(*, trade_id: int, key: Optional[str] = None) -> List[_CustomData]:
if trade_id is None:
trade_id = 0
if CustomDataWrapper.use_db:
filtered_custom_data = _CustomData.session.scalars(select(_CustomData).filter(
filters = [
_CustomData.ft_trade_id == trade_id,
_CustomData.cd_key.ilike(key))).all()
]
if key is not None:
filters.append(_CustomData.cd_key.ilike(key))
filtered_custom_data = _CustomData.session.scalars(select(_CustomData).filter(
*filters)).all()
else:
filtered_custom_data = [
@ -124,7 +135,7 @@ class CustomDataWrapper:
return [CustomDataWrapper._convert_custom_data(d) for d in filtered_custom_data]
@staticmethod
def set_custom_data(key: str, value: Any, trade_id: Optional[int] = None) -> None:
def set_custom_data(trade_id: int, key: str, value: Any) -> None:
value_type = type(value).__name__
@ -140,7 +151,7 @@ class CustomDataWrapper:
if trade_id is None:
trade_id = 0
custom_data = CustomDataWrapper.get_custom_data(key=key, trade_id=trade_id)
custom_data = CustomDataWrapper.get_custom_data(trade_id=trade_id, key=key)
if custom_data:
data_entry = custom_data[0]
data_entry.cd_value = value_db

8
freqtrade/persistence/trade_model.py
View File

@ -1211,16 +1211,16 @@ class LocalTrade:
:param key: key of the custom data
:param value: value of the custom data (must be JSON serializable)
"""
CustomDataWrapper.set_custom_data(key=key, value=value, trade_id=self.id)
CustomDataWrapper.set_custom_data(trade_id=self.id, key=key, value=value)
def get_custom_data(self, key: str, default: Any = None) -> Any:
"""
Get custom data for this trade
:param key: key of the custom data
"""
data = CustomDataWrapper.get_custom_data(key=key, trade_id=self.id)
data = CustomDataWrapper.get_custom_data(trade_id=self.id, key=key)
if data:
return data[0]
return data[0].value
return default
def get_custom_data_entry(self, key: str) -> Optional[_CustomData]:
@ -1228,7 +1228,7 @@ class LocalTrade:
Get custom data for this trade
:param key: key of the custom data
"""
data = CustomDataWrapper.get_custom_data(key=key, trade_id=self.id)
data = CustomDataWrapper.get_custom_data(trade_id=self.id, key=key)
if data:
return data[0]
return None