clear-skies 1.20.3__tar.gz → 1.21.0__tar.gz

{clear_skies-1.20.3 → clear_skies-1.21.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: clear-skies
-Version: 1.20.3
+Version: 1.21.0
 Summary: A framework for building backends in the cloud
 Home-page: https://github.com/cmancone/clearskies
 License: MIT

{clear_skies-1.20.3 → clear_skies-1.21.0}/pyproject.toml

@@ -2,7 +2,7 @@
 
 [tool.poetry]
 name = "clear-skies"
-version = "1.20.3"
+version = "1.21.0"
 description = "A framework for building backends in the cloud"
 authors = [
     "Conor Mancone <cmancone@gmail.com>",

{clear_skies-1.20.3 → clear_skies-1.21.0}/src/clearskies/column_types/created.py

@@ -8,8 +8,8 @@ class Created(DateTime):
         "utc",
     ]
 
-    def __init__(self, di, datetime):
-        super().__init__(di)
+    def __init__(self, di, datetime, timezone):
+        super().__init__(di, timezone)
         self.datetime = datetime
 
     @property
@@ -22,5 +22,5 @@ class Created(DateTime):
         if self.config("utc", silent=True):
             now = self.datetime.datetime.now(self.datetime.timezone.utc)
         else:
-            now = self.datetime.datetime.now()
+            now = self.datetime.datetime.now(self._timezone)
         return {**data, self.name: now}

{clear_skies-1.20.3 → clear_skies-1.21.0}/src/clearskies/column_types/created_micro.py

@@ -8,8 +8,8 @@ class CreatedMicro(DateTimeMicro):
         "utc",
     ]
 
-    def __init__(self, di, datetime):
-        super().__init__(di)
+    def __init__(self, di, datetime, timezone):
+        super().__init__(di, timezone)
         self.datetime = datetime
 
     @property
@@ -22,5 +22,5 @@ class CreatedMicro(DateTimeMicro):
         if self.config("utc", silent=True):
             now = self.datetime.datetime.now(self.datetime.timezone.utc)
         else:
-            now = self.datetime.datetime.now()
+            now = self.datetime.datetime.now(self._timezone)
         return {**data, self.name: now}

{clear_skies-1.20.3 → clear_skies-1.21.0}/src/clearskies/column_types/datetime.py

@@ -3,7 +3,6 @@ from datetime import datetime, timezone
 import dateparser
 from ..autodoc.schema import DateTime as AutoDocDateTime
 
-
 class DateTime(Column):
     _auto_doc_class = AutoDocDateTime
     _date_format = "%Y-%m-%d %H:%M:%S"
@@ -14,8 +13,9 @@ class DateTime(Column):
         "default_date",
     ]
 
-    def __init__(self, di):
+    def __init__(self, di, timezone: datetime.tzinfo):
         super().__init__(di)
+        self._timezone = timezone
 
     def _finalize_configuration(self, configuration):
         return {
@@ -33,7 +33,7 @@ class DateTime(Column):
             date = dateparser.parse(value)
         else:
             date = value
-        return date.replace(tzinfo=timezone.utc) if date else None
+        return date.replace(tzinfo=self._timezone) if date else None
 
     def to_backend(self, data):
         if not self.name in data or type(data[self.name]) == str or data[self.name] == None:
@@ -47,7 +47,7 @@ class DateTime(Column):
         return {self.name: datetime.isoformat() if datetime else None}
 
     def build_condition(self, value, operator=None, column_prefix=""):
-        date = dateparser.parse(value).astimezone(timezone.utc).strftime(self.config("date_format"))
+        date = dateparser.parse(value).astimezone(self._timezone).strftime(self.config("date_format"))
         if not operator:
             operator = "="
         return f"{column_prefix}{self.name}{operator}{date}"

{clear_skies-1.20.3 → clear_skies-1.21.0}/src/clearskies/column_types/datetime_micro.py

@@ -1,3 +1,4 @@
+from re import T
 from .datetime import DateTime
 from datetime import datetime, timezone
 import dateparser
@@ -8,5 +9,5 @@ class DateTimeMicro(DateTime):
     _date_format = "%Y-%m-%d %H:%M:%S.%f"
     _default_date = "0000-00-00 00:00:00.000000"
 
-    def __init__(self, di):
-        super().__init__(di)
+    def __init__(self, di, timezone: datetime.tzinfo):
+        super().__init__(di, timezone)

{clear_skies-1.20.3 → clear_skies-1.21.0}/src/clearskies/column_types/timestamp.py

@@ -1,3 +1,4 @@
+import time
 from .datetime import DateTime
 from datetime import datetime, timezone
 import dateparser
@@ -28,16 +29,16 @@ class Timestamp(DateTime):
                 raise ValueError(
                     f"Invalid data was found in the backend for model {self.model_class.__name__} and column {self.name}: a string value was found that is not a timestamp.  It was '{value}'"
                 )
-            date = datetime.fromtimestamp(int(value) / mult)
+            date = datetime.fromtimestamp(int(value) / mult, self._timezone)
         elif isinstance(value, int):
-            date = datetime.fromtimestamp(value / mult)
+            date = datetime.fromtimestamp(value / mult, self._timezone)
         else:
             if not isinstance(value, datetime):
                 raise ValueError(
                     f"Invalid data was found in the backend for model {self.model_class.__name__} and column {self.name}: the value was neither an integer, a string, nor a datetime object"
                 )
             date = value
-        return date.replace(tzinfo=timezone.utc) if date else None
+        return date.replace(tzinfo=self._timezone) if date else None
 
     def to_backend(self, data):
         if not self.name in data or isinstance(data[self.name], int) or data[self.name] == None:

{clear_skies-1.20.3 → clear_skies-1.21.0}/src/clearskies/column_types/updated.py

@@ -1,3 +1,5 @@
+import datetime
+
 from .datetime import DateTime
 
 
@@ -8,8 +10,8 @@ class Updated(DateTime):
         "utc",
     ]
 
-    def __init__(self, di, datetime):
-        super().__init__(di)
+    def __init__(self, di, datetime, timezone: datetime.tzinfo):
+        super().__init__(di, timezone)
         self.datetime = datetime
 
     @property
@@ -20,5 +22,5 @@ class Updated(DateTime):
         if self.config("utc", silent=True):
             now = self.datetime.datetime.now(self.datetime.timezone.utc)
         else:
-            now = self.datetime.datetime.now()
+            now = self.datetime.datetime.now(self._timezone)
         return {**data, self.name: now}

{clear_skies-1.20.3 → clear_skies-1.21.0}/src/clearskies/column_types/updated_micro.py

@@ -1,3 +1,5 @@
+import datetime
+
 from .datetime_micro import DateTimeMicro
 
 
@@ -8,8 +10,8 @@ class UpdatedMicro(DateTimeMicro):
         "utc",
     ]
 
-    def __init__(self, di, datetime):
-        super().__init__(di)
+    def __init__(self, di, datetime, timezone: datetime.tzinfo):
+        super().__init__(di, timezone)
         self.datetime = datetime
 
     @property
@@ -20,5 +22,5 @@ class UpdatedMicro(DateTimeMicro):
         if self.config("utc", silent=True):
             now = self.datetime.datetime.now(self.datetime.timezone.utc)
         else:
-            now = self.datetime.datetime.now()
+            now = self.datetime.datetime.now(self._timezone)
         return {**data, self.name: now}

{clear_skies-1.20.3 → clear_skies-1.21.0}/src/clearskies/di/standard_dependencies.py

@@ -138,3 +138,8 @@ class StandardDependencies(DI):
 
     def provide_uuid(self):
         return uuid
+  
+    def provide_timezone(self):
+        """Set the default timezone."""
+        import datetime
+        return datetime.UTC