python3-cyberfusion-queue-support 2.6.4__py3-none-any.whl → 2.7__py3-none-any.whl

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),
                     )
                 )

cyberfusion/QueueSupport/database.py

@@ -1,3 +1,5 @@
+import json
+
 from alembic.config import Config
 import os
 import functools
@@ -13,7 +15,7 @@ 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
 
 
@@ -45,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)

cyberfusion/QueueSupport/encoders.py

@@ -1,21 +1,42 @@
-import json
 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, Unit):
+        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)
-
-
-def json_serialize(obj: Any) -> str:
-    return json.dumps(obj, cls=CustomEncoder)

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
         )

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.4.dist-info → python3_cyberfusion_queue_support-2.7.dist-info}/METADATA

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

@@ -1,6 +1,6 @@
-cyberfusion/QueueSupport/__init__.py,sha256=M8p5MMMrnnmPcahALPN41S7DO8oSj4e5axbX6k0rzv4,4499
-cyberfusion/QueueSupport/database.py,sha256=VlQX3Vtq5J3dTTur2vgoi-4DrMDBHIea0SjJEmo9PAA,4136
-cyberfusion/QueueSupport/encoders.py,sha256=_xv2OZrMqTwLd5LBtBpq97vehPgpB36iIngEGU_8azw,483
+cyberfusion/QueueSupport/__init__.py,sha256=1HItOphSXe4sP6yJT_15a3yDke1nzioUZ7Q8MuCQfUw,4345
+cyberfusion/QueueSupport/database.py,sha256=-8IOvsoDM1R5oG48HaG7qsM8O_lAbXwDkKJE5Ky3LJQ,4180
+cyberfusion/QueueSupport/encoders.py,sha256=SzuMoyr2q3ME8LI_bZtpP76Xg7SP0B4O4uUuywrDwBI,1532
 cyberfusion/QueueSupport/interfaces.py,sha256=ip8z6cfLFldQCDSec6fK6AIOdxOjIyFykDv4dCHJYSI,943
 cyberfusion/QueueSupport/outcomes.py,sha256=MjvhjfEu2rACvgZfAsjtmVPOUonuhyVhAuV5HuJDvgI,18903
 cyberfusion/QueueSupport/sentinels.py,sha256=LwD1BUxDJgY6aJr21cunZKRn5nycqqlNlmJhFKjqUBw,57
@@ -14,8 +14,8 @@ cyberfusion/QueueSupport/items/command.py,sha256=TrBWZEYW9tLJzypDdJH0je8U_P0Pgc0
 cyberfusion/QueueSupport/items/copy.py,sha256=08vPCIsgrkOH4Ryir8m8CpjT9Y4GL5vPmgWuVosK4q4,3007
 cyberfusion/QueueSupport/items/database_create.py,sha256=01Z3ULjhzQFjL4PSfvKNZ9pMkjiZb3RIr6WCirbaK6c,1832
 cyberfusion/QueueSupport/items/database_drop.py,sha256=cnmEL8gZ6ORBL-ylghQAQSq1FOZCtM6O8uwPcnqBI4c,1806
-cyberfusion/QueueSupport/items/database_user_drop.py,sha256=8t6M9OxNNp8iINrwsr5kMBbMP4tBMHFi8Wo9S_IYujA,2194
-cyberfusion/QueueSupport/items/database_user_ensure_state.py,sha256=t5AklbHWe11TqL2WO4o-Ci8N4NIWX0nFO12n20CbOQk,2940
+cyberfusion/QueueSupport/items/database_user_drop.py,sha256=PmqTVFBVjxPXrnIvlsDMFpYf6iC3l1wcqGY6CW_I4nw,2190
+cyberfusion/QueueSupport/items/database_user_ensure_state.py,sha256=EAxaS2ROBaAim5--Odn2c40hgIawQLRdEKOC0EDhlII,2936
 cyberfusion/QueueSupport/items/database_user_grant_grant.py,sha256=lEN1qPFeRy0NG5HzjinOxniw8QbrJPNPBfkanbonHBU,3692
 cyberfusion/QueueSupport/items/database_user_grant_revoke.py,sha256=iK4xIhM5fUhZy3XkZFBpxbv_CtfI34Fb2LW8AGF1DNk,3699
 cyberfusion/QueueSupport/items/mkdir.py,sha256=9Zzl72oGTHcRIz_vJd5r1Ty6nyasFwEqtGKa9xx05aY,1479
@@ -36,8 +36,8 @@ cyberfusion/QueueSupport/migrations/versions/571e55ab5ed5_initial_migration.py,s
 cyberfusion/QueueSupport/migrations/versions/8023b9eecdd1_add_traceback_to_queue_items.py,sha256=IfwqqHeE6e4iDH3bc6FrOgdBT4w-Kxa2MYv0dzYjEbk,497
 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
-python3_cyberfusion_queue_support-2.6.4.dist-info/METADATA,sha256=_VR05dxSDE5ak4VXFuKQtvRnwFXHV446w1sedceT-y8,4490
-python3_cyberfusion_queue_support-2.6.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-python3_cyberfusion_queue_support-2.6.4.dist-info/entry_points.txt,sha256=j42nbFWu1jTev4Ca3GhEZlH546t48aqYXnaKP20NWfA,91
-python3_cyberfusion_queue_support-2.6.4.dist-info/top_level.txt,sha256=ss011q9S6SL_KIIyq7iujFmIYa0grSjlnInO7cDkeag,12
-python3_cyberfusion_queue_support-2.6.4.dist-info/RECORD,,
+python3_cyberfusion_queue_support-2.7.dist-info/METADATA,sha256=jdemnuj86o2WT-NZq30l-q0MnERWJFqSVsFJ2-xCeXY,4488
+python3_cyberfusion_queue_support-2.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+python3_cyberfusion_queue_support-2.7.dist-info/entry_points.txt,sha256=j42nbFWu1jTev4Ca3GhEZlH546t48aqYXnaKP20NWfA,91
+python3_cyberfusion_queue_support-2.7.dist-info/top_level.txt,sha256=ss011q9S6SL_KIIyq7iujFmIYa0grSjlnInO7cDkeag,12
+python3_cyberfusion_queue_support-2.7.dist-info/RECORD,,