Make JSONSetting more ergonomic

lms/models/json_settings.py

@@ -91,9 +91,9 @@ class JSONSettings(MutableDict):
     >>> model.settings.changed()
     """
 
-    fields: Mapping[Any, JSONSetting] | None = None
+    fields: Mapping[Any, JSONSetting]
     """
-    An optional spec for the acceptable fields and types.
+    An spec for the acceptable fields and types.
     """
 
     def get(self, group: str, key: str, default=None):  # type: ignore[override]
@@ -109,7 +109,12 @@ def get(self, group: str, key: str, default=None):  # type: ignore[override]
         """
         return super().get(group, {}).get(key, default)
 
-    def get_setting(self, setting: JSONSetting):
+    def get_setting(self, setting_name: Any) -> Any:
+        setting = self.fields.get(setting_name)
+        if not setting:
+            err = f"Unknown setting for type {self.__class__.__name__}: {setting_name}"
+            raise ValueError(err)
+
         value = self.get(setting.group, setting.key, setting.default)
         if value is None:  # None is used a sentinel for "unset" or "default"
             value = setting.default

lms/resources/_js_config/file_picker_config.py

@@ -47,10 +47,10 @@ def blackboard_config(cls, request, application_instance):
     def moodle_config(cls, request, application_instance):
         ai_settings = application_instance.settings
         files_enabled = ai_settings.get_setting(
-            ai_settings.fields[ai_settings.Settings.MOODLE_FILES_ENABLED]
+            ai_settings.Settings.MOODLE_FILES_ENABLED
         )
         pages_enabled = ai_settings.get_setting(
-            ai_settings.fields[ai_settings.Settings.MOODLE_PAGES_ENABLED]
+            ai_settings.Settings.MOODLE_PAGES_ENABLED
         )
 
         config = {"enabled": files_enabled, "pagesEnabled": pages_enabled}

lms/services/roster.py

@@ -523,9 +523,7 @@ def _get_roster_users(
             if LTIRoleService.is_instructor(roles) or (
                 LTIRoleService.is_learner(roles)
                 and ai_settings.get_setting(
-                    ai_settings.fields[
-                        ai_settings.Settings.HYPOTHESIS_COLLECT_STUDENT_EMAILS
-                    ]
+                    ai_settings.Settings.HYPOTHESIS_COLLECT_STUDENT_EMAILS
                 )
             ):
                 email = member.get("email")

lms/services/user.py

@@ -75,9 +75,7 @@ def upsert_user(self, lti_user: LTIUser) -> User:
         if lti_user.is_instructor or (
             lti_user.is_learner
             and ai_settings.get_setting(
-                ai_settings.fields[
-                    ai_settings.Settings.HYPOTHESIS_COLLECT_STUDENT_EMAILS
-                ]
+                ai_settings.Settings.HYPOTHESIS_COLLECT_STUDENT_EMAILS
             )
         ):
             # Always store instructor emails

lms/services/youtube.py

@@ -90,9 +90,7 @@ def factory(_context, request) -> YouTubeService:
     app_settings = request.registry.settings
 
     return YouTubeService(
-        enabled=ai_settings.get_setting(
-            ai_settings.fields[ai_settings.Settings.YOUTUBE_ENABLED]
-        ),
+        enabled=ai_settings.get_setting(ai_settings.Settings.YOUTUBE_ENABLED),
         api_key=app_settings.get("youtube_api_key"),
         http=request.find_service(name="http"),
     )

lms/views/lti/basic_launch.py

@@ -250,16 +250,12 @@ def _show_document(self, assignment):
         # should be enabled here via `self.context.js_config.enable_client_feature`.
         ai_settings = self.request.lti_user.application_instance.settings
         if (
-            ai_settings.get_setting(
-                ai_settings.fields[ai_settings.Settings.HYPOTHESIS_MENTIONS]
-            )
+            ai_settings.get_setting(ai_settings.Settings.HYPOTHESIS_MENTIONS)
             and
             # Currently the only way to notify about mentions is email,
             # if we are not emails disable mentions altogether
             ai_settings.get_setting(
-                ai_settings.fields[
-                    ai_settings.Settings.HYPOTHESIS_COLLECT_STUDENT_EMAILS
-                ]
+                ai_settings.Settings.HYPOTHESIS_COLLECT_STUDENT_EMAILS
             )
         ):
             self.context.js_config.enable_client_feature("at_mentions")