python3-cyberfusion-queue-support 2.3__tar.gz → 2.5__tar.gz

{python3_cyberfusion_queue_support-2.3 → python3_cyberfusion_queue_support-2.5}/PKG-INFO

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

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

{python3_cyberfusion_queue_support-2.3 → python3_cyberfusion_queue_support-2.5}/src/cyberfusion/QueueSupport/__init__.py

@@ -4,7 +4,7 @@ import logging
 from copy import copy
 from dataclasses import dataclass
 from typing import List
-
+import traceback
 from cyberfusion.QueueSupport.database import (
     Queue as QueueModel,
     QueueItem,
@@ -12,7 +12,7 @@ from cyberfusion.QueueSupport.database import (
     QueueItemOutcome,
     QueueProcess,
 )
-from cyberfusion.QueueSupport.exceptions import QueueFulfillFailed
+
 from cyberfusion.QueueSupport.interfaces import OutcomeInterface
 from cyberfusion.QueueSupport.items import _Item
 
@@ -78,6 +78,7 @@ class Queue:
             hide_outcomes=item.hide_outcomes,
             deduplicated=deduplicated,
             attributes=item_dict,
+            traceback=None,
         )
 
         self._database_session.add(object_)
@@ -105,7 +106,7 @@ class Queue:
             if not item_mapping.database_object.deduplicated
         ]:
             logger.debug(
-                "Processing item with id '%s'", item_mapping.database_object.id
+                "Processing item with ID '%s'", item_mapping.database_object.id
             )
 
             item_outcomes = []
@@ -116,7 +117,7 @@ class Queue:
             else:
                 try:
                     logger.debug(
-                        "Fulfilling item with id '%s'", item_mapping.database_object.id
+                        "Fulfilling item with ID '%s'", item_mapping.database_object.id
                     )
 
                     if item_mapping.item.hide_outcomes:
@@ -125,14 +126,19 @@ class Queue:
                         item_outcomes.extend(item_mapping.item.fulfill())
 
                     logger.debug(
-                        "Fulfilled item with id '%s'", item_mapping.database_object.id
+                        "Fulfilled item with ID '%s'", item_mapping.database_object.id
                     )
-                except QueueFulfillFailed:
-                    raise
                 except Exception as e:
-                    raise QueueFulfillFailed(
-                        item_mapping.item,
-                    ) from e
+                    logger.exception(e)
+
+                    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
+
+                    break
 
             outcomes.extend(item_outcomes)
 
@@ -149,7 +155,7 @@ class Queue:
 
                 self._database_session.commit()
 
-            logger.debug("Processed item with id '%s'", item_mapping.database_object.id)
+            logger.debug("Processed item with ID '%s'", item_mapping.database_object.id)
 
         logger.debug("Processed items")
 

{python3_cyberfusion_queue_support-2.3 → python3_cyberfusion_queue_support-2.5}/src/cyberfusion/QueueSupport/database.py

@@ -106,6 +106,7 @@ class QueueItem(BaseModel):
     hide_outcomes = Column(Boolean, nullable=False)
     deduplicated = Column(Boolean, nullable=False)
     attributes = Column(JSON, nullable=False)
+    traceback = Column(String(), nullable=True)
 
 
 class QueueItemOutcome(BaseModel):

{python3_cyberfusion_queue_support-2.3 → python3_cyberfusion_queue_support-2.5}/src/cyberfusion/QueueSupport/exceptions/__init__.py

@@ -20,16 +20,10 @@ class PathIsSymlinkError(ItemError):
 
 
 @dataclass
-class QueueFulfillFailed(Exception):
-    """Error occurred while fulfilling queue."""
-
-    item: _Item
-
-
-@dataclass
-class CommandQueueFulfillFailed(QueueFulfillFailed):
+class CommandQueueFulfillFailed(Exception):
     """Error occurred while fulfilling queue, with command item."""
 
+    item: _Item
     command: List[str]
     stdout: str
     stderr: str

{python3_cyberfusion_queue_support-2.3 → python3_cyberfusion_queue_support-2.5}/src/cyberfusion/QueueSupport/items/command.py

@@ -45,11 +45,12 @@ class CommandItem(_Item):
                     outcome.command,
                     check=True,
                     text=True,
-                    capture_output=True,
+                    stdout=subprocess.PIPE,
+                    stderr=subprocess.PIPE,
                 )
 
-                logger.info("Command stdout: %s", output.stdout)
-                logger.info("Command stderr: %s", output.stderr)
+                outcome.stdout = output.stdout
+                outcome.stderr = output.stderr
             except subprocess.CalledProcessError as e:
                 raise CommandQueueFulfillFailed(
                     self, command=outcome.command, stdout=e.stdout, stderr=e.stderr

python3_cyberfusion_queue_support-2.5/src/cyberfusion/QueueSupport/migrations/versions/8023b9eecdd1_add_traceback_to_queue_items.py

@@ -0,0 +1,25 @@
+"""Add traceback to queue_items
+
+Revision ID: 8023b9eecdd1
+Revises: 9ae29b5db790
+Create Date: 2025-06-07 12:32:49.485214
+
+"""
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = "8023b9eecdd1"
+down_revision = "9ae29b5db790"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    op.add_column("queue_items", sa.Column("traceback", sa.String(), nullable=True))
+
+
+def downgrade() -> None:
+    op.drop_column("queue_items", "traceback")

{python3_cyberfusion_queue_support-2.3 → python3_cyberfusion_queue_support-2.5}/src/cyberfusion/QueueSupport/outcomes.py

@@ -9,6 +9,8 @@ from cyberfusion.DatabaseSupport.databases import Database
 from cyberfusion.QueueSupport.interfaces import OutcomeInterface
 from cyberfusion.SystemdSupport.units import Unit
 
+from cyberfusion.QueueSupport.sentinels import UNKNOWN
+
 
 class CopyItemCopyOutcome(OutcomeInterface):
     """Represents outcome."""
@@ -147,9 +149,17 @@ class RmTreeItemRemoveOutcome(OutcomeInterface):
 class CommandItemRunOutcome(OutcomeInterface):
     """Represents outcome."""
 
-    def __init__(self, *, command: List[str]) -> None:
+    def __init__(
+        self,
+        *,
+        command: List[str],
+        stdout: str | UNKNOWN = UNKNOWN,
+        stderr: str | UNKNOWN = UNKNOWN,
+    ) -> None:
         """Set attributes."""
         self.command = command
+        self.stdout = stdout
+        self.stderr = stderr
 
     def __str__(self) -> str:
         """Get human-readable string."""
@@ -160,7 +170,11 @@ class CommandItemRunOutcome(OutcomeInterface):
         if not isinstance(other, CommandItemRunOutcome):
             return False
 
-        return other.command == self.command
+        return (
+            other.command == self.command
+            and other.stdout == self.stdout
+            and other.stderr == self.stderr
+        )
 
 
 class ChmodItemModeChangeOutcome(OutcomeInterface):

python3_cyberfusion_queue_support-2.5/src/cyberfusion/QueueSupport/sentinels.py

@@ -0,0 +1,3 @@
+from typing import TypeVar
+
+UNKNOWN = TypeVar("UNKNOWN")

{python3_cyberfusion_queue_support-2.3 → python3_cyberfusion_queue_support-2.5}/src/python3_cyberfusion_queue_support.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python3-cyberfusion-queue-support
-Version: 2.3
+Version: 2.5
 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.3 → python3_cyberfusion_queue_support-2.5}/src/python3_cyberfusion_queue_support.egg-info/SOURCES.txt

@@ -6,6 +6,7 @@ src/cyberfusion/QueueSupport/database.py
 src/cyberfusion/QueueSupport/encoders.py
 src/cyberfusion/QueueSupport/interfaces.py
 src/cyberfusion/QueueSupport/outcomes.py
+src/cyberfusion/QueueSupport/sentinels.py
 src/cyberfusion/QueueSupport/settings.py
 src/cyberfusion/QueueSupport/utilities.py
 src/cyberfusion/QueueSupport/exceptions/__init__.py
@@ -35,6 +36,7 @@ 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/8023b9eecdd1_add_traceback_to_queue_items.py
 src/cyberfusion/QueueSupport/migrations/versions/9ae29b5db790_add_string_to_queue_item_outcomes.py
 src/cyberfusion/QueueSupport/migrations/versions/__init__.py
 src/python3_cyberfusion_queue_support.egg-info/PKG-INFO