terryutils 1.0.5__py3-none-any.whl → 1.0.7__py3-none-any.whl

terryutils/__init__.py

@@ -1,2 +1,3 @@
 from .mysql_util import MysqlUtil
-from .log import setup_logger
+from .log import setup_logger
+from .date_util import  DateUtils

terryutils/date_util.py

@@ -0,0 +1,228 @@
+from datetime import datetime, date, timedelta
+import calendar
+import re
+
+class DateUtils:
+    """企业级 Python 日期工具类"""
+
+    COMMON_FORMATS = [
+        "%Y-%m-%d %H:%M:%S",
+        "%Y-%m-%d %H:%M",
+        "%Y-%m-%d",
+        "%d/%m/%Y",
+        "%d-%m-%Y",
+        "%Y/%m/%d",
+    ]
+
+    # -------------------- 基础获取 --------------------
+    @staticmethod
+    def now(fmt="%Y-%m-%d %H:%M:%S"):
+        """当前时间"""
+        return datetime.now().strftime(fmt)
+
+    @staticmethod
+    def today(fmt="%Y-%m-%d"):
+        """今天"""
+        return date.today().strftime(fmt)
+
+    @staticmethod
+    def datetime_now():
+        """返回datetime对象"""
+        return datetime.now()
+
+    @staticmethod
+    def date_today():
+        """返回date对象"""
+        return date.today()
+
+    # -------------------- 字符串与datetime互转 --------------------
+    @staticmethod
+    def parse(date_str, fmt=None):
+        """尝试多种格式解析字符串"""
+        if isinstance(date_str, (int, float)):
+            return datetime.fromtimestamp(date_str)
+        if isinstance(date_str, datetime):
+            return date_str
+        if fmt:
+            return datetime.strptime(date_str, fmt)
+        for f in DateUtils.COMMON_FORMATS:
+            try:
+                return datetime.strptime(date_str, f)
+            except:
+                continue
+        raise ValueError(f"无法解析日期: {date_str}")
+
+    @staticmethod
+    def format(dt, fmt="%Y-%m-%d %H:%M:%S"):
+        if isinstance(dt, str):
+            dt = DateUtils.parse(dt)
+        return dt.strftime(fmt)
+
+    @staticmethod
+    def to_timestamp(dt):
+        dt = DateUtils.parse(dt) if isinstance(dt, (str, int, float)) else dt
+        return int(dt.timestamp())
+
+    @staticmethod
+    def from_timestamp(ts):
+        return datetime.fromtimestamp(ts)
+
+    # -------------------- 日期加减 --------------------
+    @staticmethod
+    def add_days(dt, days):
+        dt = DateUtils.parse(dt)
+        return dt + timedelta(days=days)
+
+    @staticmethod
+    def add_seconds(dt, seconds, ft):
+        dt = DateUtils.parse(dt, ft)
+        return dt + timedelta(seconds=seconds)
+
+    @staticmethod
+    def add_months(dt, months):
+        dt = DateUtils.parse(dt)
+        month = dt.month - 1 + months
+        year = dt.year + month // 12
+        month = month % 12 + 1
+        day = min(dt.day, calendar.monthrange(year, month)[1])
+        return dt.replace(year=year, month=month, day=day)
+
+    @staticmethod
+    def add_years(dt, years):
+        dt = DateUtils.parse(dt)
+        try:
+            return dt.replace(year=dt.year + years)
+        except ValueError:
+            # 闰年2月29日处理
+            return dt.replace(month=2, day=28, year=dt.year + years)
+
+    # -------------------- 周/月/季度起止 --------------------
+    @staticmethod
+    def start_of_day(dt=None):
+        dt = DateUtils.parse(dt) if dt else datetime.now()
+        return datetime(dt.year, dt.month, dt.day, 0, 0, 0)
+
+    @staticmethod
+    def end_of_day(dt=None):
+        dt = DateUtils.parse(dt) if dt else datetime.now()
+        return datetime(dt.year, dt.month, dt.day, 23, 59, 59)
+
+    @staticmethod
+    def start_of_week(dt=None):
+        dt = DateUtils.parse(dt) if dt else datetime.now()
+        start = dt - timedelta(days=dt.weekday())
+        return datetime(start.year, start.month, start.day)
+
+    @staticmethod
+    def end_of_week(dt=None):
+        dt = DateUtils.parse(dt) if dt else datetime.now()
+        end = dt + timedelta(days=6 - dt.weekday())
+        return datetime(end.year, end.month, end.day, 23, 59, 59)
+
+    @staticmethod
+    def start_of_month(dt=None):
+        dt = DateUtils.parse(dt) if dt else datetime.now()
+        return datetime(dt.year, dt.month, 1)
+
+    @staticmethod
+    def end_of_month(dt=None):
+        dt = DateUtils.parse(dt) if dt else datetime.now()
+        last_day = calendar.monthrange(dt.year, dt.month)[1]
+        return datetime(dt.year, dt.month, last_day, 23, 59, 59)
+
+    @staticmethod
+    def start_of_quarter(dt=None):
+        dt = DateUtils.parse(dt) if dt else datetime.now()
+        month = ((dt.month - 1) // 3) * 3 + 1
+        return datetime(dt.year, month, 1)
+
+    @staticmethod
+    def end_of_quarter(dt=None):
+        dt = DateUtils.parse(dt) if dt else datetime.now()
+        month = ((dt.month - 1) // 3 + 1) * 3
+        last_day = calendar.monthrange(dt.year, month)[1]
+        return datetime(dt.year, month, last_day, 23, 59, 59)
+
+    # -------------------- 日期判断 --------------------
+    @staticmethod
+    def is_leap_year(year):
+        return calendar.isleap(year)
+
+    @staticmethod
+    def weekday(dt=None):
+        dt = DateUtils.parse(dt) if dt else datetime.now()
+        return dt.weekday()  # 0=周一
+
+    @staticmethod
+    def is_weekend(dt=None):
+        return DateUtils.weekday(dt) >= 5
+
+    @staticmethod
+    def days_between(start, end):
+        start = DateUtils.parse(start)
+        end = DateUtils.parse(end)
+        return (end - start).days
+
+    # -------------------- 日期区间 --------------------
+    @staticmethod
+    def date_range(start, end, step=1):
+        start = DateUtils.parse(start)
+        end = DateUtils.parse(end)
+        days = []
+        delta = timedelta(days=step)
+        current = start
+        while current <= end:
+            days.append(current)
+            current += delta
+        return days
+
+    # -------------------- 自然语言解析 --------------------
+    @staticmethod
+    def smart_parse(text):
+        """支持 '今天','明天','昨天','上周一','下个月15号'"""
+        today = datetime.now()
+        text = text.strip()
+        if text == "今天":
+            return today
+        elif text == "明天":
+            return today + timedelta(days=1)
+        elif text == "昨天":
+            return today - timedelta(days=1)
+        m = re.match(r"上周([一二三四五六日])", text)
+        if m:
+            weekday_map = {"一":0,"二":1,"三":2,"四":3,"五":4,"六":5,"日":6}
+            target_weekday = weekday_map[m.group(1)]
+            delta_days = today.weekday() - target_weekday + 7
+            return today - timedelta(days=delta_days)
+        # TODO: 可继续扩展自然语言解析
+        return DateUtils.parse(text)
+
+    @staticmethod
+    def add_days_str(date_str, days, fmt="%Y-%m-%d"):
+        """直接对字符串日期加减天数，返回字符串"""
+        dt = datetime.strptime(date_str, fmt)
+        dt += timedelta(days=days)
+        return dt.strftime(fmt)
+
+    @staticmethod
+    def format_day(date_str, fmt="%Y-%m-%d"):
+        """直接对字符串日期加减天数，返回字符串"""
+        dt = datetime.strptime(date_str, fmt)
+        return dt.strftime("%Y年%m月%d日")
+
+    @staticmethod
+    def to_timestamp(dt):
+        dt = DateUtils.parse(dt) if isinstance(dt, (str, int, float)) else dt
+        return int(dt.timestamp())
+# ------------------------ 测试 ------------------------
+if __name__ == "__main__":
+    print("现在时间:", DateUtils.now())
+    print("今天:", DateUtils.today())
+    print("月初:", DateUtils.start_of_month())
+    print("月末:", DateUtils.end_of_month())
+    print("季度开始:", DateUtils.start_of_quarter())
+    print("季度结束:", DateUtils.end_of_quarter())
+    print("加3天:", DateUtils.add_days(datetime.now(), 3))
+    print("是否周末:", DateUtils.is_weekend())
+    print("自然语言解析 明天:", DateUtils.smart_parse("明天"))
+    print("日期区间:", [d.strftime("%Y-%m-%d") for d in DateUtils.date_range("2025-12-01", "2025-12-05")])

terryutils/mysql_pool_util.py

@@ -0,0 +1,63 @@
+from dbutils.pooled_db import PooledDB
+import pymysql
+from pymysql.cursors import DictCursor
+
+MYSQL_POOL = PooledDB(
+    creator=pymysql,
+    maxconnections=20,     # 最大连接数（重点）
+    mincached=2,           # 启动时创建
+    maxcached=10,          # 池中最大空闲
+    blocking=True,         # 连接耗尽时等待
+    host="localhost",
+    user="user",
+    password="password",
+    database="db",
+    port=3306,
+    charset="utf8mb4",
+    cursorclass=DictCursor,
+    autocommit=False
+)
+
+
+class MysqlClient:
+
+    def __init__(self, pool):
+        self.pool = pool
+
+    def _execute(self, fn):
+        conn = self.pool.connection()
+        try:
+            result = fn(conn)
+            conn.commit()
+            return result
+        except Exception:
+            conn.rollback()
+            raise
+        finally:
+            conn.close()  # ❗归还给 pool，不是真 close
+
+    def execute(self, sql, params=None):
+        def run(conn):
+            with conn.cursor() as cursor:
+                return cursor.execute(sql, params or ())
+        return self._execute(run)
+
+    def executemany(self, sql, params_list):
+        def run(conn):
+            with conn.cursor() as cursor:
+                return cursor.executemany(sql, params_list)
+        return self._execute(run)
+
+    def fetchone(self, sql, params=None):
+        def run(conn):
+            with conn.cursor() as cursor:
+                cursor.execute(sql, params or ())
+                return cursor.fetchone()
+        return self._execute(run)
+
+    def fetchall(self, sql, params=None):
+        def run(conn):
+            with conn.cursor() as cursor:
+                cursor.execute(sql, params or ())
+                return cursor.fetchall()
+        return self._execute(run)

terryutils/task_framework.py

@@ -0,0 +1,222 @@
+import os
+import sys
+import time
+import asyncio
+import inspect
+import logging
+import traceback
+import threading
+from queue import Queue, Empty
+from dataclasses import dataclass, field
+from typing import Callable, Optional
+from logging.handlers import RotatingFileHandler
+
+log_dir = "logs"
+os.makedirs(log_dir, exist_ok=True)
+
+log_file = os.path.join(log_dir, "request_framework.log")
+
+formatter = logging.Formatter(
+    '%(asctime)s | %(levelname)-5s | %(threadName)s | %(message)s',
+    datefmt='%Y-%m-%d %H:%M:%S'
+)
+# --- 文件 handler ---
+file_handler = RotatingFileHandler(
+    log_file,
+    maxBytes=50 * 1024 * 1024,
+    backupCount=5,
+    encoding='utf-8'
+)
+file_handler.setFormatter(formatter)
+file_handler.setLevel(logging.INFO)
+
+# --- 控制台 handler ---
+console_handler = logging.StreamHandler()
+console_handler.setFormatter(formatter)
+console_handler.setLevel(logging.INFO)
+
+logger = logging.getLogger("RequestFramework")
+logger.setLevel(logging.INFO)
+
+# 防止重复 add
+if not logger.handlers:
+    logger.addHandler(file_handler)
+    logger.addHandler(console_handler)
+
+logger.propagate = False
+
+
+
+
+# --- 1. 任务实体：统一封装请求 ---
+@dataclass
+class RequestTask:
+    name: str  # 任务名称（日志用）
+    func: Callable  # 执行函数 (requests.get 或 sdk.call)
+    args: tuple = field(default_factory=tuple)
+    kwargs: dict = field(default_factory=dict)
+    callback: Optional[Callable] = None  # 成功回调
+    max_retries: int = 3  # 最大重试次数
+    retry_count: int = 0  # 当前重试计数
+    priority: int = 10  # 优先级（数字越小越高）
+
+
+# --- 2. 频率控制器：令牌桶思想 ---
+class RateLimiter:
+    def __init__(self, qps: int):
+        self.interval = 1.0 / qps
+        self.last_run = 0.0
+        self._lock = threading.Lock()
+
+    def wait(self):
+        with self._lock:
+            elapsed = time.time() - self.last_run
+            wait_time = self.interval - elapsed
+            if wait_time > 0:
+                time.sleep(wait_time)
+            self.last_run = time.time()
+
+
+# --- 3. 调度引擎 ---
+class RequestEngine:
+    def __init__(self, worker_num: int = 3, qps: int = 5):
+        self.task_queue = Queue()  # 待处理队列
+        self.error_queue = Queue()  # 错误队列
+        self.limiter = RateLimiter(qps)  # 频率控制
+        self.worker_num = worker_num
+        self.running = False
+
+    def add_task(self, task: RequestTask):
+        """外部提交任务接口"""
+        self.task_queue.put(task)
+
+    def start(self):
+        """启动引擎"""
+        self.running = True
+        for i in range(self.worker_num):
+            t = threading.Thread(target=self._worker_loop, name=f"Worker-{i}")
+            t.daemon = True
+            t.start()
+        logger.info(f"引擎启动：工作线程={self.worker_num}, QPS限制={1 / self.limiter.interval}")
+
+    def _worker_loop(self):
+        """工作线程主循环"""
+        while self.running:
+            try:
+                # 1. 获取任务 (阻塞1秒以便检查running状态)
+                task: RequestTask = self.task_queue.get(timeout=1)
+
+                # 2. 频率控制
+                self.limiter.wait()
+
+                # 3. 执行任务
+                self._execute(task)
+
+                self.task_queue.task_done()
+            except Empty:
+                continue
+
+    def _execute(self, task: RequestTask):
+        """执行逻辑：包含重试和异常处理"""
+        try:
+            logger.info(f"正在执行: {task.name}, 参数: {task.args}")
+            # 判断并处理异步函数
+            if inspect.iscoroutinefunction(task.func):
+                # 如果是 async def 定义的函数，启动一个临时的事件循环运行它
+                result = asyncio.run(task.func(*task.args, **task.kwargs))
+            else:
+                # 如果是普通的 def 定义的函数，直接调用
+                result = task.func(*task.args, **task.kwargs)
+
+            # 4. 执行回调
+            if task.callback:
+                task.callback(result)
+
+            logger.info(f"执行成功: {task.name}")
+
+        except Exception as e:
+            exc_type, exc_obj, tb = sys.exc_info()
+            filename = tb.tb_frame.f_code.co_filename
+            lineno = tb.tb_lineno
+            traceback.print_exc()
+            logger.error(
+                f"执行失败: {task.name}, "
+                f"{exc_type.__name__} at {filename}:{lineno}, "
+                f"错误信息: {e}"
+            )
+
+            # 5. 重试逻辑
+            if task.retry_count < task.max_retries:
+                task.retry_count += 1
+                wait_s = 2 ** task.retry_count  # 指数退避
+                logger.warning(f"任务 {task.name} 将在 {wait_s}s 后进行第 {task.retry_count} 次重试")
+
+                # 异步延迟重试：不阻塞当前线程，放入定时器重新入队
+                threading.Timer(wait_s, self.add_task, args=[task]).start()
+            else:
+                # 6. 最终失败，放入错误队列
+                logger.critical(f"任务 {task.name} 达到最大重试次数，放弃处理")
+                self.error_queue.put({"task": task, "error": str(e)})
+
+
+
+
+if __name__ == "__main__":
+    import requests
+
+    # 1. 初始化引擎（5个并发，每秒最多2个请求）
+    engine = RequestEngine(worker_num=3, qps=1)
+    # 2. 启动
+    engine.start()
+
+
+    # 示例 A: 封装 requests 请求
+    def get_weather(city):
+        resp = requests.get(f"https://httpbin.org/get?city={city}", timeout=5)
+        resp.raise_for_status()
+        return resp.json()
+
+    def callback_func(result):
+        print(result)
+
+    task1 = RequestTask(
+        name="天气查询-北京",
+        func=get_weather,
+        args=("Beijing",),
+        callback=callback_func # 成功后落库
+    )
+
+
+    # 示例 B: 封装 SDK 请求
+    class MySDK:
+        def upload_file(self, file_id):
+            if file_id == "bad_id": raise ValueError("SDK内部错误")
+            return {"status": "uploaded", "id": file_id}
+
+
+    sdk = MySDK()
+    task2 = RequestTask(
+        name="SDK上传-001",
+        func=sdk.upload_file,
+        kwargs={"file_id": "file_123"},
+        callback=callback_func
+    )
+
+    # 示例 C: 故意失败的任务（测试重试）
+    task3 = RequestTask(
+        name="必失败任务",
+        func=sdk.upload_file,
+        kwargs={"file_id": "bad_id"},
+        max_retries=2
+    )
+
+    # 3. 提交任务到队列
+    engine.add_task(task1)
+    engine.add_task(task2)
+    engine.add_task(task3)
+
+    # 保持主线程运行
+    try:
+        while True: time.sleep(1)
+    except KeyboardInterrupt:
+        print("退出中...")

{terryutils-1.0.5.dist-info → terryutils-1.0.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: terryutils
-Version: 1.0.5
+Version: 1.0.7
 Summary: My personal python toolkit
 Author-email: Terry Zhu <596480606@qq.com>
 License: MIT

terryutils-1.0.7.dist-info/RECORD

@@ -0,0 +1,10 @@
+terryutils/__init__.py,sha256=rDDyXE01Cmz90yMbiDhWa9AOdsB7JX-KqSmYBYt9PAY,99
+terryutils/date_util.py,sha256=KdsTOd8EjKu7p9gbfBjm0Yd06zokM8WDAD2NfnogPu0,7832
+terryutils/log.py,sha256=ul9DF7-6AwjH-vE7aPB96hFM0OKrYUjjUFmd4xP4678,1063
+terryutils/mysql_pool_util.py,sha256=TI0MxEmdR5CZ4VtSS6lL9CAyzrANLM5-1caUJulYg24,1835
+terryutils/mysql_util.py,sha256=UwnF8z-KNJlMuOnH03iHVPKkpSNj073YSsrvI3x8pkM,3292
+terryutils/task_framework.py,sha256=040gMwDggAo2KFdtnHCNf4u9ctIJh7xCiHqJRTPB1Fo,6927
+terryutils-1.0.7.dist-info/METADATA,sha256=gpy_i3tPNOPFksvc_OzO8ZBIaiN9EmUAQacq5yh4Q6o,344
+terryutils-1.0.7.dist-info/WHEEL,sha256=WnJ8fYhv8N4SYVK2lLYNI6N0kVATA7b0piVUNvqIIJE,91
+terryutils-1.0.7.dist-info/top_level.txt,sha256=LQtzsZsXViaVLHb_rJ4SJiT9ScUfK6dUoy89dP1mLIo,11
+terryutils-1.0.7.dist-info/RECORD,,

terryutils-1.0.5.dist-info/RECORD

@@ -1,7 +0,0 @@
-terryutils/__init__.py,sha256=lxrRwy_RkvG1mcSs6DOv4SLRqZmwHVERKnT8CzgQ6t8,64
-terryutils/log.py,sha256=ul9DF7-6AwjH-vE7aPB96hFM0OKrYUjjUFmd4xP4678,1063
-terryutils/mysql_util.py,sha256=UwnF8z-KNJlMuOnH03iHVPKkpSNj073YSsrvI3x8pkM,3292
-terryutils-1.0.5.dist-info/METADATA,sha256=ZPiFz_6ifTjLHjTs-2TVERdpXkktNn-mRBqk1FRggMo,344
-terryutils-1.0.5.dist-info/WHEEL,sha256=WnJ8fYhv8N4SYVK2lLYNI6N0kVATA7b0piVUNvqIIJE,91
-terryutils-1.0.5.dist-info/top_level.txt,sha256=LQtzsZsXViaVLHb_rJ4SJiT9ScUfK6dUoy89dP1mLIo,11
-terryutils-1.0.5.dist-info/RECORD,,