python3-cyberfusion-queue-support 2.2.1__tar.gz → 2.2.3__tar.gz

{python3_cyberfusion_queue_support-2.2.1 → python3_cyberfusion_queue_support-2.2.3}/PKG-INFO

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

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

{python3_cyberfusion_queue_support-2.2.1 → python3_cyberfusion_queue_support-2.2.3}/src/cyberfusion/QueueSupport/__init__.py

@@ -108,19 +108,21 @@ class Queue:
                 "Processing item with id '%s'", item_mapping.database_object.id
             )
 
+            item_outcomes = []
+
             if preview:
                 if not item_mapping.item.hide_outcomes:
-                    outcomes.extend(item_mapping.item.outcomes)
+                    item_outcomes.extend(item_mapping.item.outcomes)
             else:
                 try:
                     logger.debug(
                         "Fulfilling item with id '%s'", item_mapping.database_object.id
                     )
 
-                    fulfill_outcomes = item_mapping.item.fulfill()
-
-                    if not item_mapping.item.hide_outcomes:
-                        outcomes.extend(fulfill_outcomes)
+                    if item_mapping.item.hide_outcomes:
+                        item_mapping.item.fulfill()
+                    else:
+                        item_outcomes.extend(item_mapping.item.fulfill())
 
                     logger.debug(
                         "Fulfilled item with id '%s'", item_mapping.database_object.id
@@ -132,15 +134,18 @@ class Queue:
                         item_mapping.item,
                     ) from e
 
-            for outcome in outcomes:
-                outcome_object = QueueItemOutcome(
-                    queue_item=item_mapping.database_object,
-                    queue_process=process_object,
-                    type=outcome.__class__.__name__,
-                    attributes=outcome.__dict__,
+            outcomes.extend(item_outcomes)
+
+            for outcome in item_outcomes:
+                self._database_session.add(
+                    QueueItemOutcome(
+                        queue_item=item_mapping.database_object,
+                        queue_process=process_object,
+                        type=outcome.__class__.__name__,
+                        attributes=outcome.__dict__,
+                    )
                 )
 
-                self._database_session.add(outcome_object)
                 self._database_session.commit()
 
             logger.debug("Processed item with id '%s'", item_mapping.database_object.id)

{python3_cyberfusion_queue_support-2.2.1 → python3_cyberfusion_queue_support-2.2.3}/src/cyberfusion/QueueSupport/database.py

@@ -3,6 +3,7 @@ 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
@@ -12,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
 
 
@@ -47,7 +49,9 @@ def run_migrations() -> None:
 
 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.3/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.1 → python3_cyberfusion_queue_support-2.2.3}/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.1
+Version: 2.2.3
 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.1 → python3_cyberfusion_queue_support-2.2.3}/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