mayutils 1.2.4__tar.gz → 1.2.5__tar.gz

{mayutils-1.2.4 → mayutils-1.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: mayutils
-Version: 1.2.4
+Version: 1.2.5
 Summary: Utilities for Python from Mayuran Visakan
 Author: Mayuran Visakan
 Author-email: Mayuran Visakan <mayuran.k.v@gmail.com>

{mayutils-1.2.4 → mayutils-1.2.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mayutils"
-version = "1.2.4"
+version = "1.2.5"
 description = "Utilities for Python from Mayuran Visakan"
 authors = [
     { name = "Mayuran Visakan", email = "mayuran.k.v@gmail.com" }

{mayutils-1.2.4 → mayutils-1.2.5}/src/mayutils/objects/datetime.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from contextlib import _GeneratorContextManager
 from sqlite3 import register_adapter
 from typing import Any, Optional, Self, Literal
@@ -96,6 +97,125 @@ class Timezone(BaseTimezone):
 UTC = Timezone(key="UTC")
 
 
+class Date(BaseDate):
+    @classmethod
+    def from_base(
+        cls,
+        base: BaseDate,
+    ) -> Self:
+        return cls(
+            year=base.year,
+            month=base.month,
+            day=base.day,
+        )
+
+    @classmethod
+    def from_datetime(
+        cls,
+        date: _datetime.date,
+    ) -> Self:
+        return cls(
+            year=date.year,
+            month=date.month,
+            day=date.day,
+        )
+
+    @classmethod
+    def parse(
+        cls,
+        input,
+    ) -> Self:
+        output = parse(input=input)
+
+        if not isinstance(output, cls):
+            raise ValueError("Could not parse to date")
+
+        return output
+
+    def to_datetime(
+        self,
+        tz: str | Timezone = UTC,
+    ) -> DateTime:
+        return DateTime.create(
+            year=self.year,
+            month=self.month,
+            day=self.day,
+            hour=0,
+            minute=0,
+            second=0,
+            microsecond=0,
+            tz=tz,
+        )
+
+    def to_numpy(
+        self,
+    ) -> np.datetime64:
+        return np.datetime64(self)
+
+
+class Time(BaseTime):
+    @classmethod
+    def from_base(
+        cls,
+        base: BaseTime,
+    ) -> Self:
+        return cls(
+            hour=base.hour,
+            minute=base.minute,
+            second=base.second,
+            microsecond=base.microsecond,
+            tzinfo=base.tzinfo,
+        )
+
+    @classmethod
+    def from_datetime(
+        cls,
+        time: _datetime.time,
+        tz: str | Timezone | FixedTimezone | _datetime.tzinfo | None = UTC,
+    ) -> Self:
+        return cls.instance(
+            t=time,
+            tz=tz,
+        )
+
+    @classmethod
+    def parse(
+        cls,
+        input,
+    ) -> Self:
+        output = parse(input=input)
+
+        if not isinstance(output, cls):
+            raise ValueError("Could not parse to time")
+
+        return output
+
+    def today(
+        self,
+    ) -> DateTime:
+        return DateTime.now(tz=self.tzinfo).at(
+            hour=self.hour,
+            minute=self.minute,
+            second=self.second,
+            microsecond=self.microsecond,
+        )
+
+    def on(
+        self,
+        date: Date,
+    ) -> DateTime:
+        return DateTime(
+            year=date.year,
+            month=date.month,
+            day=date.day,
+            hour=self.hour,
+            minute=self.minute,
+            second=self.second,
+            microsecond=self.microsecond,
+            tzinfo=self.tzinfo,
+        )
+
+
 class DateTime(BaseDateTime):
     @classmethod
     def from_base(
@@ -277,129 +397,25 @@ class DateTime(BaseDateTime):
             microsecond=self.microsecond,
         )
 
-    def numpy(
-        self,
-    ) -> np.datetime64:
-        return np.datetime64(self)
-
-
-class Date(BaseDate):
-    @classmethod
-    def from_base(
-        cls,
-        base: BaseDate,
-    ) -> Self:
-        return cls(
-            year=base.year,
-            month=base.month,
-            day=base.day,
-        )
-
-    @classmethod
-    def from_datetime(
-        cls,
-        date: _datetime.date,
-    ) -> Self:
-        return cls(
-            year=date.year,
-            month=date.month,
-            day=date.day,
-        )
-
-    @classmethod
-    def parse(
-        cls,
-        input,
-    ) -> Self:
-        output = parse(input=input)
-
-        if not isinstance(output, cls):
-            raise ValueError("Could not parse to date")
-
-        return output
-
-    def to_datetime(
-        self,
-        tz: str | Timezone = UTC,
-    ) -> DateTime:
-        return DateTime.create(
+    def date(self) -> Date:
+        return Date(
             year=self.year,
             month=self.month,
             day=self.day,
-            hour=0,
-            minute=0,
-            second=0,
-            microsecond=0,
-            tz=tz,
-        )
-
-    def numpy(
-        self,
-    ) -> np.datetime64:
-        return np.datetime64(self)
-
-
-class Time(BaseTime):
-    @classmethod
-    def from_base(
-        cls,
-        base: BaseTime,
-    ) -> Self:
-        return cls(
-            hour=base.hour,
-            minute=base.minute,
-            second=base.second,
-            microsecond=base.microsecond,
-            tzinfo=base.tzinfo,
         )
 
-    @classmethod
-    def from_datetime(
-        cls,
-        time: _datetime.time,
-        tz: str | Timezone | FixedTimezone | _datetime.tzinfo | None = UTC,
-    ) -> Self:
-        return cls.instance(
-            t=time,
-            tz=tz,
-        )
-
-    @classmethod
-    def parse(
-        cls,
-        input,
-    ) -> Self:
-        output = parse(input=input)
-
-        if not isinstance(output, cls):
-            raise ValueError("Could not parse to time")
-
-        return output
-
-    def today(
-        self,
-    ) -> DateTime:
-        return DateTime.now(tz=self.tzinfo).at(
+    def time(self) -> Time:
+        return Time(
             hour=self.hour,
             minute=self.minute,
             second=self.second,
             microsecond=self.microsecond,
         )
 
-    def on(
+    def to_numpy(
         self,
-        date: Date,
-    ) -> DateTime:
-        return DateTime(
-            year=date.year,
-            month=date.month,
-            day=date.day,
-            hour=self.hour,
-            minute=self.minute,
-            second=self.second,
-            microsecond=self.microsecond,
-            tzinfo=self.tzinfo,
-        )
+    ) -> np.datetime64:
+        return np.datetime64(self)
 
 
 # TODO: NewInterval for working with pandas? nah add to pandas accessor? Or maybe to convert to pandas indexable thing