Skip to content

更新数据截止到上一交易日 #194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
imbian wants to merge 1 commit into
base: master
Choose a base branch
from
Open

更新数据截止到上一交易日 #194

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions xalpha/info.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
rget,
rget_json,
_float,
last_onday,
)
from xalpha.exceptions import FundTypeError, TradeBehaviorError, ParserFailure
from xalpha.indicator import indicator
Expand Down Expand Up @@ -639,7 +640,7 @@ def _basic_init(self):
df = df.reset_index(drop=True)
if len(df) == 0:
raise ParserFailure("no price table found for this fund %s" % self.code)
self.price = df[df["date"] <= yesterdaydash()]
self.price = df[df["date"] <= last_onday(today_obj())]
# deal with the redemption fee attrs finally
if not self.priceonly:
self._feepreprocess()
Expand Down Expand Up @@ -920,15 +921,15 @@ def _hk_update(self):
# 暂时不确定增量更新逻辑无 bug，需时间验证
# 注意增量更新时分红的同步更新
lastdate = self.price.iloc[-1].date
diffdays = (yesterdayobj() - lastdate).days
diffdays = (last_onday(today_obj()) - lastdate).days
if diffdays == 0:
return None
import xalpha.universal as xu

df = xu.get_daily("F" + self.code, start=lastdate.strftime("%Y%m%d"))
df = df[df["date"].isin(opendate)]
df = df.reset_index(drop=True)
df = df[df["date"] <= yesterdayobj()]
df = df[df["date"] <= last_onday(today_obj())]
df = df[df["date"] > lastdate]

if len(df) != 0:
Expand All @@ -949,7 +950,7 @@ def update(self):
if self.code.startswith("96"):
return self._hk_update()
lastdate = self.price.iloc[-1].date
diffdays = (yesterdayobj() - lastdate).days
diffdays = (last_onday(today_obj()) - lastdate).days
if (
diffdays == 0
): ## for some QDII, this value is 1, anyways, trying update is compatible (d+2 update)
Expand Down Expand Up @@ -1018,7 +1019,7 @@ def update(self):
df = df.iloc[::-1] ## reverse the time order
df = df[df["date"].isin(opendate)]
df = df.reset_index(drop=True)
df = df[df["date"] <= yesterdayobj()]
df = df[df["date"] <= last_onday(today_obj())]
if len(df) != 0:
self.price = self.price.append(df, ignore_index=True, sort=True)
return df
Expand Down Expand Up @@ -1382,7 +1383,7 @@ def _basic_init(self):
self.name = "货币基金"
self.rate = 0
datel = list(
pd.date_range(dt.datetime.strftime(self.start, "%Y-%m-%d"), yesterdaydash())
pd.date_range(dt.datetime.strftime(self.start, "%Y-%m-%d"), last_onday(today_obj()).strftime("%Y-%m-%d"))
)
valuel = []
for i, date in enumerate(datel):
Expand Down Expand Up @@ -1471,7 +1472,7 @@ def _basic_init(self):
if len(df) == 0:
raise ParserFailure("no price table for %s" % self.code)
df = df.reset_index(drop=True)
self.price = df[df["date"] <= yesterdaydash()]
self.price = df[df["date"] <= last_onday(today_obj())]

def _save_csv(self, path):
"""
Expand Down Expand Up @@ -1547,7 +1548,7 @@ def update(self):
"""
lastdate = self.price.iloc[-1].date
startvalue = self.price.iloc[-1].totvalue
diffdays = (yesterdayobj() - lastdate).days
diffdays = (last_onday(today_obj()) - lastdate).days
if diffdays == 0:
return None
self._updateurl = (
Expand Down Expand Up @@ -1618,7 +1619,7 @@ def update(self):
)
df = df[df["date"].isin(opendate)]
df = df.reset_index(drop=True)
df = df[df["date"] <= yesterdayobj()]
df = df[df["date"] <= last_onday(today_obj())]
if len(df) != 0:
self.price = self.price.append(df, ignore_index=True, sort=True)
return df
Expand Down