python3-cyberfusion-queue-support 2.2__tar.gz → 2.2.2__tar.gz

{python3_cyberfusion_queue_support-2.2 → python3_cyberfusion_queue_support-2.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python3-cyberfusion-queue-support
-Version: 2.2
+Version: 2.2.2
 Summary: Library to queue actions.
 Author-email: Cyberfusion <support@cyberfusion.io>
 Project-URL: Source, https://github.com/CyberfusionIO/python3-cyberfusion-queue-support

{python3_cyberfusion_queue_support-2.2 → python3_cyberfusion_queue_support-2.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "python3-cyberfusion-queue-support"
-version = "2.2"
+version = "2.2.2"
 description = "Library to queue actions."
 readme = "README.md"
 authors = [
@@ -23,3 +23,8 @@ dependencies = [
 
 [project.scripts]
 queue-support-migrate = "cyberfusion.QueueSupport.database:run_migrations"
+
+[tool.coverage.run]
+omit = [
+    "*/migrations/*"
+]

{python3_cyberfusion_queue_support-2.2 → python3_cyberfusion_queue_support-2.2.2}/src/cyberfusion/QueueSupport/database.py

@@ -1,7 +1,9 @@
 from alembic.config import Config
+import os
 from alembic import command
 import sqlite3
 from datetime import datetime, timezone
+
 from sqlalchemy.pool.base import _ConnectionRecord
 from sqlalchemy import ForeignKey, MetaData, Boolean
 from sqlalchemy import create_engine, Column, DateTime, Integer, String
@@ -11,6 +13,7 @@ from sqlalchemy.engine import Engine
 from sqlalchemy import event
 from sqlalchemy.types import JSON
 
+from cyberfusion.QueueSupport.encoders import json_serialize
 from cyberfusion.QueueSupport.settings import settings
 
 
@@ -33,15 +36,22 @@ def set_sqlite_pragma(
 
 def run_migrations() -> None:
     """Upgrade database schema to latest version."""
-    alembic_config = Config(file_=settings.alembic_config_file_path)
+    alembic_config = Config()
+
     alembic_config.set_main_option("sqlalchemy.url", settings.database_path)
+    alembic_config.set_main_option(
+        "script_location",
+        os.path.join(os.path.dirname(os.path.realpath(__file__)), "migrations"),
+    )
 
     command.upgrade(alembic_config, "head")
 
 
 def make_database_session() -> Session:
     engine = create_engine(
-        settings.database_path, connect_args={"check_same_thread": False}
+        settings.database_path,
+        connect_args={"check_same_thread": False},
+        json_serializer=json_serialize,
     )
 
     return sessionmaker(bind=engine)()

python3_cyberfusion_queue_support-2.2.2/src/cyberfusion/QueueSupport/encoders.py

@@ -0,0 +1,17 @@
+import json
+from json import JSONEncoder
+from typing import Any
+
+from cyberfusion.SystemdSupport import Unit
+
+
+class CustomEncoder(JSONEncoder):
+    def default(self, o: Any) -> Any:
+        if isinstance(o, Unit):
+            return {"name": o.name}
+
+        return super().default(o)
+
+
+def json_serialize(obj: Any) -> str:
+    return json.dumps(obj, cls=CustomEncoder)

python3_cyberfusion_queue_support-2.2.2/src/cyberfusion/QueueSupport/migrations/env.py

@@ -0,0 +1,49 @@
+from logging.config import fileConfig
+
+from sqlalchemy import engine_from_config
+from sqlalchemy import pool
+
+from alembic import context
+
+from cyberfusion.QueueSupport import database
+
+config = context.config
+
+if config.config_file_name is not None:
+    fileConfig(config.config_file_name)
+
+target_metadata = database.metadata
+
+
+def run_migrations_offline() -> None:
+    url = config.get_main_option("sqlalchemy.url")
+
+    context.configure(
+        url=url,
+        target_metadata=target_metadata,
+        literal_binds=True,
+        dialect_opts={"paramstyle": "named"},
+    )
+
+    with context.begin_transaction():
+        context.run_migrations()
+
+
+def run_migrations_online() -> None:
+    connectable = engine_from_config(
+        config.get_section(config.config_ini_section),
+        prefix="sqlalchemy.",
+        poolclass=pool.NullPool,
+    )
+
+    with connectable.connect() as connection:
+        context.configure(connection=connection, target_metadata=target_metadata)
+
+        with context.begin_transaction():
+            context.run_migrations()
+
+
+if context.is_offline_mode():
+    run_migrations_offline()
+else:
+    run_migrations_online()

python3_cyberfusion_queue_support-2.2.2/src/cyberfusion/QueueSupport/migrations/versions/571e55ab5ed5_initial_migration.py

@@ -0,0 +1,82 @@
+"""Initial migration
+
+Revision ID: 571e55ab5ed5
+Revises:
+Create Date: 2025-04-09 18:46:38.122919
+
+"""
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = "571e55ab5ed5"
+down_revision = None
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    op.create_table(
+        "queues",
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column("created_at", sa.DateTime(), nullable=False),
+        sa.PrimaryKeyConstraint("id", name=op.f("pk_queues")),
+    )
+
+    op.create_table(
+        "queue_items",
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column("created_at", sa.DateTime(), nullable=False),
+        sa.Column("queue_id", sa.Integer(), nullable=False),
+        sa.Column("type", sa.String(length=255), nullable=False),
+        sa.Column("reference", sa.String(length=255), nullable=True),
+        sa.Column("hide_outcomes", sa.Boolean(), nullable=False),
+        sa.Column("deduplicated", sa.Boolean(), nullable=False),
+        sa.Column("attributes", sa.JSON(), nullable=False),
+        sa.ForeignKeyConstraint(
+            ["queue_id"], ["queues.id"], name=op.f("fk_queue_items_queue_id_queues")
+        ),
+        sa.PrimaryKeyConstraint("id", name=op.f("pk_queue_items")),
+    )
+
+    op.create_table(
+        "queue_processes",
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column("created_at", sa.DateTime(), nullable=False),
+        sa.Column("queue_id", sa.Integer(), nullable=False),
+        sa.Column("preview", sa.Boolean(), nullable=False),
+        sa.ForeignKeyConstraint(
+            ["queue_id"], ["queues.id"], name=op.f("fk_queue_processes_queue_id_queues")
+        ),
+        sa.PrimaryKeyConstraint("id", name=op.f("pk_queue_processes")),
+    )
+
+    op.create_table(
+        "queue_item_outcomes",
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column("created_at", sa.DateTime(), nullable=False),
+        sa.Column("queue_item_id", sa.Integer(), nullable=False),
+        sa.Column("queue_process_id", sa.Integer(), nullable=False),
+        sa.Column("type", sa.String(length=255), nullable=False),
+        sa.Column("attributes", sa.JSON(), nullable=False),
+        sa.ForeignKeyConstraint(
+            ["queue_item_id"],
+            ["queue_items.id"],
+            name=op.f("fk_queue_item_outcomes_queue_item_id_queue_items"),
+        ),
+        sa.ForeignKeyConstraint(
+            ["queue_process_id"],
+            ["queue_processes.id"],
+            name=op.f("fk_queue_item_outcomes_queue_process_id_queue_processes"),
+        ),
+        sa.PrimaryKeyConstraint("id", name=op.f("pk_queue_item_outcomes")),
+    )
+
+
+def downgrade() -> None:
+    op.drop_table("queue_item_outcomes")
+    op.drop_table("queue_processes")
+    op.drop_table("queue_items")
+    op.drop_table("queues")

{python3_cyberfusion_queue_support-2.2 → python3_cyberfusion_queue_support-2.2.2}/src/cyberfusion/QueueSupport/settings.py

@@ -3,7 +3,6 @@ from pydantic import BaseSettings
 
 class Settings(BaseSettings):
     database_path: str = "sqlite:///./queue-support.db"
-    alembic_config_file_path: str = "alembic.ini"
 
     class Config:
         env_prefix = "queue_support_"

{python3_cyberfusion_queue_support-2.2 → python3_cyberfusion_queue_support-2.2.2}/src/python3_cyberfusion_queue_support.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python3-cyberfusion-queue-support
-Version: 2.2
+Version: 2.2.2
 Summary: Library to queue actions.
 Author-email: Cyberfusion <support@cyberfusion.io>
 Project-URL: Source, https://github.com/CyberfusionIO/python3-cyberfusion-queue-support

{python3_cyberfusion_queue_support-2.2 → python3_cyberfusion_queue_support-2.2.2}/src/python3_cyberfusion_queue_support.egg-info/SOURCES.txt

@@ -3,6 +3,7 @@ pyproject.toml
 setup.cfg
 src/cyberfusion/QueueSupport/__init__.py
 src/cyberfusion/QueueSupport/database.py
+src/cyberfusion/QueueSupport/encoders.py
 src/cyberfusion/QueueSupport/interfaces.py
 src/cyberfusion/QueueSupport/outcomes.py
 src/cyberfusion/QueueSupport/settings.py
@@ -31,6 +32,10 @@ src/cyberfusion/QueueSupport/items/systemd_unit_restart.py
 src/cyberfusion/QueueSupport/items/systemd_unit_start.py
 src/cyberfusion/QueueSupport/items/systemd_unit_stop.py
 src/cyberfusion/QueueSupport/items/unlink.py
+src/cyberfusion/QueueSupport/migrations/__init__.py
+src/cyberfusion/QueueSupport/migrations/env.py
+src/cyberfusion/QueueSupport/migrations/versions/571e55ab5ed5_initial_migration.py
+src/cyberfusion/QueueSupport/migrations/versions/__init__.py
 src/python3_cyberfusion_queue_support.egg-info/PKG-INFO
 src/python3_cyberfusion_queue_support.egg-info/SOURCES.txt
 src/python3_cyberfusion_queue_support.egg-info/dependency_links.txt