siat 3.8.27__py3-none-any.whl → 3.8.28__py3-none-any.whl

siat/valuation_china.py

@@ -123,7 +123,13 @@ def get_valuation_market_china(start,end,measure='pe',method='lyr',value='value'
         mp['Date']=mp['date']
         mp.sort_values(by=['Date'],ascending=True,inplace=True)
         mp.set_index(['Date'],inplace=True) 
-        mp1=mp[(mp.index >= startpd) & (mp.index <=endpd)]
+        
+        try:
+            mp1=mp[(mp.index >= startpd) & (mp.index <=endpd)]
+        except:
+            startpd=startpd.date()
+            endpd=endpd.date()
+            mp1=mp[(mp.index >= startpd) & (mp.index <=endpd)]            
         
         mp9=mp1[['date',field,'close']]
         mp9['field']=mp9[field]
@@ -149,7 +155,13 @@ def get_valuation_market_china(start,end,measure='pe',method='lyr',value='value'
         mp['Date']=mp['date']
         mp.sort_values(by=['Date'],ascending=True,inplace=True)
         mp.set_index(['Date'],inplace=True) 
-        mp1=mp[(mp.index >= startpd) & (mp.index <=endpd)]
+        
+        try:
+            mp1=mp[(mp.index >= startpd) & (mp.index <=endpd)]
+        except:
+            startpd=startpd.date()
+            endpd=endpd.date()
+            mp1=mp[(mp.index >= startpd) & (mp.index <=endpd)]            
         
         mp9=mp1[['date',field,'close']]
         mp9['field']=mp9[field]
@@ -177,20 +189,27 @@ if __name__ =="__main__":
     measures='pe'; methods=['lyr','ttm']; values='value'; statistics='median'
 
 
-def valuation_market_china(start,end,measures=['pe','pb'], \
+def valuation_market_china(start='MRY',end='today',measures=['pe','pb'], \
                            methods='lyr',values='value',statistics='median', \
                            twinx=False,loc1='best',loc2='best'):
     """
+    ===========================================================================
     功能：比较中国全A股市场的估值指标变化趋势
-    ----------
-    start: 开始日期
-    end: 结束日期
+    start: 开始日期，格式YYYY-MM-DD。
+    或者简写版，例如'MRY'近1年、'L3Y'表示近3年等。
+    end: 结束日期，默认今天。
+    
     measures: 估值指标市盈率'pe'或市净率'pb'，不支持股息率
     methods: 滚动'ttm/静态取样'lyr'.
     values: 直接采用估值指标数值'value'或分位数'quantile'
     statistics: 采用中位数'median'或等权均值'equal-weighted'
-
+    twinx：是否使用双轴绘图法，默认否False。
+        如果同时选择了市盈率'pe'或市净率'pb'，建议打开该选项True。
+    loc1/loc2：图例1/2的位置，默认自动决定'best'。
+        如果自动位置不理想，可以手动设置位置。
     """
+    #处理日期
+    start,end=start_end_preprocess(start,end)
     
     #解析比较的指标，以第一个双指标为准
     found2=False
@@ -222,7 +241,7 @@ def valuation_market_china(start,end,measures=['pe','pb'], \
                 found2=True
                 
     if not found2:
-        print("  #Warning(valuation_market_china)：no comparing parameters from either of",parmlist)
+        print("  #Warning(valuation_market_china)：parameters mismatch among",parmlist)
         #return None,None
     """            
     print("measures1=",measures1,"measures2=",measures2)
@@ -235,6 +254,9 @@ def valuation_market_china(start,end,measures=['pe','pb'], \
         ylabeltxt='估值比率'
     else:
         ylabeltxt='分位数'
+        
+    print("  Working on valuating China stock market ... ...")
+        
     titletxt='中国全A股市场估值的变化趋势'
     
     import datetime
@@ -244,7 +266,7 @@ def valuation_market_china(start,end,measures=['pe','pb'], \
     #获取指标1
     df1=get_valuation_market_china(start,end,measure=measures1,method=methods1,value=values1,statistic=statistics1)
     if df1 is None:
-        print("  #Error(valuation_market_china)：no data available for the combination of",measures1,methods1,values1,statistics1)
+        print("  #Error(valuation_market_china)：no data available for the combine of",measures1,methods1,values1,statistics1)
         return None,None
     
     ticker1=df1['desc'].values[0]
@@ -260,7 +282,7 @@ def valuation_market_china(start,end,measures=['pe','pb'], \
     #获取指标2
     df2=get_valuation_market_china(start,end,measure=measures2,method=methods2,value=values2,statistic=statistics2)
     if df2 is None:
-        print("  #Error(valuation_market_china)：no data available for the combination of",measures2,methods2,values2,statistics2)
+        print("  #Error(valuation_market_china)：data unavailable for the combine of",measures2,methods2,values2,statistics2)
         return None,None
     
     ticker2=df2['desc'].values[0]

{siat-3.8.27.dist-info → siat-3.8.28.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.1
 Name: siat
-Version: 3.8.27
+Version: 3.8.28
 Summary: Securities Investment Analysis Tools (siat)
 Home-page: https://pypi.org/project/siat/
 Author: Prof. WANG Dehong, International Business School, Beijing Foreign Studies University
@@ -40,14 +40,6 @@ Requires-Dist: translators
 Requires-Dist: nbconvert
 Requires-Dist: ipywidgets
 Requires-Dist: playwright
-Dynamic: author
-Dynamic: author-email
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
-Dynamic: license
-Dynamic: requires-dist
-Dynamic: summary
 
 
 # What is siat?

{siat-3.8.27.dist-info → siat-3.8.28.dist-info}/RECORD

@@ -140,12 +140,12 @@ siat/translate_20240606.py,sha256=63IyHWEU3Uz9mjwyuAX3fqY4nUMdwh0ICQAgmgPXP7Y,21
 siat/translate_241003_keep.py,sha256=un7Fqe1v35MXsja5exZgjmLzrZtt66NARZIGlyFuGGU,218747
 siat/universal_test.py,sha256=CDAOffW1Rvs-TcNN5giWVvHMlch1w4dp-w5SIV9jXL0,3936
 siat/valuation.py,sha256=K7epQC_UtELjRR5cyjJp4gskSyJMxXy-jHIAS0SUEj8,51801
-siat/valuation_china.py,sha256=CVp1IwIsF3Om0J29RGkyxZLt4n9Ug-ua_RKhLwL9fUQ,69624
+siat/valuation_china.py,sha256=izg7EhnkZkHQQuVmkLTvPdOETJgQ8epAeEmQVBOEg1g,70607
 siat/valuation_market_china_test.py,sha256=gbJ0ioauuo4koTPH6WKUkqcXiQPafnbhU5eKJ6lpdLA,1571
 siat/var_model_validation.py,sha256=R0caWnuZarrRg9939hxh3vJIIpIyPfvelYmzFNZtPbo,14910
 siat/yf_name.py,sha256=laNKMTZ9hdenGX3IZ7G0a2RLBKEWtUQJFY9CWuk_fp8,24058
-siat-3.8.27.dist-info/LICENSE,sha256=NTEMMROY9_4U1szoKC3N2BLHcDd_o5uTgqdVH8tbApw,1071
-siat-3.8.27.dist-info/METADATA,sha256=3SUzT5YcBbrdG3S5mrpUgvkFvBqEZPm2D8fZp9-i7mU,8321
-siat-3.8.27.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-siat-3.8.27.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-3.8.27.dist-info/RECORD,,
+siat-3.8.28.dist-info/LICENSE,sha256=NTEMMROY9_4U1szoKC3N2BLHcDd_o5uTgqdVH8tbApw,1071
+siat-3.8.28.dist-info/METADATA,sha256=-znpXFY93SnCc5fC9dnEraPjh_vwbitlZSkqjwkGpTo,8144
+siat-3.8.28.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+siat-3.8.28.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-3.8.28.dist-info/RECORD,,

{siat-3.8.27.dist-info → siat-3.8.28.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (75.6.0)
 Root-Is-Purelib: true
 Tag: py3-none-any