siat 3.2.30__py3-none-any.whl → 3.2.31__py3-none-any.whl

siat/__init__ -20240701.py

@@ -0,0 +1,65 @@
+# -*- coding: utf-8 -*-
+"""
+功能：一次性引入SIAT的所有模块
+作者：王德宏，北京外国语大学国际商学院
+版权：2021-2024(C) 仅限教学使用，商业使用需要授权
+联络：wdehong2000@163.com
+"""
+
+#==============================================================================
+#屏蔽所有警告性信息
+import warnings; warnings.filterwarnings('ignore')
+#==============================================================================
+from siat.allin import *
+#==============================================================================
+#同一命令行多个输出，主要用于Jupyter Notebook
+from IPython.core.interactiveshell import InteractiveShell
+InteractiveShell.ast_node_interactivity='all'
+#==============================================================================
+# 检查是否存在新版本
+try:
+    import pkg_resources
+    current_version=pkg_resources.get_distribution("siat").version
+    current_list=current_version.split('.')
+    print("Successfully imported siat version",current_version)
+
+    import luddite
+    latest_version=luddite.get_version_pypi("siat")
+    latest_list=latest_version.split('.')
+    
+    newest=True
+    for i in range(3):
+        #print(i)
+        if int(current_list[i]) < int(latest_list[i]):
+            newest=False
+    
+    """
+    if not newest:
+        print("The latest version of siat is",latest_version,'\n')
+        print("*** If you expect to upgrade siat in Anaconda Prompt, use the instruction below:")
+        print("    pip install siat --upgrade")
+        print("*** If you expect to upgrade in Jupyter, add a \'!\' right before the instruction above",'\n')
+        
+        print("*** If you encounter incompatible plug-in, try to uninstall siat first and reinstall it:")
+        print("    pip uninstall siat")
+        print("    pip install siat",'\n')
+        
+        print("*** If you have a slow internet connection, use an option trailing the instruction above:")
+        print("    -i https://mirrors.aliyun.com/pypi/simple/",'\n')
+    
+        print("If you have done any of the above, restart the Python (eg. restarting the kernel)")
+        print("Provided you still need additional help, please contact wdehong2000@163.com")
+    """
+    if not newest:
+        #print("The latest version of siat is",latest_version,'\n')
+        print("Now there is a newer version of siat",latest_version,'\n')
+        print("*** How to upgrade siat?")
+        print("Upgrade directly from official source? use command: upgrade_siat()")
+        print("Upgrade from Tsinghua? use command: upgrade_siat(alternative='tsinghua')")
+        print("Upgrade from Alibaba? use command: upgrade_siat(alternative='alibaba')")
+    
+except:
+    pass
+    
+
+#==============================================================================

siat/__init__.py

@@ -17,46 +17,32 @@ from IPython.core.interactiveshell import InteractiveShell
 InteractiveShell.ast_node_interactivity='all'
 #==============================================================================
 # 检查是否存在新版本
+check_newer_version=False
+
 try:
     import pkg_resources
     current_version=pkg_resources.get_distribution("siat").version
     current_list=current_version.split('.')
     print("Successfully imported siat version",current_version)
 
-    import luddite
-    latest_version=luddite.get_version_pypi("siat")
-    latest_list=latest_version.split('.')
-    
-    newest=True
-    for i in range(3):
-        #print(i)
-        if int(current_list[i]) < int(latest_list[i]):
-            newest=False
-    
-    """
-    if not newest:
-        print("The latest version of siat is",latest_version,'\n')
-        print("*** If you expect to upgrade siat in Anaconda Prompt, use the instruction below:")
-        print("    pip install siat --upgrade")
-        print("*** If you expect to upgrade in Jupyter, add a \'!\' right before the instruction above",'\n')
+    if check_newer_version:
+        import luddite
+        latest_version=luddite.get_version_pypi("siat")
+        latest_list=latest_version.split('.')
         
-        print("*** If you encounter incompatible plug-in, try to uninstall siat first and reinstall it:")
-        print("    pip uninstall siat")
-        print("    pip install siat",'\n')
+        newest=True
+        for i in range(3):
+            #print(i)
+            if int(current_list[i]) < int(latest_list[i]):
+                newest=False
         
-        print("*** If you have a slow internet connection, use an option trailing the instruction above:")
-        print("    -i https://mirrors.aliyun.com/pypi/simple/",'\n')
-    
-        print("If you have done any of the above, restart the Python (eg. restarting the kernel)")
-        print("Provided you still need additional help, please contact wdehong2000@163.com")
-    """
-    if not newest:
-        #print("The latest version of siat is",latest_version,'\n')
-        print("Now there is a newer version of siat",latest_version,'\n')
-        print("*** How to upgrade siat?")
-        print("Upgrade directly from official source? use command: upgrade_siat()")
-        print("Upgrade from Tsinghua? use command: upgrade_siat(alternative='tsinghua')")
-        print("Upgrade from Alibaba? use command: upgrade_siat(alternative='alibaba')")
+        if not newest:
+            #print("The latest version of siat is",latest_version,'\n')
+            print("Now there is a newer version of siat",latest_version,'\n')
+            print("*** How to upgrade siat?")
+            print("Upgrade directly from official source? use command: upgrade_siat()")
+            print("Upgrade from Tsinghua? use command: upgrade_siat(alternative='tsinghua')")
+            print("Upgrade from Alibaba? use command: upgrade_siat(alternative='alibaba')")
     
 except:
     pass

siat/luchy_draw.py

@@ -20,7 +20,45 @@ import pickle
 import random
 import datetime
 import time
+import os
+from IPython.display import display_html, HTML
  
+#==============================================================================
+
+def current_dir(printout=True):
+    """
+    功能：找出当前路径
+    """
+    
+    current_path = os.getcwd()
+    
+    if printout:
+        print(f"[当前工作路径] {current_path}")
+        
+    return current_path
+
+#==============================================================================
+if __name__=='__main__':
+    file_path="S:\北外工作-24春\小学期-人大\学生名单\student_list.xlsx"
+    pickle_path="student_list.pkl"
+    
+    existing(file_path)
+    existing(pickle_path)
+    
+
+def existing(file_path):
+    """
+    功能：检查文件file_path是否存在，不带路径时检查当前目录
+    """
+    # 检查文件是否存在
+    if os.path.exists(file_path):
+        if os.path.isfile(file_path):
+            return True
+        else:
+            return False
+    else:
+        return False    
+
 #==============================================================================
 if __name__=='__main__':
     text="A B C"
@@ -28,11 +66,13 @@ if __name__=='__main__':
     text_size=12
     delay=1
     
-    typewriter(text,text_color='red',text_size=12,delay=1)        
+    typewriter(text,text_color='red',text_size=12,delay=1)      
 
-def typewriter(text,text_color='blue',text_size=12,delay=1):
+def typewriter(text,text_color='blue',text_size=12,delay=3):
     from IPython.display import display_html
     
+    time.sleep(delay)
+    
     text_html="<center><font size="+str(text_size)+" color="+text_color+">"+text
     display_html(text_html, raw=True)
 
@@ -41,17 +81,103 @@ def typewriter(text,text_color='blue',text_size=12,delay=1):
 #==============================================================================
 
 def pickle_write(df,pickle_path):
-    with open(pickle_path, 'wb') as pickle_file:
-        # 使用pickle模块的dump函数写入对象
-        pickle.dump(df,pickle_file)     
+    
+    ok2go=True
+    
+    prompt="File "+pickle_path+" already exists, overwrite it? [yes/no]"
+    file_exist=existing(pickle_path)
+    if file_exist:
+        yes=read_yes_no(prompt, default=None)
+        if not yes:
+            ok2go=False
+    
+    if ok2go:
+        with open(pickle_path, 'wb') as pickle_file:
+            # 使用pickle模块的dump函数写入对象
+            pickle.dump(df,pickle_file)   
+            
+    return
 
 if __name__=='__main__':
+    course="SICS RUC24"
     file_path="S:\北外工作-24春\小学期-人大\学生名单\student_list.xlsx"
     pickle_path="student_list.pkl"
     skiprows=1
     column='Name'
     
-    namelist_get(file_path,skiprows=1,column='Name',pickle_path="student_list.pkl")
+    draw_limit=2
+    absent_limit=2
+    pass_limit=2
+    
+    lucky_draw_header_create(course,file_path, \
+                                 skiprows=1,column='Name',draw_limit=2, \
+                                     absent_limit=2,pass_limit=2)
+    pickle_read(pickle_path=course+' header.pkl')        
+    
+    
+def lucky_draw_header_create(course,file_path, \
+                             skiprows=1,column='Name',draw_limit=2, \
+                             absent_limit=2,pass_limit=2):
+    
+    pickle_path=course+" header.pkl"
+    
+    header_dict={'course':course,'file_path':file_path,'pickle_path':pickle_path, \
+                'skiprows':skiprows,'column':column,'draw_limit':draw_limit, \
+                'absent_limit':absent_limit,'pass_limit':pass_limit}  
+        
+    pickle_write(header_dict,pickle_path)
+    
+    return
+
+def lucky_draw_header_modify(course,file_path="current", \
+                             skiprows=="current",column=="current",draw_limit=="current", \
+                             absent_limit=="current",pass_limit=="current"):
+    
+    pickle_path=course+" header.pkl"
+    header_dict=pickle_read(pickle_path) 
+    
+    if file_path !='current':
+        header_dict['file_path']=file_path
+    else:
+        file_path=header_dict['file_path']
+    
+    if skiprows !='current':
+        header_dict['skiprows']=skiprows
+    else:
+        skiprows=header_dict['skiprows']
+    
+    if column !='current':
+        header_dict['column']=column
+    else:
+        column=header_dict['column']
+    
+    if draw_limit !='current':
+        header_dict['draw_limit']=draw_limit
+    else:
+        draw_limit=header_dict['draw_limit']
+    
+    if absent_limit !='current':
+        header_dict['absent_limit']=absent_limit
+    else:
+        absent_limit=header_dict['absent_limit']
+    
+    if pass_limit !='current':
+        header_dict['pass_limit']=pass_limit
+    else:
+        pass_limit=header_dict['pass_limit']
+    
+    header_dict={'course':course,'file_path':file_path,'pickle_path':pickle_path, \
+                'skiprows':skiprows,'column':column,'draw_limit':draw_limit, \
+                'absent_limit':absent_limit,'pass_limit':pass_limit}  
+        
+    pickle_write(header_dict,pickle_path)
+    
+    return
+
+
+
+    
+    lucky_draw_initialize(file_path,skiprows=1,column='Name',pickle_path="student_list.pkl")
     
 def lucky_draw_initialize(file_path,skiprows=1,column='Name',pickle_path="student_list.pkl"):
     """
@@ -93,15 +219,6 @@ def pickle_read(pickle_path="student_list.pkl"):
 
 
 
-def pickle_append(df,column='Name',pickle_path="student_list.pkl"):
-    df_tmp=pickle_read(pickle_path)
-    df_new=pd.concat([df_tmp,df])
-    
-    df_new.sort_values(by=[column,'Date'],inplace=True)
-    
-    pickle_write(df_new,pickle_path)
-    
-    return
 
 #==============================================================================
 if __name__=='__main__':

{siat-3.2.30.dist-info → siat-3.2.31.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: siat
-Version: 3.2.30
+Version: 3.2.31
 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.2.30.dist-info → siat-3.2.31.dist-info}/RECORD

@@ -1,4 +1,5 @@
-siat/__init__.py,sha256=gP5uajXnJesnH5SL0ZPwq_Qhv59AG1bs4qwZv26Fo2Y,2894
+siat/__init__ -20240701.py,sha256=gP5uajXnJesnH5SL0ZPwq_Qhv59AG1bs4qwZv26Fo2Y,2894
+siat/__init__.py,sha256=NJn2HSa0cdet21YFoJs5nafHgrM3H3J3wdtFYi1KzfM,2065
 siat/allin.py,sha256=f8mlMSQJUgx4mRVOJNlHH2SZP0jUyWaeDPT2V6AGfY8,2757
 siat/alpha_vantage_test.py,sha256=tKr-vmuFH3CZAqwmISz6jzjPHzV1JJl3sPfZdz8aTfM,747
 siat/assets_liquidity.py,sha256=o_UZdLs693uNWPEQB2OzxDH0mdWimOmq4qe_vx1pue0,28987
@@ -64,7 +65,7 @@ siat/grafix_test.py,sha256=kXvcpLgQNO7wd30g_bWljLj5UH7bIVI0_dUtXbfiKR0,3150
 siat/holding_risk.py,sha256=G3wpaewAKF9CwEqRpr4khyuDu9SU2EGyQUHdk7cmHOA,30693
 siat/holding_risk_test.py,sha256=FRlw_9wFG98BYcg_cSj95HX5WZ1TvkGaOUdXD7-V86s,474
 siat/local_debug_test.py,sha256=CDAOffW1Rvs-TcNN5giWVvHMlch1w4dp-w5SIV9jXL0,3936
-siat/luchy_draw.py,sha256=cL-QBRbnjvY2h8B6YGp6Orycw43ypvBPhkFARD1bbPo,8248
+siat/luchy_draw.py,sha256=d4Ga2KqbF0nBv4P6GQBSRe2vq3S55G2B0HtKuEJJzyo,11699
 siat/market_china.py,sha256=hKoTLUyHuzsuG2L3_IuLx_utTKqS-__mZ63wrElh65U,45943
 siat/markowitz.py,sha256=glHikhabFAF6Hb6df1pYfhkxid2IZXBYAVQng5wd9Wk,97526
 siat/markowitz2-20240620.py,sha256=irZAPnjaatFsKQmFRMENP-cO6bEUl2narYtkU5NKTWI,108019
@@ -137,7 +138,7 @@ siat/valuation.py,sha256=NKfeZMdDJOW42oLVHob6eSVBXUqlN1OCnnzwyGAst8c,48855
 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-3.2.30.dist-info/METADATA,sha256=zYx92U4_7j4-A4T0OGuZKkgwk8HFROhi0Wblv7L-w2E,7234
-siat-3.2.30.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-siat-3.2.30.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-3.2.30.dist-info/RECORD,,
+siat-3.2.31.dist-info/METADATA,sha256=acxPalewEFV2nyg0ZetnYmjlFyvjL5X9S4UCVjjcJss,7234
+siat-3.2.31.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+siat-3.2.31.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-3.2.31.dist-info/RECORD,,