python3-cyberfusion-queue-support 2.6.2__tar.gz → 2.6.4__tar.gz

{python3_cyberfusion_queue_support-2.6.2 → python3_cyberfusion_queue_support-2.6.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python3-cyberfusion-queue-support
-Version: 2.6.2
+Version: 2.6.4
 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.6.2 → python3_cyberfusion_queue_support-2.6.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "python3-cyberfusion-queue-support"
-version = "2.6.2"
+version = "2.6.4"
 description = "Library to queue actions."
 readme = "README.md"
 authors = [

{python3_cyberfusion_queue_support-2.6.2 → python3_cyberfusion_queue_support-2.6.4}/src/cyberfusion/QueueSupport/__init__.py

@@ -47,22 +47,18 @@ class Queue:
         """Add item to queue."""
         deduplicated = False
 
-        existing_item_index = next(
-            (
-                index
-                for index, item_mapping in enumerate(self.item_mappings)
-                if item_mapping.item == item
-            ),
-            None,
-        )
+        existing_items_indexes = [
+            index
+            for index, item_mapping in enumerate(self.item_mappings)
+            if item_mapping.item == item
+        ]
 
-        if existing_item_index is not None:
+        if existing_items_indexes:
             if run_duplicate_last:
-                self.item_mappings[
-                    existing_item_index
-                ].database_object.deduplicated = True
-
-                self._database_session.commit()
+                for existing_item_index in existing_items_indexes:
+                    self.item_mappings[
+                        existing_item_index
+                    ].database_object.deduplicated = True
             else:
                 deduplicated = True
 
@@ -82,7 +78,6 @@ class Queue:
         )
 
         self._database_session.add(object_)
-        self._database_session.commit()
 
         self.item_mappings.append(QueueItemMapping(item, object_))
 
@@ -96,7 +91,6 @@ class Queue:
         )
 
         self._database_session.add(process_object)
-        self._database_session.commit()
 
         outcomes = []
 
@@ -134,7 +128,6 @@ class Queue:
                     item_mapping.database_object.traceback = traceback.format_exc()
 
                     self._database_session.add(item_mapping.database_object)
-                    self._database_session.commit()
 
                     # Don't fulfill other queue items
 
@@ -153,10 +146,10 @@ class Queue:
                     )
                 )
 
-                self._database_session.commit()
-
             logger.debug("Processed item with ID '%s'", item_mapping.database_object.id)
 
         logger.debug("Processed items")
 
+        self._database_session.commit()
+
         return outcomes

{python3_cyberfusion_queue_support-2.6.2 → python3_cyberfusion_queue_support-2.6.4}/src/cyberfusion/QueueSupport/database.py

@@ -1,5 +1,6 @@
 from alembic.config import Config
 import os
+import functools
 from alembic import command
 import sqlite3
 from datetime import datetime, timezone
@@ -19,15 +20,11 @@ from cyberfusion.QueueSupport.settings import settings
 def set_sqlite_pragma(
     dbapi_connection: sqlite3.Connection, connection_record: _ConnectionRecord
 ) -> None:
-    """Enable foreign key support.
-
-    This is needed for cascade deletes to work.
-
-    See https://docs.sqlalchemy.org/en/13/dialects/sqlite.html#sqlite-foreign-keys
-    """
     cursor = dbapi_connection.cursor()
 
     cursor.execute("PRAGMA foreign_keys=ON")
+    cursor.execute("PRAGMA journal_mode=WAL")
+    cursor.execute("PRAGMA synchronous=NORMAL")
 
     cursor.close()
 
@@ -75,7 +72,9 @@ class BaseModel(Base):  # type: ignore[misc, valid-type]
     __abstract__ = True
 
     id = Column(Integer, primary_key=True)
-    created_at = Column(DateTime, default=datetime.now(timezone.utc), nullable=False)
+    created_at = Column(
+        DateTime, default=functools.partial(datetime.now, timezone.utc), nullable=False
+    )
 
 
 class Queue(BaseModel):
@@ -83,6 +82,15 @@ class Queue(BaseModel):
 
     __tablename__ = "queues"
 
+    queue_items = relationship(
+        "QueueItem",
+        back_populates="queue",
+    )
+    queue_processes = relationship(
+        "QueueProcess",
+        back_populates="queue",
+    )
+
 
 class QueueProcess(BaseModel):
     """QueueProcess model."""
@@ -90,9 +98,14 @@ class QueueProcess(BaseModel):
     __tablename__ = "queue_processes"
 
     queue_id = Column(Integer, ForeignKey("queues.id"), nullable=False)
-    queue = relationship("Queue")
     preview = Column(Boolean, nullable=False)
 
+    queue = relationship("Queue", back_populates="queue_processes")
+    queue_item_outcomes = relationship(
+        "QueueItemOutcome",
+        back_populates="queue_process",
+    )
+
 
 class QueueItem(BaseModel):
     """QueueItem model."""
@@ -100,7 +113,6 @@ class QueueItem(BaseModel):
     __tablename__ = "queue_items"
 
     queue_id = Column(Integer, ForeignKey("queues.id"), nullable=False)
-    queue = relationship("Queue")
     type = Column(String(length=255), nullable=False)
     reference = Column(String(length=255), nullable=True)
     hide_outcomes = Column(Boolean, nullable=False)
@@ -108,6 +120,12 @@ class QueueItem(BaseModel):
     attributes = Column(JSON, nullable=False)
     traceback = Column(String(), nullable=True)
 
+    queue = relationship("Queue", back_populates="queue_items")
+    queue_item_outcomes = relationship(
+        "QueueItemOutcome",
+        back_populates="queue_item",
+    )
+
 
 class QueueItemOutcome(BaseModel):
     """QueueItemOutcome model."""
@@ -115,9 +133,10 @@ class QueueItemOutcome(BaseModel):
     __tablename__ = "queue_item_outcomes"
 
     queue_item_id = Column(Integer, ForeignKey("queue_items.id"), nullable=False)
-    queue_item = relationship("QueueItem")
     queue_process_id = Column(Integer, ForeignKey("queue_processes.id"), nullable=False)
-    queue_process = relationship("QueueProcess")
     type = Column(String(length=255), nullable=False)
     attributes = Column(JSON, nullable=False)
     string = Column(String(length=255), nullable=False)
+
+    queue_item = relationship("QueueItem", back_populates="queue_item_outcomes")
+    queue_process = relationship("QueueProcess", back_populates="queue_item_outcomes")

{python3_cyberfusion_queue_support-2.6.2 → python3_cyberfusion_queue_support-2.6.4}/src/python3_cyberfusion_queue_support.egg-info/PKG-INFO

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