clear-skies 1.18.32__py3-none-any.whl → 1.19.1__py3-none-any.whl

{clear_skies-1.18.32.dist-info → clear_skies-1.19.1.dist-info}/METADATA

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

{clear_skies-1.18.32.dist-info → clear_skies-1.19.1.dist-info}/RECORD

@@ -54,19 +54,21 @@ clearskies/backends/memory_backend.py,sha256=6Ts_NtP9S_QisvpNcQKO0CUqhCRAuL3d5LZ
 clearskies/backends/restful_api_advanced_search_backend.py,sha256=uiR4SEKhLNmczYJEAkVMIdPWxQc4YWSp-_WzcSL7DEo,5480
 clearskies/backends/secrets_backend.py,sha256=4lzrgdL_O_pgCT5HknV2gotFgp9GzjQ5_2n0-4H4kvs,2204
 clearskies/binding_config.py,sha256=bF8LBNEgJacwKCqToAtDqN9hv5omzU7zt_4qB9KPtE0,457
-clearskies/column_types/__init__.py,sha256=WAEB52v0m_Yzg_H3sSGMsRoKFcKkB1oEZXIONocYwy8,3747
+clearskies/column_types/__init__.py,sha256=QHEFFd3wRXvaOR7uZk-bpVLlLoTiN3D4S8sBU9rFwCE,4330
 clearskies/column_types/audit.py,sha256=meDFV0s4u9i6UojN5f6EQk_kh-nGP8xPscCRa2Nd-yw,8102
 clearskies/column_types/belongs_to.py,sha256=a64yQ1kWRiljOfHToGsyKbAqdgNLvbRKBYEzrp1IWXo,10714
 clearskies/column_types/boolean.py,sha256=1yyM1CUfgD84pPE65c1OP1Qjf_J0Z45hjPrDR51AUkQ,1878
 clearskies/column_types/category_tree.py,sha256=PgNmzZPyqYS5NADH_QTCxLvDXZFxzv5ESKTkvPrrLXo,9140
 clearskies/column_types/column.py,sha256=PUrFyA2KmSyAZTAiJPfHy5Dlc1YPEb62c7r0BOTkF1s,13541
-clearskies/column_types/created.py,sha256=R8P3egUb7JEHoU_NtbmN9OIwBUHQ0XFi1GoAb5RpSkI,339
+clearskies/column_types/created.py,sha256=S78e1VuvvUPYiI79gWGqlPzMSLIbXMpaYQMw8as7l38,615
 clearskies/column_types/created_by_authorization_data.py,sha256=--1w1TOSo2CMwrpn6Y_iorl2RTqLgG8MbR8k27qreew,1108
 clearskies/column_types/created_by_header.py,sha256=5sY6vjtra-BrAgUE4zkuLhBtzCVWHNtJPwMozPw_7_s,520
 clearskies/column_types/created_by_ip.py,sha256=wwCUoEwHEVGN89x4xP7NJ6QR85Aum6v3JmxofoQrqtg,395
 clearskies/column_types/created_by_routing_data.py,sha256=EhVorRaGV2OhEb0YSPwPmrsK2NQycYgGEd4ab8-qI2I,569
 clearskies/column_types/created_by_user_agent.py,sha256=sSYDRrqSjsCwcYlhF_s9NO-iDww3PaH6aO2ATp_SKGQ,419
-clearskies/column_types/datetime.py,sha256=MuVaeI6FMgevTdgv6djZjlHogs72TC1HTuYdw_6MF2M,3824
+clearskies/column_types/created_micro.py,sha256=EqeHB3ZHbi4nCa1rbrKy1TbooT9U3Kfw5z4jUvLi32U,636
+clearskies/column_types/datetime.py,sha256=OEy5eMfqWp6KOqEHQa3Ga_tl0oawtcMRBafI1SPYDFk,4275
+clearskies/column_types/datetime_micro.py,sha256=3DxtkeJZhWigdni7QEJFV3BJuCmXJMyFQjDZ9jyI144,328
 clearskies/column_types/email.py,sha256=rCaCFCxGhVzJcYVeGm98S6e7myJ6eQX9YznqAZIgwQI,606
 clearskies/column_types/float.py,sha256=j8jJeBueSOusPtAFCWgLHYBncfLnqT1U7bh1zcAkYiA,1332
 clearskies/column_types/has_many.py,sha256=Z4oM1g2dQx6H9171c52FLC41nLryCOKmh51I75mYmmY,5895
@@ -76,7 +78,8 @@ clearskies/column_types/many_to_many.py,sha256=Yu5wmMkVqRteMrH_8uSZK-bM_IrfDyv6A
 clearskies/column_types/many_to_many_with_data.py,sha256=NOYjZedeLIWVyDV4BTRyNmhkNHZzx6SkHLFbL-VqHQU,7769
 clearskies/column_types/select.py,sha256=1oBslTJ_7QCjlFeEcwJVRL-ED4sXwCESVFRAOonvG2I,297
 clearskies/column_types/string.py,sha256=XbHC31TmlW0k86cvdVJBDyowU8Xis6Te6R0rPLXgLpI,863
-clearskies/column_types/updated.py,sha256=ZAHTHZtKbZQE_JwZ2wMwAUSr4PUYNscy8SwzZGko8hU,290
+clearskies/column_types/updated.py,sha256=FNyRK-PS6lgFQ9QN2VrcIZP2g5EHGhll6pf-MgqMH7s,566
+clearskies/column_types/updated_micro.py,sha256=3geqsV4nsPB9xDKyvQDGniU-KMqM8WvoqHfUYcBqGJY,587
 clearskies/column_types/uuid.py,sha256=pA6Cd-1QSRuUpz0PxWAGRdG01hW7bpIicOhhJvAvDkQ,711
 clearskies/columns.py,sha256=3PgLopL1l20vVWaUqOJkwXMr06a-gFHEsbExfOWVB4I,5925
 clearskies/condition_parser.py,sha256=IXl51-rDxws7-nAtTVu_m6gTegtpkDnoGAFX2MTPDIo,6589
@@ -189,7 +192,7 @@ clearskies/tests/simple_api/models/__init__.py,sha256=nUA0W6fgXw_Bxa9CudkaDkC80t
 clearskies/tests/simple_api/models/status.py,sha256=PEhPbaQh5qdUNHp8O0gz91LOLENAEBtqSaHxUPXchaM,699
 clearskies/tests/simple_api/models/user.py,sha256=5_P4Tp1tTdX7PkMJ__epPM5MA7JAeVYGas69vcWloLc,819
 clearskies/tests/simple_api/users_api.py,sha256=KYXCgEofDxHeRdQK67txN5oYUPvxxmB8JTku7L-apk4,2344
-clear_skies-1.18.32.dist-info/LICENSE,sha256=3Ehd0g3YOpCj8sqj0Xjq5qbOtjjgk9qzhhD9YjRQgOA,1053
-clear_skies-1.18.32.dist-info/METADATA,sha256=_HzZ08JOblFHCDkpP8QbG0Q7VKbqYBDRR962zrsorpQ,1367
-clear_skies-1.18.32.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
-clear_skies-1.18.32.dist-info/RECORD,,
+clear_skies-1.19.1.dist-info/LICENSE,sha256=3Ehd0g3YOpCj8sqj0Xjq5qbOtjjgk9qzhhD9YjRQgOA,1053
+clear_skies-1.19.1.dist-info/METADATA,sha256=DX_73NV_YKj9ZGgLCWUMttObuA9R60kC4_EQXfTVgqs,1366
+clear_skies-1.19.1.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
+clear_skies-1.19.1.dist-info/RECORD,,

clearskies/column_types/__init__.py

@@ -9,7 +9,9 @@ from .created_by_header import CreatedByHeader
 from .created_by_ip import CreatedByIp
 from .created_by_routing_data import CreatedByRoutingData
 from .created_by_user_agent import CreatedByUserAgent
+from .created_micro import CreatedMicro
 from .datetime import DateTime
+from .datetime_micro import DateTimeMicro
 from .email import Email
 from .float import Float
 from .has_many import HasMany
@@ -20,6 +22,7 @@ from .many_to_many_with_data import ManyToManyWithData
 from .select import Select
 from .string import String
 from .updated import Updated
+from .updated_micro import UpdatedMicro
 from .uuid import UUID
 
 
@@ -67,10 +70,18 @@ def created_by_user_agent(name, **kwargs):
     return build_column_config(name, CreatedByUserAgent, **kwargs)
 
 
+def created_micro(name, **kwargs):
+    return build_column_config(name, CreatedMicro, **kwargs)
+
+
 def datetime(name, **kwargs):
     return build_column_config(name, DateTime, **kwargs)
 
 
+def datetime_micro(name, **kwargs):
+    return build_column_config(name, DateTimeMicro, **kwargs)
+
+
 def email(name, **kwargs):
     return build_column_config(name, Email, **kwargs)
 
@@ -111,6 +122,10 @@ def updated(name, **kwargs):
     return build_column_config(name, Updated, **kwargs)
 
 
+def updated_micro(name, **kwargs):
+    return build_column_config(name, UpdatedMicro, **kwargs)
+
+
 def uuid(name, **kwargs):
     return build_column_config(name, UUID, **kwargs)
 
@@ -127,15 +142,21 @@ __all__ = [
     "CategoryTree",
     "Column",
     "created",
+    "created_micro",
     "Created",
+    "CreatdMicro",
     "created_by_authorization_data",
     "CreatedByAuthorizationData",
     "created_by_ip",
     "CreatedByIp",
     "created_by_user_agent",
     "CreatedByUserAgent",
+    "CreatedMicro",
+    "created_micro",
     "datetime",
+    "datetime_micro",
     "DateTime",
+    "DateTimeMicro",
     "email",
     "Email",
     "float",
@@ -155,7 +176,9 @@ __all__ = [
     "string",
     "String",
     "updated",
+    "updated_micro",
     "Updated",
+    "UpdatedMicro",
     "uuid",
     "UUID",
 ]

clearskies/column_types/created.py

@@ -2,9 +2,15 @@ from .datetime import DateTime
 
 
 class Created(DateTime):
-    def __init__(self, di, now):
+    my_configs = [
+        "date_format",
+        "default_date",
+        "utc",
+    ]
+
+    def __init__(self, di, datetime):
         super().__init__(di)
-        self.now = now
+        self.datetime = datetime
 
     @property
     def is_writeable(self):
@@ -13,4 +19,8 @@ class Created(DateTime):
     def pre_save(self, data, model):
         if model.exists:
             return data
-        return {**data, self.name: self.now}
+        if self.config("utc", silent=True):
+            now = self.datetime.datetime.now(self.datetime.timezone.utc)
+        else:
+            now = self.datetime.datetime.now()
+        return {**data, self.name: now}

clearskies/column_types/created_micro.py

@@ -0,0 +1,26 @@
+from .datetime_micro import DateTimeMicro
+
+
+class CreatedMicro(DateTimeMicro):
+    my_configs = [
+        "date_format",
+        "default_date",
+        "utc",
+    ]
+
+    def __init__(self, di, datetime):
+        super().__init__(di)
+        self.datetime = datetime
+
+    @property
+    def is_writeable(self):
+        return False
+
+    def pre_save(self, data, model):
+        if model.exists:
+            return data
+        if self.config("utc", silent=True):
+            now = self.datetime.datetime.now(self.datetime.timezone.utc)
+        else:
+            now = self.datetime.datetime.now()
+        return {**data, self.name: now}

clearskies/column_types/datetime.py

@@ -6,12 +6,28 @@ from ..autodoc.schema import DateTime as AutoDocDateTime
 
 class DateTime(Column):
     _auto_doc_class = AutoDocDateTime
+    _date_format = "%Y-%m-%d %H:%M:%S"
+    _default_date = "0000-00-00 00:00:00"
+
+    my_configs = [
+        "date_format",
+        "default_date",
+    ]
 
     def __init__(self, di):
         super().__init__(di)
 
+    def _finalize_configuration(self, configuration):
+        return {
+            **{
+                "date_format": self._date_format,
+                "default_date": self._default_date,
+            },
+            **super()._finalize_configuration(configuration),
+        }
+
     def from_backend(self, value):
-        if not value or value == "0000-00-00 00:00:00":
+        if not value or value == self.config("default_date"):
             date = None
         elif type(value) == str:
             date = dateparser.parse(value)
@@ -24,14 +40,14 @@ class DateTime(Column):
             return data
 
         # hopefully this is a Python datetime object in UTC timezone...
-        return {**data, **{self.name: data[self.name].strftime("%Y-%m-%d %H:%M:%S")}}
+        return {**data, **{self.name: data[self.name].strftime(self.config("date_format"))}}
 
     def to_json(self, model):
         datetime = model.get(self.name, silent=True)
         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("%Y-%m-%d %H:%M:%S")
+        date = dateparser.parse(value).astimezone(timezone.utc).strftime(self.config("date_format"))
         if not operator:
             operator = "="
         return f"{column_prefix}{self.name}{operator}{date}"

clearskies/column_types/datetime_micro.py

@@ -0,0 +1,12 @@
+from .datetime import DateTime
+from datetime import datetime, timezone
+import dateparser
+from ..autodoc.schema import DateTime as AutoDocDateTime
+
+
+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)

clearskies/column_types/updated.py

@@ -2,13 +2,23 @@ from .datetime import DateTime
 
 
 class Updated(DateTime):
-    def __init__(self, di, now):
+    my_configs = [
+        "date_format",
+        "default_date",
+        "utc",
+    ]
+
+    def __init__(self, di, datetime):
         super().__init__(di)
-        self.now = now
+        self.datetime = datetime
 
     @property
     def is_writeable(self):
         return False
 
     def pre_save(self, data, model):
-        return {**data, self.name: self.now}
+        if self.config("utc", silent=True):
+            now = self.datetime.datetime.now(self.datetime.timezone.utc)
+        else:
+            now = self.datetime.datetime.now()
+        return {**data, self.name: now}

clearskies/column_types/updated_micro.py

@@ -0,0 +1,24 @@
+from .datetime_micro import DateTimeMicro
+
+
+class UpdatedMicro(DateTimeMicro):
+    my_configs = [
+        "date_format",
+        "default_date",
+        "utc",
+    ]
+
+    def __init__(self, di, datetime):
+        super().__init__(di)
+        self.datetime = datetime
+
+    @property
+    def is_writeable(self):
+        return False
+
+    def pre_save(self, data, model):
+        if self.config("utc", silent=True):
+            now = self.datetime.datetime.now(self.datetime.timezone.utc)
+        else:
+            now = self.datetime.datetime.now()
+        return {**data, self.name: now}