python3-cyberfusion-queue-support 3.0.3__py3-none-any.whl → 3.2__py3-none-any.whl

cyberfusion/QueueSupport/database.py

@@ -104,9 +104,7 @@ class QueueProcess(BaseModel):
     __tablename__ = "queue_processes"
 
     queue_id = Column(
-        Integer,
-        ForeignKey("queues.id", ondelete="CASCADE"),
-        nullable=False,
+        Integer, ForeignKey("queues.id", ondelete="CASCADE"), nullable=False, index=True
     )
     preview = Column(Boolean, nullable=False)
     status = Column(Enum(QueueProcessStatus), nullable=True)
@@ -125,9 +123,7 @@ class QueueItem(BaseModel):
     __tablename__ = "queue_items"
 
     queue_id = Column(
-        Integer,
-        ForeignKey("queues.id", ondelete="CASCADE"),
-        nullable=False,
+        Integer, ForeignKey("queues.id", ondelete="CASCADE"), nullable=False, index=True
     )
     type = Column(String(length=255), nullable=False)
     reference = Column(String(length=255), nullable=True)
@@ -154,11 +150,13 @@ class QueueItemOutcome(BaseModel):
         Integer,
         ForeignKey("queue_items.id", ondelete="CASCADE"),
         nullable=False,
+        index=True,
     )
     queue_process_id = Column(
         Integer,
         ForeignKey("queue_processes.id", ondelete="CASCADE"),
         nullable=False,
+        index=True,
     )
     type = Column(String(length=255), nullable=False)
     attributes = Column(JSON, nullable=False)

cyberfusion/QueueSupport/exceptions/__init__.py

@@ -7,27 +7,30 @@ from cyberfusion.QueueSupport.items import _Item
 
 
 class ItemError(Exception):
-    """Issues with item."""
-
     pass
 
 
 @dataclass
 class PathIsSymlinkError(ItemError):
-    """Path is symlink."""
+    path: str
 
+
+@dataclass
+class PathIsFileError(ItemError):
     path: str
 
 
 @dataclass
-class CommandQueueFulfillFailed(Exception):
-    """Error occurred while fulfilling queue, with command item."""
+class ParentNotFoundError(ItemError):
+    parent: str
+
 
+@dataclass
+class CommandQueueFulfillFailed(Exception):
     item: _Item
     command: List[str]
     stdout: str
     stderr: str
 
     def __str__(self) -> str:
-        """Get string representation."""
         return f"Command:\n\n{self.command}\n\nStdout:\n\n{self.stdout}\n\nStderr:\n\n{self.stderr}"

cyberfusion/QueueSupport/items/mkdir.py

@@ -2,9 +2,14 @@
 
 import logging
 import os
+from pathlib import Path
 from typing import List, Optional
 
-from cyberfusion.QueueSupport.exceptions import PathIsSymlinkError
+from cyberfusion.QueueSupport.exceptions import (
+    PathIsSymlinkError,
+    PathIsFileError,
+    ParentNotFoundError,
+)
 from cyberfusion.QueueSupport.items import _Item
 from cyberfusion.QueueSupport.outcomes import MkdirItemCreateOutcome
 
@@ -18,30 +23,38 @@ class MkdirItem(_Item):
         self,
         *,
         path: str,
+        recursively: bool = False,
         reference: Optional[str] = None,
         hide_outcomes: bool = False,
         fail_silently: bool = False,
     ) -> None:
         """Set attributes."""
         self.path = path
+        self.recursively = recursively
         self._reference = reference
         self._hide_outcomes = hide_outcomes
         self._fail_silently = fail_silently
 
-        if os.path.islink(self.path):
-            raise PathIsSymlinkError(self.path)
-
     @property
     def outcomes(self) -> List[MkdirItemCreateOutcome]:
         """Get outcomes of item."""
         outcomes = []
 
-        if not os.path.isdir(self.path):
-            outcomes.append(
-                MkdirItemCreateOutcome(
-                    path=self.path,
-                )
-            )
+        path_elements = list(reversed(Path(self.path).parents))
+        path_elements.append(Path(self.path))
+
+        for path in path_elements:
+            if os.path.islink(path):
+                raise PathIsSymlinkError(str(path))
+            elif os.path.isfile(path):
+                raise PathIsFileError(str(path))
+            elif os.path.isdir(path):
+                continue
+
+            if not self.recursively and str(path) != self.path:
+                raise ParentNotFoundError(str(path))
+
+            outcomes.append(MkdirItemCreateOutcome(path=str(path)))
 
         return outcomes
 

cyberfusion/QueueSupport/migrations/versions/93c79cb2baba_add_indexes.py

@@ -0,0 +1,52 @@
+"""Add indexes
+
+Revision ID: 93c79cb2baba
+Revises: 2f4316506856
+Create Date: 2025-10-03 13:55:00.001141
+
+"""
+
+from alembic import op
+
+
+# revision identifiers, used by Alembic.
+revision = "93c79cb2baba"
+down_revision = "2f4316506856"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    with op.batch_alter_table("queue_item_outcomes", schema=None) as batch_op:
+        batch_op.create_index(
+            batch_op.f("ix_queue_item_outcomes_queue_item_id"),
+            ["queue_item_id"],
+            unique=False,
+        )
+        batch_op.create_index(
+            batch_op.f("ix_queue_item_outcomes_queue_process_id"),
+            ["queue_process_id"],
+            unique=False,
+        )
+
+    with op.batch_alter_table("queue_items", schema=None) as batch_op:
+        batch_op.create_index(
+            batch_op.f("ix_queue_items_queue_id"), ["queue_id"], unique=False
+        )
+
+    with op.batch_alter_table("queue_processes", schema=None) as batch_op:
+        batch_op.create_index(
+            batch_op.f("ix_queue_processes_queue_id"), ["queue_id"], unique=False
+        )
+
+
+def downgrade() -> None:
+    with op.batch_alter_table("queue_processes", schema=None) as batch_op:
+        batch_op.drop_index(batch_op.f("ix_queue_processes_queue_id"))
+
+    with op.batch_alter_table("queue_items", schema=None) as batch_op:
+        batch_op.drop_index(batch_op.f("ix_queue_items_queue_id"))
+
+    with op.batch_alter_table("queue_item_outcomes", schema=None) as batch_op:
+        batch_op.drop_index(batch_op.f("ix_queue_item_outcomes_queue_process_id"))
+        batch_op.drop_index(batch_op.f("ix_queue_item_outcomes_queue_item_id"))

cyberfusion/QueueSupport/outcomes.py

@@ -483,19 +483,6 @@ class DatabaseUserEnsureStateItemEditPasswordOutcome(OutcomeInterface):
         if not isinstance(other, DatabaseUserEnsureStateItemEditPasswordOutcome):
             return False
 
-        print(
-            other.database_user.server_software_name,
-            other.database_user.name,
-            other.database_user.password,
-            other.database_user.host,
-        )
-        print(
-            self.database_user.server_software_name,
-            self.database_user.name,
-            self.database_user.password,
-            self.database_user.host,
-        )
-
         return (
             other.database_user.server_software_name
             == self.database_user.server_software_name

cyberfusion/QueueSupport/scripts/purge_queues.py

@@ -11,11 +11,8 @@ def main() -> None:
         days=settings.queue_purge_days
     )
 
-    queues = (
-        database_session.query(Queue).filter(Queue.created_at < purge_before_date).all()
-    )
+    queues = database_session.query(Queue).filter(Queue.created_at < purge_before_date)
 
-    for queue in queues:
-        database_session.delete(queue)
+    queues.delete()
 
     database_session.commit()

{python3_cyberfusion_queue_support-3.0.3.dist-info → python3_cyberfusion_queue_support-3.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python3-cyberfusion-queue-support
-Version: 3.0.3
+Version: 3.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-3.0.3.dist-info → python3_cyberfusion_queue_support-3.2.dist-info}/RECORD

@@ -1,13 +1,13 @@
 cyberfusion/QueueSupport/__init__.py,sha256=KvLhTLBUE3aUMc-HetRzAgPxYNIvnJ4sixqbw0WVuVo,4836
-cyberfusion/QueueSupport/database.py,sha256=cAFG587-ljpsbBq9hnyqWxy4IHkllH1KptLmzA5TQmo,4711
+cyberfusion/QueueSupport/database.py,sha256=SRGHi0MJ7GerGcKOvEpu4lp82OfYf-Ev_eZeJ1PmexM,4741
 cyberfusion/QueueSupport/encoders.py,sha256=SzuMoyr2q3ME8LI_bZtpP76Xg7SP0B4O4uUuywrDwBI,1532
 cyberfusion/QueueSupport/enums.py,sha256=XzOy5J4sa7SOCKNFyw9kw3MyqDkjPookbfiMQHRHGfQ,122
 cyberfusion/QueueSupport/interfaces.py,sha256=ip8z6cfLFldQCDSec6fK6AIOdxOjIyFykDv4dCHJYSI,943
-cyberfusion/QueueSupport/outcomes.py,sha256=MjvhjfEu2rACvgZfAsjtmVPOUonuhyVhAuV5HuJDvgI,18903
+cyberfusion/QueueSupport/outcomes.py,sha256=M1qkxSBxrNFZMZJAmdiixmFo6peWFrVL9ka7l1AdnUI,18512
 cyberfusion/QueueSupport/sentinels.py,sha256=LwD1BUxDJgY6aJr21cunZKRn5nycqqlNlmJhFKjqUBw,57
 cyberfusion/QueueSupport/settings.py,sha256=UL0WDxK7W6N--SdhKwkSQf1b3ZKstzxMirZzpyjgefE,289
 cyberfusion/QueueSupport/utilities.py,sha256=vsQOZunX0UwudoIauCPV-Ij1TVrjWG_16wctvJPaMVQ,186
-cyberfusion/QueueSupport/exceptions/__init__.py,sha256=2YAEQg8bsAMHq184ZCggNogaY3gsUv7Zym1EXAPSG-I,657
+cyberfusion/QueueSupport/exceptions/__init__.py,sha256=MfSC7X751Kbe1lhQAcUeX3LIUlUOfBoAtFNUIFWrQNo,618
 cyberfusion/QueueSupport/items/__init__.py,sha256=_2nJSRRDofe-whGZOLzp0SXoafZNYP6GAh8DVBNj5Jg,1077
 cyberfusion/QueueSupport/items/chmod.py,sha256=jkS3hkmMxgUpPumhK1DfiR6YQ-gZBKmaizwObdjF_7o,2122
 cyberfusion/QueueSupport/items/chown.py,sha256=8NGg4p6r9Jl03jC1Z2J2EBdUVFjgV0nXVmlw0YZIS2k,4135
@@ -19,7 +19,7 @@ cyberfusion/QueueSupport/items/database_user_drop.py,sha256=KrWbRYD7CzoxkHVVo82g
 cyberfusion/QueueSupport/items/database_user_ensure_state.py,sha256=kJC6be3bnWuw-yKhb2BqIumAXPMRvyPgIu4Rt4timE4,3022
 cyberfusion/QueueSupport/items/database_user_grant_grant.py,sha256=hZ6xv0CSBrCcxjX5OKje66CnzCDGp8Melx-JmfZUFc4,3773
 cyberfusion/QueueSupport/items/database_user_grant_revoke.py,sha256=njD8TdEukco4JIg71L-cBYsl2g0Tzt9J6LUd3Xbcd5s,3780
-cyberfusion/QueueSupport/items/mkdir.py,sha256=FJZ1KuAMbnRDV8voDfN0ESNb-85A_hT-N8JJjNR5u4k,1560
+cyberfusion/QueueSupport/items/mkdir.py,sha256=hK7l8crazhT9KWozrMlzx6NlHjjIIMFLYioUyrqIuQ0,2022
 cyberfusion/QueueSupport/items/move.py,sha256=0JzuQdQ7DU3jXmF0xziE8G_SXQqQsWI95QUVWva11zM,1750
 cyberfusion/QueueSupport/items/rmtree.py,sha256=WtrdU8ehE2oT43RCYaUQhW2amZKSt1_Oxy5op5bMrHU,2007
 cyberfusion/QueueSupport/items/systemd_daemon_reload.py,sha256=MTHp3ypnyFh5y23lYKKS8wCLHQ4-HRRstImStubpPXE,1363
@@ -39,12 +39,13 @@ cyberfusion/QueueSupport/migrations/versions/52d1b17abcd0_add_status.py,sha256=g
 cyberfusion/QueueSupport/migrations/versions/571e55ab5ed5_initial_migration.py,sha256=1yYFZhQyHVnn1nHXxLVRb94V7gXprWYMfIDhF0_DPVU,2845
 cyberfusion/QueueSupport/migrations/versions/8023b9eecdd1_add_traceback_to_queue_items.py,sha256=IfwqqHeE6e4iDH3bc6FrOgdBT4w-Kxa2MYv0dzYjEbk,497
 cyberfusion/QueueSupport/migrations/versions/8406a0af7394_set_status_on_existing_queue_processes.py,sha256=fhfeErva3B3rrmr6-cbGO8DrjXU6qp1sIzVJGzOJ7iI,424
+cyberfusion/QueueSupport/migrations/versions/93c79cb2baba_add_indexes.py,sha256=raIrgSg6b4CboiSvtzhBy7q7kuREb8FeYKCUtBTaYbM,1651
 cyberfusion/QueueSupport/migrations/versions/9ae29b5db790_add_string_to_queue_item_outcomes.py,sha256=CzNJVL5Ia_J5woGsnCRSrlraoaT8YfgZUVOlAWHjb2Y,546
 cyberfusion/QueueSupport/migrations/versions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cyberfusion/QueueSupport/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cyberfusion/QueueSupport/scripts/purge_queues.py,sha256=0i77UEK_dzCof0I3wF0zagc6FXhx3obv7x5Ocju3i0M,539
-python3_cyberfusion_queue_support-3.0.3.dist-info/METADATA,sha256=qhFQy3jmqk-DIifaDHuEaze4-lIBGYeEbmDycDBoFLA,4621
-python3_cyberfusion_queue_support-3.0.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-python3_cyberfusion_queue_support-3.0.3.dist-info/entry_points.txt,sha256=z7WykKo9hbm5I1iMbHIearPGdkGemhQnSkl7a44zMDY,171
-python3_cyberfusion_queue_support-3.0.3.dist-info/top_level.txt,sha256=ss011q9S6SL_KIIyq7iujFmIYa0grSjlnInO7cDkeag,12
-python3_cyberfusion_queue_support-3.0.3.dist-info/RECORD,,
+cyberfusion/QueueSupport/scripts/purge_queues.py,sha256=W1-p85YhAJhJfHIPQrS0KVgrLMzWPlGniDTZ_dSma_w,473
+python3_cyberfusion_queue_support-3.2.dist-info/METADATA,sha256=0YfuZGV2z_sx_gWT4gy5vOm3fkHXQv0EJt96M0hPN94,4619
+python3_cyberfusion_queue_support-3.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+python3_cyberfusion_queue_support-3.2.dist-info/entry_points.txt,sha256=z7WykKo9hbm5I1iMbHIearPGdkGemhQnSkl7a44zMDY,171
+python3_cyberfusion_queue_support-3.2.dist-info/top_level.txt,sha256=ss011q9S6SL_KIIyq7iujFmIYa0grSjlnInO7cDkeag,12
+python3_cyberfusion_queue_support-3.2.dist-info/RECORD,,