ezKit 1.11.6__tar.gz → 1.11.8__tar.gz

{ezkit-1.11.6/ezKit.egg-info → ezkit-1.11.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ezKit
-Version: 1.11.6
+Version: 1.11.8
 Summary: Easy Kit
 Author: septvean
 Author-email: septvean@gmail.com

{ezkit-1.11.6 → ezkit-1.11.8}/ezKit/utils.py

@@ -1,6 +1,5 @@
 """Utils"""
 import csv
-import datetime
 import hashlib
 import json
 import os
@@ -9,6 +8,7 @@ import time
 import tomllib
 from concurrent.futures import ProcessPoolExecutor, ThreadPoolExecutor
 from copy import deepcopy
+from datetime import date, datetime, timedelta, timezone
 from itertools import islice
 from pathlib import Path
 from shutil import rmtree
@@ -73,11 +73,11 @@ def check_arguments(data: list) -> bool:
 
     try:
         if not isTrue(data, list):
-            logger.error("argument error: data")
+            logger.error(f"argument type error: data {type(data)}")
             return False
         for arg, arg_type, arg_name in data:
             if not isTrue(arg, arg_type):
-                logger.error(f"argument error: {arg_name}")
+                logger.error(f"argument type error: {arg_name} {type(arg)}")
                 return False
         return True
     except Exception as e:
@@ -806,20 +806,20 @@ def retry(func: Callable, times: int = 3, **kwargs) -> Any:
 
 
 def date_to_datetime(
-    date_object: datetime.datetime
-) -> datetime.datetime | None:
+    date_object: datetime
+) -> datetime | None:
     """'日期'转换为'日期时间'"""
     # https://stackoverflow.com/a/1937636
     try:
-        return datetime.datetime.combine(date_object, datetime.datetime.min.time())
+        return datetime.combine(date_object, datetime.min.time())
     except Exception as e:
         logger.exception(e)
         return None
 
 
 def datetime_to_date(
-    datetime_instance: datetime.datetime
-) -> datetime.date | None:
+    datetime_instance: datetime
+) -> date | None:
     """'日期时间'转换为'日期'"""
     # https://stackoverflow.com/a/3743240
     try:
@@ -831,25 +831,25 @@ def datetime_to_date(
 
 def local_timezone():
     """获取当前时区"""
-    return datetime.datetime.now(datetime.timezone.utc).astimezone().tzinfo
+    return datetime.now(timezone.utc).astimezone().tzinfo
 
 
-def datetime_now(**kwargs) -> datetime.datetime | None:
+def datetime_now(**kwargs) -> datetime | None:
     """获取当前日期和时间"""
     utc = kwargs.pop("utc", False)
     try:
         if isTrue(utc, bool):
-            return datetime.datetime.now(datetime.timezone.utc)
-        return datetime.datetime.now(**kwargs)
+            return datetime.now(timezone.utc)
+        return datetime.now(**kwargs)
     except Exception as e:
         logger.exception(e)
         return None
 
 
 def datetime_offset(
-    datetime_instance: datetime.datetime | None = None,
+    datetime_instance: datetime | None = None,
     **kwargs
-) -> datetime.datetime | None:
+) -> datetime | None:
     """
     获取 '向前或向后特定日期时间' 的日期和时间
 
@@ -857,13 +857,13 @@ def datetime_offset(
     """
     _utc = kwargs.pop("utc", False)
     try:
-        if isinstance(datetime_instance, datetime.datetime):
-            return datetime_instance + datetime.timedelta(**kwargs)
+        if isinstance(datetime_instance, datetime):
+            return datetime_instance + timedelta(**kwargs)
 
         if _utc is True:
-            return datetime.datetime.now(datetime.timezone.utc) + datetime.timedelta(**kwargs)
+            return datetime.now(timezone.utc) + timedelta(**kwargs)
 
-        return datetime.datetime.now() + datetime.timedelta(**kwargs)
+        return datetime.now() + timedelta(**kwargs)
 
     except Exception as e:
         logger.exception(e)
@@ -871,21 +871,21 @@ def datetime_offset(
 
 
 def datetime_to_string(
-    datetime_instance: datetime.datetime,
+    datetime_instance: datetime,
     string_format: str = '%Y-%m-%d %H:%M:%S'
 ) -> str | None:
     """'日期时间'转换为'字符串'"""
     try:
-        if not isTrue(datetime_instance, datetime.datetime):
+        if not isTrue(datetime_instance, datetime):
             return None
-        return datetime.datetime.strftime(datetime_instance, string_format)
+        return datetime.strftime(datetime_instance, string_format)
     except Exception as e:
         logger.exception(e)
         return None
 
 
 def datetime_to_timestamp(
-    datetime_instance: datetime.datetime = datetime.datetime.now(),
+    datetime_instance: datetime,
     utc: bool = False
 ) -> int | None:
     """
@@ -894,43 +894,43 @@ def datetime_to_timestamp(
     UTC datetime 需要先替换 timezone 再转换为 Unix Timestamp
     """
     try:
-        if not isTrue(datetime_instance, datetime.datetime):
+        if not isTrue(datetime_instance, datetime):
             return None
-        return int(datetime_instance.replace(tzinfo=datetime.timezone.utc).timestamp()) if utc is True else int(datetime_instance.timestamp())
+        return int(datetime_instance.replace(tzinfo=timezone.utc).timestamp()) if utc is True else int(datetime_instance.timestamp())
     except Exception as e:
         logger.exception(e)
         return None
 
 
 def datetime_local_to_timezone(
-    datetime_instance: datetime.datetime,
-    tz: datetime.timezone = datetime.timezone.utc
-) -> datetime.datetime | None:
+    datetime_instance: datetime,
+    tz: timezone = timezone.utc
+) -> datetime | None:
     """
     Local datetime to TimeZone datetime(默认转换为 UTC datetime)
     replace(tzinfo=None) 移除结尾的时区信息
     """
     try:
-        if not isTrue(datetime_instance, datetime.datetime):
+        if not isTrue(datetime_instance, datetime):
             return None
-        return (datetime.datetime.fromtimestamp(datetime_instance.timestamp(), tz=tz)).replace(tzinfo=None)
+        return (datetime.fromtimestamp(datetime_instance.timestamp(), tz=tz)).replace(tzinfo=None)
     except Exception as e:
         logger.exception(e)
         return None
 
 
 def datetime_utc_to_timezone(
-    datetime_instance: datetime.datetime,
-    tz: Any = datetime.datetime.now(datetime.timezone.utc).astimezone().tzinfo
-) -> datetime.datetime | None:
+    datetime_instance: datetime,
+    tz: Any = datetime.now(timezone.utc).astimezone().tzinfo
+) -> datetime | None:
     """
     UTC datetime to TimeZone datetime(默认转换为 Local datetime)
     replace(tzinfo=None) 移除结尾的时区信息
     """
     try:
-        if not isTrue(datetime_instance, datetime.datetime):
+        if not isTrue(datetime_instance, datetime):
             return None
-        return datetime_instance.replace(tzinfo=datetime.timezone.utc).astimezone(tz).replace(tzinfo=None)
+        return datetime_instance.replace(tzinfo=timezone.utc).astimezone(tz).replace(tzinfo=None)
 
     except Exception as e:
         logger.exception(e)
@@ -939,13 +939,13 @@ def datetime_utc_to_timezone(
 
 def timestamp_to_datetime(
     timestamp: int,
-    tz: datetime.timezone = datetime.timezone.utc
-) -> datetime.datetime | None:
+    tz: timezone = timezone.utc
+) -> datetime | None:
     """Unix Timestamp 转换为 Datatime"""
     try:
         if not isTrue(timestamp, int):
             return None
-        return (datetime.datetime.fromtimestamp(timestamp, tz=tz)).replace(tzinfo=None)
+        return (datetime.fromtimestamp(timestamp, tz=tz)).replace(tzinfo=None)
     except Exception as e:
         logger.exception(e)
         return None
@@ -954,12 +954,12 @@ def timestamp_to_datetime(
 def datetime_string_to_datetime(
     datetime_string: str,
     datetime_format: str = '%Y-%m-%d %H:%M:%S'
-) -> datetime.datetime | None:
+) -> datetime | None:
     """datetime string to datetime"""
     try:
         if not isTrue(datetime_string, str):
             return None
-        return datetime.datetime.strptime(datetime_string, datetime_format)
+        return datetime.strptime(datetime_string, datetime_format)
     except Exception as e:
         logger.exception(e)
         return None
@@ -980,7 +980,7 @@ def datetime_string_to_timestamp(
 
 
 def datetime_object(
-    date_time: datetime.datetime
+    date_time: datetime
 ) -> dict | None:
     """datetime object"""
     try:

{ezkit-1.11.6 → ezkit-1.11.8/ezKit.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ezKit
-Version: 1.11.6
+Version: 1.11.8
 Summary: Easy Kit
 Author: septvean
 Author-email: septvean@gmail.com

{ezkit-1.11.6 → ezkit-1.11.8}/setup.py

@@ -3,7 +3,7 @@ from setuptools import find_packages, setup
 
 setup(
     name='ezKit',
-    version='1.11.6',
+    version='1.11.8',
     author='septvean',
     author_email='septvean@gmail.com',
     description='Easy Kit',