fix: Make Mealie Timezone-Aware

.devcontainer/devcontainer.json

@@ -27,6 +27,7 @@
         "python.formatting.yapfPath": "/usr/local/py-utils/bin/yapf",
       },
       "extensions": [
+        "charliermarsh.ruff",
         "dbaeumer.vscode-eslint",
         "matangover.mypy",
         "ms-python.black-formatter",

alembic/versions/2023-02-14-20.45.41_5ab195a474eb_add_normalized_search_properties.py

@@ -13,7 +13,7 @@
 
 import mealie.db.migration_types
 from alembic import op
-from mealie.db.models._model_utils import GUID
+from mealie.db.models._model_utils.guid import GUID
 
 # revision identifiers, used by Alembic.
 revision = "5ab195a474eb"

alembic/versions/2024-03-18-02.28.15_d7c6efd2de42_migrate_favorites_and_ratings_to_user_.py

@@ -6,7 +6,7 @@
 
 """
 
-from datetime import datetime
+from datetime import datetime, timezone
 from textwrap import dedent
 from typing import Any
 from uuid import uuid4
@@ -34,7 +34,7 @@ def new_user_rating(user_id: Any, recipe_id: Any, rating: float | None = None, i
     else:
         id = "%.32x" % uuid4().int
 
-    now = datetime.now().isoformat()
+    now = datetime.now(timezone.utc).isoformat()
     return {
         "id": id,
         "user_id": user_id,

frontend/components/Domain/Recipe/RecipeLastMade.vue

@@ -102,7 +102,7 @@
           <v-icon left>
             {{ $globals.icons.calendar }}
           </v-icon>
-            {{ $t('recipe.last-made-date', { date: value ? new Date(value+"Z").toLocaleDateString($i18n.locale) : $t("general.never") } ) }}
+            {{ $t('recipe.last-made-date', { date: value ? new Date(value).toLocaleDateString($i18n.locale) : $t("general.never") } ) }}
         </v-chip>
       </div>
     </div>
@@ -199,11 +199,7 @@ export default defineComponent({
         await userApi.recipes.updateLastMade(props.recipe.slug,  newTimelineEvent.value.timestamp);
 
         // update recipe in parent so the user can see it
-        // we remove the trailing "Z" since this is how the API returns it
-        context.emit(
-          "input", newTimelineEvent.value.timestamp
-            .substring(0, newTimelineEvent.value.timestamp.length - 1)
-        );
+        context.emit("input", newTimelineEvent.value.timestamp);
       }
 
       // update the image, if provided

frontend/components/Domain/Recipe/RecipeTimelineItem.vue

@@ -8,7 +8,7 @@
     <template v-if="!useMobileFormat" #opposite>
       <v-chip v-if="event.timestamp" label large>
         <v-icon class="mr-1"> {{ $globals.icons.calendar }} </v-icon>
-        {{ new Date(event.timestamp+"Z").toLocaleDateString($i18n.locale) }}
+        {{ new Date(event.timestamp).toLocaleDateString($i18n.locale) }}
       </v-chip>
     </template>
     <v-card
@@ -25,7 +25,7 @@
           <v-col v-if="useMobileFormat" align-self="center" class="pr-0">
               <v-chip label>
               <v-icon> {{ $globals.icons.calendar }} </v-icon>
-              {{ new Date(event.timestamp+"Z").toLocaleDateString($i18n.locale) }}
+              {{ new Date(event.timestamp || "").toLocaleDateString($i18n.locale) }}
               </v-chip>
           </v-col>
           <v-col v-else cols="9" style="margin: auto; text-align: center;">

frontend/components/Domain/ShoppingList/ShoppingListItem.vue

@@ -75,7 +75,7 @@
     <v-row v-if="listItem.checked" no-gutters class="mb-2">
       <v-col cols="auto">
         <div class="text-caption font-weight-light font-italic">
-          {{ $t("shopping-list.completed-on", {date: new Date(listItem.updateAt+"Z").toLocaleDateString($i18n.locale)}) }}
+          {{ $t("shopping-list.completed-on", {date: new Date(listItem.updateAt || "").toLocaleDateString($i18n.locale)}) }}
         </div>
       </v-col>
     </v-row>

frontend/composables/use-shopping-list-item-actions.ts

@@ -4,7 +4,7 @@ import { useUserApi } from "~/composables/api";
 import { ShoppingListItemOut } from "~/lib/api/types/group";
 
 const localStorageKey = "shopping-list-queue";
-const queueTimeout = 48 * 60 * 60 * 1000;  // 48 hours
+const queueTimeout = 5 * 60 * 1000;  // 5 minutes
 
 type ItemQueueType = "create" | "update" | "delete";
 

frontend/pages/shopping-lists/_id.vue

@@ -868,7 +868,6 @@ export default defineComponent({
 
         // set a temporary updatedAt timestamp prior to refresh so it appears at the top of the checked items
         item.updateAt = new Date().toISOString();
-        item.updateAt = item.updateAt.substring(0, item.updateAt.length-1);
       }
 
       // make updates reflect immediately

frontend/pages/user/profile/api-tokens.vue

@@ -51,7 +51,7 @@
               <v-list-item-title>
                 {{ token.name }}
               </v-list-item-title>
-              <v-list-item-subtitle> {{ $t('general.created-on-date', [$d(new Date(token.createdAt+"Z"))]) }} </v-list-item-subtitle>
+              <v-list-item-subtitle> {{ $t('general.created-on-date', [$d(new Date(token.createdAt))]) }} </v-list-item-subtitle>
             </v-list-item-content>
             <v-list-item-action>
               <BaseButton delete small @click="deleteToken(token.id)"></BaseButton>

mealie/core/release_checker.py

@@ -32,7 +32,7 @@ def get_latest_version() -> str:
 
     global _LAST_RESET
 
-    now = datetime.datetime.now()
+    now = datetime.datetime.now(datetime.timezone.utc)
 
     if not _LAST_RESET or now - _LAST_RESET > datetime.timedelta(days=MAX_DAYS_OLD):
         _LAST_RESET = now

mealie/db/models/_model_base.py

@@ -4,11 +4,13 @@
 from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column
 from text_unidecode import unidecode
 
+from ._model_utils.datetime import get_utc_now
+
 
 class SqlAlchemyBase(DeclarativeBase):
     id: Mapped[int] = mapped_column(Integer, primary_key=True)
-    created_at: Mapped[datetime | None] = mapped_column(DateTime, default=datetime.now, index=True)
-    update_at: Mapped[datetime | None] = mapped_column(DateTime, default=datetime.now, onupdate=datetime.now)
+    created_at: Mapped[datetime | None] = mapped_column(DateTime, default=get_utc_now, index=True)
+    update_at: Mapped[datetime | None] = mapped_column(DateTime, default=get_utc_now, onupdate=get_utc_now)
 
     @classmethod
     def normalize(cls, val: str) -> str:

mealie/db/models/_model_utils/__init__.py

@@ -1,7 +0,0 @@
-from .auto_init import auto_init
-from .guid import GUID
-
-__all__ = [
-    "auto_init",
-    "GUID",
-]

mealie/db/models/_model_utils/datetime.py

@@ -0,0 +1,15 @@
+from datetime import datetime, timezone
+
+
+def get_utc_now():
+    """
+    Returns the current time in UTC.
+    """
+    return datetime.now(timezone.utc)
+
+
+def get_utc_today():
+    """
+    Returns the current date in UTC.
+    """
+    return datetime.now(timezone.utc).date()

mealie/db/models/group/cookbook.py

@@ -4,13 +4,14 @@
 from sqlalchemy.orm import Mapped, mapped_column
 
 from .._model_base import BaseMixins, SqlAlchemyBase
-from .._model_utils import auto_init, guid
+from .._model_utils import guid
+from .._model_utils.auto_init import auto_init
 from ..recipe.category import Category, cookbooks_to_categories
 from ..recipe.tag import Tag, cookbooks_to_tags
 from ..recipe.tool import Tool, cookbooks_to_tools
 
 if TYPE_CHECKING:
-    from group import Group
+    from .group import Group
 
 
 class CookBook(SqlAlchemyBase, BaseMixins):

mealie/db/models/group/events.py

@@ -4,10 +4,11 @@
 from sqlalchemy.orm import Mapped, mapped_column
 
 from .._model_base import BaseMixins, SqlAlchemyBase
-from .._model_utils import GUID, auto_init
+from .._model_utils.auto_init import auto_init
+from .._model_utils.guid import GUID
 
 if TYPE_CHECKING:
-    from group import Group
+    from .group import Group
 
 
 class GroupEventNotifierOptionsModel(SqlAlchemyBase, BaseMixins):

mealie/db/models/group/exports.py

@@ -4,10 +4,11 @@
 from sqlalchemy.orm import Mapped, mapped_column
 
 from .._model_base import BaseMixins, SqlAlchemyBase
-from .._model_utils import GUID, auto_init
+from .._model_utils.auto_init import auto_init
+from .._model_utils.guid import GUID
 
 if TYPE_CHECKING:
-    from group import Group
+    from .group import Group
 
 
 class GroupDataExportsModel(SqlAlchemyBase, BaseMixins):

mealie/db/models/group/group.py

@@ -11,7 +11,8 @@
 from mealie.db.models.labels import MultiPurposeLabel
 
 from .._model_base import BaseMixins, SqlAlchemyBase
-from .._model_utils import GUID, auto_init
+from .._model_utils.auto_init import auto_init
+from .._model_utils.guid import GUID
 from ..group.invite_tokens import GroupInviteToken
 from ..group.webhooks import GroupWebhooksModel
 from ..recipe.category import Category, group_to_categories

mealie/db/models/group/invite_tokens.py

@@ -4,10 +4,11 @@
 from sqlalchemy.orm import Mapped, mapped_column
 
 from .._model_base import BaseMixins, SqlAlchemyBase
-from .._model_utils import auto_init, guid
+from .._model_utils import guid
+from .._model_utils.auto_init import auto_init
 
 if TYPE_CHECKING:
-    from group import Group
+    from .group import Group
 
 
 class GroupInviteToken(SqlAlchemyBase, BaseMixins):

mealie/db/models/group/mealplan.py

@@ -7,14 +7,14 @@
 from mealie.db.models.recipe.tag import Tag, plan_rules_to_tags
 
 from .._model_base import BaseMixins, SqlAlchemyBase
-from .._model_utils import GUID, auto_init
+from .._model_utils.auto_init import auto_init
+from .._model_utils.guid import GUID
 from ..recipe.category import Category, plan_rules_to_categories
 
 if TYPE_CHECKING:
-    from group import Group
-
     from ..recipe import RecipeModel
     from ..users import User
+    from .group import Group
 
 
 class GroupMealPlanRules(BaseMixins, SqlAlchemyBase):

mealie/db/models/group/preferences.py

@@ -5,11 +5,11 @@
 from sqlalchemy.orm import Mapped, mapped_column
 
 from .._model_base import BaseMixins, SqlAlchemyBase
-from .._model_utils import auto_init
+from .._model_utils.auto_init import auto_init
 from .._model_utils.guid import GUID
 
 if TYPE_CHECKING:
-    from group import Group
+    from .group import Group
 
 
 class GroupPreferencesModel(SqlAlchemyBase, BaseMixins):

mealie/db/models/group/recipe_action.py

@@ -4,10 +4,11 @@
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
 from .._model_base import BaseMixins, SqlAlchemyBase
-from .._model_utils import GUID, auto_init
+from .._model_utils.auto_init import auto_init
+from .._model_utils.guid import GUID
 
 if TYPE_CHECKING:
-    from group import Group
+    from .group import Group
 
 
 class GroupRecipeAction(SqlAlchemyBase, BaseMixins):

mealie/db/models/group/report.py

@@ -8,11 +8,12 @@
 
 from mealie.db.models._model_base import BaseMixins, SqlAlchemyBase
 
-from .._model_utils import auto_init
+from .._model_utils.auto_init import auto_init
+from .._model_utils.datetime import get_utc_now
 from .._model_utils.guid import GUID
 
 if TYPE_CHECKING:
-    from group import Group
+    from .group import Group
 
 
 class ReportEntryModel(SqlAlchemyBase, BaseMixins):
@@ -22,7 +23,7 @@ class ReportEntryModel(SqlAlchemyBase, BaseMixins):
     success: Mapped[bool | None] = mapped_column(Boolean, default=False)
     message: Mapped[str] = mapped_column(String, nullable=True)
     exception: Mapped[str] = mapped_column(String, nullable=True)
-    timestamp: Mapped[datetime] = mapped_column(DateTime, nullable=False, default=datetime.utcnow)
+    timestamp: Mapped[datetime] = mapped_column(DateTime, nullable=False, default=get_utc_now)
 
     report_id: Mapped[GUID] = mapped_column(GUID, ForeignKey("group_reports.id"), nullable=False, index=True)
     report: Mapped["ReportModel"] = orm.relationship("ReportModel", back_populates="entries")
@@ -39,7 +40,7 @@ class ReportModel(SqlAlchemyBase, BaseMixins):
     name: Mapped[str] = mapped_column(String, nullable=False)
     status: Mapped[str] = mapped_column(String, nullable=False)
     category: Mapped[str] = mapped_column(String, index=True, nullable=False)
-    timestamp: Mapped[datetime] = mapped_column(DateTime, nullable=False, default=datetime.utcnow)
+    timestamp: Mapped[datetime] = mapped_column(DateTime, nullable=False, default=get_utc_now)
 
     entries: Mapped[list[ReportEntryModel]] = orm.relationship(
         ReportEntryModel, back_populates="report", cascade="all, delete-orphan"

mealie/db/models/group/shopping_list.py

@@ -1,5 +1,5 @@
 from contextvars import ContextVar
-from datetime import datetime
+from datetime import datetime, timezone
 from typing import TYPE_CHECKING, Optional
 
 from pydantic import ConfigDict
@@ -11,7 +11,8 @@
 from mealie.db.models.recipe.api_extras import ShoppingListExtras, ShoppingListItemExtras, api_extras
 
 from .._model_base import BaseMixins, SqlAlchemyBase
-from .._model_utils import GUID, auto_init
+from .._model_utils.auto_init import auto_init
+from .._model_utils.guid import GUID
 from ..recipe.ingredient import IngredientFoodModel, IngredientUnitModel
 
 if TYPE_CHECKING:
@@ -203,7 +204,7 @@ def update_shopping_lists(session: orm.Session, _):
             if not shopping_list:
                 continue
 
-            shopping_list.update_at = datetime.now()
+            shopping_list.update_at = datetime.now(timezone.utc)
         local_session.commit()
     except Exception:
         local_session.rollback()

mealie/db/models/group/webhooks.py

@@ -1,14 +1,15 @@
-from datetime import datetime, time
+from datetime import datetime, time, timezone
 from typing import TYPE_CHECKING, Optional
 
 from sqlalchemy import Boolean, ForeignKey, String, Time, orm
 from sqlalchemy.orm import Mapped, mapped_column
 
 from .._model_base import BaseMixins, SqlAlchemyBase
-from .._model_utils import GUID, auto_init
+from .._model_utils.auto_init import auto_init
+from .._model_utils.guid import GUID
 
 if TYPE_CHECKING:
-    from group import Group
+    from .group import Group
 
 
 class GroupWebhooksModel(SqlAlchemyBase, BaseMixins):
@@ -24,7 +25,7 @@ class GroupWebhooksModel(SqlAlchemyBase, BaseMixins):
 
     # New Fields
     webhook_type: Mapped[str | None] = mapped_column(String, default="")  # Future use for different types of webhooks
-    scheduled_time: Mapped[time | None] = mapped_column(Time, default=lambda: datetime.now().time())
+    scheduled_time: Mapped[time | None] = mapped_column(Time, default=lambda: datetime.now(timezone.utc).time())
 
     # Columne is no longer used but is kept for since it's super annoying to
     # delete a column in SQLite and it's not a big deal to keep it around

mealie/db/models/labels.py

@@ -5,13 +5,13 @@
 
 from mealie.db.models._model_base import BaseMixins, SqlAlchemyBase
 
-from ._model_utils import auto_init
+from ._model_utils.auto_init import auto_init
 from ._model_utils.guid import GUID
 
 if TYPE_CHECKING:
-    from group import Group
-    from group.shopping_list import ShoppingListItem, ShoppingListMultiPurposeLabel
-    from recipe import IngredientFoodModel
+    from .group.group import Group
+    from .group.shopping_list import ShoppingListItem, ShoppingListMultiPurposeLabel
+    from .recipe import IngredientFoodModel
 
 
 class MultiPurposeLabel(SqlAlchemyBase, BaseMixins):

mealie/db/models/recipe/comment.py

@@ -4,7 +4,7 @@
 from sqlalchemy.orm import Mapped, mapped_column
 
 from mealie.db.models._model_base import BaseMixins, SqlAlchemyBase
-from mealie.db.models._model_utils import auto_init
+from mealie.db.models._model_utils.auto_init import auto_init
 from mealie.db.models._model_utils.guid import GUID
 
 if TYPE_CHECKING:

mealie/db/models/recipe/ingredient.py

@@ -9,7 +9,7 @@
 from mealie.db.models.labels import MultiPurposeLabel
 from mealie.db.models.recipe.api_extras import IngredientFoodExtras, api_extras
 
-from .._model_utils import auto_init
+from .._model_utils.auto_init import auto_init
 from .._model_utils.guid import GUID
 
 if TYPE_CHECKING: