siat 3.7.5__py3-none-any.whl → 3.7.7__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
siat/__init__.py CHANGED
@@ -10,42 +10,64 @@
10
10
  #屏蔽所有警告性信息
11
11
  import warnings; warnings.filterwarnings('ignore')
12
12
  #==============================================================================
13
- from siat.allin import *
14
- #==============================================================================
15
- #同一命令行多个输出,主要用于Jupyter Notebook
16
- from IPython.core.interactiveshell import InteractiveShell
17
- InteractiveShell.ast_node_interactivity='all'
18
- #==============================================================================
19
- # 检查是否存在新版本
20
- check_newer_version=False
21
-
22
13
  try:
23
- import pkg_resources
24
- current_version=pkg_resources.get_distribution("siat").version
25
- current_list=current_version.split('.')
26
- print("Successfully enabled siat version",current_version)
14
+ from siat.allin import *
15
+ success=True
16
+ except:
17
+ print(" #Warning: failed to enable siat!")
18
+ import sys; version=sys.version
19
+ version_list=version.split('|')
20
+ python_version=version_list[0].strip()
21
+ python_version_list=python_version.split('.')
22
+ python_version2="{0}.{1}".format(python_version_list[0],python_version_list[1])
23
+
24
+ if python_version2 < '3.11':
25
+ print(" Solution: your Python version is {0}, suggest upgrade to {1} or above".format(python_version2,'3.11'))
26
+ elif python_version2 < '3.12':
27
+ print(" Solution: your Python version is {0}, suggest upgrade to {1} or above".format(python_version2,'3.12'))
28
+ else:
29
+ print(" Solution: your Python version is {}, suggest upgrade to the newest one".format(python_version2))
30
+
31
+ success=False
27
32
 
28
- if check_newer_version:
29
- import luddite
30
- latest_version=luddite.get_version_pypi("siat")
31
- latest_list=latest_version.split('.')
32
-
33
- newest=True
34
- for i in range(3):
35
- #print(i)
36
- if int(current_list[i]) < int(latest_list[i]):
37
- newest=False
38
-
39
- if not newest:
40
- #print("The latest version of siat is",latest_version,'\n')
41
- print("There is a newer version of siat",latest_version,'\n')
42
- print("*** How to upgrade siat?")
43
- print("Upgrade from official website? Command: upgrade_siat()")
44
- print("Upgrade from Tsinghua? Command: upgrade_siat(alternative='tsinghua')")
45
- print("Upgrade from Alibaba? Command: upgrade_siat(alternative='alibaba')")
33
+ if success:
34
+ #==============================================================================
35
+ #同一命令行多个输出,主要用于Jupyter Notebook
36
+ from IPython.core.interactiveshell import InteractiveShell
37
+ InteractiveShell.ast_node_interactivity='all'
38
+ #==============================================================================
39
+ # 检查是否存在新版本
40
+ check_newer_version=False
46
41
 
47
- except:
48
- pass
42
+ try:
43
+ import pkg_resources
44
+ current_version=pkg_resources.get_distribution("siat").version
45
+ current_list=current_version.split('.')
46
+ print("Successfully enabled siat version",current_version)
47
+
48
+ if check_newer_version:
49
+ import luddite
50
+ latest_version=luddite.get_version_pypi("siat")
51
+ latest_list=latest_version.split('.')
52
+
53
+ newest=True
54
+ for i in range(3):
55
+ #print(i)
56
+ if int(current_list[i]) < int(latest_list[i]):
57
+ newest=False
58
+
59
+ if not newest:
60
+ #print("The latest version of siat is",latest_version,'\n')
61
+ print("There is a newer version of siat",latest_version,'\n')
62
+ print("*** How to upgrade siat?")
63
+ print("Upgrade from official website? Command: upgrade_siat()")
64
+ print("Upgrade from Tsinghua? Command: upgrade_siat(alternative='tsinghua')")
65
+ print("Upgrade from Alibaba? Command: upgrade_siat(alternative='alibaba')")
66
+
67
+ except:
68
+ print(" #Warning: plugin went unexpected with either {0} or {1}".format("pkg_resources","luddite"))
69
+ print(" Solution: please re-run. If problem remains, contact the author of siat for help")
70
+ #pass
49
71
 
50
72
 
51
73
  #==============================================================================
siat/common.py CHANGED
@@ -3827,7 +3827,8 @@ if __name__=='__main__':
3827
3827
  def upgrade_siat(module_list=['siat','akshare','pandas','pandas_datareader', \
3828
3828
  'yfinance','yahooquery','urllib3','tabulate','twine', \
3829
3829
  'mplfinance','openpyxl','pip','bottleneck','ipywidgets'], \
3830
- pipcmd="python -m pip install --upgrade --user",alternative=""):
3830
+ pipcmd="python -m pip install --upgrade --user", \
3831
+ mirror="aliyun"):
3831
3832
  """
3832
3833
  功能:一次性升级siat及其相关插件
3833
3834
 
@@ -3839,7 +3840,8 @@ def upgrade_siat(module_list=['siat','akshare','pandas','pandas_datareader', \
3839
3840
  DEBUG=False
3840
3841
 
3841
3842
  print("Upgrading siat and related modules, please wait ... ...")
3842
-
3843
+ alternative=mirror
3844
+
3843
3845
  #获取系统目录
3844
3846
  import sys
3845
3847
  syspath=sys.path
@@ -3930,7 +3932,7 @@ def upgrade_siat(module_list=['siat','akshare','pandas','pandas_datareader', \
3930
3932
  if 'pip' in fail_list:
3931
3933
  print("Upgrading for pip, in Anaconda Prompt (Windows) or Terminal (Mac):")
3932
3934
  print(" python -m pip install --upgrade --user pip")
3933
-
3935
+ print("Please RESTART Python kernel to enforce the upgraded modules!")
3934
3936
  return
3935
3937
 
3936
3938
  def df_index_timezone_remove(df):
@@ -4171,14 +4173,58 @@ def firstLetterUpper(text):
4171
4173
 
4172
4174
  #==============================================================================
4173
4175
  if __name__ == '__main__':
4174
- string = "Hello, Welcome to this New World!"
4176
+ string = "HeLLo, Welcome to this New WorLd!"
4175
4177
  words = ["Hello", "World"]
4176
4178
 
4177
4179
  contains_any(string, words)
4178
4180
 
4179
4181
  def contains_any(string, words):
4180
- # 定义一个函数,检查字符串string是否包含列表words中的任何元素
4181
- return any(word in string for word in words)
4182
+ """
4183
+
4184
+ 功能:测试字符串string中是否含有字符串列表words中的任意一个元素
4185
+ 参数:
4186
+ string:字符串,大小写不限
4187
+ words:字符串列表,大小写不限
4188
+ 注意:为避免大小写字母的影响,比较前需要先将两边的字母全部小写化
4189
+ """
4190
+ #将字符串列表中的元素小写,避免大小写差异导致比较失败
4191
+ if not isinstance(words,list):
4192
+ words_list=[words]
4193
+ else:
4194
+ words_list=words
4195
+ new_words=words_list.copy() #不改变原列表的内容
4196
+
4197
+ new_words_list=[]
4198
+ for w in new_words:
4199
+ if isinstance(w,str):
4200
+ new_words_list=new_words_list+[w.lower()]
4201
+ else: continue #过滤列表中非字符串的元素
4202
+
4203
+ if isinstance(string,str):
4204
+ new_string=string.lower()
4205
+ else:
4206
+ return False
4207
+
4208
+ #检查字符串new_string是否包含列表new_words_list中的任何元素
4209
+ return any((word in new_string) for word in new_words_list)
4210
+
4211
+ #==============================================================================
4212
+ if __name__ == '__main__':
4213
+ s = "Hello, 世界! This is a test string with symbols #$%^&*()."
4214
+
4215
+ cleaned_s = remove_symbols(s)
4216
+
4217
+ def remove_symbols(s):
4218
+ """
4219
+
4220
+ 功能:删除字符串中除字母、数字和汉字外的所有符号
4221
+ """
4222
+ import re
4223
+ # 正则表达式匹配字母、数字和汉字
4224
+ pattern = re.compile(r'[^\w\u4e00-\u9fa5]')
4225
+ # 使用sub()函数将所有不匹配的符号替换为空字符
4226
+ return pattern.sub('', s)
4227
+
4182
4228
 
4183
4229
  #==============================================================================
4184
4230
  if __name__ == '__main__':
@@ -22,6 +22,7 @@ import pandas as pd
22
22
  #本模块使用yahooquery插件
23
23
  #==============================================================================
24
24
  if __name__=='__main__':
25
+ symbol='JD'
25
26
  symbol='INTL'
26
27
  symbol='MSFT'
27
28
  symbol='600519.SS'
@@ -36,7 +37,7 @@ def get_balance_sheet(symbol):
36
37
  """
37
38
  功能:获取雅虎财经上一只股票所有的年度和季度资产负债表
38
39
  """
39
- print(" Searching for balance info of",symbol,"\b, please wait...")
40
+ print(" Searching for balance info of {}, please wait...".format(symbol))
40
41
 
41
42
  result,prefix,suffix=split_prefix_suffix(symbol)
42
43
  if result & (suffix=='HK'):
siat/financials.py CHANGED
@@ -77,7 +77,7 @@ def compare_history(tickers,items, \
77
77
  twinx=False:单纵轴
78
78
  """
79
79
  #检查power的范围是否合理
80
- if not (power in range(0,10)):
80
+ if not (power in range(0,80)):
81
81
  print(" #Error(compare_history): invalid parameter, power =",power)
82
82
  return None
83
83
 
@@ -1157,17 +1157,21 @@ def get_financial_rates(ticker):
1157
1157
  #####以上的指标为时间序列;以下的指标为非时间序列,类似于快照信息
1158
1158
  #==============================================================================
1159
1159
  if __name__=='__main__':
1160
+ symbol='JD'
1160
1161
  symbol='AAPL'
1161
1162
  symbol='BABA'
1162
1163
  symbol='2883.HK'
1163
1164
  symbol='EBAY'
1165
+
1166
+ stock_info(symbol)
1164
1167
 
1165
1168
  def stock_info(symbol):
1166
1169
  """
1167
1170
  功能:返回静态信息
1168
1171
  """
1169
1172
  DEBUG=False
1170
- #print("...Searching for information of",symbol,"\b, please wait...")
1173
+ if DEBUG:
1174
+ print(" DEBUG: in stock_info, symbol={}".format(symbol))
1171
1175
 
1172
1176
  from yahooquery import Ticker
1173
1177
  stock = Ticker(symbol)
@@ -1616,6 +1620,7 @@ if __name__=='__main__':
1616
1620
 
1617
1621
  #==============================================================================
1618
1622
  if __name__=='__main__':
1623
+ ticker='01810.HK'
1619
1624
  ticker='AAPL'
1620
1625
  info_type='fin_rates'
1621
1626
 
@@ -1637,6 +1642,10 @@ def get_stock_profile(ticker,info_type='basic',graph=True):
1637
1642
  print(" Supported info_type:\n",typelist)
1638
1643
  return None
1639
1644
 
1645
+ #改变港股代码,去掉前导的0或8
1646
+ if '.HK' in ticker.upper():
1647
+ ticker=ticker[-7:]
1648
+
1640
1649
  info=stock_info(ticker)
1641
1650
  if not graph: return info
1642
1651
 
siat/financials2.py CHANGED
@@ -21,6 +21,7 @@ from siat.common import *
21
21
  from siat.translate import *
22
22
  from siat.financial_statements import *
23
23
  from siat.financials import *
24
+ from siat.stock import *
24
25
  from siat.grafix import *
25
26
  #==============================================================================
26
27
  import matplotlib.pyplot as plt
@@ -61,8 +62,17 @@ if czxt in ['linux']: #website Jupyter
61
62
  plt.rcParams['axes.unicode_minus'] = False
62
63
  #==============================================================================
63
64
  if __name__=='__main__':
65
+ #测试1
66
+ tickers="JD"
67
+ analysis_type='Balance Sheet'
68
+ fsdates='2023-12-31'
69
+
70
+ font_size='16px'
71
+ business_period='annual'
72
+
73
+
64
74
  tickers=["JD","00700.HK",'BABA','09999.HK']
65
- fsdates='2022-12-31'
75
+ fsdates='2023-12-31'
66
76
 
67
77
  analysis_type='Balance Sheet'
68
78
  analysis_type='Income Statement'
@@ -92,8 +102,10 @@ if __name__=='__main__':
92
102
 
93
103
  def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
94
104
  category='profile',business_period='annual', \
95
- scale1=10,scale2=10,sort='PM',
96
- printout=True,facecolor='papayawhip',font_size='16px'
105
+ scale1=10,scale2=10,dupont_sort='PM',
106
+ printout=True, \
107
+ entry_sort=False, \
108
+ facecolor='papayawhip',font_size='16px'
97
109
  ):
98
110
  """
99
111
  功能:tickers为股票列表,fsdates为财报日期,可为单个日期或日期列表
@@ -130,36 +142,54 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
130
142
 
131
143
  #确定表格字体大小
132
144
  titile_font_size=font_size
133
- heading_font_size=data_font_size=str(int(font_size.replace('px',''))-1)+'px'
145
+ heading_font_size=data_font_size=str(int(font_size.replace('px',''))-3)+'px'
134
146
 
135
147
  # 基于analysis_type1的类型分别处理
136
- if ('profile' in analysis_type1):
148
+ #if ('profile' in analysis_type1):
149
+ if contains_any(analysis_type1,['profile']):
137
150
  # 股票需为单只股票,若为列表则仅取第一个
138
151
  if not isinstance(tickers,str):
139
152
  if isinstance(tickers,list): tickers=tickers[0]
140
153
  else:
141
- print(" #Warning(fs_analysis_china): must be one ticker or first ticker in a list for",tickers)
154
+ print(" #Warning(fs_analysis_china): {} must be one ticker or ticker list".format(tickers))
142
155
  return None
143
156
 
144
157
  # 检查category
145
- category_list=['profile','officers','market_rates','dividend','stock_split','fin_rates','risk_general','risk_esg']
146
- if category not in category_list:
147
- print(" Unsupported category:",category,"\b. Supported categories as follows:")
148
- print_list(category_list,leading_blanks=2)
158
+ #category_list=['profile','officers','market_rates','dividend','split','fin_rates','risk_general','risk_esg']
159
+ category_list=['profile','officers','market rates','dividend','split','financial rates','general risk','esg']
149
160
 
150
- if category == 'profile':
151
- info=get_stock_profile(ticker)
152
- elif category == 'dividend':
153
- info=stock_dividend(ticker,fromdate='1990-1-1',todate=todaydt)
154
- elif category == 'stock_split':
155
- info=stock_split(ticker,fromdate='1990-1-1',todate=todaydt)
161
+ #if category == 'profile':
162
+ if contains_any(category,['profile']):
163
+ info=get_stock_profile(tickers)
164
+ #elif category == 'dividend':
165
+ elif contains_any(category,['dividend']):
166
+ #info=stock_dividend(tickers,start='1990-1-1',end=todaydt)
167
+ info=stock_dividend(tickers)
168
+ #elif category == 'stock_split':
169
+ elif contains_any(category,['split']):
170
+ #info=stock_split(tickers,start='1990-1-1',end=todaydt)
171
+ info=stock_split(tickers)
172
+ elif contains_any(category,['market']):
173
+ category='market_rates'
174
+ info=get_stock_profile(tickers,info_type=category)
175
+ elif contains_any(category,['financial']):
176
+ category='fin_rates'
177
+ info=get_stock_profile(tickers,info_type=category)
178
+
179
+ elif contains_any(category,['risk']):
180
+ category='risk_general'
181
+ info=get_stock_profile(tickers,info_type=category)
182
+ elif contains_any(category,['esg']):
183
+ category='risk_esg'
184
+ info=get_stock_profile(tickers,info_type=category)
156
185
  else:
157
- info=get_stock_profile(ticker,info_type=category)
186
+ print(" Unsupported category {}, supported categories:".format(category))
187
+ print_list(category_list,leading_blanks=2)
158
188
 
159
189
  return info
160
-
161
- elif ('balance' in analysis_type1) or ('sheet' in analysis_type1) \
162
- or ('asset' in analysis_type1) or ('liability' in analysis_type1):
190
+ #elif ('balance' in analysis_type1) or ('sheet' in analysis_type1) or ('asset' in analysis_type1) or ('liability' in analysis_type1):
191
+ #elif contains_any(analysis_type1,['balance','sheet','asset','liability']):
192
+ elif contains_any(analysis_type1,['balance','sheet','asset','liability']):
163
193
  # 股票需为单只股票,若为列表则仅取第一个
164
194
  if not isinstance(tickers,str):
165
195
  if isinstance(tickers,list): tickers=tickers[0]
@@ -261,9 +291,8 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
261
291
 
262
292
  else:
263
293
  return fsdf2
264
-
265
- elif ('income' in analysis_type1) or ('cost' in analysis_type1) \
266
- or ('expense' in analysis_type1) or ('earning' in analysis_type1):
294
+ #elif ('income' in analysis_type1) or ('cost' in analysis_type1) or ('expense' in analysis_type1) or ('earnings' in analysis_type1):
295
+ elif contains_any(analysis_type1,['income','revenue','cost','expense','earnings']):
267
296
  # 股票需为单只股票,若为列表则仅取第一个
268
297
  if not isinstance(tickers,str):
269
298
  if isinstance(tickers,list): tickers=tickers[0]
@@ -342,8 +371,8 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
342
371
  return fsdf6
343
372
 
344
373
  return fsdf2
345
-
346
- elif ('cash' in analysis_type1) or ('flow' in analysis_type1):
374
+ #elif ('cash' in analysis_type1) or ('flow' in analysis_type1):
375
+ elif contains_any(analysis_type1,['cash','flow']):
347
376
  # 股票需为单只股票,若为列表则仅取第一个
348
377
  if not isinstance(tickers,str):
349
378
  if isinstance(tickers,list): tickers=tickers[0]
@@ -421,9 +450,8 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
421
450
  return fsdf6
422
451
 
423
452
  return fsdf2
424
-
425
- elif ('summary' in analysis_type1):
426
-
453
+ #elif ('summary' in analysis_type1):
454
+ elif contains_any(analysis_type1,['summary']):
427
455
  itemlist1=[
428
456
  #资产负债表
429
457
  'CashAndCashEquivalents','AccountsReceivable','Inventory', \
@@ -634,9 +662,8 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
634
662
  return fsdf6
635
663
 
636
664
  return fsdf2
637
-
638
- elif ('indicator' in analysis_type1):
639
-
665
+ #elif ('indicator' in analysis_type1):
666
+ elif contains_any(analysis_type1,['indicator']):
640
667
  itemlist=[
641
668
  #短期偿债能力
642
669
  'Current Ratio','Quick Ratio','Cash Ratio','Cash Flow Ratio', \
@@ -847,8 +874,8 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
847
874
 
848
875
  return fsdf2
849
876
 
850
-
851
- elif ('dupont' in analysis_type1) and (('identity' in analysis_type1) or ('analysis' in analysis_type1)):
877
+ #elif ('dupont' in analysis_type1) and (('identity' in analysis_type1) or ('analysis' in analysis_type1)):
878
+ elif contains_any(analysis_type1,['dupont','identity']):
852
879
  # 股票需为股票列表
853
880
  if not isinstance(tickers,list):
854
881
  print(" #Warning(fs_analysis_china): must be a ticker list for",tickers)
@@ -903,11 +930,11 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
903
930
  name4='Return on Equity'
904
931
  name5='endDate'
905
932
 
906
- if sort=='PM':
933
+ if dupont_sort=='PM':
907
934
  df.sort_values(name1,ascending=False,inplace=True)
908
- elif sort=='TAT':
935
+ elif dupont_sort=='TAT':
909
936
  df.sort_values(name2,ascending=False,inplace=True)
910
- elif sort=='EM':
937
+ elif dupont_sort=='EM':
911
938
  df.sort_values(name3,ascending=False,inplace=True)
912
939
  else:
913
940
  df.sort_values(name1,ascending=False,inplace=True)
siat/markowitz2.py CHANGED
@@ -961,27 +961,27 @@ def portfolio_ranks_cn(portfolio_returns,pname,facecolor='papayawhip'):
961
961
  "风险排名":text_lang("风险排名","Risk#"), \
962
962
  "年化标准差%":text_lang("年化标准差%","pa Std%"), \
963
963
  "标准差变化":text_lang("标准差变化","Std%+/-"), \
964
- "收益率/标准差":text_lang("收益率/标准差","Return/Std")}, \
964
+ "收益率/标准差":text_lang("收益/风险性价比","Return/Std")}, \
965
965
  inplace=True)
966
966
 
967
967
  #重新排名:相同的值赋予相同的序号
968
- prr2["pa Return%"]=prr2["pa Return%"].apply(lambda x: round(float(x),ndecimals))
969
- prr2["Return#"]=prr2["pa Return%"].rank(ascending=False,method='dense')
970
- prr2["Return#"]=prr2["Return#"].apply(lambda x: int(x))
968
+ prr2[text_lang("年化收益率%","pa Return%")]=prr2[text_lang("年化收益率%","pa Return%")].apply(lambda x: round(float(x),ndecimals))
969
+ prr2[text_lang("收益排名","Return#")]=prr2[text_lang("年化收益率%","pa Return%")].rank(ascending=False,method='dense')
970
+ prr2[text_lang("收益排名","Return#")]=prr2[text_lang("收益排名","Return#")].apply(lambda x: int(x))
971
971
 
972
- prr2["pa Std%"]=prr2["pa Std%"].apply(lambda x: round(float(x),ndecimals))
973
- prr2["Risk#"]=prr2["pa Std%"].rank(ascending=False,method='dense')
974
- prr2["Risk#"]=prr2["Risk#"].apply(lambda x: int(x))
972
+ prr2[text_lang("年化标准差%","pa Std%")]=prr2[text_lang("年化标准差%","pa Std%")].apply(lambda x: round(float(x),ndecimals))
973
+ prr2[text_lang("风险排名","Risk#")]=prr2[text_lang("年化标准差%","pa Std%")].rank(ascending=False,method='dense')
974
+ prr2[text_lang("风险排名","Risk#")]=prr2[text_lang("风险排名","Risk#")].apply(lambda x: int(x))
975
975
 
976
- prr2["Return/Std"]=prr2["Return/Std"].apply(lambda x: round(float(x),ndecimals))
977
- prr2["Ret/Std#"]=prr2["Return/Std"].rank(ascending=False,method='dense')
978
- prr2["Ret/Std#"]=prr2["Ret/Std#"].apply(lambda x: int(x))
976
+ prr2[text_lang("收益/风险性价比","Return/Std")]=prr2[text_lang("收益/风险性价比","Return/Std")].apply(lambda x: round(float(x),ndecimals))
977
+ prr2[text_lang("性价比排名","Ret/Std#")]=prr2[text_lang("收益/风险性价比","Return/Std")].rank(ascending=False,method='dense')
978
+ prr2[text_lang("性价比排名","Ret/Std#")]=prr2[text_lang("性价比排名","Ret/Std#")].apply(lambda x: int(x))
979
979
 
980
980
  df_display_CSS(prr2,titletxt=titletxt,footnote='',facecolor='papayawhip',decimals=ndecimals, \
981
981
  first_col_align='left',second_col_align='center', \
982
982
  last_col_align='center',other_col_align='center', \
983
- titile_font_size='15px',heading_font_size='14px', \
984
- data_font_size='14px')
983
+ titile_font_size='15px',heading_font_size='13px', \
984
+ data_font_size='13px')
985
985
 
986
986
  """
987
987
  print(' ') #空一行
siat/sector_china.py CHANGED
@@ -2909,7 +2909,7 @@ def find_peers_china(industry='',top=20,rank=20,sw_level='2'):
2909
2909
  return tickerlist
2910
2910
  else:
2911
2911
  print(" #Warning(find_peers_china): failed in retrieving component stocks for Shenwan industry",industry)
2912
- print(" Possible solution: upgrade akshare. if still fail, reportto the author of siat for help")
2912
+ print(" Possible solution: upgrade akshare. if still fail, report to the author of siat for help")
2913
2913
  return []
2914
2914
 
2915
2915
  #==============================================================================
siat/security_prices.py CHANGED
@@ -2211,8 +2211,16 @@ if __name__ =="__main__":
2211
2211
  portfolio={'Market':('US','^GSPC'),'AAPL':1}
2212
2212
  portfolio={'Market':('China','^HSI'),'0823.HK':1.0}
2213
2213
  portfolio={'Market':('China','000001.SS'),'000661.SZ':2,'603392.SS':3,'300601.SZ':4}
2214
+
2214
2215
  fromdate='2019-7-19'
2215
2216
  todate='2020-7-20'
2217
+
2218
+ market={"Market":("China","000300.SS","我的地产组合")}
2219
+ stocks1={"600048.SS":.4,"001979":.3}
2220
+ stocks2={"600515.SS":.2,"600895":.1}
2221
+ portfolio=dict(market,**stocks1,**stocks2)
2222
+
2223
+ fromdate="2024-1-1"; todate="2024-11-25"
2216
2224
  adj=False
2217
2225
  source='auto'
2218
2226
 
siat/stock.py CHANGED
@@ -2620,7 +2620,7 @@ if __name__ =="__main__":
2620
2620
  todate="2022-9-26"
2621
2621
 
2622
2622
 
2623
- def security_dividend(ticker,start="L3Y",end="today",facecolor='whitesmoke',fontcolor='black'):
2623
+ def security_dividend(ticker,start="L5Y",end="today",facecolor='whitesmoke',fontcolor='black'):
2624
2624
  """
2625
2625
  功能:套壳函数stock_dividend
2626
2626
  """
siat/stock_china.py CHANGED
@@ -1350,7 +1350,7 @@ def stock_profile_china(ticker,category='profile', \
1350
1350
  titile_font_size=titile_font_size,heading_font_size=heading_font_size, \
1351
1351
  data_font_size=data_font_size)
1352
1352
 
1353
- print('\n')
1353
+ print('')
1354
1354
  footnote='数据来源:东方财富,'+str(stoday)
1355
1355
  df_display_CSS(df=dftmp1b,titletxt=titletxt1b,footnote=footnote, \
1356
1356
  first_col_align='left',second_col_align='right', \
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: siat
3
- Version: 3.7.5
3
+ Version: 3.7.7
4
4
  Summary: Securities Investment Analysis Tools (siat)
5
5
  Home-page: https://pypi.org/project/siat/
6
6
  Author: Prof. WANG Dehong, International Business School, Beijing Foreign Studies University
@@ -1,5 +1,5 @@
1
1
  siat/__init__ -20240701.py,sha256=gP5uajXnJesnH5SL0ZPwq_Qhv59AG1bs4qwZv26Fo2Y,2894
2
- siat/__init__.py,sha256=sJP_LlLfNAssg5ZCPxxkVMi2v6h5x3WcSco3KBN5CsE,2040
2
+ siat/__init__.py,sha256=pIo4CV3lNPKIhitmhIh_6aAfZrmzQWGNDcEnvZ7GXoc,3216
3
3
  siat/allin.py,sha256=JLuxVmxtlOTDelnfulK6rPoFTIhzTNe5_GShXCiKGZY,2904
4
4
  siat/alpha_vantage_test.py,sha256=tKr-vmuFH3CZAqwmISz6jzjPHzV1JJl3sPfZdz8aTfM,747
5
5
  siat/assets_liquidity.py,sha256=o_UZdLs693uNWPEQB2OzxDH0mdWimOmq4qe_vx1pue0,28987
@@ -18,7 +18,7 @@ siat/capm_beta.py,sha256=cxXdRVBQBllhbfz1LeTJAIWvyRYhW54nhtNUXv4HwS0,29063
18
18
  siat/capm_beta2.py,sha256=-ZYYp1HK7SkfTR3vBKZ0QVC4Q_tbST2O4MGbX_V77J0,32031
19
19
  siat/capm_beta_test.py,sha256=ImR0c5mc4hIl714XmHztdl7qg8v1E2lycKyiqnFj6qs,1745
20
20
  siat/cmat_commons.py,sha256=Nj9Kf0alywaztVoMVeVVL_EZk5jRERJy8R8kBw88_Tg,38116
21
- siat/common.py,sha256=2Y51NN6n4FhkNXDRFnV9xPE2Z7XcjqcqaWtZLRaDmgQ,163283
21
+ siat/common.py,sha256=08Gb287rbVIAFdLilHPg3DJHLCCIhM95rJ-zhuZpudc,164861
22
22
  siat/compare_cross.py,sha256=3iP9TH2h3w27F2ARZc7FjKcErYCzWRc-TPiymOyoVtw,24171
23
23
  siat/compare_cross_test.py,sha256=xra5XYmQGEtfIZL2h-GssdH2hLdFIhG3eoCrkDrL3gY,3473
24
24
  siat/concepts_iwencai.py,sha256=m1YEDtECRT6FqtzlKm91pt2I9d3Z_XoP59BtWdRdu8I,3061
@@ -37,11 +37,11 @@ siat/exchange_bond_china.pickle,sha256=zDqdPrFacQ0nqjP_SuF6Yy87EgijIRsFvFroW7FAY
37
37
  siat/fama_french.py,sha256=aUTC-67t_CEPbLk4u79woW_zfZ7OCP6Fo4z5EdWCSkQ,48051
38
38
  siat/fama_french_test.py,sha256=M4O23lBKsJxhWHRluwCb3l7HSEn3OFTjzGMpehcevRg,4678
39
39
  siat/financial_base.py,sha256=5u298_1OSlgLnDmhXxqvo4WgMM0JKSa_4jBYF-Ilx38,41097
40
- siat/financial_statements.py,sha256=Ek18eKHflxZ01evOIwnfH1KZ_M2g8Vr8SxkL1om-K7U,25391
40
+ siat/financial_statements.py,sha256=xx0SMpFqAMKm6cj8uYeG2RpJE6G-RoJ3NWa33UyaVMk,25414
41
41
  siat/financial_statements_test.py,sha256=FLhx8JD-tVVWSBGux6AMz1jioXX4U4bp9DmgFHYXb_w,716
42
- siat/financials.py,sha256=mbEZSNeHMMFcnPUryQWvdmNlWQvpnOG9eItgS7IVw3k,80458
42
+ siat/financials.py,sha256=6WOWYift3MpKkNBnvnBFASXy9nKKC6DzAr8rg2XyNtw,80646
43
43
  siat/financials2 - 副本.py,sha256=dKlNjIfKeoSy055fQ6E6TUj9HEoO5Ney9grD84J5kfk,14389
44
- siat/financials2.py,sha256=7mnsTncKsgwFu8PP4refh5C5iMIO9P0KOMSF87ZyncY,45736
44
+ siat/financials2.py,sha256=A6gjqbdNVgA0hloglhPlDR82mHjb3rSskD-s0T8LKg0,47289
45
45
  siat/financials_china.py,sha256=Y9QHyJKDgVbkb5L1f65BAiNxLIDmasRUN9_ju4Yby_c,191925
46
46
  siat/financials_china2.py,sha256=NZzpS1eCaxEClOhh8dvfdn88NhIULqeb9E0GUDUiG4U,92892
47
47
  siat/financials_china2_test.py,sha256=Erz5k4LyOplBBvYls2MypuqHpVNJ3daiLdyeJezNPu0,2722
@@ -70,7 +70,7 @@ siat/luchy_draw.py,sha256=8Ue-NKnvSVqINPY1eXat0NJat5MR-gex_K62aOYFdmA,20486
70
70
  siat/market_china.py,sha256=fQjAFyu4JAqtVA8I1QYfzv0fmYhLP3zoNe5Ftk63qgM,50724
71
71
  siat/markowitz.py,sha256=DsfS6vG9TAfdJP4GgN-CCArujPi84XjD23CWbxaA2o4,97627
72
72
  siat/markowitz2-20240620.py,sha256=irZAPnjaatFsKQmFRMENP-cO6bEUl2narYtkU5NKTWI,108019
73
- siat/markowitz2.py,sha256=LK2pDEtE5PUmBtCHmCcRs8FlPqZKmhFXiuLIL4JeQa8,121991
73
+ siat/markowitz2.py,sha256=s7-E43VskzSsPpZXQVBe3VTR1AM81EDIn_uVZn3mLpw,122525
74
74
  siat/markowitz_ccb_test.py,sha256=xBkkoaNHdq9KSUrNuHGgKTdNYUvgi84kNYcf719eoyE,1593
75
75
  siat/markowitz_ef_test.py,sha256=wjNlICkgRIqnonPeSIHo4Mu2GRtb9dr21wDt2kMNEcI,4032
76
76
  siat/markowitz_old.py,sha256=Lf7O_4QWT8RsdkHiUyc_7kKY3eZjKDtFR89Fz3pwYnY,33046
@@ -95,21 +95,21 @@ siat/risk_evaluation.py,sha256=I6B3gty-t--AkDCO0tKF-291YfpnF-IkXcFjqNKCt9I,76286
95
95
  siat/risk_evaluation_test.py,sha256=YEXM96gKzTfwN4U61AS4Rr1tV7KgUvn4rRC6f3iMw9s,3731
96
96
  siat/risk_free_rate.py,sha256=ZMr4cHikPvXvywr54gGqiI3Nvb69am6tq3zj2hwzANE,12384
97
97
  siat/risk_free_rate_test.py,sha256=CpmhUf8aEAEZeNu4gvWP2Mz2dLoIgBX5bI41vfUBEr8,4285
98
- siat/sector_china.py,sha256=MX1pzqvHvmWD9qGAe8lnUoCXSWjwnjBK8HhAbijTirI,150761
98
+ siat/sector_china.py,sha256=Mxx5Zd5qvhLdwutedwoPRoXlAopTsPww4rRhOgpRmb8,150762
99
99
  siat/sector_china_test.py,sha256=1wq7ef8Bb_L8F0h0W6FvyBrIcBTEbrTV7hljtpj49U4,5843
100
100
  siat/security_price.py,sha256=2oHskgiw41KMGfqtnA0i2YjNNV6cYgtlUK0j3YeuXWs,29185
101
101
  siat/security_price2.py,sha256=FkX-EeqS5Gqm2kIKnDqrqSk_nvG3BbL3Eu4eEmw1OEY,26379
102
- siat/security_prices.py,sha256=Zhn6pvwLy996mbBHDorbqWQdQw9RHdr9m0yzke3ya8M,108597
102
+ siat/security_prices.py,sha256=i_4ZA7sRb9gMRVOgTT-XxQ1Jrz9eHDjZznsoXPDhh0Y,108859
103
103
  siat/security_prices_test.py,sha256=OEphoJ87NPKoNow1QA8EU_5MUYrJF-qKoWKNapVfZNI,10779
104
104
  siat/security_trend.py,sha256=o0vpWdrJkmODCP94X-Bvn-w7efHhj9HpUYBHtLl55D0,17240
105
105
  siat/security_trend2-20240620.py,sha256=QVnEcb7AyVbO77jVqfFsJffGXrX8pgJ9xCfoAKmWBPk,24854
106
106
  siat/security_trend2.py,sha256=mamJtFAbXC1orGgMEmp0taPk-yUqWm-jdGf64bjhn2Q,29756
107
107
  siat/setup.py,sha256=up65rQGLmTBkhtaMLowjoQXYmIsnycnm4g1SYmeQS6o,1335
108
108
  siat/shenwan index history test.py,sha256=JCVAzOSEldHalhSFa3pqD8JI_8_djPMQOxpkuYU-Esg,1418
109
- siat/stock.py,sha256=sDYEXGE9XYnzRYzxv1AUJqMqAu6ISZx7skiu82L1Z7Y,158613
109
+ siat/stock.py,sha256=Eq8dVs9CxT1vS1BEsFQ4xCff3aXBucbT5OPW-WidNcA,158613
110
110
  siat/stock_advice_linear.py,sha256=-twT7IGP-NEplkL1WPSACcNJjggRB2j4mlAQCkzOAuo,31655
111
111
  siat/stock_base.py,sha256=uISvbRyOGy8p9QREA96CVydgflBkn5L3OXOGKl8oanc,1312
112
- siat/stock_china.py,sha256=zzi3JvzkfPG7ldX_ykkiQOe1iMpB3pnejfxuT7mg5oM,93462
112
+ siat/stock_china.py,sha256=vm_BslG0gJm4R0-O5bNtENkMMfDP-u1TYKCKzLH9Nkk,93460
113
113
  siat/stock_china_test.py,sha256=eO4HWsSvc6qezl0LndjtL24lViEyrBjH_sx2c2Y2Q2M,1294
114
114
  siat/stock_info.pickle,sha256=XqcFwQrXoBXAzZnE6rnfpI7zETXZS2usqzsx2ff7MEg,1319005
115
115
  siat/stock_info_test.py,sha256=gfG3DbhDACbtD8wnv_R6zhj0t11XaC8NX8uLD9Qv3Fo,6122
@@ -141,8 +141,8 @@ siat/valuation_china.py,sha256=CVp1IwIsF3Om0J29RGkyxZLt4n9Ug-ua_RKhLwL9fUQ,69624
141
141
  siat/valuation_market_china_test.py,sha256=gbJ0ioauuo4koTPH6WKUkqcXiQPafnbhU5eKJ6lpdLA,1571
142
142
  siat/var_model_validation.py,sha256=R0caWnuZarrRg9939hxh3vJIIpIyPfvelYmzFNZtPbo,14910
143
143
  siat/yf_name.py,sha256=r0Q67cSMMlfebEkI9h9pdGlJCooEq7hw_3M5IUs4cSI,20081
144
- siat-3.7.5.dist-info/LICENSE,sha256=NTEMMROY9_4U1szoKC3N2BLHcDd_o5uTgqdVH8tbApw,1071
145
- siat-3.7.5.dist-info/METADATA,sha256=P8JImZGTi4f_S8g00nK3hIfsnKoE6EQMlRcc1Tb94ws,8009
146
- siat-3.7.5.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
147
- siat-3.7.5.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
148
- siat-3.7.5.dist-info/RECORD,,
144
+ siat-3.7.7.dist-info/LICENSE,sha256=NTEMMROY9_4U1szoKC3N2BLHcDd_o5uTgqdVH8tbApw,1071
145
+ siat-3.7.7.dist-info/METADATA,sha256=4VE1VSyUItSI2OgG2CW5PSJ4PS7C9xZRhSt8TizioV8,8009
146
+ siat-3.7.7.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
147
+ siat-3.7.7.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
148
+ siat-3.7.7.dist-info/RECORD,,
File without changes
File without changes