Improved internal settings

src/cpl_core/configuration/configuration.py

@@ -290,6 +290,7 @@ class Configuration(ConfigurationABC):
                         Console.color_reset()
                         configuration.from_dict(value)
                     else:
+                        Console.error(sub, 1)
                         configuration = JSONProcessor.process(sub, value)
 
                     self.add_configuration(sub, configuration)

src/cpl_core/database/database_settings.py

@@ -65,36 +65,3 @@ class DatabaseSettings(ConfigurationModelABC):
     @property
     def auth_plugin(self) -> Optional[str]:
         return self._auth_plugin
-
-    # def from_dict(self, settings: dict):
-    #     r"""Sets attributes from given dict
-    #
-    #     Parameter:
-    #     settings: :class:`dict`
-    #     """
-    #     try:
-    #         self._host = settings[DatabaseSettingsNameEnum.host.value]
-    #         if DatabaseSettingsNameEnum.port.value in settings:
-    #             self._port = settings[DatabaseSettingsNameEnum.port.value]
-    #         else:
-    #             self._port = 3306
-    #         self._user = settings[DatabaseSettingsNameEnum.user.value]
-    #         self._password = settings[DatabaseSettingsNameEnum.password.value]
-    #         self._databse = settings[DatabaseSettingsNameEnum.database.value]
-    #
-    #         if DatabaseSettingsNameEnum.charset.value in settings:
-    #             self._charset = settings[DatabaseSettingsNameEnum.charset.value]
-    #
-    #         if DatabaseSettingsNameEnum.buffered.value in settings:
-    #             self._use_unicode = bool(settings[DatabaseSettingsNameEnum.use_unicode.value])
-    #
-    #         if DatabaseSettingsNameEnum.buffered.value in settings:
-    #             self._buffered = bool(settings[DatabaseSettingsNameEnum.buffered.value])
-    #
-    #         if DatabaseSettingsNameEnum.auth_plugin.value in settings:
-    #             self._auth_plugin = settings[DatabaseSettingsNameEnum.auth_plugin.value]
-    #     except Exception as e:
-    #         Console.set_foreground_color(ForegroundColorEnum.red)
-    #         Console.write_line(f"[ ERROR ] [ {__name__} ]: Reading error in {type(self).__name__} settings")
-    #         Console.write_line(f"[ EXCEPTION ] [ {__name__} ]: {e} -> {traceback.format_exc()}")
-    #         Console.set_foreground_color(ForegroundColorEnum.default)

src/cpl_core/logging/logging_settings.py

@@ -55,15 +55,3 @@ class LoggingSettings(ConfigurationModelABC):
     @level.setter
     def level(self, level: LoggingLevelEnum) -> None:
         self._level = level
-
-    # def from_dict(self, settings: dict):
-    #     try:
-    #         self._path = settings[LoggingSettingsNameEnum.path.value]
-    #         self._filename = settings[LoggingSettingsNameEnum.filename.value]
-    #         self._console = LoggingLevelEnum[settings[LoggingSettingsNameEnum.console_level.value]]
-    #         self._level = LoggingLevelEnum[settings[LoggingSettingsNameEnum.file_level.value]]
-    #     except Exception as e:
-    #         Console.set_foreground_color(ForegroundColorEnum.red)
-    #         Console.write_line(f"[ ERROR ] [ {__name__} ]: Reading error in {type(self).__name__} settings")
-    #         Console.write_line(f"[ EXCEPTION ] [ {__name__} ]: {e} -> {traceback.format_exc()}")
-    #         Console.set_foreground_color(ForegroundColorEnum.default)

src/cpl_core/mailing/email_client_settings.py

@@ -49,13 +49,3 @@ class EMailClientSettings(ConfigurationModelABC):
     @credentials.setter
     def credentials(self, credentials: str) -> None:
         self._credentials = credentials
-
-    # def from_dict(self, settings: dict):
-    #     try:
-    #         self._host = settings[EMailClientSettingsNameEnum.host.value]
-    #         self._port = settings[EMailClientSettingsNameEnum.port.value]
-    #         self._user_name = settings[EMailClientSettingsNameEnum.user_name.value]
-    #         self._credentials = settings[EMailClientSettingsNameEnum.credentials.value]
-    #     except Exception as e:
-    #         Console.error(f"[ ERROR ] [ {__name__} ]: Reading error in {type(self).__name__} settings")
-    #         Console.error(f"[ EXCEPTION ] [ {__name__} ]: {e} -> {traceback.format_exc()}")

src/cpl_core/time/time_format_settings.py

@@ -54,15 +54,3 @@ class TimeFormatSettings(ConfigurationModelABC):
     @date_time_log_format.setter
     def date_time_log_format(self, date_time_now_format: str) -> None:
         self._date_time_log_format = date_time_now_format
-
-    # def from_dict(self, settings: dict):
-    #     try:
-    #         self._date_format = settings[TimeFormatSettingsNamesEnum.date_format.value]
-    #         self._time_format = settings[TimeFormatSettingsNamesEnum.time_format.value]
-    #         self._date_time_format = settings[TimeFormatSettingsNamesEnum.date_time_format.value]
-    #         self._date_time_log_format = settings[TimeFormatSettingsNamesEnum.date_time_log_format.value]
-    #     except Exception as e:
-    #         Console.set_foreground_color(ForegroundColorEnum.red)
-    #         Console.write_line(f"[ ERROR ] [ {__name__} ]: Reading error in {type(self).__name__} settings")
-    #         Console.write_line(f"[ EXCEPTION ] [ {__name__} ]: {e} -> {traceback.format_exc()}")
-    #         Console.set_foreground_color(ForegroundColorEnum.default)

src/cpl_core/utils/json_processor.py

@@ -24,8 +24,8 @@ class JSONProcessor:
                 else:
                     value = values[name_first_lower]
 
-                if isinstance(value, dict):
-                    value = JSONProcessor.process(parameter.annotation, value)
+                if isinstance(value, dict) and not issubclass(parameter.annotation, dict):
+                    value = JSONProcessor.process(dict, value)
 
                 if issubclass(parameter.annotation, enum.Enum):
                     value = parameter.annotation[value]