siat 3.2.32__py3-none-any.whl → 3.2.37__py3-none-any.whl

siat/common.py

@@ -3946,5 +3946,49 @@ def sort_list_by_len(alist,reverse=False):
     
     return alist_sorted
 #==============================================================================
+if __name__=='__main__':
+    data=security_trend("AAPL")
+    search_mode=True
+    
+    show_df(data,search_mode=False)
+    show_df(data,search_mode=True)
+
+def show_df(data,search_mode=False):
+    """
+    功能：在Jupyter中查看dataframe，并可下载成Excel
+    """
+    df=data.copy()
+    
+    import pandas as pd
+    import datetime
+    from itables import init_notebook_mode, show
+    init_notebook_mode(all_interactive=True)
+    
+    if not search_mode:
+        show(df, buttons=["copyHtml5", "csvHtml5", "excelHtml5"])
+    else:
+        #需要所有日期字段都是datetime格式，有错误，不能用
+        columns = df.columns
+        # 判断哪些字段是日期，并转换
+        date_columns=[]
+        for col in columns:
+            if 'date' in col.lower() or '日期' in col:
+                try:
+                    df[col]=df[col].apply(lambda x: pd.to_datetime(x))
+                    date_columns=date_columns+[col]
+                except:
+                    continue
+        
+        firstCol=list(df)[0]
+        firstValue=df[firstCol].values[0]
+        
+        show(df,
+             layout={"tool":"searchBuilder"},
+             searchBuilder={"preDefined":{
+                 "criteria":[{"data":firstCol,"condition":"=","value":firstValue}]
+             }})
+    
+    return
+    
 #==============================================================================
 #==============================================================================

siat/luchy_draw.py

@@ -33,7 +33,7 @@ def current_dir(printout=True):
     current_path = os.getcwd()
     
     if printout:
-        print(f"[当前工作路径] {current_path}")
+        print(f"[Current path] {current_path}")
         
     return current_path
 
@@ -69,6 +69,9 @@ if __name__=='__main__':
     typewriter(text,text_color='red',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)
@@ -80,16 +83,20 @@ def typewriter(text,text_color='blue',text_size=12,delay=3):
 
 #==============================================================================
 
-def pickle_write(df,pickle_path):
+def pickle_write(df,pickle_path,overlap_confirm=True):
     
     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 overlap_confirm:
+        cur_dir=current_dir(printout=False)
+        
+        prompt=pickle_path+" already exists in "+cur_dir+", overwrite it?"
+        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:
@@ -118,29 +125,47 @@ if __name__=='__main__':
 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"
+    pickle_path=course+" detail.pkl"
+    header_path=course+" header.pkl"
+    cur_dir=current_dir(printout=False)
     
     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)
+    pickle_write(header_dict,header_path)
+    print(header_path,"is created in",cur_dir)
     
     return
 
-def lucky_draw_header_modify(course,file_path="current", \
+if __name__=='__main__':
+    course="SICS RUC24"
+    
+    lucky_draw_header_modify(course,draw_limit=3) 
+    pickle_read(pickle_path=course+' header.pkl')
+
+def lucky_draw_header_modify(course,file_path="current",pickle_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) 
+    header_path=course+" header.pkl"
+    header_dict=pickle_read(header_path) 
+    cur_dir=current_dir(printout=False)
     
     if file_path !='current':
         header_dict['file_path']=file_path
     else:
         file_path=header_dict['file_path']
     
+    if pickle_path !='current':
+        header_dict['pickle_path']=pickle_path
+    else:
+        pickle_path=header_dict['pickle_path']
+        
     if skiprows !='current':
         header_dict['skiprows']=skiprows
     else:
@@ -170,12 +195,255 @@ def lucky_draw_header_modify(course,file_path="current", \
                 'skiprows':skiprows,'column':column,'draw_limit':draw_limit, \
                 'absent_limit':absent_limit,'pass_limit':pass_limit}  
         
-    pickle_write(header_dict,pickle_path)
+    pickle_write(header_dict,pickle_path,overlap_confirm=False)
+    print(header_path,"is modified in",cur_dir)
+    
+    return
+
+#==============================================================================
+if __name__=='__main__':
+    course="SICS RUC24"
+    lucky_draw_detail_create(course)
+    pickle_read(course+" detail.pkl")
+
+    
+def lucky_draw_detail_create(course):
+    """
+    功能：创建随机点名明细文件，记录随机点名的过程
+    """
+    #读取参数信息
+    header_path=course+" header.pkl"
+    header_dict=pickle_read(header_path) 
+    detail_path=header_dict['pickle_path']
+    cur_dir=current_dir(printout=False)
+
+    #读取学生名单
+    df = pd.read_excel(header_dict['file_path'],skiprows=header_dict['skiprows'])  
+    df1=df[[header_dict['column']]].copy()  
+
+    todaydt = str(datetime.date.today())
+    df1['Date']=todaydt
+    df1['Lucky']=0
+    df1['Absent']=0
+    df1['Pass']=0
+    
+    #排序
+    df1.sort_values(by=[header_dict['column'],'Date','Lucky','Absent','Pass'],inplace=True)
+    df1.reset_index(drop=True,inplace=True)
+    df1.index=df1.index + 1
     
+    pickle_write(df1,detail_path)
+    print(detail_path,"is created in",cur_dir)
+        
     return
 
+if __name__=='__main__':
+    course="SICS RUC24"
+    
+    lucky_draw_detail_add(course,name="Liu Chixin")
+    lucky_draw_detail_add(course,name=["Liu Chixin","Zhang San Feng","Li Si Ye"])
+    
+    pickle_read(course+" detail.pkl")
 
 
+def lucky_draw_detail_add(course,name):
+    """
+    功能：在随机点名明细文件中增加一个名字，支持批量增加
+    """
+    #读取参数信息
+    header_path=course+" header.pkl"
+    header_dict=pickle_read(header_path) 
+    
+    #读取明细文件
+    detail_path=header_dict['pickle_path']
+    df=pickle_read(detail_path) 
+
+    todaydt = str(datetime.date.today())
+
+    if isinstance(name,str):
+        name=[name]
+
+    added=False        
+    for n in name:
+        #重名检查
+        if n in list(df[header_dict['column']]):
+            print(n,"is already in file, no need to add")
+            continue
+    
+        #增加名单
+        added=True
+        row=pd.Series({header_dict['column']:n,'Date':todaydt,'Lucky':0,'Absent':0,'Pass':0})
+        try:
+            df=df.append(row,ignore_index=True)        
+        except:
+            df=df._append(row,ignore_index=True)
+            
+        print(n,"is added into file")
+
+    #写回明细文件
+    if added:
+        pickle_write(df,header_dict['pickle_path'],overlap_confirm=False)
+        
+    return
+
+#==============================================================================
+if __name__=='__main__':
+    course="SICS RUC24"
+    
+    lucky_draw_detail_remove(course,name="Liu Chixin")
+    lucky_draw_detail_remove(course,name=["Liu Chixin","Zhang San Feng","Li Si Ye"])
+    pickle_read(course+" detail.pkl")
+
+
+def lucky_draw_detail_remove(course,name):
+    """
+    功能：在随机点名明细文件中删除一个名字的所有记录，支持批量删除
+    """
+    #读取参数信息
+    header_path=course+" header.pkl"
+    header_dict=pickle_read(header_path) 
+    
+    #读取明细文件
+    detail_path=header_dict['pickle_path']
+    df=pickle_read(detail_path) 
+    
+    if isinstance(name,str):
+        name=[name]
+
+    found=False        
+    for n in name:
+        #检查是否存在
+        if n not in list(df[header_dict['column']]):
+            print(n,"is not in file, no need to remove")
+            continue
+        
+        found=True
+        #删除该名字的所有记录
+        to_drop = df[df[header_dict['column']] == n].index
+        df.drop(to_drop, inplace=True)
+        
+        print(n,"is removed from file")
+    
+    #写回明细文件
+    if found:
+        pickle_write(df,header_dict['pickle_path'],overlap_confirm=False)
+        
+    return
+
+#==============================================================================
+if __name__=='__main__':
+    course="SICS RUC24"
+    lucky_color="blue"
+    
+
+
+def random_draw(course,lucky_color="blue"):
+    """
+    随机点名，并记录
+    draw_limit：整个课程每人最多几次抽签机会
+    absent_limit：整个课程每人最多缺席几次，超过就丧失抽签资格
+    pass_limit：整个课程每人最多可以pass几次，超过就丧失抽签资格
+    """
+    #读取参数信息
+    header_path=course+" header.pkl"
+    header_dict=pickle_read(header_path) 
+    
+    #读取明细文件
+    detail_path=header_dict['pickle_path']
+    df=pickle_read(detail_path) 
+    
+    #点名名单
+    column=header_dict['column']
+    alist=list(set(list(df[column])))    
+    
+    found=False
+    todaydt = str(datetime.date.today())
+    draw_limit=header_dict['draw_limit']
+    absent_limit=header_dict['absent_limit']
+    pass_limit=header_dict['pass_limit']
+    column=header_dict['column']
+    
+    prompt="*** Is the lucky person here on site?"
+    prompt2="*** Does the lucky person expect to pass?"
+    prompt3="*** Continue lucky draw?"
+    
+    while True:
+        while True:
+            aname=random_select(alist)
+            
+            adf=df[df[column]==aname]
+            atimes=adf['Lucky'].sum()
+            aonsite=adf['Absent'].sum()
+            apass=adf['Pass'].sum()
+            
+            if atimes < draw_limit and aonsite <= absent_limit and apass < pass_limit:
+                #检查今日是否被抽中过
+                drew_today=False
+                try:
+                    adf_today=adf[adf['Date']==todaydt]
+                    if len(adf_today) > 0:
+                        if adf_today['Lucky'].sum() > 0:
+                            #有当日记录，且被抽中过（排除当日刚刚加入课程的情形）
+                            drew_today=True
+                except: pass
+                
+                if not drew_today:                    
+                    found=True
+                    break
+                else: continue
+            else:
+                continue
+
+        if not found:  
+            #循环完毕，无合适人选
+            print("Congratulations! all person has been lucky for",draw_limit,"times")
+        else:
+            typewriter(text=aname,text_color=lucky_color,text_size=12,delay=1)
+            
+            #是否到场
+            onsite=read_yes_no(prompt)
+            if onsite: absent=0
+            else: absent=1
+            
+            #是否pass
+            onpass=False
+            bpass=0
+            if onsite:            
+                onpass=read_yes_no(prompt2)
+                #是否pass
+                if onpass: bpass=1
+            
+            #只要抽中，不论是否到场都记录
+            row=pd.Series({column:aname,'Date':todaydt,'Lucky':1,'Absent':absent,'Pass':bpass})
+            try:
+                df=df.append(row,ignore_index=True)        
+            except:
+                df=df._append(row,ignore_index=True)
+                            
+            if onsite and not onpass:
+                proceed=read_yes_no(prompt3)
+                if not proceed:
+                    #到场且不pass，结束本轮抽签
+                    print("=== Lucky draw ends!")
+                    break
+            else:
+                #未到场或pass，继续抽签
+                continue
+    
+    df.sort_values(by=[column,'Date'],inplace=True)
+    pickle_write(df,detail_path,overlap_confirm=False)
+    
+    return
+
+#==============================================================================
+#==============================================================================
+if __name__=='__main__':
+    file_path="S:\北外工作-24春\小学期-人大\学生名单\student_list.xlsx"
+    
+    draw_limit=2
+    absent_limit=2
+    pass_limit=2
+
     
     lucky_draw_initialize(file_path,skiprows=1,column='Name',pickle_path="student_list.pkl")
     
@@ -184,6 +452,7 @@ def lucky_draw_initialize(file_path,skiprows=1,column='Name',pickle_path="studen
     功能：读入带有指定路径的Excel文件file_path，跳过前skiprows行
     Excel文件结构：抽奖名单字段为'Name'，字段位于第2行
     输出：存入pickle文件student_list.pkl
+    废弃！！！
     """
     
     df = pd.read_excel(file_path,skiprows=skiprows)  
@@ -206,19 +475,15 @@ def lucky_draw_initialize(file_path,skiprows=1,column='Name',pickle_path="studen
 
 #==============================================================================
 if __name__=='__main__':
-    pickle_path="student_list.pkl"
+    pickle_path="SICS RUC24 detail.pkl"
     
     df=pickle_read(pickle_path)
 
-def pickle_read(pickle_path="student_list.pkl"):   
+def pickle_read(pickle_path):   
     with open(pickle_path,'rb') as pickle_file:
         df = pickle.load(pickle_file)
     return df
 
-#==============================================================================
-
-
-
 
 #==============================================================================
 if __name__=='__main__':
@@ -272,6 +537,7 @@ def lucky_draw(draw_limit=2,absent_limit=2,column='Name',pickle_path="student_li
     """
     draw_limit=2：整个课程每人最多2次抽签机会
     absent_limit=2：整个课程每人最多缺席2次，超过就丧失抽签资格
+    废弃！
     """
     df=pickle_read(pickle_path)
 

{siat-3.2.32.dist-info → siat-3.2.37.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: siat
-Version: 3.2.32
+Version: 3.2.37
 Summary: Securities Investment Analysis Tools (siat)
 Home-page: https://pypi.org/project/siat/
 Author: Prof. WANG Dehong, International Business School, Beijing Foreign Studies University
@@ -31,6 +31,7 @@ Requires-Dist: prettytable
 Requires-Dist: graphviz
 Requires-Dist: luddite
 Requires-Dist: pendulum
+Requires-Dist: itables
 
 # Welcome to the Magic World of siat
 

{siat-3.2.32.dist-info → siat-3.2.37.dist-info}/RECORD

@@ -18,7 +18,7 @@ siat/capm_beta.py,sha256=cxXdRVBQBllhbfz1LeTJAIWvyRYhW54nhtNUXv4HwS0,29063
 siat/capm_beta2.py,sha256=07y3q4nJdkM-anpZepj4gK0gvTKj-BB0ppDDI5-TCcY,26904
 siat/capm_beta_test.py,sha256=ImR0c5mc4hIl714XmHztdl7qg8v1E2lycKyiqnFj6qs,1745
 siat/cmat_commons.py,sha256=Nj9Kf0alywaztVoMVeVVL_EZk5jRERJy8R8kBw88_Tg,38116
-siat/common.py,sha256=mw6fvy_RPc1hBCu_IERWmjknjoSwLHQzMqf0g5Gcfac,145721
+siat/common.py,sha256=AaZYKbkeLYYRdsncZ3HDhTM6d0RSJbJX7nid6U6TMfo,147084
 siat/compare_cross.py,sha256=3iP9TH2h3w27F2ARZc7FjKcErYCzWRc-TPiymOyoVtw,24171
 siat/compare_cross_test.py,sha256=xra5XYmQGEtfIZL2h-GssdH2hLdFIhG3eoCrkDrL3gY,3473
 siat/concepts_iwencai.py,sha256=m1YEDtECRT6FqtzlKm91pt2I9d3Z_XoP59BtWdRdu8I,3061
@@ -65,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=VVOsPUxCaegFuY-cZ39ucyxRBYw6rp9DeyCNltiaoHE,11694
+siat/luchy_draw.py,sha256=27YTkFPr91D_ndNbmoxeUUcsjbfGWoufKP1FcF1lCkY,20379
 siat/market_china.py,sha256=hKoTLUyHuzsuG2L3_IuLx_utTKqS-__mZ63wrElh65U,45943
 siat/markowitz.py,sha256=glHikhabFAF6Hb6df1pYfhkxid2IZXBYAVQng5wd9Wk,97526
 siat/markowitz2-20240620.py,sha256=irZAPnjaatFsKQmFRMENP-cO6bEUl2narYtkU5NKTWI,108019
@@ -138,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.32.dist-info/METADATA,sha256=vwFwBHG51nUPwHwT69gPhlo1U2pyseJH2EFPxAypznE,7234
-siat-3.2.32.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-siat-3.2.32.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-3.2.32.dist-info/RECORD,,
+siat-3.2.37.dist-info/METADATA,sha256=UnwG90_i5hNJUS3gc7fHwrxRs2EJZJaZHqExVTLJgR0,7258
+siat-3.2.37.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+siat-3.2.37.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-3.2.37.dist-info/RECORD,,