siat 3.4.9__py3-none-any.whl → 3.4.12__py3-none-any.whl

siat/sector_china.py

@@ -3197,13 +3197,14 @@ if __name__=='__main__':
     
     font_size="16px"; facecolor="papayawhip"
     
-    peers=stock_peer_em(ticker,indicator="市盈率",rank=10)
+    peers=stock_industry_peer_em(ticker,indicator="市盈率",rank=10)
 
-def stock_peer_em(ticker,indicator="市盈率",rank=10, \
-                  font_size="16px",facecolor="papayawhip"):
+def stock_peers_em(ticker='',indicator='',rank=10, \
+                  font_size="16px",facecolor="papayawhip", \
+                  numberPerLine=5):
     """
-    功能：基于东方财富行业分类，查找股票所属的行业板块以及主要同行
-    特点：行业板块分类较粗糙，略胜于无
+    功能：基于东方财富行业分类，查找股票所属的行业以及主要同行
+    特点：行业分类较粗糙，略胜于无
     """
     if indicator in ["股价","股票价格","价格","收盘价","价位"]:
         indicator="最新价"
@@ -3219,14 +3220,16 @@ def stock_peer_em(ticker,indicator="市盈率",rank=10, \
     try:
         info=ak.stock_individual_info_em(symbol=ticker[:6])
     except:
-        print("  #Warning(stock_peer_em): stock info not found for",ticker,"\n")
+        if not ticker=='':
+            print("  #Warning(stock_peer_em): stock info not found for",ticker)
+            
         df_em=ak.stock_board_industry_name_em()
         #df_em.sort_values(by="板块名称",ascending=True,inplace=True)
         #industry_names_em=sorted(list(df_em["板块名称"]),reverse=True)
         industry_names_em=list(df_em["板块名称"])
-        print("  List of sectors/industries in East Money:",len(df_em))
-        printlist(industry_names_em,numperline=7,beforehand='  ')
-        
+        print("  List of stock industries in East Money:",len(df_em),end='')
+        #printlist(industry_names_em,numperline=7,beforehand='  ')
+        printInLine_md(industry_names_em,numberPerLine=numberPerLine,colalign="center")
         return None        
     
     #东方财富板块名称
@@ -3240,8 +3243,11 @@ def stock_peer_em(ticker,indicator="市盈率",rank=10, \
     for i in cfg_col_list:
         if indicator in i:
             indicator_col=i
-    if indicator_col=='':
-        print("  #Warning(stock_peer_em): unsupported indicator",indicator)
+            break
+        
+    if indicator_col=='' or indicator=='':
+        if indicator!='':
+            print("  #Warning(stock_peer_em): unsupported indicator",indicator)
         
         remove_list=["序号","代码","名称"]
         cfg_col_list_tmp = [x for x in cfg_col_list if x not in remove_list]
@@ -3254,7 +3260,8 @@ def stock_peer_em(ticker,indicator="市盈率",rank=10, \
         collist=collist+[indicator_col]
         
     #重新排序
-    cfg.sort_values(by=indicator_col,ascending=False,inplace=True)
+    #cfg.sort_values(by=indicator_col,ascending=False,inplace=True)
+    cfg.sort_values(by=[indicator_col]+["代码"],ascending=[False,True],inplace=True)
     cfg.reset_index(drop=True,inplace=True)
     cfg['序号']=cfg.index+1
         
@@ -3276,12 +3283,28 @@ def stock_peer_em(ticker,indicator="市盈率",rank=10, \
         rank_flag="后"
         df_disp=cfg[collist].tail(abs(rank))
     
+    #强制显示所选股票
+    if force_show_stock:
+        #所选股票是否在其中？
+        if not ticker[:6] in list(df_disp["代码"]):
+            ticker_seq=cfg[cfg["代码"]==ticker[:6]]["序号"].values[0]
+            seq1=ticker_seq-4; seq2=ticker_seq+5
+            #如果超出开头
+            if seq1 <=0:
+                seq1=1; seq2=10
+            #如果超出结尾    
+            if seq2 > len(cfg):
+                seq2=len(cfg); seq1=len(cfg)-9
+                
+            #注意：此处的&不能换为and    
+            df_disp=cfg[(cfg["序号"]>=seq1) & (cfg["序号"]<=seq2)][collist]
+    
     #制表
     tname=ticker_name(ticker)
     titletxt="行业板块及其上市公司排名："+hangye+"，"+indicator_col+"("+rank_flag+str(abs(rank))+"名)"
     
     footnote1="全行业的"+indicator_col+"状况：均值"+str(round(indicator_mean,2))+"，中位数"+str(round(indicator_median,2))+"\n"
-    footnote2=tname+"的"+indicator_col+"："+str(round(indicator_value,2))+"，行业排名"+str(indicator_seq)+"/"+str(indicator_total)+"，分位数"+str(round(indicator_pct,2))+"%\n"
+    footnote2=tname+"的"+indicator_col+"："+str(round(indicator_value,2))+"，行业排名"+str(indicator_seq)+"/"+str(indicator_total)+"，分位"+str(round(indicator_pct,2))+"%\n"
     import datetime; stoday = datetime.date.today()
     footnote3="*** 信息来源：东方财富，"+str(stoday) 
     footnote=footnote1+footnote2+footnote3
@@ -3297,6 +3320,180 @@ def stock_peer_em(ticker,indicator="市盈率",rank=10, \
     
     return cfg
     
+#==============================================================================
+if __name__=='__main__':
+    concept='酒'
+    concept='股'
+    concept='白酒'
+    
+    ticker="600519.SS"
+    indicator="市盈率"
+    rank=11
+    
+    force_show_stock=True
+    
+    font_size="16px"; facecolor="papayawhip"; numberPerLine=7
+    
+
+def concept_stocks_em(concept='',ticker='',indicator="市盈率",rank=10, \
+                      force_show_stock=False, \
+                      font_size="16px",facecolor="papayawhip",numberPerLine=5):
+    """
+    功能：基于东方财富概念板块，查找关键字相关概念以及股票业绩
+    特点：概念板块划分细致，同一股票可能分属多个板块，与行业分类不同
+    """
+    if indicator in ["股价","股票价格","价格","收盘价","价位"]:
+        indicator="最新价"
+    if indicator in ["流动性","热门","活跃"]:
+        indicator="换手率"   
+
+    if rank==0:
+        rank=5  
+        
+    import akshare as ak
+    
+    #获取所有板块信息
+    try:
+        concept_df = ak.stock_board_concept_name_em()
+    except:
+        print("  #Warning(concept_stocks_em): data source is unaccessible, check network")
+        return None
+   
+    concept_list=list(concept_df["板块名称"])
+    concept_list2 = [x for x in concept_list if "昨日" not in x]
+    concept_list_tmp = [x for x in concept_list2 if concept in x]
+    
+    #未找到
+    if len(concept_list_tmp)==0 or concept=='':
+        if concept!='':
+            print("  #Warning(concept_stocks_em): concept not found with",concept)
+        print("  Available concepts in East Money:",len(concept_list2),end='')
+        printInLine_md(concept_list2,numberPerLine=numberPerLine,colalign="center")
+        #print("  Tips: you can use one of the concepts above to re-run the command")
+        
+        return None    
+        
+    #找到多个概念板块
+    if len(concept_list_tmp)>1 and len(concept_list_tmp)<numberPerLine:
+        print("  Concepts found in East Money:",end='')
+        print_list(concept_list_tmp,leading_blanks=2)
+        #print("  Tips: you can use one of the concepts above to re-run the command")
+        
+        return None    
+
+    if len(concept_list_tmp)>numberPerLine and concept!='':
+        print("  Concepts found in East Money:",len(concept_list_tmp),end='')
+        printInLine_md(concept_list_tmp,numberPerLine=numberPerLine,colalign="center")
+        #print("  Tips: you can use one of the concepts above to re-run the command")
+        
+        return None    
+
+    #找到一个概念板块，详细处理
+    #if len(concept_list_tmp)==1:
+    concept=concept_list_tmp[0]
+    
+    #东方财富概念板块成分股
+    cfg=ak.stock_board_concept_cons_em(concept)
+    
+    cfg_col_list=list(cfg)
+    indicator_col=''
+    for i in cfg_col_list:
+        if indicator in i:
+            indicator_col=i
+            break
+        
+    if indicator_col=='':
+        print("  #Warning(concept_stocks_em): unsupported indicator",indicator)
+        
+        remove_list=["序号","代码","名称"]
+        cfg_col_list_tmp = [x for x in cfg_col_list if x not in remove_list]
+        print("  Supported indicators:",)
+        print_list(cfg_col_list_tmp,leading_blanks=2)
+        
+        return None        
+    
+    collist=['序号','名称','代码','市盈率-动态','市净率','最新价','涨跌幅','换手率']
+    if not indicator_col in collist:
+        collist=collist+[indicator_col]
+        
+    #重新排序
+    cfg.sort_values(by=[indicator_col]+["代码"],ascending=[False,True],inplace=True)
+    cfg.reset_index(drop=True,inplace=True)
+    cfg['序号']=cfg.index+1
+        
+    #行业均值与中位数
+    indicator_mean=cfg[indicator_col].mean()
+    indicator_median=cfg[indicator_col].median()
+    indicator_total=cfg["代码"].count()
+    
+    found_stock=False
+    stock_list=list(cfg['代码'])
+    if ticker[:6] in stock_list:
+        found_stock=True
+    else:
+        if not ticker=='':
+            print("  #Warning(concept_stocks_em): stock not found for",ticker)
+    
+    if found_stock:
+        indicator_value=cfg[cfg['代码']==ticker[:6]][indicator_col].values[0]
+        indicator_seq=cfg[cfg['代码']==ticker[:6]]["序号"].values[0]
+        from scipy.stats import percentileofscore
+        indicator_pct=percentileofscore(cfg[indicator_col],indicator_value)
+    
+    #筛选
+    if rank > 0:
+        rank_flag="前"
+        df_disp=cfg[collist].head(rank)
+    else:
+        rank_flag="后"
+        df_disp=cfg[collist].tail(abs(rank))
+    
+    #强制显示所选股票
+    if force_show_stock:
+        #所选股票是否在其中？
+        if not ticker[:6] in list(df_disp["代码"]):
+            ticker_seq=cfg[cfg["代码"]==ticker[:6]]["序号"].values[0]
+            seq1=ticker_seq-4; seq2=ticker_seq+5
+            #如果超出开头
+            if seq1 <=0:
+                seq1=1; seq2=10
+            #如果超出结尾    
+            if seq2 > len(cfg):
+                seq2=len(cfg); seq1=len(cfg)-9
+                
+            #注意：此处的&不能换为and    
+            df_disp=cfg[(cfg["序号"]>=seq1) & (cfg["序号"]<=seq2)][collist]
+        
+    
+    #制表
+    titletxt="概念板块及其上市公司排名："+concept+"，"+indicator_col+"("+rank_flag+str(abs(rank))+"名)"
+
+    footnote1="概念板块的"+indicator_col+"整体状况：均值"+str(round(indicator_mean,2))+"，中位数"+str(round(indicator_median,2))+"\n"
+    footnote2=''
+    if found_stock:
+        tname=ticker_name(ticker)
+        footnote2=tname+"的"+indicator_col+"："+str(round(indicator_value,2))+"，板块排名"+str(indicator_seq)+"/"+str(indicator_total)+"，分位"+str(round(indicator_pct,2))+"%\n"
+    else:
+        footnote2="概念板块："+concept+"，成分股数量"+str(len(cfg))+'\n'
+        
+    import datetime; stoday = datetime.date.today()
+    footnote3="*** 信息来源：东方财富，"+str(stoday) 
+    if found_stock:
+        footnote=footnote1+footnote2+footnote3
+    else:
+        footnote=footnote2+footnote1+footnote3
+    
+    #确定表格字体大小
+    titile_font_size=font_size
+    heading_font_size=data_font_size=str(int(font_size.replace('px',''))-1)+'px'
+    
+    df_display_CSS(df_disp,titletxt=titletxt,footnote=footnote,facecolor=facecolor, \
+                   first_col_align='center',second_col_align='left', \
+                   titile_font_size=titile_font_size,heading_font_size=heading_font_size, \
+                   data_font_size=data_font_size)
+    
+    return cfg
+    
 
 
 

{siat-3.4.9.dist-info → siat-3.4.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: siat
-Version: 3.4.9
+Version: 3.4.12
 Summary: Securities Investment Analysis Tools (siat)
 Home-page: https://pypi.org/project/siat/
 Author: Prof. WANG Dehong, International Business School, Beijing Foreign Studies University

{siat-3.4.9.dist-info → siat-3.4.12.dist-info}/RECORD

@@ -94,7 +94,7 @@ siat/risk_evaluation.py,sha256=I6B3gty-t--AkDCO0tKF-291YfpnF-IkXcFjqNKCt9I,76286
 siat/risk_evaluation_test.py,sha256=YEXM96gKzTfwN4U61AS4Rr1tV7KgUvn4rRC6f3iMw9s,3731
 siat/risk_free_rate.py,sha256=ZMr4cHikPvXvywr54gGqiI3Nvb69am6tq3zj2hwzANE,12384
 siat/risk_free_rate_test.py,sha256=CpmhUf8aEAEZeNu4gvWP2Mz2dLoIgBX5bI41vfUBEr8,4285
-siat/sector_china.py,sha256=y07Yh8t_LKc7MPOeOw6sTNgzmJR6vgYyLVUY9XB3rCU,122864
+siat/sector_china.py,sha256=dCBzhFUbCKZytRmtMcPCmrq6ktmXJ50FH6g48SMXlt8,130573
 siat/sector_china_test.py,sha256=1wq7ef8Bb_L8F0h0W6FvyBrIcBTEbrTV7hljtpj49U4,5843
 siat/security_price.py,sha256=2oHskgiw41KMGfqtnA0i2YjNNV6cYgtlUK0j3YeuXWs,29185
 siat/security_price2.py,sha256=65s64L68aRZdVVK3V8UYxdPd_JHMqgJ2FBJJX5MSW-Q,26174
@@ -139,7 +139,7 @@ siat/valuation_china.py,sha256=EkZQaVkoBjM0c4MCNbaX-bMnlG0e3FXeaWczZDnkptU,67784
 siat/valuation_market_china_test.py,sha256=gbJ0ioauuo4koTPH6WKUkqcXiQPafnbhU5eKJ6lpdLA,1571
 siat/var_model_validation.py,sha256=R0caWnuZarrRg9939hxh3vJIIpIyPfvelYmzFNZtPbo,14910
 siat/yf_name.py,sha256=H1EM8YYXA8nQHIqsJlso0I3HKPiJLT3QujO4gRVQXWs,13945
-siat-3.4.9.dist-info/METADATA,sha256=JWFmtzgZF0_L_HvISH6Cy_rbSOykNGFnSx0vUHqpEMA,7682
-siat-3.4.9.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-siat-3.4.9.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-3.4.9.dist-info/RECORD,,
+siat-3.4.12.dist-info/METADATA,sha256=4x-7hEFgcIpc91o197nqMAM8kxqCckIONyb5qWMpdO8,7683
+siat-3.4.12.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+siat-3.4.12.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-3.4.12.dist-info/RECORD,,

{siat-3.4.9.dist-info → siat-3.4.12.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.38.4)
+Generator: bdist_wheel (0.43.0)
 Root-Is-Purelib: true
 Tag: py3-none-any