oafuncs 0.0.98.47__tar.gz → 0.0.98.50__tar.gz

{oafuncs-0.0.98.47/oafuncs.egg-info → oafuncs-0.0.98.50}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oafuncs
-Version: 0.0.98.47
+Version: 0.0.98.50
 Summary: Oceanic and Atmospheric Functions
 Home-page: https://github.com/Industry-Pays/OAFuncs
 Author: Kun Liu

{oafuncs-0.0.98.47 → oafuncs-0.0.98.50}/oafuncs/_script/email.py

@@ -2,25 +2,8 @@ from rich import print
 
 __all__ = ["send"]
 
-def _email_info():
-    import random
-    email_dict = {
-        "liukun0312@vip.qq.com": [4, 13, -10, 2, -10, 4, -7, -8, 8, -1, 3, -2, -11, -6, -9, -7],
-        "756866877@qq.com": [4, -2, -3, 13, 12, 8, -6, 9, -12, 13, -10, -12, -11, -12, -4, -11],
-        "99138763@qq.com": [0, 6, 12, 2, 9, 9, 4, -1, 11, -7, -12, 6, -11, -3, -5, -11],
-        "1031260@qq.com": [-1, -5, -9, 9, -3, 4, -8, -7, -12, -2, 0, -9, -11, -3, -7, -10],
-    }
-    keys = list(email_dict.keys())
-    choose_email = random.randint(0, len(keys) - 1)
-    msg_from = keys[choose_email]
-    return msg_from, email_dict[msg_from]
 
-
-def _decode_password(password):
-    return "".join([chr(i + 109) for i in password])
-
-
-def _send_message(title, content, msg_to):
+def _send_message(title, content, msg_to, msg_from, password):
     from email.header import Header
     from email.mime.multipart import MIMEMultipart
     from email.mime.text import MIMEText
@@ -29,8 +12,9 @@ def _send_message(title, content, msg_to):
     con = smtplib.SMTP_SSL("smtp.qq.com", 465)
 
     # 2. 登录邮箱
-    msg_from, password = _email_info()
-    con.login(msg_from, _decode_password(password))
+    # msg_from, password = _email_info()
+    # con.login(msg_from, _decode_password(password))
+    con.login(msg_from, password)
 
     # 3. 准备数据
     # 创建邮件对象
@@ -70,7 +54,7 @@ def _send_message(title, content, msg_to):
     print("发送内容为：\n{}\n\n".format(content))
 
 
-def send(title="Title", content=None, send_to="16031215@qq.com"):
+def send(title="Title", content=None, send_to: str = "email@qq.com", msg_from='must@qq.com', password='email_not_qq_pwd'):
     """
     Description: 发送邮件
 
@@ -85,11 +69,10 @@ def send(title="Title", content=None, send_to="16031215@qq.com"):
     Example:
         send(title='Title', content='Content', '123@qq.com')
     """
-    if content is None:
-        # 避免发送空邮件，或有人误调用
+    if content is None or send_to=='email@qq.com' or msg_from=='must@qq.com' or password=='email_not_qq_pwd':
         return
     else:
-        _send_message(title, content, send_to)
+        _send_message(title, content, send_to, msg_from, password)
 
 
 if __name__ == "__main__":

{oafuncs-0.0.98.47 → oafuncs-0.0.98.50}/oafuncs/oa_linux.py

@@ -54,10 +54,15 @@ def query_queue(need_node=1, queue_list =['dcu','bigmem','cpu_parallel','cpu_sin
     queue_dict = get_queue_node()
     hs = None
     for my_queue in queue_list:
-        if my_queue in queue_dict and queue_dict[my_queue] >= need_node:
-            # slurm_file = f'../run.slurm.{my_queue}'
-            hs = my_queue
-            break
+        if my_queue == 'cpu_parallel':
+            for mq in ['cpu_parallel','cpu_parallel*']:
+                if mq in queue_dict and queue_dict[mq] >= need_node:
+                    hs = 'cpu_parallel'
+                    break
+        else:
+            if my_queue in queue_dict and queue_dict[my_queue] >= need_node:
+                hs = my_queue
+                break
     return hs
 
 def running_jobs():
@@ -116,7 +121,7 @@ def submit_job(working_dir=None, script_tmp='run.slurm', script_run='run.slurm',
         while True:
             if job_id in running_jobs():
                 print(f'Time: {datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")}')
-                print(f'任务{job_id}正在任务队列中...')
+                print(f'任务{job_id}正在队列中...')
                 time.sleep(60)
             else:
                 print(f'任务{job_id}已完成！')

{oafuncs-0.0.98.47 → oafuncs-0.0.98.50}/oafuncs/oa_tool.py

@@ -118,7 +118,7 @@ class PEx(ParallelExecutor):
 
 
 
-def email(title: str = "Title", content: Optional[str] = None, send_to: str = "10001@qq.com") -> None:
+def email(title: str = "Title", content: Optional[str] = None, send_to: str = "email@qq.com", msg_from='must@qq.com', password='email_not_qq_pwd') -> None:
     """
     Send an email using the specified title, content, and recipient.
 
@@ -130,7 +130,7 @@ def email(title: str = "Title", content: Optional[str] = None, send_to: str = "1
     from ._script.email import send
 
     print(f"[green]Sending email to {send_to} with title: {title}[/green]")
-    send(title, content, send_to)
+    send(title, content, send_to, msg_from, password)
 
 
 def pbar(

{oafuncs-0.0.98.47 → oafuncs-0.0.98.50/oafuncs.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oafuncs
-Version: 0.0.98.47
+Version: 0.0.98.50
 Summary: Oceanic and Atmospheric Functions
 Home-page: https://github.com/Industry-Pays/OAFuncs
 Author: Kun Liu

{oafuncs-0.0.98.47 → oafuncs-0.0.98.50}/setup.py

@@ -18,7 +18,7 @@ URL = "https://github.com/Industry-Pays/OAFuncs"
 EMAIL = "liukun0312@stu.ouc.edu.cn"
 AUTHOR = "Kun Liu"
 REQUIRES_PYTHON = ">=3.10.0"  # 2025/03/13
-VERSION = "0.0.98.47"
+VERSION = "0.0.98.50"
 
 # What packages are required for this module to be executed?
 REQUIRED = [