Fix sql, singleton and additional widgets (#308)

Author: davidhozic

src/daf/logging/sql/mgr.py

@@ -1099,7 +1099,11 @@ async def analytic_get_num_invites(
             return await self.__analytic_get_counts(
                 session,
                 group_by,
-                [InviteLOG.invite_id],
+                [
+                    Invite.discord_id,
+                    GuildUSER.snowflake_id,
+                    GuildUSER.name,
+                ],
                 conditions,
                 limit,
                 sort_by,

src/daf_gui/widgets/convert.py

@@ -5,6 +5,7 @@
 from typing import Any, Union, List, get_type_hints
 from contextlib import suppress
 from enum import Enum
+from inspect import signature
 
 import decimal
 import datetime as dt
@@ -233,13 +234,20 @@ def convert_to_object_info(object_: object, save_original = False, cache = False
     """
     def _convert_object_info(object_, save_original, object_type, attrs):
         data_conv = {}
-
         for k, v in attrs.items():
             with suppress(Exception):
                 if callable(v):
                     value = v(object_)
                 else:
                     value = getattr(object_, v)
+
+                # Check if object is a singleton that is not builtin.
+                # Singletons should not be stored as they would get recreated causing issues on save -> load.
+                type_value = type(value)
+                with suppress(ValueError):  # Some don't have a signature
+                    if type_value.__name__ not in __builtins__ and not len(signature(type_value).parameters):
+                        continue
+
                 if value is object_:
                     data_conv[k] = value
                 else:

src/daf_gui/widgets/extra.py

@@ -144,10 +144,12 @@ def _callback(*args):
         continue
 
     if hasattr(item, "update"):
-        ADDITIONAL_WIDGETS[item] = [
+        if item not in ADDITIONAL_WIDGETS:
+            ADDITIONAL_WIDGETS[item] = []
+        ADDITIONAL_WIDGETS[item].extend([
             AdditionalWidget(ttk.Button, setup_additional_live_update, text="Live update"),
             AdditionalWidget(ttk.Button, setup_additional_live_refresh, text="Refresh")
-        ]
+        ])
 
 
 __all__ = list(globals().keys())