python3-cyberfusion-queue-support 2.6.3__tar.gz → 2.7__tar.gz

{python3_cyberfusion_queue_support-2.6.3 → python3_cyberfusion_queue_support-2.7}/PKG-INFO

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

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

{python3_cyberfusion_queue_support-2.6.3 → python3_cyberfusion_queue_support-2.7}/src/cyberfusion/QueueSupport/__init__.py

@@ -1,7 +1,6 @@
 """Classes for queue."""
 
 import logging
-from copy import copy
 from dataclasses import dataclass
 from typing import List
 import traceback
@@ -62,18 +61,13 @@ class Queue:
             else:
                 deduplicated = True
 
-        item_dict = copy(item.__dict__)
-
-        del item_dict["_reference"]
-        del item_dict["_hide_outcomes"]
-
         object_ = QueueItem(
             queue=self.queue_database_object,
             type=item.__class__.__name__,
             reference=item.reference,
             hide_outcomes=item.hide_outcomes,
             deduplicated=deduplicated,
-            attributes=item_dict,
+            attributes=item,
             traceback=None,
         )
 
@@ -141,7 +135,7 @@ class Queue:
                         queue_item=item_mapping.database_object,
                         queue_process=process_object,
                         type=outcome.__class__.__name__,
-                        attributes=outcome.__dict__,
+                        attributes=outcome,
                         string=str(outcome),
                     )
                 )

{python3_cyberfusion_queue_support-2.6.3 → python3_cyberfusion_queue_support-2.7}/src/cyberfusion/QueueSupport/database.py

@@ -1,3 +1,5 @@
+import json
+
 from alembic.config import Config
 import os
 import functools
@@ -13,19 +15,13 @@ from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy import event
 from sqlalchemy.types import JSON
 
-from cyberfusion.QueueSupport.encoders import json_serialize
+from cyberfusion.QueueSupport.encoders import CustomEncoder
 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")
@@ -51,7 +47,7 @@ def run_migrations() -> None:
 def make_database_session() -> Session:
     engine = create_engine(
         settings.database_path,
-        json_serializer=json_serialize,
+        json_serializer=lambda obj: json.dumps(obj, cls=CustomEncoder),
     )
 
     event.listen(engine, "connect", set_sqlite_pragma)
@@ -88,6 +84,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."""
@@ -95,9 +100,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."""
@@ -105,7 +115,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)
@@ -113,6 +122,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."""
@@ -120,9 +135,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.7/src/cyberfusion/QueueSupport/encoders.py

@@ -0,0 +1,42 @@
+from json import JSONEncoder
+from typing import Any
+
+from cyberfusion.DatabaseSupport.database_user_grants import DatabaseUserGrant
+from cyberfusion.DatabaseSupport.database_users import DatabaseUser
+from cyberfusion.DatabaseSupport.databases import Database
+from cyberfusion.SystemdSupport import Unit
+
+from cyberfusion.QueueSupport.outcomes import OutcomeInterface
+from cyberfusion.QueueSupport.items import _Item
+from cyberfusion.QueueSupport.sentinels import UNKNOWN
+
+
+class CustomEncoder(JSONEncoder):
+    def default(self, o: Any) -> Any:
+        if isinstance(o, _Item):
+            return {
+                key: value for key, value in vars(o).items() if not key.startswith("_")
+            }
+        elif isinstance(o, OutcomeInterface):
+            return vars(o)
+        elif isinstance(o, Unit):
+            return {"name": o.name}
+        elif isinstance(o, Database):
+            return {"name": o.name, "server_software_name": o.server_software_name}
+        elif isinstance(o, DatabaseUser):
+            return {
+                "name": o.name,
+                "server_software_name": o.server_software_name,
+                "host": o.host,
+            }
+        elif isinstance(o, DatabaseUserGrant):
+            return {
+                "database": o.database,
+                "database_user": o.database_user,
+                "privileges_name": o.privilege_names,
+                "table_name": o.table_name,
+            }
+        elif o == UNKNOWN:
+            return "unknown"
+
+        return super().default(o)

{python3_cyberfusion_queue_support-2.6.3 → python3_cyberfusion_queue_support-2.7}/src/cyberfusion/QueueSupport/items/database_user_drop.py

@@ -31,7 +31,7 @@ class DatabaseUserDropItem(_Item):
         """Set attributes."""
         self.server_software_name = server_software_name
         self.name = name
-        self._host = host
+        self.host = host
         self._reference = reference
         self._hide_outcomes = hide_outcomes
 
@@ -43,7 +43,7 @@ class DatabaseUserDropItem(_Item):
             ),
             name=self.name,
             server_software_name=self.server_software_name,
-            host=self._host,
+            host=self.host,
         )
 
     @property
@@ -77,5 +77,5 @@ class DatabaseUserDropItem(_Item):
         return (
             other.server_software_name == self.server_software_name
             and other.name == self.name
-            and other._host == self._host
+            and other.host == self.host
         )

{python3_cyberfusion_queue_support-2.6.3 → python3_cyberfusion_queue_support-2.7}/src/cyberfusion/QueueSupport/items/database_user_ensure_state.py

@@ -34,7 +34,7 @@ class DatabaseUserEnsureStateItem(_Item):
         self.server_software_name = server_software_name
         self.name = name
         self.password = password
-        self._host = host
+        self.host = host
         self._reference = reference
         self._hide_outcomes = hide_outcomes
 
@@ -47,7 +47,7 @@ class DatabaseUserEnsureStateItem(_Item):
             name=self.name,
             server_software_name=self.server_software_name,
             password=self.password,
-            host=self._host,
+            host=self.host,
         )
 
     @property
@@ -95,6 +95,6 @@ class DatabaseUserEnsureStateItem(_Item):
         return (
             other.server_software_name == self.server_software_name
             and other.name == self.name
-            and other._host == self._host
+            and other.host == self.host
             and other.password == self.password
         )

{python3_cyberfusion_queue_support-2.6.3 → python3_cyberfusion_queue_support-2.7}/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.3
+Version: 2.7
 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.3/src/cyberfusion/QueueSupport/encoders.py

@@ -1,21 +0,0 @@
-import json
-from json import JSONEncoder
-from typing import Any
-
-from cyberfusion.SystemdSupport import Unit
-
-from cyberfusion.QueueSupport.sentinels import UNKNOWN
-
-
-class CustomEncoder(JSONEncoder):
-    def default(self, o: Any) -> Any:
-        if isinstance(o, Unit):
-            return {"name": o.name}
-        elif o == UNKNOWN:
-            return "unknown"
-
-        return super().default(o)
-
-
-def json_serialize(obj: Any) -> str:
-    return json.dumps(obj, cls=CustomEncoder)