python3-cyberfusion-queue-support 3.2.1__tar.gz → 3.3.1__tar.gz

{python3_cyberfusion_queue_support-3.2.1 → python3_cyberfusion_queue_support-3.3.1}/PKG-INFO

@@ -1,15 +1,15 @@
 Metadata-Version: 2.4
 Name: python3-cyberfusion-queue-support
-Version: 3.2.1
+Version: 3.3.1
 Summary: Library to queue actions.
 Author-email: Cyberfusion <support@cyberfusion.io>
 Project-URL: Source, https://github.com/CyberfusionIO/python3-cyberfusion-queue-support
 Description-Content-Type: text/markdown
 Requires-Dist: python3-cyberfusion-systemd-support~=2.2
-Requires-Dist: python3-cyberfusion-database-support~=3.0
-Requires-Dist: alembic==1.8.1
-Requires-Dist: SQLAlchemy==1.4.46
-Requires-Dist: pydantic[dotenv]==1.10.4
+Requires-Dist: python3-cyberfusion-database-support~=3.2
+Requires-Dist: alembic==1.13.2
+Requires-Dist: SQLAlchemy==2.0.40
+Requires-Dist: pydantic-settings==2.8.1
 
 # python3-cyberfusion-queue-support
 

{python3_cyberfusion_queue_support-3.2.1 → python3_cyberfusion_queue_support-3.3.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "python3-cyberfusion-queue-support"
-version = "3.2.1"
+version = "3.3.1"
 description = "Library to queue actions."
 readme = "README.md"
 authors = [
@@ -12,10 +12,10 @@ authors = [
 ]
 dependencies = [
     "python3-cyberfusion-systemd-support~=2.2",
-    "python3-cyberfusion-database-support~=3.0",
-    "alembic==1.8.1",
-    "SQLAlchemy==1.4.46",
-    "pydantic[dotenv]==1.10.4",
+    "python3-cyberfusion-database-support~=3.2",
+    "alembic==1.13.2",
+    "SQLAlchemy==2.0.40",
+    "pydantic-settings==2.8.1",
 ]
 
 [project.urls]

{python3_cyberfusion_queue_support-3.2.1 → python3_cyberfusion_queue_support-3.3.1}/src/cyberfusion/QueueSupport/database.py

@@ -1,3 +1,4 @@
+from typing import List, Optional
 import json
 from sqlalchemy import Enum
 
@@ -7,12 +8,11 @@ import functools
 from alembic import command
 import sqlite3
 from datetime import datetime, timezone
-
+from sqlalchemy.orm import Mapped, mapped_column, relationship
 from sqlalchemy.pool.base import _ConnectionRecord
 from sqlalchemy import ForeignKey, MetaData, Boolean
-from sqlalchemy import create_engine, Column, DateTime, Integer, String
-from sqlalchemy.orm import Session, sessionmaker, relationship
-from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy import create_engine, DateTime, Integer, String
+from sqlalchemy.orm import Session, sessionmaker, DeclarativeBase
 from sqlalchemy import event
 from sqlalchemy.types import JSON
 
@@ -65,19 +65,22 @@ naming_convention = {
     "pk": "pk_%(table_name)s",
 }
 
-metadata = MetaData(naming_convention=naming_convention)
+metadata_obj = MetaData(naming_convention=naming_convention)
+
 
-Base = declarative_base(metadata=metadata)
+class Base(DeclarativeBase):
+    metadata = metadata_obj
 
 
-class BaseModel(Base):  # type: ignore[misc, valid-type]
+class BaseModel(Base):
     """Base model."""
 
     __abstract__ = True
 
-    id = Column(Integer, primary_key=True)
-    created_at = Column(
-        DateTime, default=functools.partial(datetime.now, timezone.utc), nullable=False
+    id: Mapped[int] = mapped_column(Integer, primary_key=True)
+    created_at: Mapped[datetime] = mapped_column(
+        DateTime,
+        default=functools.partial(datetime.now, timezone.utc),
     )
 
 
@@ -86,12 +89,12 @@ class Queue(BaseModel):
 
     __tablename__ = "queues"
 
-    queue_items = relationship(
+    queue_items: Mapped[List["QueueItem"]] = relationship(
         "QueueItem",
         back_populates="queue",
         cascade="all, delete",
     )
-    queue_processes = relationship(
+    queue_processes: Mapped[List["QueueProcess"]] = relationship(
         "QueueProcess",
         back_populates="queue",
         cascade="all, delete",
@@ -103,14 +106,20 @@ class QueueProcess(BaseModel):
 
     __tablename__ = "queue_processes"
 
-    queue_id = Column(
-        Integer, ForeignKey("queues.id", ondelete="CASCADE"), nullable=False, index=True
+    queue_id: Mapped[int] = mapped_column(
+        Integer, ForeignKey("queues.id", ondelete="CASCADE"), index=True
+    )
+    preview: Mapped[bool] = mapped_column(
+        Boolean,
+    )
+    status: Mapped[Optional[QueueProcessStatus]] = mapped_column(
+        Enum(QueueProcessStatus),
     )
-    preview = Column(Boolean, nullable=False)
-    status = Column(Enum(QueueProcessStatus), nullable=True)
 
-    queue = relationship("Queue", back_populates="queue_processes")
-    queue_item_outcomes = relationship(
+    queue: Mapped["Queue"] = relationship(
+        "Queue", back_populates="queue_processes", uselist=False
+    )
+    queue_item_outcomes: Mapped[List["QueueItemOutcome"]] = relationship(
         "QueueItemOutcome",
         back_populates="queue_process",
         cascade="all, delete",
@@ -122,19 +131,35 @@ class QueueItem(BaseModel):
 
     __tablename__ = "queue_items"
 
-    queue_id = Column(
-        Integer, ForeignKey("queues.id", ondelete="CASCADE"), nullable=False, index=True
+    queue_id: Mapped[int] = mapped_column(
+        Integer, ForeignKey("queues.id", ondelete="CASCADE"), index=True
+    )
+    type: Mapped[str] = mapped_column(
+        String(length=255),
+    )
+    reference: Mapped[Optional[str]] = mapped_column(
+        String(length=255),
+    )
+    hide_outcomes: Mapped[bool] = mapped_column(
+        Boolean,
+    )
+    fail_silently: Mapped[bool] = mapped_column(
+        Boolean,
+    )
+    deduplicated: Mapped[bool] = mapped_column(
+        Boolean,
+    )
+    attributes: Mapped[dict] = mapped_column(
+        JSON,
+    )
+    traceback: Mapped[Optional[str]] = mapped_column(
+        String(),
     )
-    type = Column(String(length=255), nullable=False)
-    reference = Column(String(length=255), nullable=True)
-    hide_outcomes = Column(Boolean, nullable=False)
-    fail_silently = Column(Boolean, nullable=False)
-    deduplicated = Column(Boolean, nullable=False)
-    attributes = Column(JSON, nullable=False)
-    traceback = Column(String(), nullable=True)
 
-    queue = relationship("Queue", back_populates="queue_items")
-    queue_item_outcomes = relationship(
+    queue: Mapped["Queue"] = relationship(
+        "Queue", back_populates="queue_items", uselist=False
+    )
+    queue_item_outcomes: Mapped[List["QueueItemOutcome"]] = relationship(
         "QueueItemOutcome",
         back_populates="queue_item",
         cascade="all, delete",
@@ -146,21 +171,29 @@ class QueueItemOutcome(BaseModel):
 
     __tablename__ = "queue_item_outcomes"
 
-    queue_item_id = Column(
+    queue_item_id: Mapped[int] = mapped_column(
         Integer,
         ForeignKey("queue_items.id", ondelete="CASCADE"),
-        nullable=False,
         index=True,
     )
-    queue_process_id = Column(
+    queue_process_id: Mapped[int] = mapped_column(
         Integer,
         ForeignKey("queue_processes.id", ondelete="CASCADE"),
-        nullable=False,
         index=True,
     )
-    type = Column(String(length=255), nullable=False)
-    attributes = Column(JSON, nullable=False)
-    string = Column(String(length=255), nullable=False)
+    type: Mapped[str] = mapped_column(
+        String(length=255),
+    )
+    attributes: Mapped[dict] = mapped_column(
+        JSON,
+    )
+    string: Mapped[str] = mapped_column(
+        String(length=255),
+    )
 
-    queue_item = relationship("QueueItem", back_populates="queue_item_outcomes")
-    queue_process = relationship("QueueProcess", back_populates="queue_item_outcomes")
+    queue_item: Mapped["QueueItem"] = relationship(
+        "QueueItem", back_populates="queue_item_outcomes", uselist=False
+    )
+    queue_process: Mapped["QueueProcess"] = relationship(
+        "QueueProcess", back_populates="queue_item_outcomes"
+    )

{python3_cyberfusion_queue_support-3.2.1 → python3_cyberfusion_queue_support-3.3.1}/src/cyberfusion/QueueSupport/migrations/env.py

@@ -5,14 +5,14 @@ from sqlalchemy import pool
 
 from alembic import context
 
-from cyberfusion.QueueSupport import database
+from cyberfusion.QueueSupport.database import Base
 
 config = context.config
 
 if config.config_file_name is not None:
     fileConfig(config.config_file_name)
 
-target_metadata = database.metadata
+target_metadata = Base.metadata
 
 
 def run_migrations_offline() -> None:

python3_cyberfusion_queue_support-3.3.1/src/cyberfusion/QueueSupport/settings.py

@@ -0,0 +1,16 @@
+from pydantic_settings import BaseSettings, SettingsConfigDict
+
+
+class Settings(BaseSettings):
+    model_config = SettingsConfigDict(
+        env_prefix="queue_support_",
+        env_file=(".env", "/etc/queue-support.conf"),
+        extra="ignore",
+    )
+
+    database_path: str = "sqlite:///./queue-support.db"
+
+    queue_purge_days: int = 30
+
+
+settings = Settings()

{python3_cyberfusion_queue_support-3.2.1 → python3_cyberfusion_queue_support-3.3.1}/src/python3_cyberfusion_queue_support.egg-info/PKG-INFO

@@ -1,15 +1,15 @@
 Metadata-Version: 2.4
 Name: python3-cyberfusion-queue-support
-Version: 3.2.1
+Version: 3.3.1
 Summary: Library to queue actions.
 Author-email: Cyberfusion <support@cyberfusion.io>
 Project-URL: Source, https://github.com/CyberfusionIO/python3-cyberfusion-queue-support
 Description-Content-Type: text/markdown
 Requires-Dist: python3-cyberfusion-systemd-support~=2.2
-Requires-Dist: python3-cyberfusion-database-support~=3.0
-Requires-Dist: alembic==1.8.1
-Requires-Dist: SQLAlchemy==1.4.46
-Requires-Dist: pydantic[dotenv]==1.10.4
+Requires-Dist: python3-cyberfusion-database-support~=3.2
+Requires-Dist: alembic==1.13.2
+Requires-Dist: SQLAlchemy==2.0.40
+Requires-Dist: pydantic-settings==2.8.1
 
 # python3-cyberfusion-queue-support
 

python3_cyberfusion_queue_support-3.3.1/src/python3_cyberfusion_queue_support.egg-info/requires.txt

@@ -0,0 +1,5 @@
+python3-cyberfusion-systemd-support~=2.2
+python3-cyberfusion-database-support~=3.2
+alembic==1.13.2
+SQLAlchemy==2.0.40
+pydantic-settings==2.8.1

python3_cyberfusion_queue_support-3.2.1/src/cyberfusion/QueueSupport/settings.py

@@ -1,15 +0,0 @@
-from pydantic import BaseSettings
-
-
-class Settings(BaseSettings):
-    database_path: str = "sqlite:///./queue-support.db"
-
-    queue_purge_days: int = 30
-
-    class Config:
-        env_prefix = "queue_support_"
-
-        env_file = ".env", "/etc/queue-support.conf"
-
-
-settings = Settings()

python3_cyberfusion_queue_support-3.2.1/src/python3_cyberfusion_queue_support.egg-info/requires.txt

@@ -1,5 +0,0 @@
-python3-cyberfusion-systemd-support~=2.2
-python3-cyberfusion-database-support~=3.0
-alembic==1.8.1
-SQLAlchemy==1.4.46
-pydantic[dotenv]==1.10.4