gomyck-tools 1.3.2__py3-none-any.whl → 1.3.4__py3-none-any.whl

ctools/cdebug.py

@@ -0,0 +1,143 @@
+import subprocess
+import sys
+import threading
+from datetime import datetime
+from queue import Queue, Empty
+
+
+class ProgramInterceptor:
+  def __init__(self, command):
+    self.command = command
+    timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
+    self.log_filename = f"program_io_log_{timestamp}.txt"
+    self.process = None
+    self.log_queue = Queue()
+
+  def start(self):
+    # 启动子进程
+    self.process = subprocess.Popen(
+      self.command,
+      stdin=subprocess.PIPE,
+      stdout=subprocess.PIPE,
+      stderr=subprocess.PIPE,
+      bufsize=0,
+      universal_newlines=True
+    )
+
+    # 启动日志写入线程
+    log_thread = threading.Thread(target=self._write_log_thread, daemon=True)
+    log_thread.start()
+
+    # 记录初始信息
+    self._enqueue_log("header", f"Command: {' '.join(self.command)}")
+    self._enqueue_log("header", f"Start time: {datetime.now()}")
+    self._enqueue_log("header", "-" * 50)
+
+    # 启动输出转发线程
+    stdout_thread = threading.Thread(
+      target=self._forward_stream,
+      args=(self.process.stdout, sys.stdout, "stdout"),
+      daemon=True
+    )
+    stderr_thread = threading.Thread(
+      target=self._forward_stream,
+      args=(self.process.stderr, sys.stderr, "stderr"),
+      daemon=True
+    )
+
+    stdout_thread.start()
+    stderr_thread.start()
+
+    # 主线程处理输入转发
+    try:
+      while True:
+        if self.process.poll() is not None:
+          break
+
+        # 读取用户输入
+        try:
+          user_input = sys.stdin.readline()
+          if not user_input:  # EOF
+            break
+
+          # 记录输入
+          self._enqueue_log("stdin", user_input)
+
+          # 转发到子进程
+          try:
+            self.process.stdin.write(user_input)
+            self.process.stdin.flush()
+          except (BrokenPipeError, OSError):
+            break
+
+        except KeyboardInterrupt:
+          break
+
+    finally:
+      # 清理工作
+      self.process.terminate()
+
+      # 等待所有输出处理完成
+      stdout_thread.join(timeout=1)
+      stderr_thread.join(timeout=1)
+
+      # 记录结束信息
+      self._enqueue_log("header", "-" * 50)
+      self._enqueue_log("header", f"End time: {datetime.now()}")
+      self._enqueue_log("header", f"Exit code: {self.process.returncode}")
+
+      # 等待日志写入完成
+      self.log_queue.put(None)  # 结束信号
+      log_thread.join(timeout=2)
+
+  def _forward_stream(self, source, target, stream_name):
+    """转发数据流并记录"""
+    for line in iter(source.readline, ''):
+      # 转发到目标
+      target.write(line)
+      target.flush()
+
+      # 记录输出
+      self._enqueue_log(stream_name, line)
+
+  def _enqueue_log(self, stream_type, content):
+    """将日志内容放入队列"""
+    self.log_queue.put((stream_type, content))
+
+  def _write_log_thread(self):
+    """日志写入线程"""
+    with open(self.log_filename, 'w', encoding='utf-8') as log_file:
+      while True:
+        try:
+          item = self.log_queue.get(timeout=0.5)
+          if item is None:  # 结束信号
+            break
+
+          stream_type, content = item
+
+          if stream_type == 'stderr': continue
+
+          if stream_type == "header":
+            log_file.write(content + "\n")
+          else:
+            direction = ">>>" if stream_type == "stdin" else "<<<"
+            log_file.write(f"{direction} {stream_type}: {content}")
+
+          log_file.flush()
+
+        except Empty:
+          if self.process.poll() is not None:
+            continue
+
+
+def main():
+  if len(sys.argv) < 2:
+    print("Usage: cdebug.py <program> [args...]")
+    print("Example: cdebug.py python script.py arg1 arg2")
+    sys.exit(1)
+  interceptor = ProgramInterceptor(sys.argv[1:])
+  interceptor.start()
+
+
+if __name__ == "__main__":
+  main()

ctools/cron_lite.py

@@ -23,7 +23,7 @@ def demo1():
 def demo2(xx, fff):
   print('hello world222', xx, fff)
 
-cron_lite.apply_cron_task('0/1 * * * * ? *', demo2, (123123123, 34534534))
+cron_lite.reg_cron_task('0/1 * * * * ? *', demo2, (123123123, 34534534))
 print(123123)
 
 cron_lite.start_all()
@@ -35,13 +35,14 @@ class SchedulerMeta:
   status: bool = False
   event: sched.Event = None
   scheduler: sched.scheduler = None
+  cron_str: str = None
 
 
 scheduler_map: Dict[str, SchedulerMeta] = {}  # {timer_task_name: SchedulerMeta}
 _switch = False
 _info_handler  = print
 _error_handler = print
-_time_zone: Optional[pytz.BaseTzInfo] = None
+_time_zone: Optional[pytz.BaseTzInfo] = pytz.timezone("Asia/Shanghai")
 
 
 def set_time_zone(time_zone_name: str):
@@ -79,7 +80,7 @@ def cron_task(cron_expr: str, task_name: str = None, till_time_stamp: int = None
   return deco
 
 
-def apply_cron_task(cron_expr, func, params, timer_task_name=None, till_time_stamp=None):
+def reg_cron_task(cron_expr, func, params, timer_task_name=None, till_time_stamp=None):
   """
   cron_task decorator to register a function as crontab task
   :param func: task callback function
@@ -105,11 +106,6 @@ def apply_cron_task(cron_expr, func, params, timer_task_name=None, till_time_sta
       _register_next(task_name, wrapper, cron_expr, till_time_stamp)
 
   _register_next(task_name, wrapper, cron_expr, till_time_stamp, init=True)
-  # 不使用 submit, 因为提交的任务, 不是 daemon 线程
-  t = threading.Thread(target=_start, args=(timer_task_name, ))
-  t.setDaemon(True)
-  t.start()
-  return t
 
 def start_all(spawn: bool = True, daemon: bool = True, info_handler=None, error_handler=None) -> Optional[threading.Thread]:
   """
@@ -130,8 +126,7 @@ def start_all(spawn: bool = True, daemon: bool = True, info_handler=None, error_
   if error_handler:
     _error_handler = error_handler
   if spawn:
-    t = threading.Thread(target=_start)
-    t.setDaemon(daemon)
+    t = threading.Thread(target=_start, daemon=daemon)
     t.start()
     return t
   else:
@@ -192,6 +187,7 @@ def _register_next(timer_task_name, base_func, cron_expr, till_time_stamp, init:
     scheduler_meta.timer_task_name = timer_task_name
     scheduler_meta.switch = True
     scheduler_meta.scheduler = sched.scheduler(time.time, time.sleep)
+    scheduler_meta.cron_str = cron_expr
     scheduler_map[timer_task_name] = scheduler_meta
   elif init:
     raise ValueError(f"task name: {timer_task_name} already exists!!!!!")
@@ -219,7 +215,6 @@ def _run_sched(scheduler_meta: SchedulerMeta):
         return
       time.sleep(0.5)
 
-
 def _start(taskName: str = None):
   global _switch
   _switch = True
@@ -227,9 +222,8 @@ def _start(taskName: str = None):
   taskList = []
   for timer_task_name, scheduler_meta in scheduler_map.items():
     if taskName is not None and timer_task_name != taskName: continue
-    print("register job: ", timer_task_name)
-    thread = threading.Thread(target=_run_sched, args=(scheduler_meta, ))
-    thread.setDaemon(True)
+    print("register job: ", timer_task_name, ", cron: ", scheduler_meta.cron_str)
+    thread = threading.Thread(target=_run_sched, args=(scheduler_meta, ), daemon=True)
     thread.start()
     taskList.append(thread)
   for task in taskList: task.join()
@@ -237,7 +231,6 @@ def _start(taskName: str = None):
   _switch = False
   scheduler_map.clear()
 
-
 def _convert_cron(cron_expr):
   res_cron = ""
   cron_list = cron_expr.split(" ")

ctools/sys_log.py

@@ -76,6 +76,9 @@ class GlobalLogger(object):
   def flush(self):
     pass
 
+  def fileno(self):
+    return sys.__stdout__.fileno()
+
 
 @call.init
 def _init_log() -> None:

{gomyck_tools-1.3.2.dist-info → gomyck_tools-1.3.4.dist-info}/METADATA

@@ -1,11 +1,12 @@
 Metadata-Version: 2.4
 Name: gomyck-tools
-Version: 1.3.2
+Version: 1.3.4
 Summary: A tools collection for python development by hao474798383
 Author-email: gomyck <hao474798383@163.com>
-License: MIT
+License-Expression: Apache-2.0
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
+License-File: LICENSE
 Requires-Dist: jsonpickle~=3.4.2
 Requires-Dist: SQLAlchemy~=2.0.36
 Requires-Dist: chardet~=5.2.0
@@ -41,6 +42,7 @@ Requires-Dist: asyncpg>=0.28; extra == "full"
 Requires-Dist: pytest>=7.0; extra == "full"
 Requires-Dist: black>=24.0; extra == "full"
 Requires-Dist: mypy>=1.0; extra == "full"
+Dynamic: license-file
 
 # Gomyck-Tools
 

{gomyck_tools-1.3.2.dist-info → gomyck_tools-1.3.4.dist-info}/RECORD

@@ -9,6 +9,7 @@ ctools/bottle_webserver.py,sha256=l7t_sN4ayywD1sR0kzuhGioOuaqGR9VhJh7e6Gbd6aE,46
 ctools/bottle_websocket.py,sha256=zqCE1rGlMeC9oxFOULNd137IWIhdetq83Oq5OoH_zGI,1953
 ctools/browser_element_tools.py,sha256=IFR_tWu5on0LxhuC_4yT6EOjwCsC-juIoU8KQRDqR7E,9952
 ctools/call.py,sha256=BCr8wzt5qd70okv8IZn-9-EpjywleZgvA3u1vfZ_Kt8,1581
+ctools/cdebug.py,sha256=4PWZxrUcfTOljK7xXSiQ9iXddYwsKKeq96RGUFNqNkg,3807
 ctools/cftp.py,sha256=SkHPDvKu58jnMnl68u5WxWEiFWsm2C0CGa5_GR_Obcw,2481
 ctools/cjson.py,sha256=d0RZ53b-M18OudRFGRtPCvvGofJcaLHdbNlTCemyJag,1365
 ctools/ckafka.py,sha256=EiiGCFkSbq8yRjQKVjc2_V114hKb8fJAVIOks_XbQ3w,5944
@@ -16,7 +17,7 @@ ctools/compile_tools.py,sha256=Nybh3vnkurIKnPnubdYzigjnzFu4GaTMKPvqFdibxmE,510
 ctools/console.py,sha256=EZumuyynwteKUhUxB_XoulHswDxHd75OQB34RiZ-OBM,1807
 ctools/coord_trans.py,sha256=pzIHxC4aLwvOF3eJG47Dda3vIq-Zp42xnu_FwILDflU,3951
 ctools/credis.py,sha256=sW7yDQvxa7B4dWvGwUH7GROq-7ElRMDhFT6g2C8ryfE,4522
-ctools/cron_lite.py,sha256=f9g7-64GsCxcAW-HUAvT6S-kooScl8zaJyqwHY-X_rE,8308
+ctools/cron_lite.py,sha256=CUqdtO02VnYUWcw6t6Jr7v2dKKhx3_G7CDAtlWnirBE,8232
 ctools/ctoken.py,sha256=NZSBGF3lJajJFLRIZoeXmpp8h5cKM0dAH2weySgeORc,882
 ctools/cword.py,sha256=ZRzAFn96yjo-hAbZuGIm4DoBAL2y8tFySWZ5xbYgY6Q,857
 ctools/czip.py,sha256=8VQ420KgMF09U8McSXTkaAz0jd0Zzm6qazf3iJADQI4,4674
@@ -48,7 +49,7 @@ ctools/snow_id.py,sha256=hYinnRN-aOule4_9vfgXB7XnsU-56cIS3PhzAwWBc5E,2270
 ctools/str_diff.py,sha256=QUtXOfsRLTFozH_zByqsC39JeuG3eZtrwGVeLyaHYUI,429
 ctools/string_tools.py,sha256=itK59W4Ed4rQzuyHuioNgDRUcBlfb4ZoZnwmS9cJxiI,1887
 ctools/sys_info.py,sha256=NvKCuBlWHHiW4bDI4tYZUo3QusvODm1HlW6aAkrllnE,4248
-ctools/sys_log.py,sha256=oqb1S41LosdeZxtogFVgDk8R4sjiHhUeYJLCzHd728E,2805
+ctools/sys_log.py,sha256=GO7wBCkF_R35WwLJ7x5lW8Dz0KeZExlbsE_yGspRH1Y,2861
 ctools/thread_pool.py,sha256=Mt60XMhs-nk-hbkPo8NA7wQ4RxRLZTk4X6vh5Wn3WEw,944
 ctools/upload_tools.py,sha256=sqe6K3ZWiyY58pFE5IO5mNaS1znnS7U4c4UqY8noED4,1068
 ctools/win_canvas.py,sha256=PAxI4i1jalfree9d1YG4damjc2EzaHZrgHZCTgk2GiM,2530
@@ -56,7 +57,8 @@ ctools/win_control.py,sha256=35f9x_ijSyc4ZDkcT32e9ZIhr_ffNxadynrQfFuIdYo,3489
 ctools/word_fill.py,sha256=xeo-P4DOjQUqd-o9XL3g66wQrE2diUPGwFywm8TdVyw,18210
 ctools/word_fill_entity.py,sha256=eX3G0Gy16hfGpavQSEkCIoKDdTnNgRRJrFvKliETZK8,985
 ctools/work_path.py,sha256=OmfYu-Jjg2huRY6Su8zJ_2EGFFhtBZFbobYTwbjJtG4,1817
-gomyck_tools-1.3.2.dist-info/METADATA,sha256=n0mq8Z9a0-nOrX3PWZ8JA6ILp79wX__r8foWccyIQB4,1682
-gomyck_tools-1.3.2.dist-info/WHEEL,sha256=ck4Vq1_RXyvS4Jt6SI0Vz6fyVs4GWg7AINwpsaGEgPE,91
-gomyck_tools-1.3.2.dist-info/top_level.txt,sha256=-MiIH9FYRVKp1i5_SVRkaI-71WmF1sZSRrNWFU9ls3s,7
-gomyck_tools-1.3.2.dist-info/RECORD,,
+gomyck_tools-1.3.4.dist-info/licenses/LICENSE,sha256=X25ypfH9E6VTht2hcO8k7LCSdHUcoG_ALQt80jdYZfY,547
+gomyck_tools-1.3.4.dist-info/METADATA,sha256=2urHv5Qj9jvzPiYDOLJ19UQDEGeQK5KcTuflQMl_w4o,1744
+gomyck_tools-1.3.4.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+gomyck_tools-1.3.4.dist-info/top_level.txt,sha256=-MiIH9FYRVKp1i5_SVRkaI-71WmF1sZSRrNWFU9ls3s,7
+gomyck_tools-1.3.4.dist-info/RECORD,,

{gomyck_tools-1.3.2.dist-info → gomyck_tools-1.3.4.dist-info}/WHEEL

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

gomyck_tools-1.3.4.dist-info/licenses/LICENSE

@@ -0,0 +1,13 @@
+Copyright 2025 gomyck
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.