sandwitches 1.4.2__py3-none-any.whl → 2.0.0__py3-none-any.whl

sandwitches/migrations/0001_initial.py

@@ -1,13 +1,22 @@
-# Generated by Django 5.2.8 on 2025-11-05 19:15
+# Generated by Django 6.0 on 2025-12-31 16:09
 
+import django.contrib.auth.models
+import django.contrib.auth.validators
+import django.core.validators
+import django.db.models.deletion
+import django.utils.timezone
 import sandwitches.storage
+import simple_history.models
+from django.conf import settings
 from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
     initial = True
 
-    dependencies = []
+    dependencies = [
+        ("auth", "0012_alter_user_first_name_max_length"),
+    ]
 
     operations = [
         migrations.CreateModel(
@@ -31,6 +40,188 @@ class Migration(migrations.Migration):
                 "ordering": ("name",),
             },
         ),
+        migrations.CreateModel(
+            name="User",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("password", models.CharField(max_length=128, verbose_name="password")),
+                (
+                    "last_login",
+                    models.DateTimeField(
+                        blank=True, null=True, verbose_name="last login"
+                    ),
+                ),
+                (
+                    "is_superuser",
+                    models.BooleanField(
+                        default=False,
+                        help_text="Designates that this user has all permissions without explicitly assigning them.",
+                        verbose_name="superuser status",
+                    ),
+                ),
+                (
+                    "username",
+                    models.CharField(
+                        error_messages={
+                            "unique": "A user with that username already exists."
+                        },
+                        help_text="Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.",
+                        max_length=150,
+                        unique=True,
+                        validators=[
+                            django.contrib.auth.validators.UnicodeUsernameValidator()
+                        ],
+                        verbose_name="username",
+                    ),
+                ),
+                (
+                    "first_name",
+                    models.CharField(
+                        blank=True, max_length=150, verbose_name="first name"
+                    ),
+                ),
+                (
+                    "last_name",
+                    models.CharField(
+                        blank=True, max_length=150, verbose_name="last name"
+                    ),
+                ),
+                (
+                    "email",
+                    models.EmailField(
+                        blank=True, max_length=254, verbose_name="email address"
+                    ),
+                ),
+                (
+                    "is_staff",
+                    models.BooleanField(
+                        default=False,
+                        help_text="Designates whether the user can log into this admin site.",
+                        verbose_name="staff status",
+                    ),
+                ),
+                (
+                    "is_active",
+                    models.BooleanField(
+                        default=True,
+                        help_text="Designates whether this user should be treated as active. Unselect this instead of deleting accounts.",
+                        verbose_name="active",
+                    ),
+                ),
+                (
+                    "date_joined",
+                    models.DateTimeField(
+                        default=django.utils.timezone.now, verbose_name="date joined"
+                    ),
+                ),
+                (
+                    "avatar",
+                    models.ImageField(blank=True, null=True, upload_to="avatars"),
+                ),
+                ("bio", models.TextField(blank=True)),
+                (
+                    "language",
+                    models.CharField(
+                        choices=[("en", "English"), ("nl", "Nederlands")],
+                        default="en",
+                        max_length=10,
+                    ),
+                ),
+                (
+                    "groups",
+                    models.ManyToManyField(
+                        blank=True,
+                        help_text="The groups this user belongs to. A user will get all permissions granted to each of their groups.",
+                        related_name="user_set",
+                        related_query_name="user",
+                        to="auth.group",
+                        verbose_name="groups",
+                    ),
+                ),
+                (
+                    "user_permissions",
+                    models.ManyToManyField(
+                        blank=True,
+                        help_text="Specific permissions for this user.",
+                        related_name="user_set",
+                        related_query_name="user",
+                        to="auth.permission",
+                        verbose_name="user permissions",
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "User",
+                "verbose_name_plural": "Users",
+            },
+            managers=[
+                ("objects", django.contrib.auth.models.UserManager()),
+            ],
+        ),
+        migrations.CreateModel(
+            name="HistoricalRecipe",
+            fields=[
+                (
+                    "id",
+                    models.BigIntegerField(
+                        auto_created=True, blank=True, db_index=True, verbose_name="ID"
+                    ),
+                ),
+                ("title", models.CharField(db_index=True, max_length=255)),
+                ("slug", models.SlugField(blank=True, max_length=255)),
+                ("description", models.TextField(blank=True)),
+                ("ingredients", models.TextField(blank=True)),
+                ("instructions", models.TextField(blank=True)),
+                ("image", models.TextField(blank=True, max_length=100, null=True)),
+                ("created_at", models.DateTimeField(blank=True, editable=False)),
+                ("updated_at", models.DateTimeField(blank=True, editable=False)),
+                ("history_id", models.AutoField(primary_key=True, serialize=False)),
+                ("history_date", models.DateTimeField(db_index=True)),
+                ("history_change_reason", models.CharField(max_length=100, null=True)),
+                (
+                    "history_type",
+                    models.CharField(
+                        choices=[("+", "Created"), ("~", "Changed"), ("-", "Deleted")],
+                        max_length=1,
+                    ),
+                ),
+                (
+                    "history_user",
+                    models.ForeignKey(
+                        null=True,
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        related_name="+",
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+                (
+                    "uploaded_by",
+                    models.ForeignKey(
+                        blank=True,
+                        db_constraint=False,
+                        null=True,
+                        on_delete=django.db.models.deletion.DO_NOTHING,
+                        related_name="+",
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "historical Recipe",
+                "verbose_name_plural": "historical Recipes",
+                "ordering": ("-history_date", "-history_id"),
+                "get_latest_by": ("history_date", "history_id"),
+            },
+            bases=(simple_history.models.HistoricalChanges, models.Model),
+        ),
         migrations.CreateModel(
             name="Recipe",
             fields=[
@@ -59,6 +250,16 @@ class Migration(migrations.Migration):
                 ),
                 ("created_at", models.DateTimeField(auto_now_add=True)),
                 ("updated_at", models.DateTimeField(auto_now=True)),
+                (
+                    "uploaded_by",
+                    models.ForeignKey(
+                        blank=True,
+                        null=True,
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        related_name="recipes",
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
                 (
                     "tags",
                     models.ManyToManyField(
@@ -72,4 +273,56 @@ class Migration(migrations.Migration):
                 "ordering": ("-created_at",),
             },
         ),
+        migrations.AddField(
+            model_name="user",
+            name="favorites",
+            field=models.ManyToManyField(
+                blank=True, related_name="favorited_by", to="sandwitches.recipe"
+            ),
+        ),
+        migrations.CreateModel(
+            name="Rating",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "score",
+                    models.FloatField(
+                        validators=[
+                            django.core.validators.MinValueValidator(0.0),
+                            django.core.validators.MaxValueValidator(10.0),
+                        ]
+                    ),
+                ),
+                ("created_at", models.DateTimeField(auto_now_add=True)),
+                ("updated_at", models.DateTimeField(auto_now=True)),
+                (
+                    "user",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="ratings",
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+                (
+                    "recipe",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="ratings",
+                        to="sandwitches.recipe",
+                    ),
+                ),
+            ],
+            options={
+                "ordering": ("-updated_at",),
+                "unique_together": {("recipe", "user")},
+            },
+        ),
     ]

sandwitches/migrations/0002_historicalrecipe_servings_recipe_servings.py

@@ -0,0 +1,27 @@
+# Generated by Django 6.0 on 2026-01-13 11:59
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("sandwitches", "0001_initial"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="historicalrecipe",
+            name="servings",
+            field=models.IntegerField(
+                default=1, validators=[django.core.validators.MinValueValidator(1)]
+            ),
+        ),
+        migrations.AddField(
+            model_name="recipe",
+            name="servings",
+            field=models.IntegerField(
+                default=1, validators=[django.core.validators.MinValueValidator(1)]
+            ),
+        ),
+    ]

sandwitches/migrations/0003_setting.py

@@ -0,0 +1,35 @@
+# Generated by Django 6.0 on 2026-01-14 09:13
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("sandwitches", "0002_historicalrecipe_servings_recipe_servings"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="Setting",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("site_name", models.CharField(default="Sandwitches", max_length=255)),
+                ("site_description", models.TextField(blank=True)),
+                ("email", models.EmailField(blank=True, max_length=254)),
+                ("ai_connection_point", models.URLField(blank=True)),
+                ("ai_model", models.CharField(blank=True, max_length=255)),
+                ("ai_api_key", models.CharField(blank=True, max_length=255)),
+            ],
+            options={
+                "verbose_name": "Site Settings",
+            },
+        ),
+    ]

sandwitches/migrations/0004_alter_setting_ai_api_key_and_more.py

@@ -0,0 +1,37 @@
+# Generated by Django 6.0 on 2026-01-14 09:32
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("sandwitches", "0003_setting"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="setting",
+            name="ai_api_key",
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+        migrations.AlterField(
+            model_name="setting",
+            name="ai_connection_point",
+            field=models.URLField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name="setting",
+            name="ai_model",
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+        migrations.AlterField(
+            model_name="setting",
+            name="email",
+            field=models.EmailField(blank=True, max_length=254, null=True),
+        ),
+        migrations.AlterField(
+            model_name="setting",
+            name="site_description",
+            field=models.TextField(blank=True, null=True),
+        ),
+    ]

sandwitches/migrations/0005_rating_comment.py

@@ -0,0 +1,17 @@
+# Generated by Django 6.0 on 2026-01-14 10:03
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("sandwitches", "0004_alter_setting_ai_api_key_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="rating",
+            name="comment",
+            field=models.TextField(blank=True),
+        ),
+    ]

sandwitches/models.py

@@ -2,20 +2,60 @@ from django.db import models
 from django.utils.text import slugify
 from .storage import HashedFilenameStorage
 from simple_history.models import HistoricalRecords
-from django.contrib.auth import get_user_model
+from django.contrib.auth.models import AbstractUser
 from django.db.models import Avg
 from .tasks import email_users
 from django.conf import settings
 from django.core.validators import MinValueValidator, MaxValueValidator
 import logging
 from django.urls import reverse
+from solo.models import SingletonModel
 
 from imagekit.models import ImageSpecField
 from imagekit.processors import ResizeToFill
 
 hashed_storage = HashedFilenameStorage()
 
-User = get_user_model()
+
+class Setting(SingletonModel):
+    site_name = models.CharField(max_length=255, default="Sandwitches")
+    site_description = models.TextField(blank=True, null=True)
+    email = models.EmailField(blank=True, null=True)
+    ai_connection_point = models.URLField(blank=True, null=True)
+    ai_model = models.CharField(max_length=255, blank=True, null=True)
+    ai_api_key = models.CharField(max_length=255, blank=True, null=True)
+
+    def __str__(self):
+        return "Site Settings"
+
+    class Meta:
+        verbose_name = "Site Settings"
+
+
+class User(AbstractUser):
+    avatar = models.ImageField(upload_to="avatars", blank=True, null=True)
+    avatar_thumbnail = ImageSpecField(
+        source="avatar",
+        processors=[ResizeToFill(100, 50)],
+        format="JPEG",
+        options={"quality": 60},
+    )
+    bio = models.TextField(blank=True)
+    language = models.CharField(
+        max_length=10,
+        choices=settings.LANGUAGES,
+        default=settings.LANGUAGE_CODE,
+    )
+    favorites = models.ManyToManyField(
+        "Recipe", related_name="favorited_by", blank=True
+    )
+
+    class Meta:
+        verbose_name = "User"
+        verbose_name_plural = "Users"
+
+    def __str__(self):
+        return self.username
 
 
 class Tag(models.Model):
@@ -48,8 +88,9 @@ class Recipe(models.Model):
     description = models.TextField(blank=True)
     ingredients = models.TextField(blank=True)
     instructions = models.TextField(blank=True)
+    servings = models.IntegerField(default=1, validators=[MinValueValidator(1)])
     uploaded_by = models.ForeignKey(
-        User,
+        settings.AUTH_USER_MODEL,
         related_name="recipes",
         on_delete=models.SET_NULL,
         null=True,
@@ -158,10 +199,13 @@ class Recipe(models.Model):
 
 class Rating(models.Model):
     recipe = models.ForeignKey(Recipe, related_name="ratings", on_delete=models.CASCADE)
-    user = models.ForeignKey(User, related_name="ratings", on_delete=models.CASCADE)
+    user = models.ForeignKey(
+        settings.AUTH_USER_MODEL, related_name="ratings", on_delete=models.CASCADE
+    )
     score = models.FloatField(
         validators=[MinValueValidator(0.0), MaxValueValidator(10.0)]
     )
+    comment = models.TextField(blank=True)
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
 

sandwitches/settings.py

@@ -12,10 +12,11 @@ https://docs.djangoproject.com/en/5.2/ref/settings/
 
 from pathlib import Path
 import os
+
 from django.core.exceptions import ImproperlyConfigured
 from . import storage
 
-DEBUG = bool(os.environ.get("DEBUG", default=0))  # ty:ignore[no-matching-overload]
+DEBUG = bool(os.environ.get("DEBUG", default=0))
 
 SECRET_KEY = os.environ.get("SECRET_KEY")
 if not SECRET_KEY:
@@ -25,7 +26,7 @@ if not SECRET_KEY:
 
 ALLOWED_HOSTS = os.environ.get("ALLOWED_HOSTS", "127.0.0.1, localhost").split(",")
 CSRF_TRUSTED_ORIGINS = os.environ.get("CSRF_TRUSTED_ORIGINS", "").split(",")
-DATABASE_FILE = Path(os.environ.get("DATABASE_FILE", default="/db/db.sqlite3"))  # ty:ignore[no-matching-overload]
+DATABASE_FILE = Path(os.environ.get("DATABASE_FILE", default="/db/db.sqlite3"))
 
 storage.is_database_readable(DATABASE_FILE)
 storage.is_database_writable(DATABASE_FILE)
@@ -67,6 +68,7 @@ INSTALLED_APPS = [
     "imagekit",
     "import_export",
     "simple_history",
+    "solo",
 ]
 
 MIDDLEWARE = [
@@ -132,6 +134,8 @@ LOGGING = {
 # Password validation
 # https://docs.djangoproject.com/en/5.2/ref/settings/#auth-password-validators
 
+AUTH_USER_MODEL = "sandwitches.User"
+
 AUTH_PASSWORD_VALIDATORS = [
     {
         "NAME": "django.contrib.auth.password_validation.UserAttributeSimilarityValidator",
@@ -150,13 +154,11 @@ AUTH_PASSWORD_VALIDATORS = [
 
 # Media files (for uploaded images)
 MEDIA_URL = "/media/"
-MEDIA_ROOT = Path(os.environ.get("MEDIA_ROOT", default=BASE_DIR / "media"))  # ty:ignore[no-matching-overload]
+MEDIA_ROOT = Path(os.environ.get("MEDIA_ROOT", default=BASE_DIR / "media"))
 
 # Static (for CSS etc)
 STATIC_URL = "/static/"
 STATIC_ROOT = Path("/tmp/staticfiles")
-STATIC_URL = "static/"
-
 STATICFILES_DIRS = [BASE_DIR / "static", MEDIA_ROOT]
 
 LANGUAGE_CODE = "en"
@@ -171,6 +173,12 @@ LOCALE_PATHS = [BASE_DIR / "locale"]
 
 USE_TZ = True
 
+# EU Date formats
+DATE_FORMAT = "d/m/Y"
+DATETIME_FORMAT = "d/m/Y H:i:s"
+SHORT_DATE_FORMAT = "d/m/Y"
+SHORT_DATETIME_FORMAT = "d/m/Y H:i"
+
 INTERNAL_IPS = [
     "127.0.0.1",
 ]
@@ -184,6 +192,7 @@ STORAGES = {
     },
 }
 
+
 EMAIL_BACKEND = "django.core.mail.backends.smtp.EmailBackend"
 EMAIL_USE_TLS = os.environ.get("SMTP_USE_TLS")
 EMAIL_HOST = os.environ.get("SMTP_HOST")

sandwitches/storage.py

@@ -46,13 +46,21 @@ def is_database_readable(path=None) -> bool:
 
     p = Path(path)
     logging.debug(f"Checking database file readability at: {p}")
-    readable = p.is_file() and os.access(p, os.R_OK)
-    if not readable:
-        logging.error(f"Database file at {p} is not readable or does not exist.")
+    try:
+        if p.is_file():
+            with open(p, "r"):  # Removed 'as f'
+                # If we can open it, it's readable. No need to read content.
+                pass
+            logging.debug(f"Database file at {p} is readable.")
+            return True
+        else:
+            logging.error(f"Database file at {p} does not exist.")
+            return False
+    except IOError:
+        logging.error(
+            f"Database file at {p} is not readable due to permission or other IO error."
+        )
         return False
-    else:
-        logging.debug(f"Database file at {p} is readable.")
-        return readable
 
 
 def is_database_writable(path=None) -> bool:
@@ -73,10 +81,34 @@ def is_database_writable(path=None) -> bool:
 
     p = Path(path)
     logging.debug(f"Checking database file writability at: {p}")
-    writable = p.is_file() and os.access(p, os.W_OK)
-    if not writable:
-        logging.error(f"Database file at {p} is not writable or does not exist.")
+    try:
+        # If the file exists, try to open it for appending
+        if p.is_file():
+            with open(p, "a"):  # Removed 'as f'
+                pass
+            logging.debug(f"Database file at {p} is writable.")
+            return True
+        else:
+            # If file does not exist, check if its parent directory is writable
+            if p.parent.is_dir() and os.access(p.parent, os.W_OK):
+                # Try creating a dummy file to confirm writability
+                dummy_file = p.parent / f".tmp_writable_test_{os.getpid()}"
+                try:
+                    dummy_file.touch()
+                    dummy_file.unlink()
+                    logging.debug(f"Database path at {p.parent} is writable.")
+                    return True
+                except IOError:
+                    logging.error(f"Cannot create dummy file in {p.parent}.")
+                    return False
+            else:
+                logging.error(
+                    f"Parent directory {p.parent} is not writable or does not exist."
+                )
+                return False
+
+    except IOError:
+        logging.error(
+            f"Database file at {p} is not writable due to permission or other IO error."
+        )
         return False
-    else:
-        logging.debug(f"Database file at {p} is writable.")
-    return writable