Merge pull request learningequality#5771 from rtibbles/hotfixesintounstable

Hotfixes into unstable

Author: bjester

.gitignore

@@ -26,10 +26,14 @@ var/
 # Ignore editor / IDE related data
 .vscode/
 .claude/
+.gemini/
 
 # IntelliJ IDE, except project config
 .idea/
 /*.iml
+.junie/
+.aiassistant/
+.aiignore
 # ignore future updates to run configuration
 .run/devserver.run.xml
 

contentcuration/contentcuration/constants/completion_criteria.py

@@ -3,7 +3,9 @@
 from jsonschema.validators import validator_for
 from le_utils.constants import completion_criteria
 from le_utils.constants import content_kinds
+from le_utils.constants import exercises
 from le_utils.constants import mastery_criteria
+from le_utils.constants import modalities
 
 
 def _build_validator():
@@ -52,10 +54,11 @@ def _build_validator():
         completion_criteria.APPROX_TIME,
         completion_criteria.REFERENCE,
     },
+    content_kinds.TOPIC: {completion_criteria.MASTERY},
 }
 
 
-def check_model_for_kind(data, kind):
+def check_model_for_kind(data, kind, modality=None):
     model = data.get("model")
     if kind is None or model is None or kind not in ALLOWED_MODELS_PER_KIND:
         return
@@ -68,11 +71,37 @@ def check_model_for_kind(data, kind):
             )
         )
 
+    if kind == content_kinds.TOPIC:
+        check_topic_completion_criteria(data, modality)
 
-def validate(data, kind=None):
+
+def check_topic_completion_criteria(data, modality):
+    """
+    Validates topic-specific completion criteria rules:
+    - Topics can only have completion criteria if modality is UNIT
+    - Topics can only use PRE_POST_TEST mastery model
+    """
+    # Topics can only have completion criteria with UNIT modality
+    if modality != modalities.UNIT:
+        raise ValidationError(
+            "Topics can only have completion criteria with UNIT modality"
+        )
+
+    # Topics can only use PRE_POST_TEST mastery model
+    threshold = data.get("threshold", {})
+    mastery_model = threshold.get("mastery_model")
+    if mastery_model is not None and mastery_model != exercises.PRE_POST_TEST:
+        raise ValidationError(
+            "mastery_model '{}' is invalid for topic content kind; "
+            "only '{}' is allowed".format(mastery_model, exercises.PRE_POST_TEST)
+        )
+
+
+def validate(data, kind=None, modality=None):
     """
     :param data: Dictionary of data to validate
     :param kind: A str of the node content kind
+    :param modality: A str of the node modality (required for topics with completion criteria)
     :raises: ValidationError: When invalid
     """
     # empty dicts are okay
@@ -104,4 +133,4 @@ def validate(data, kind=None):
         e.error_list.extend(error_descriptions)
         raise e
 
-    check_model_for_kind(data, kind)
+    check_model_for_kind(data, kind, modality)

contentcuration/contentcuration/frontend/channelEdit/pages/StagingTreePage/index.vue

@@ -227,6 +227,7 @@
             </VBtn>
 
             <VBtn
+              v-if="false"
               color="primary"
               data-test="display-publish-draft-dialog-btn"
               @click="displayPublishDraftDialog = true"

contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SearchOrBrowseWindow.vue

@@ -400,7 +400,6 @@
       ...mapGetters('contentNode', ['getContentNodeAncestors']),
       ...mapGetters('currentChannel', ['currentChannel']),
       ...mapGetters('importFromChannels', ['savedSearchesExist']),
-      ...mapGetters(['isAIFeatureEnabled']),
       ...mapState('importFromChannels', ['selected']),
       isBrowsing() {
         return this.$route.name === RouteNames.IMPORT_FROM_CHANNELS_BROWSE;
@@ -432,10 +431,6 @@
         };
       },
       shouldShowRecommendations() {
-        if (!this.isAIFeatureEnabled) {
-          return false;
-        }
-
         if (this.embedTopicRequest === null) {
           return false;
         }

contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/__tests__/SearchOrBrowseWindow.spec.js

@@ -77,7 +77,6 @@ describe('SearchOrBrowseWindow', () => {
     getters = {
       'currentChannel/currentChannel': () => ({ language: 'en' }),
       'importFromChannels/savedSearchesExist': () => true,
-      isAIFeatureEnabled: () => true,
       'contentNode/getContentNodeAncestors': () => () => [{ id: 'node-1', title: 'Test folder' }],
     };
 
@@ -132,9 +131,7 @@ describe('SearchOrBrowseWindow', () => {
       actions: {
         showSnackbar: actions.showSnackbar,
       },
-      getters: {
-        isAIFeatureEnabled: getters.isAIFeatureEnabled,
-      },
+      getters: {},
     });
 
     const routes = [

contentcuration/contentcuration/frontend/shared/views/GlobalSnackbar.vue

@@ -5,6 +5,7 @@
     :key="key"
     :timeout="snackbarOptions.duration"
     left
+    multi-line
     :value="snackbarIsVisible"
     @input="visibilityToggled"
   >

contentcuration/contentcuration/frontend/shared/views/policies/TermsOfServiceModal.vue

@@ -185,7 +185,7 @@
         <p>
           <KExternalLink
             :text="$tr('dmcaLink')"
-            href="https://docs.google.com/forms/d/e/1FAIpQLSd7qWORCOOczCnOlDzaftIjBsaUtl3DKH3hbxlO1arRc1_IQg/viewform?usp=sf_link"
+            href="https://forms.gle/oviMu2YPuFSrW7S26"
             :openInNewTab="true"
           />
         </p>

contentcuration/contentcuration/frontend/shared/vuex/session/index.js

@@ -6,7 +6,6 @@ import { Session, User } from 'shared/data/resources';
 import { forceServerSync } from 'shared/data/serverSync';
 import translator from 'shared/translator';
 import { applyMods } from 'shared/data/applyRemoteChanges';
-import { FeatureFlagKeys } from 'shared/constants';
 
 function langCode(language) {
   // Turns a Django language name (en-gb) into an ISO language code (en-GB)
@@ -95,12 +94,6 @@ export default {
         return getters.isAdmin || Boolean(getters.featureFlags[flag]);
       };
     },
-    isAIFeatureEnabled(state, getters) {
-      if (getters.loggedIn) {
-        return getters.hasFeatureEnabled(FeatureFlagKeys.ai_feature);
-      }
-      return false;
-    },
     hasNewNotifications(state) {
       const {
         newest_notification_date: newestNotificationDate,

contentcuration/contentcuration/frontend/shared/vuex/session/index.spec.js

@@ -1,5 +1,4 @@
 import vuexSessionModule from './index.js';
-import { FeatureFlagKeys } from 'shared/constants';
 
 describe('session module feature flag related getters', () => {
   let state;
@@ -12,7 +11,6 @@ describe('session module feature flag related getters', () => {
         },
       },
     };
-    state.currentUser.feature_flags[FeatureFlagKeys.ai_feature] = true;
   });
 
   describe('featureFlags', () => {
@@ -54,31 +52,4 @@ describe('session module feature flag related getters', () => {
       expect(getters.hasFeatureEnabled(state, getters)('false_flag')).toBe(false);
     });
   });
-
-  describe('isAIFeatureEnabled', () => {
-    let getters;
-    beforeEach(() => {
-      getters = {
-        loggedIn: true,
-        hasFeatureEnabled: vuexSessionModule.getters.hasFeatureEnabled(state, {
-          featureFlags: vuexSessionModule.getters.featureFlags(state),
-          isAdmin: false,
-        }),
-        isAIFeatureEnabled: vuexSessionModule.getters.isAIFeatureEnabled,
-      };
-    });
-    it('should return false if not logged in', () => {
-      getters.loggedIn = false;
-      expect(getters.isAIFeatureEnabled(state, getters)).toBe(false);
-    });
-
-    it('should return true if logged in and ai feature flag is true', () => {
-      expect(getters.isAIFeatureEnabled(state, getters)).toBe(true);
-    });
-
-    it('should return false if logged in and ai feature flag is false', () => {
-      state.currentUser.feature_flags[FeatureFlagKeys.ai_feature] = false;
-      expect(getters.isAIFeatureEnabled(state, getters)).toBe(false);
-    });
-  });
 });

contentcuration/contentcuration/management/commands/fix_exercise_extra_fields.py

@@ -0,0 +1,158 @@
+import json
+import logging as logmodule
+import time
+
+from django.core.management.base import BaseCommand
+from le_utils.constants import content_kinds
+from le_utils.constants import exercises
+
+from contentcuration.models import ContentNode
+from contentcuration.utils.nodes import migrate_extra_fields
+
+logging = logmodule.getLogger("command")
+
+CHUNKSIZE = 5000
+
+
+def _needs_m_n_fix(extra_fields):
+    """
+    Check if already-migrated extra_fields have non-null m/n
+    on a non-m_of_n mastery model.
+    """
+    try:
+        threshold = extra_fields["options"]["completion_criteria"]["threshold"]
+    except (KeyError, TypeError):
+        return False
+    mastery_model = threshold.get("mastery_model")
+    if mastery_model is None or mastery_model == exercises.M_OF_N:
+        return False
+    return threshold.get("m") is not None or threshold.get("n") is not None
+
+
+def _needs_old_style_migration(extra_fields):
+    """
+    Check if extra_fields still has old-style top-level mastery_model.
+    """
+    return isinstance(extra_fields, dict) and "mastery_model" in extra_fields
+
+
+class Command(BaseCommand):
+    help = (
+        "Fix exercise extra_fields that were migrated with invalid m/n values "
+        "in their completion criteria threshold. Non-m_of_n mastery models "
+        "require m and n to be null, but old data may have had non-null values "
+        "that were carried over during migration. Also migrates any remaining "
+        "old-style extra_fields to the new format."
+    )
+
+    def add_arguments(self, parser):
+        parser.add_argument(
+            "--dry-run",
+            action="store_true",
+            help="Report what would be changed without modifying the database.",
+        )
+
+    def handle(self, *args, **options):
+        dry_run = options.get("dry_run", False)
+        start = time.time()
+
+        # Single pass over all exercises, filtering in Python to avoid
+        # expensive nested JSON field queries in the database.
+        queryset = ContentNode.objects.filter(kind_id=content_kinds.EXERCISE)
+
+        total = ContentNode.objects.filter(kind_id="exercise").count()
+        migrated_fixed = 0
+        migrated_complete = 0
+        old_style_fixed = 0
+        old_style_complete = 0
+        incomplete_fixed = 0
+        exercises_checked = 0
+
+        for node in queryset.iterator(chunk_size=CHUNKSIZE):
+            fix_type, complete = self._process_node(node, dry_run)
+            if fix_type == "old_style":
+                old_style_fixed += 1
+                if complete:
+                    old_style_complete += 1
+            elif fix_type == "m_n_fix":
+                migrated_fixed += 1
+                if complete:
+                    migrated_complete += 1
+            elif fix_type == "incomplete" and complete:
+                incomplete_fixed += 1
+            exercises_checked += 1
+            if exercises_checked % CHUNKSIZE == 0:
+                logging.info(
+                    "{} / {} exercises checked".format(exercises_checked, total)
+                )
+                logging.info(
+                    "{} marked complete out of {} old style fixed".format(
+                        old_style_complete, old_style_fixed
+                    )
+                )
+                logging.info(
+                    "{} marked complete out of {} migrated fixed".format(
+                        migrated_complete, migrated_fixed
+                    )
+                )
+                logging.info(
+                    "{} marked complete that were previously incomplete".format(
+                        incomplete_fixed
+                    )
+                )
+
+        logging.info("{} / {} exercises checked".format(exercises_checked, total))
+        logging.info(
+            "{} marked complete out of {} old style fixed".format(
+                old_style_complete, old_style_fixed
+            )
+        )
+        logging.info(
+            "{} marked complete out of {} migrated fixed".format(
+                migrated_complete, migrated_fixed
+            )
+        )
+        logging.info(
+            "{} marked complete that were previously incomplete".format(
+                incomplete_fixed
+            )
+        )
+        logging.info(
+            "Done in {:.1f}s. Fixed {} migrated exercises, "
+            "migrated {} old-style exercises."
+            "marked {} previously incomplete exercises complete. {}".format(
+                time.time() - start,
+                migrated_fixed,
+                old_style_fixed,
+                incomplete_fixed,
+                " (dry run)" if dry_run else "",
+            )
+        )
+
+    def _process_node(self, node, dry_run):
+        ef = node.extra_fields
+        was_complete = node.complete
+        if isinstance(ef, str):
+            try:
+                ef = json.loads(ef)
+            except (json.JSONDecodeError, ValueError):
+                return None, None
+        if not isinstance(ef, dict):
+            return None, None
+
+        if _needs_old_style_migration(ef):
+            ef = migrate_extra_fields(ef)
+            fix_type = "old_style"
+        elif _needs_m_n_fix(ef):
+            ef["options"]["completion_criteria"]["threshold"]["m"] = None
+            ef["options"]["completion_criteria"]["threshold"]["n"] = None
+            fix_type = "m_n_fix"
+        elif not was_complete:
+            fix_type = "incomplete"
+        else:
+            return None, None
+        node.extra_fields = ef
+        complete = not node.mark_complete()
+        if not dry_run:
+            node.save(update_fields=["extra_fields", "complete"])
+        return fix_type, complete