refactoring

model/settings.py

@@ -1,12 +1,16 @@
+from types import NoneType, UnionType
+from aiogram.utils.i18n.context import get_i18n
 from datetime import datetime
 from sqlmodel import SQLModel, Field, select
-from typing import Any, get_origin
+from typing import Any, get_args, get_origin
 
 from ..db import async_session
 from .role import RoleBase
 from .descriptors import EntityFieldDescriptor, Setting
 from ..utils import deserialize, serialize
 
+import ujson as json
+
 
 class DbSettings(SQLModel, table = True):
     __tablename__ = "settings"
@@ -31,23 +35,40 @@ class SettingsMetaclass(type):
             attr_value = attributes.get(annotation)
             name = annotation
             
+            type_ = attributes['__annotations__'][annotation]
+
             if isinstance(attr_value, Setting):
                 descriptor_kwargs = attr_value.__dict__.copy()
                 name = descriptor_kwargs.pop("name") or annotation
                 attributes[annotation] = EntityFieldDescriptor(
                     name = name,
                     field_name = annotation,
-                    type_ = attributes['__annotations__'][annotation],
+                    type_ = type_,
+                    type_base = type_,
                     **descriptor_kwargs)
             
             else:
                 attributes[annotation] = EntityFieldDescriptor(
                     name = annotation,
                     field_name = annotation,
-                    type_ = attributes['__annotations__'][annotation],
+                    type_ = type_,
+                    type_base = type_,
                     default = attr_value)
                 
+            type_origin = get_origin(type_)
+
+            if type_origin == list:
+                attributes[annotation].is_list = True
+                attributes[annotation].type_base = type_ = get_args(type_)[0]
+
+            elif type_origin == UnionType and get_args(type_)[1] == NoneType:
+                attributes[annotation].is_optional = True
+                attributes[annotation].type_base = type_ = get_args(type_)[0]
+                
             settings_descriptors[name] = attributes[annotation]
+
+            if base_classes and base_classes[0].__name__ == "Settings" and hasattr(base_classes[0], annotation):
+                setattr(base_classes[0], annotation, attributes[annotation])
         
         attributes["__annotations__"] = {}
         attributes["_settings_descriptors"] = settings_descriptors
@@ -61,8 +82,7 @@ class Settings(metaclass = SettingsMetaclass):
     _settings_descriptors: dict[str, EntityFieldDescriptor] = {}
     
     PAGE_SIZE: int = Setting(default = 10, )
-
-    SECURITY_SETTINGS_ROLES: list[RoleBase] = [RoleBase.SUPER_USER]
+    SECURITY_PARAMETERS_ROLES: list[RoleBase] = Setting(name = "SECPARAMS_ROLES", default = [RoleBase.SUPER_USER], is_visible = False)
 
     APP_STRINGS_WELCOME_P_NAME: str = Setting(name = "AS_WELCOME", default = "Welcome, {name}", is_visible = False)
     APP_STRINGS_GREETING_P_NAME: str = Setting(name = "AS_GREETING", default = "Hello, {name}", is_visible = False)
@@ -90,6 +110,7 @@ class Settings(metaclass = SettingsMetaclass):
     APP_STRINGS_YES_BTN: str = Setting(name = "AS_YES_BTN", default = "✅ Yes", is_visible = False)
     APP_STRINGS_NO_BTN: str = Setting(name = "AS_NO_BTN", default = "❌ No", is_visible = False)
     APP_STRINGS_CANCEL_BTN: str = Setting(name = "AS_CANCEL_BTN", default = "❌ Cancel", is_visible = False)
+    APP_STRINGS_CLEAR_BTN: str = Setting(name = "AS_CLEAR_BTN", default = "⌫ Clear", is_visible = False)
     APP_STRINGS_DONE_BTN: str = Setting(name = "AS_DONE_BTN", default = "✅ Done", is_visible = False)
     APP_STRINGS_SKIP_BTN: str = Setting(name = "AS_SKIP_BTN", default = "⏩️ Skip", is_visible = False)
     APP_STRINGS_FIELD_EDIT_PROMPT_TEMPLATE_P_NAME_VALUE: str = Setting(
@@ -104,18 +125,30 @@ class Settings(metaclass = SettingsMetaclass):
         name = "AS_STREDIT_LOC_TEMPLATE",
         default = "string for \"{name}\"",
         is_visible = False)
+    APP_STRINGS_VIEW_FILTER_EDIT_PROMPT: str = Setting(name = "AS_FILTEREDIT_PROMPT", default = "Enter filter value", is_visible = False) 
     APP_STRINGS_INVALID_INPUT: str = Setting(name = "AS_INVALID_INPUT", default = "Invalid input", is_visible = False)
 
     
     @classmethod
-    async def get[T](cls, param: T) -> T:
+    async def get[T](cls, param: T, all_locales = False, locale: str = None) -> T:
 
         name = param.field_name
 
-        if param.name not in cls._cache.keys():
+        if name not in cls._cache.keys():
             cls._cache[name] = await cls.load_param(param)
 
-        return cls._cache[name]
+        ret_val = cls._cache[name]
+
+        if param.localizable and not all_locales:
+            if not locale:
+                locale = get_i18n().current_locale
+            try:
+                obj = json.loads(ret_val)
+            except:
+                return ret_val
+            return obj.get(locale, obj[list(obj.keys())[0]])
+
+        return ret_val
     
 
     @classmethod
@@ -180,4 +213,4 @@ class Settings(metaclass = SettingsMetaclass):
     async def get_params(cls) -> dict[EntityFieldDescriptor, Any]:
         
         params = cls.list_params()
-        return {param: await cls.get(param) for _, param in params.items()}
+        return {param: await cls.get(param, all_locales = True) for _, param in params.items()}