ecodev-core 0.0.97__tar.gz → 0.0.99__tar.gz

{ecodev_core-0.0.97 → ecodev_core-0.0.99}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ecodev-core
-Version: 0.0.97
+Version: 0.0.99
 Summary: Low level sqlmodel/fastapi/pydantic building blocks
 License: MIT
 License-File: LICENSE.md
@@ -40,6 +40,7 @@ Requires-Dist: bcrypt (>=4,<5)
 Requires-Dist: cryptography (>=46,<47)
 Requires-Dist: elasticsearch (==8.14.0)
 Requires-Dist: fastapi (>=0,<1)
+Requires-Dist: greenlet (>=3,<4)
 Requires-Dist: httpx (>=0,<1)
 Requires-Dist: numpy (>=2,<3)
 Requires-Dist: openpyxl (>=3,<4)

{ecodev_core-0.0.97 → ecodev_core-0.0.99}/ecodev_core/app_stats/activity_export.py

@@ -17,6 +17,7 @@ from ecodev_core.app_stats.constants import HOUR_GRAIN
 from ecodev_core.app_stats.constants import MONTH_GRAIN
 from ecodev_core.app_stats.contract import ActivityExport
 from ecodev_core.app_stats.contract import PagedResponse
+from ecodev_core.date_utils import as_utc
 
 
 def get_activities(
@@ -114,7 +115,7 @@ def _to_export(r, granularity: str) -> ActivityExport:
     """
     return ActivityExport(
         application=r.application,
-        period_start=r.period_start,
+        period_start=as_utc(r.period_start),
         granularity=granularity,
         method=r.method,
         activity_count=r.activity_count,

{ecodev_core-0.0.97 → ecodev_core-0.0.99}/ecodev_core/app_stats/consumer/ingest.py

@@ -17,6 +17,7 @@ from ecodev_core.app_stats.consumer.tables import RemoteActivity
 from ecodev_core.app_stats.consumer.tables import RemoteAppProject
 from ecodev_core.app_stats.contract import ActivityExport
 from ecodev_core.app_stats.contract import ProjectExport
+from ecodev_core.date_utils import as_utc
 from ecodev_core.date_utils import utc_now
 
 
@@ -71,7 +72,7 @@ def upsert_remote_activities(
         RemoteActivity(
             application=application,
             granularity=granularity,
-            period_start=item.period_start,
+            period_start=as_utc(item.period_start),
             method=item.method,
             activity_count=item.activity_count,
             unique_users=item.unique_users,
@@ -97,8 +98,8 @@ def upsert_remote_projects(
             project_id=item.project_id,
             name=item.name,
             creator=item.creator,
-            created_at=item.created_at,
-            modified_at=item.modified_at,
+            created_at=as_utc(item.created_at),
+            modified_at=as_utc(item.modified_at),
             description=item.description,
             client=item.client,
             project_type=item.project_type,

{ecodev_core-0.0.97 → ecodev_core-0.0.99}/ecodev_core/date_utils.py

@@ -13,3 +13,14 @@ def utc_now() -> datetime:
     NOTE: introduced to enforce aware datetime timezone : https://github.com/fastapi/sqlmodel/releases#release-0.0.45
     """
     return datetime.now(timezone.utc)
+
+
+def as_utc(dt: datetime | None) -> datetime | None:
+    """
+    Returns `dt` as timezone-aware UTC; naive values are assumed to already be UTC.
+    """
+    if dt is None:
+        return None
+    if dt.tzinfo is None:
+        return dt.replace(tzinfo=timezone.utc)
+    return dt.astimezone(timezone.utc)

{ecodev_core-0.0.97 → ecodev_core-0.0.99}/ecodev_core/db_upsertion.py

@@ -240,8 +240,12 @@ def _get_default_value(fld: Any, nullable: bool) -> Any:
     """
     Find if any the field default value
     """
-    if not nullable and hasattr(fld, 'default') and fld.default is not None:
+    if nullable:
+        return None
+    if getattr(fld, 'default', None) not in (None, PydanticUndefined):
         return fld.default
+    if callable(factory := getattr(fld, 'default_factory', None)):
+        return factory()
     return None
 
 
@@ -350,6 +354,8 @@ def _python_default_to_sql(value: Any, sql_type: str) -> str:
         return str(value)
     if sql_type == 'BOOLEAN':
         return 'TRUE' if value else 'FALSE'
+    if isinstance(value, datetime):
+        return f"'{value.isoformat()}'"
     if sql_type == 'BYTEA':
         if isinstance(value, bytes):
             return f"decode('{value.hex()}', 'hex')"

{ecodev_core-0.0.97 → ecodev_core-0.0.99}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ecodev-core"
-version = "0.0.97"
+version = "0.0.99"
 description = "Low level sqlmodel/fastapi/pydantic building blocks"
 authors = ["Thomas Epelbaum <tomepel@gmail.com>",
 					 "Olivier Gabriel <olivier.gabriel.geom@gmail.com>",
@@ -66,6 +66,7 @@ uvicorn = "~0"
 xlsxwriter = "~3"
 cryptography = "~46"
 requests = "~2"
+greenlet = "^3"
 
 [build-system]
 requires = ["poetry-core"]