staran 1.0.10__py3-none-any.whl → 1.0.11__py3-none-any.whl

staran/__init__.py

@@ -0,0 +1,61 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+"""
+Staran - 企业级Python日期处理库
+"""
+
+__version__ = "1.0.11"
+__author__ = "StarAn"
+__email__ = "starlxa@icloud.com"
+__license__ = "MIT"
+
+# 导入核心功能
+try:
+    from .date import (
+        Date, 
+        DateRange,
+        DateError,
+        LunarDate,
+        Language,
+        today, 
+        from_string,
+        from_lunar,
+        parse_expression,
+        get_version_info,
+        get_feature_status
+    )
+except ImportError as e:
+    import warnings
+    warnings.warn(f"Staran核心功能导入失败: {e}")
+    
+    Date = None
+    DateRange = None
+    DateError = Exception
+    LunarDate = None
+    Language = None
+    
+    def today():
+        raise ImportError("Staran核心功能不可用")
+    
+    def from_string(date_string: str):
+        raise ImportError("Staran核心功能不可用")
+    
+    def from_lunar(year: int, month: int, day: int, is_leap: bool = False):
+        raise ImportError("Staran核心功能不可用")
+    
+    def parse_expression(expression: str):
+        raise ImportError("Staran核心功能不可用")
+    
+    def get_version_info():
+        return {'version': __version__, 'status': 'core_unavailable'}
+    
+    def get_feature_status():
+        return {'core_available': False}
+
+__all__ = [
+    '__version__', '__author__', '__email__', '__license__',
+    'Date', 'DateRange', 'DateError', 'LunarDate', 'Language',
+    'today', 'from_string', 'from_lunar', 'parse_expression',
+    'get_version_info', 'get_feature_status'
+]

staran/date/__init__.py

@@ -6,7 +6,7 @@ Staran 日期处理库 v1.0.10 - 简化版导入
 """
 
 # 版本信息
-__version__ = "1.0.10"
+__version__ = "1.0.11"
 __author__ = "StarAn"
 __email__ = "starlxa@icloud.com"
 

staran/date/core/lunar.py

@@ -8,9 +8,8 @@
 提供公历与农历互转功能，支持农历日期的创建、输出和比较。
 基于中国传统农历历法计算，支持1900-2100年范围。
 """
-
-import datetime
 from typing import Tuple, Optional, Union, TYPE_CHECKING
+import datetime
 
 if TYPE_CHECKING:
     from .core import Date
@@ -23,7 +22,6 @@ class LunarDate:
     """
     
     # 农历数据表 (1900-2100年)
-    # 每个数字的低12位表示12个月，第13位表示闰月月份，第14-17位表示闰月天数
     _LUNAR_INFO = [
         0x04bd8, 0x04ae0, 0x0a570, 0x054d5, 0x0d260, 0x0d950, 0x16554, 0x056a0, 0x09ad0, 0x055d2,
         0x04ae0, 0x0a5b6, 0x0a4d0, 0x0d250, 0x1d255, 0x0b540, 0x0d6a0, 0x0ada2, 0x095b0, 0x14977,
@@ -48,63 +46,19 @@ class LunarDate:
         0x0d520
     ]
     
-    # 农历月份名称 
-    _LUNAR_MONTHS = ['正', '二', '三', '四', '五', '六', '七', '八', '九', '十', '冬', '腊']
-    _LUNAR_DAYS = ['初一', '初二', '初三', '初四', '初五', '初六', '初七', '初八', '初九', '初十',
-                   '十一', '十二', '十三', '十四', '十五', '十六', '十七', '十八', '十九', '二十',
-                   '廿一', '廿二', '廿三', '廿四', '廿五', '廿六', '廿七', '廿八', '廿九', '三十']
-    
-    # 天干地支
-    _TIANGAN = ['甲', '乙', '丙', '丁', '戊', '己', '庚', '辛', '壬', '癸']
-    _DIZHI = ['子', '丑', '寅', '卯', '辰', '巳', '午', '未', '申', '酉', '戌', '亥']
-    _ZODIAC = ['鼠', '牛', '虎', '兔', '龙', '蛇', '马', '羊', '猴', '鸡', '狗', '猪']
-    
     def __init__(self, year: int, month: int, day: int, is_leap: bool = False):
-        """初始化农历日期
-        
-        Args:
-            year: 农历年份
-            month: 农历月份
-            day: 农历日期
-            is_leap: 是否闰月
-        """
         self.year = year
         self.month = month
         self.day = day
         self.is_leap = is_leap
-        
-        if not self._is_valid():
-            raise ValueError(f"无效的农历日期: {year}年{month}月{day}日")
-    
-    def _is_valid(self) -> bool:
-        """验证农历日期是否有效"""
-        if not (1900 <= self.year <= 2100):
-            return False
-        if not (1 <= self.month <= 12):
-            return False
-        if not (1 <= self.day <= 30):
-            return False
-        return True
     
     @classmethod
-    def from_solar(cls, solar_date: Union[datetime.date, 'Date']) -> 'LunarDate':
-        """从公历日期转换为农历日期
-        
-        Args:
-            solar_date: 公历日期对象
-            
-        Returns:
-            农历日期对象
-        """
+    def from_solar(cls, solar_date):
+        """从公历日期转换为农历日期"""
         if hasattr(solar_date, 'to_datetime_object'):
-            # 处理自定义Date对象
             solar_date = solar_date.to_datetime_object()
         
-        year = solar_date.year
-        month = solar_date.month
-        day = solar_date.day
-        
-        # 计算距离1900年1月31日(农历1900年正月初一)的天数
+        # 计算距离1900年1月31日的天数
         base_date = datetime.date(1900, 1, 31)
         delta = solar_date - base_date
         offset = delta.days
@@ -130,7 +84,6 @@ class LunarDate:
             if offset >= month_days:
                 offset -= month_days
                 if lunar_month == leap_month and not is_leap:
-                    # 处理闰月
                     leap_days = cls._get_lunar_month_days(lunar_year, lunar_month, True)
                     if offset >= leap_days:
                         offset -= leap_days
@@ -144,43 +97,10 @@ class LunarDate:
                 break
         
         lunar_day = offset + 1
-        
         return cls(lunar_year, lunar_month, lunar_day, is_leap)
     
-    def to_solar(self) -> datetime.date:
-        """转换为公历日期
-        
-        Returns:
-            公历日期对象
-        """
-        # 计算农历日期距离1900年正月初一的天数
-        offset = 0
-        
-        # 累加年份天数
-        for year in range(1900, self.year):
-            offset += self._get_lunar_year_days(year)
-        
-        # 累加月份天数
-        for month in range(1, self.month):
-            offset += self._get_lunar_month_days(self.year, month, False)
-            # 如果有闰月且月份匹配，还要加上闰月天数
-            leap_month = self._get_leap_month(self.year)
-            if month == leap_month:
-                offset += self._get_lunar_month_days(self.year, month, True)
-        
-        # 如果是闰月，还要加上正常月份的天数
-        if self.is_leap:
-            offset += self._get_lunar_month_days(self.year, self.month, False)
-        
-        # 加上日期天数
-        offset += self.day - 1
-        
-        # 基准日期: 1900年1月31日(农历1900年正月初一)
-        base_date = datetime.date(1900, 1, 31)
-        return base_date + datetime.timedelta(days=offset)
-    
     @classmethod
-    def _get_lunar_year_days(cls, year: int) -> int:
+    def _get_lunar_year_days(cls, year):
         """获取农历年的总天数"""
         if year < 1900 or year > 2100:
             return 0
@@ -189,8 +109,8 @@ class LunarDate:
         days = 0
         
         # 12个月的天数
-        for i in range(12):
-            days += 29 if (info & (0x10000 >> i)) == 0 else 30
+        for month in range(1, 13):
+            days += 29 if (info & (0x10000 >> month)) == 0 else 30
         
         # 闰月天数
         leap_month = cls._get_leap_month(year)
@@ -200,7 +120,7 @@ class LunarDate:
         return days
     
     @classmethod
-    def _get_lunar_month_days(cls, year: int, month: int, is_leap: bool = False) -> int:
+    def _get_lunar_month_days(cls, year, month, is_leap=False):
         """获取农历月的天数"""
         if year < 1900 or year > 2100:
             return 0
@@ -208,113 +128,23 @@ class LunarDate:
         info = cls._LUNAR_INFO[year - 1900]
         
         if is_leap:
-            # 闰月天数
             leap_month = cls._get_leap_month(year)
             if month != leap_month:
                 return 0
             return 29 if (info & 0x10000) == 0 else 30
         else:
-            # 正常月份天数
             return 29 if (info & (0x10000 >> month)) == 0 else 30
     
     @classmethod
-    def _get_leap_month(cls, year: int) -> int:
-        """获取闰月月份，如果没有闰月返回0"""
+    def _get_leap_month(cls, year):
+        """获取闰月月份"""
         if year < 1900 or year > 2100:
             return 0
         
         info = cls._LUNAR_INFO[year - 1900]
         return info & 0xf
     
-    def get_ganzhi_year(self) -> str:
-        """获取天干地支年份"""
-        # 甲子年为1984年，每60年一个周期
-        offset = (self.year - 1984) % 60
-        tiangan_index = offset % 10
-        dizhi_index = offset % 12
-        return self._TIANGAN[tiangan_index] + self._DIZHI[dizhi_index]
-    
-    def get_zodiac(self) -> str:
-        """获取生肖"""
-        return self._ZODIAC[(self.year - 1900) % 12]
-    
-    def format_chinese(self, include_year: bool = True, include_zodiac: bool = False) -> str:
-        """格式化为中文农历日期
-        
-        Args:
-            include_year: 是否包含年份
-            include_zodiac: 是否包含生肖
-            
-        Returns:
-            中文农历日期字符串
-        """
-        result = ""
-        
-        if include_year:
-            if include_zodiac:
-                result += f"{self.get_ganzhi_year()}({self.get_zodiac()})年"
-            else:
-                result += f"农历{self.year}年"
-        
-        # 月份
-        if self.is_leap:
-            result += f"闰{self._LUNAR_MONTHS[self.month - 1]}月"
-        else:
-            result += f"{self._LUNAR_MONTHS[self.month - 1]}月"
-        
-        # 日期
-        result += self._LUNAR_DAYS[self.day - 1]
-        
-        return result
-    
-    def format_compact(self) -> str:
-        """紧凑格式"""
-        leap_prefix = "闰" if self.is_leap else ""
-        return f"{self.year}{leap_prefix}{self.month:02d}{self.day:02d}"
-    
-    def format_iso_like(self) -> str:
-        """类ISO格式"""
-        leap_suffix = "L" if self.is_leap else ""
-        return f"{self.year}-{self.month:02d}{leap_suffix}-{self.day:02d}"
-    
-    def __str__(self) -> str:
-        """字符串表示"""
-        return self.format_chinese()
-    
-    def __repr__(self) -> str:
-        """调试表示"""
-        return f"LunarDate({self.year}, {self.month}, {self.day}, is_leap={self.is_leap})"
-    
-    def __eq__(self, other) -> bool:
-        """相等比较"""
-        if not isinstance(other, LunarDate):
-            return False
-        return (self.year == other.year and 
-                self.month == other.month and 
-                self.day == other.day and 
-                self.is_leap == other.is_leap)
-    
-    def __lt__(self, other) -> bool:
-        """小于比较"""
-        if not isinstance(other, LunarDate):
-            return NotImplemented
-        
-        if self.year != other.year:
-            return self.year < other.year
-        if self.month != other.month:
-            return self.month < other.month
-        if self.is_leap != other.is_leap:
-            return not self.is_leap  # 正常月份小于闰月
-        return self.day < other.day
-    
-    def __le__(self, other) -> bool:
-        """小于等于比较"""
-        return self == other or self < other
-    
-    def __gt__(self, other) -> bool:
-        """大于比较"""
-        return not self <= other
-    
-    def __ge__(self, other) -> bool:
-        """大于等于比较"""
-        return not self < other
+    def format_chinese(self):
+        """格式化为中文"""
+        leap_str = "闰" if self.is_leap else ""
+        return f"农历{self.year}年{leap_str}{self.month}月{self.day}日"

{staran-1.0.10.dist-info → staran-1.0.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: staran
-Version: 1.0.10
+Version: 1.0.11
 Summary: staran - 企业级Python日期处理库
 Home-page: https://github.com/starlxa/staran
 Author: StarAn

{staran-1.0.10.dist-info → staran-1.0.11.dist-info}/RECORD

@@ -1,9 +1,9 @@
-staran/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-staran/date/__init__.py,sha256=CPVRv_g76wGRuKIoorXsqc58buoUQl5XkIqnZdugJUg,2858
+staran/__init__.py,sha256=2fdUCSoO3lRBtz1lIayT3wjEZY2EnsEC-4kdqFYemLQ,1538
+staran/date/__init__.py,sha256=jvim48EMYAu8vR3HZRoqALh8ADkbyQinV7oAxyF28pU,2858
 staran/date/core/__init__.py,sha256=cZmvd7X36qmXUGPrf-K0xOchzPiSONv1rw1WMi1uNXA,430
 staran/date/core/core.py,sha256=1rlVqJaZZh8PxlBcE8R6aJoHP27Xwvpc6DZ5Mv30RhU,88769
 staran/date/core/i18n.py,sha256=bvnqhVGMYvW8Lt3W4uksJw9aRZ2l4cNAy0GiYEQy4II,14677
-staran/date/core/lunar.py,sha256=JCs9EJOsfCXE4jgTkfZZw85-IKvjPbtx70CapEAy4sQ,11980
+staran/date/core/lunar.py,sha256=CiGQIOdfh8mLJAKJ4VDzqp7IWObPr_6S1SCgULkfMuQ,5875
 staran/date/examples/__init__.py,sha256=5q6uxzeIhPcFo64gXybEozx4E4lt8TEEibFC-dF_EV0,163
 staran/date/examples/basic_usage.py,sha256=hsQZaMRR6tY9krLjmYrH7GrMkk2cGapY-bfjwsL_6YQ,4738
 staran/date/examples/enhanced_features.py,sha256=KDxw1d-h3N19oidCyeHKCSMUrOtr0sP7K5YI1fsowrw,6598
@@ -26,9 +26,9 @@ staran/date/tests/test_v108_features.py,sha256=wih6mY-fgq1aEYdvXkFqzoeSk73-8Mf9W
 staran/date/tests/test_v109_features.py,sha256=hN5m3DTQM8j_U9ilh3fN3cQvBZH4DPI7stGlsgdIEEw,10932
 staran/date/utils/__init__.py,sha256=W5DkeslSOINF7kq6wFz3l16fUmGI0XALNuJAALQeLLM,142
 staran/date/utils/helpers.py,sha256=9TlebdCr-YD4vrXjTFMXDG413gbSFwdUNyivAarIp5M,5553
-staran-1.0.10.dist-info/licenses/LICENSE,sha256=2EmsBIyDCono4iVXNpv5_px9qt2b7hfPq1WuyGVMNP4,1361
-staran-1.0.10.dist-info/METADATA,sha256=9FVvrpHWubF7sAn2YOSib0wyaghDys9_ao9A1z5s1Us,8012
-staran-1.0.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-staran-1.0.10.dist-info/entry_points.txt,sha256=igvLxDd-ONmb_m9IwbFKMv_uMhAyb_nPfNIq3J3rZUg,54
-staran-1.0.10.dist-info/top_level.txt,sha256=NOUZtXSh5oSIEjHrC0lQ9WmoKtD010Q00dghWyag-Zs,7
-staran-1.0.10.dist-info/RECORD,,
+staran-1.0.11.dist-info/licenses/LICENSE,sha256=2EmsBIyDCono4iVXNpv5_px9qt2b7hfPq1WuyGVMNP4,1361
+staran-1.0.11.dist-info/METADATA,sha256=mhsT-yZaaQ6NnC_UDQQICgYv7Rx_oWZzLc6dpz1x-Ms,8012
+staran-1.0.11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+staran-1.0.11.dist-info/entry_points.txt,sha256=igvLxDd-ONmb_m9IwbFKMv_uMhAyb_nPfNIq3J3rZUg,54
+staran-1.0.11.dist-info/top_level.txt,sha256=NOUZtXSh5oSIEjHrC0lQ9WmoKtD010Q00dghWyag-Zs,7
+staran-1.0.11.dist-info/RECORD,,