siat 2.14.1__py3-none-any.whl → 3.0.0__py3-none-any.whl

siat/financials_china2.py

@@ -212,7 +212,7 @@ def get_fin_stmt_ak_multi(tickers,fsdates):
     df.rename(columns={'endDate_期初':'endDate_上期'},inplace=True)
     
     #标注股票简称,去掉其中的(A股)字样
-    df["股票简称"]=df['ticker'].apply(lambda x: codetranslate(x).replace("(A股)",''))
+    df["股票简称"]=df['ticker'].apply(lambda x: ticker_name(x).replace("(A股)",''))
 
     """
     # 替换nan为-
@@ -504,7 +504,7 @@ def fs_item_analysis_1(df,ticker,fsdate,items,title_txt='',notes=''):
     
     #无序号打印
     if title_txt=='':
-        ticker_name=codetranslate(ticker).replace("(A股)",'')
+        ticker_name=ticker_name(ticker).replace("(A股)",'')
         title_txt=ticker_name+"财报分析：重要项目的变动情况\n（截至"+fsdate+"）"
     import datetime; today=datetime.date.today()
     #footnote="*单位：亿元，数据来源：新浪财经，"+str(today) 
@@ -565,7 +565,7 @@ def fs_item_analysis_2(df,ticker,fsdates,items,title_txt='',notes=''):
         
     #无序号打印
     if title_txt=='':
-        ticker_name=codetranslate(ticker).replace("(A股)",'')
+        ticker_name=ticker_name(ticker).replace("(A股)",'')
         title_txt=ticker_name+"财报分析：重要项目占比的变动趋势"
     import datetime; today=datetime.date.today()
     footnote="*数据来源：新浪财经，"+str(today) 
@@ -620,7 +620,7 @@ def fs_item_analysis_3(df,ticker,fsdates,title_txt='',notes=''):
         
     #无序号打印
     if title_txt=='':
-        ticker_name=codetranslate(ticker).replace("(A股)",'')
+        ticker_name=ticker_name(ticker).replace("(A股)",'')
         title_txt=ticker_name+"财报分析：流动比率的变动趋势"
     import datetime; today=datetime.date.today()
     footnote="*数据来源：新浪财经，"+str(today) 
@@ -695,7 +695,7 @@ def fs_item_analysis_4(df,ticker,fsdates,title_txt='',notes=''):
     
     #无序号打印
     if title_txt=='':
-        ticker_name=codetranslate(ticker).replace("(A股)",'')
+        ticker_name=ticker_name(ticker).replace("(A股)",'')
         title_txt=ticker_name+"财报分析：速动比率的变动趋势"
     import datetime; today=datetime.date.today()
     footnote="*数据来源：新浪财经，"+str(today) 
@@ -750,7 +750,7 @@ def fs_item_analysis_5(df,ticker,fsdates,title_txt='',notes=''):
     
     #无序号打印
     if title_txt=='':
-        ticker_name=codetranslate(ticker).replace("(A股)",'')
+        ticker_name=ticker_name(ticker).replace("(A股)",'')
         title_txt=ticker_name+"财报分析：资产负债率的变动趋势"
     import datetime; today=datetime.date.today()
     footnote="*数据来源：新浪财经，"+str(today) 
@@ -811,7 +811,7 @@ def fs_item_analysis_6_original(df,ticker,fsdates,items,title_txt='',notes=''):
     
     #无序号打印
     if title_txt=='':
-        ticker_name=codetranslate(ticker).replace("(A股)",'')
+        ticker_name=ticker_name(ticker).replace("(A股)",'')
         title_txt=ticker_name+"财报分析：重要关联项目的增幅对比"
     import datetime; today=datetime.date.today()
     footnote="*数据来源：新浪财经，"+str(today) 
@@ -870,7 +870,7 @@ def fs_item_analysis_6(df,ticker,fsdates,items,title_txt='',notes=''):
     
     #无序号打印
     if title_txt=='':
-        ticker_name=codetranslate(ticker).replace("(A股)",'')
+        ticker_name=ticker_name(ticker).replace("(A股)",'')
         title_txt=ticker_name+"财报分析：重要关联项目的增幅对比"
     import datetime; today=datetime.date.today()
     if yiyuan_foot:
@@ -919,7 +919,7 @@ def fs_item_analysis_7_original(df,tickers,fsdate,items,title_txt=''):
     yiyuan_foot=False
     
     for t in tickers:
-        tname=codetranslate(t).replace("(A股)",'')
+        tname=ticker_name(t).replace("(A股)",'')
         row_list=[tname]
         for i in items:
             i_value,_,_=select_item(df,t,fsdate,i)
@@ -939,7 +939,7 @@ def fs_item_analysis_7_original(df,tickers,fsdate,items,title_txt=''):
     if title_txt=='':
         title_txt="=== 重要指标的同行业对比 ==="
         ticker=tickers[0]
-        ticker_name=codetranslate(ticker).replace("(A股)",'')
+        ticker_name=ticker_name(ticker).replace("(A股)",'')
         title_txt=ticker_name+"财报分析：重要指标的同行业对比\n（截至"+fsdate+"）"
     import datetime; today=datetime.date.today()
     if yiyuan_foot:
@@ -972,7 +972,7 @@ def fs_item_analysis_7(df,tickers,fsdate,items,title_txt='',notes=''):
     yiyuan_foot=False
     
     for t in tickers:
-        tname=codetranslate(t).replace("(A股)",'')
+        tname=ticker_name(t).replace("(A股)",'')
         row_list=[tname]
         for i in items:
             i_value,_,_=select_item(df,t,fsdate,i)
@@ -1009,7 +1009,7 @@ def fs_item_analysis_7(df,tickers,fsdate,items,title_txt='',notes=''):
     if title_txt=='':
         title_txt="=== 重要指标的同行业对比 ==="
         ticker=tickers[0]
-        ticker_name=codetranslate(ticker).replace("(A股)",'')
+        ticker_name=ticker_name(ticker).replace("(A股)",'')
         title_txt=ticker_name+"财报分析：重要指标的同行业对比\n（截至"+fsdate+"）"
     import datetime; today=datetime.date.today()
     if yiyuan_foot:
@@ -1052,7 +1052,7 @@ def fs_item_analysis_8(df,tickers,fsdate,items,title_txt='',notes=''):
     yiyuan_foot=False
     
     for t in tickers:
-        tname=codetranslate(t).replace("(A股)",'')
+        tname=ticker_name(t).replace("(A股)",'')
         row_list=[tname]
         for i in items:
             i_value,_,_=select_item(df,t,fsdate,i)
@@ -1088,7 +1088,7 @@ def fs_item_analysis_8(df,tickers,fsdate,items,title_txt='',notes=''):
     #无序号打印
     if title_txt=='':
         ticker=tickers[0]
-        ticker_name=codetranslate(ticker).replace("(A股)",'')
+        ticker_name=ticker_name(ticker).replace("(A股)",'')
         title_txt=ticker_name+"财报分析：重要指标的同行业对比\n（截至"+fsdate+"）"
 
     import datetime; today=datetime.date.today()
@@ -1156,11 +1156,11 @@ def asset_liab_structure_china(tickers,fsdates):
     comparator=tickers[0]
     comparee=tickers[1:]
     print("  Conducting asset-liability analysis ...")
-    print("  Comparator:",codetranslate(comparator))
-    #print("  Comparee  :",codetranslate(comparee))
+    print("  Comparator:",ticker_name(comparator))
+    #print("  Comparee  :",ticker_name(comparee))
     print("  Comparee  :",end='')
     if comparee != []:
-        print_list(codetranslate(comparee))
+        print_list(ticker_name(comparee))
     else:
         print(" N/A")
         
@@ -1196,7 +1196,7 @@ def asset_liab_structure_china(tickers,fsdates):
             print("  Solution: check ticker spelling and try at least 10 minutes later")
             return
     
-    title_head=codetranslate(comparator)+"资产负债分析："
+    title_head=ticker_name(comparator)+"资产负债分析："
     
     ### 资产负债表的主要项目
     #资产变动趋势2
@@ -1357,11 +1357,11 @@ def income_cost_structure_china(tickers,fsdates):
     comparator=tickers[0]
     comparee=tickers[1:]
     print("  Conducting income-cost analysis ...")
-    print("  Comparator:",codetranslate(comparator))
-    #print("  Comparee  :",codetranslate(comparee))
+    print("  Comparator:",ticker_name(comparator))
+    #print("  Comparee  :",ticker_name(comparee))
     print("  Comparee  :",end='')
     if comparee != []:
-        print_list(codetranslate(comparee))
+        print_list(ticker_name(comparee))
     else:
         print(" N/A")
     
@@ -1378,7 +1378,7 @@ def income_cost_structure_china(tickers,fsdates):
             #print("  Possible reasons: no access to data source or invalid tickers")
             return
     
-    title_head=codetranslate(comparator)+"收入成本分析："
+    title_head=ticker_name(comparator)+"收入成本分析："
     
     #收入成本总体变动趋势
     title_txt=title_head+"主要项目及其变动趋势"
@@ -1535,10 +1535,10 @@ def cash_flow_structure_china(tickers,fsdates):
     comparator=tickers[0]
     comparee=tickers[1:]
     print("  Conducting cash flow analysis ...")
-    print("  Comparator:",codetranslate(comparator))
+    print("  Comparator:",ticker_name(comparator))
     print("  Comparee  :",end='')
     if comparee != []:
-        print_list(codetranslate(comparee))
+        print_list(ticker_name(comparee))
     else:
         print(" N/A")
    
@@ -1555,7 +1555,7 @@ def cash_flow_structure_china(tickers,fsdates):
             #print("  Possible reasons: no access to data source or invalid tickers")
             return    
     
-    title_head=codetranslate(comparator)+"现金流分析："
+    title_head=ticker_name(comparator)+"现金流分析："
     
     #总体变动趋势
     title_txt=title_head+"主要项目及其变动趋势"

siat/fund_china.py

@@ -739,7 +739,8 @@ if __name__=='__main__':
     zeroline=False
 
 def oef_trend_china(fund,fromdate,todate,trend_type='净值', \
-                    power=0,twinx=False,loc1='upper left',loc2='lower left'):
+                    power=0,twinx=False, \
+                    loc1='upper left',loc2='lower left'):
     """
     功能：开放式基金业绩趋势，单位净值，累计净值，近三个月收益率，同类排名，总排名
     """
@@ -769,16 +770,16 @@ def oef_trend_china(fund,fromdate,todate,trend_type='净值', \
     source=texttranslate("数据来源：东方财富/天天基金")
 
     fund1=fund[:6]
-    fund_name,_=get_oef_name_china(fund1)
+    fund_name=ticker_name(fund1,ticker_type)
 
     #绘制单位/累计净值对比图
     if trend_type == '净值':
-        df1 = ak.fund_open_fund_info_em(fund=fund1, indicator="单位净值走势")
+        df1 = ak.fund_open_fund_info_em(fund1, indicator="单位净值走势")
         df1.rename(columns={'净值日期':'date','单位净值':'单位净值'}, inplace=True)
         df1['日期']=df1['date']
         df1.set_index(['date'],inplace=True) 
         
-        df2 = ak.fund_open_fund_info_em(fund=fund1, indicator="累计净值走势")
+        df2 = ak.fund_open_fund_info_em(fund1, indicator="累计净值走势")
         df2.rename(columns={'净值日期':'date','累计净值':'累计净值'}, inplace=True)
         df2.set_index(['date'],inplace=True)