tags to ensure that it is valid XML
- if isinstance(grade_response, dict) and 'msg' in grade_response:
- grade_response['msg'] = HTML("
{0}
").format(grade_response['msg'])
-
- data = {
- 'xqueue_header': json.dumps(xqueue_header),
- 'xqueue_body': json.dumps(grade_response)
- }
-
- post(postback_url, data=data)
- self.log_message(f"XQueue: sent grading response {data} to {postback_url}")
-
- def _register_submission(self, xqueue_body_json):
- """
- If configured, send the submission's grader payload to another service.
- """
- url = self.server.config.get('register_submission_url')
-
- # If not configured, do not need to send anything
- if url is not None:
-
- try:
- xqueue_body = json.loads(xqueue_body_json)
- except ValueError:
- self.log_error(
- f"Could not decode XQueue body as JSON: '{xqueue_body_json}'")
-
- else:
-
- # Retrieve the grader payload, which should be a JSON-encoded dict.
- # We pass the payload directly to the service we are notifying, without
- # inspecting the contents.
- grader_payload = xqueue_body.get('grader_payload')
-
- if grader_payload is not None:
- response = post(url, data={'grader_payload': grader_payload})
- if not response.ok:
- self.log_error(
- "Could register submission at URL '{}'. Status was {}".format(
- url, response.status_code))
-
- else:
- self.log_message(
- f"XQueue body is missing 'grader_payload' key: '{xqueue_body}'"
- )
-
- def _is_grade_request(self):
- """
- Return a boolean indicating whether the requested URL indicates a submission.
- """
- return 'xqueue/submit' in self.path
-
-
-class StubXQueueService(StubHttpService):
- """
- A stub XQueue grading server that responds to POST requests to localhost.
- """
-
- HANDLER_CLASS = StubXQueueHandler
- NON_QUEUE_CONFIG_KEYS = ['default', 'register_submission_url']
-
- @property
- def queue_responses(self):
- """
- Returns a list of (pattern, response) tuples, where `pattern` is a pattern
- to match in the XQueue body, and `response` is a dictionary to return
- as the response from the grader.
-
- Every configuration key is a queue name,
- except for 'default' and 'register_submission_url' which have special meaning
- """
- return list({
- key: value
- for key, value in self.config.items()
- if key not in self.NON_QUEUE_CONFIG_KEYS
- }.items())
diff --git a/common/djangoapps/terrain/stubs/youtube.py b/common/djangoapps/terrain/stubs/youtube.py
deleted file mode 100644
index 67cac950f9fb..000000000000
--- a/common/djangoapps/terrain/stubs/youtube.py
+++ /dev/null
@@ -1,172 +0,0 @@
-"""
-Stub implementation of YouTube for acceptance tests.
-
-
-To start this stub server on its own from Vagrant:
-
-1.) Locally, modify your Vagrantfile so that it contains:
-
- config.vm.network :forwarded_port, guest: 8031, host: 8031
-
-2.) From within Vagrant dev environment do:
-
- cd common/djangoapps/terrain
- python -m stubs.start youtube 8031
-
-3.) Locally, try accessing http://localhost:8031/ and see that
- you get "Unused url" message inside the browser.
-"""
-
-
-import json
-import time
-from collections import OrderedDict
-
-import requests
-from six.moves.urllib.parse import urlparse
-
-from .http import StubHttpRequestHandler, StubHttpService
-
-
-class StubYouTubeHandler(StubHttpRequestHandler):
- """
- A handler for Youtube GET requests.
- """
-
- # Default number of seconds to delay the response to simulate network latency.
- DEFAULT_DELAY_SEC = 0.5
-
- def do_DELETE(self): # pylint: disable=invalid-name
- """
- Allow callers to delete all the server configurations using the /del_config URL.
- """
- if self.path in ("/del_config", "/del_config/"):
- self.server.config = {}
- self.log_message("Reset Server Configuration.")
- self.send_response(200)
- else:
- self.send_response(404)
-
- def do_GET(self):
- """
- Handle a GET request from the client and sends response back.
- """
- self.log_message(
- f"Youtube provider received GET request to path {self.path}"
- )
-
- if 'get_config' in self.path:
- self.send_json_response(self.server.config)
-
- elif 'test_transcripts_youtube' in self.path:
-
- if 't__eq_exist' in self.path:
- status_message = "".join([
- '',
- '
',
- 'Equal transcripts'
- ]).encode('utf-8')
-
- self.send_response(
- 200, content=status_message, headers={'Content-type': 'application/xml'}
- )
-
- elif 't_neq_exist' in self.path:
- status_message = "".join([
- '',
- '
',
- 'Transcripts sample, different that on server',
- ''
- ]).encode('utf-8')
-
- self.send_response(
- 200, content=status_message, headers={'Content-type': 'application/xml'}
- )
-
- else:
- self.send_response(404)
-
- elif 'test_youtube' in self.path:
- params = urlparse(self.path)
- youtube_id = params.path.split('/').pop()
-
- if self.server.config.get('youtube_api_private_video'):
- self._send_private_video_response(youtube_id, "I'm youtube private video.") # lint-amnesty, pylint: disable=too-many-function-args
- else:
- self._send_video_response(youtube_id, "I'm youtube.")
-
- elif 'get_youtube_api' in self.path:
- # Delay the response to simulate network latency
- time.sleep(self.server.config.get('time_to_response', self.DEFAULT_DELAY_SEC))
- if self.server.config.get('youtube_api_blocked'):
- self.send_response(404, content=b'', headers={'Content-type': 'text/plain'})
- else:
- # Get the response to send from YouTube.
- # We need to do this every time because Google sometimes sends different responses
- # as part of their own experiments, which has caused our tests to become "flaky"
- self.log_message("Getting iframe api from youtube.com")
- iframe_api_response = requests.get('https://www.youtube.com/iframe_api').content.strip(b"\n")
- self.send_response(200, content=iframe_api_response, headers={'Content-type': 'text/html'})
-
- else:
- self.send_response(
- 404, content=b"Unused url", headers={'Content-type': 'text/plain'}
- )
-
- def _send_video_response(self, youtube_id, message):
- """
- Send message back to the client for video player requests.
- Requires sending back callback id.
- """
- # Delay the response to simulate network latency
- time.sleep(self.server.config.get('time_to_response', self.DEFAULT_DELAY_SEC))
-
- # Construct the response content
- callback = self.get_params['callback']
-
- data = OrderedDict({
- 'items': list(
- OrderedDict({
- 'contentDetails': OrderedDict({
- 'id': youtube_id,
- 'duration': 'PT2M20S',
- })
- })
- )
- })
- response = f"{callback}({json.dumps(data)})".encode('utf-8')
-
- self.send_response(200, content=response, headers={'Content-type': 'text/html'})
- self.log_message(f"Youtube: sent response {message}")
-
- def _send_private_video_response(self, message):
- """
- Send private video error message back to the client for video player requests.
- """
- # Construct the response content
- callback = self.get_params['callback']
- data = OrderedDict({
- "error": OrderedDict({
- "code": 403,
- "errors": [
- {
- "code": "ServiceForbiddenException",
- "domain": "GData",
- "internalReason": "Private video"
- }
- ],
- "message": message,
- })
- })
- response = f"{callback}({json.dumps(data)})".encode('utf-8')
-
- self.send_response(200, content=response, headers={'Content-type': 'text/html'})
- self.log_message(f"Youtube: sent response {message}")
-
-
-class StubYouTubeService(StubHttpService):
- """
- A stub Youtube provider server that responds to GET requests to localhost.
- """
-
- HANDLER_CLASS = StubYouTubeHandler
diff --git a/conf/locale/config.yaml b/conf/locale/config.yaml
index 6faf3188be1f..8a486ec626d3 100644
--- a/conf/locale/config.yaml
+++ b/conf/locale/config.yaml
@@ -26,7 +26,6 @@ ignore_dirs:
# Directories that only contain tests.
- common/test
- test_root
- - '*/terrain'
- '*/spec'
- '*/tests'
- '*/djangoapps/*/features'
diff --git a/lms/djangoapps/courseware/date_summary.py b/lms/djangoapps/courseware/date_summary.py
index 4123da5f38b9..e6bd5ef70597 100644
--- a/lms/djangoapps/courseware/date_summary.py
+++ b/lms/djangoapps/courseware/date_summary.py
@@ -268,7 +268,7 @@ def date_type(self):
@property
def title(self):
enrollment = CourseEnrollment.get_enrollment(self.user, self.course_id)
- if enrollment and self.course.end and enrollment.created > self.course.end:
+ if self.course.self_paced and enrollment and self.course.start and enrollment.created > self.course.start:
return gettext_lazy('Enrollment Date')
return gettext_lazy('Course starts')
diff --git a/lms/djangoapps/courseware/tests/test_date_summary.py b/lms/djangoapps/courseware/tests/test_date_summary.py
index 27e7f1a3c226..e487af8a1f70 100644
--- a/lms/djangoapps/courseware/tests/test_date_summary.py
+++ b/lms/djangoapps/courseware/tests/test_date_summary.py
@@ -400,6 +400,37 @@ def test_course_start_date(self):
block = CourseStartDate(course, user)
assert block.date == course.start
+ @ddt.data(
+ # Instructor-paced course: Use course start date
+ (False, datetime(2025, 1, 10, tzinfo=utc), datetime(2025, 1, 12, tzinfo=utc),
+ datetime(2025, 1, 10, tzinfo=utc), 'Course starts'),
+
+ # Self-paced course: Enrollment created later than course start
+ (True, datetime(2025, 1, 10, tzinfo=utc), datetime(2025, 1, 12), datetime(2025, 1, 12, tzinfo=utc),
+ 'Enrollment Date'),
+
+ # Self-paced course: Enrollment created earlier than course start
+ (True, datetime(2025, 1, 10, tzinfo=utc), datetime(2025, 1, 8), datetime(2025, 1, 10, tzinfo=utc),
+ 'Course starts'),
+
+ # Self-paced course: No enrollment
+ (True, datetime(2025, 1, 10, tzinfo=utc), None, datetime(2025, 1, 10, tzinfo=utc), 'Course starts'),
+ )
+ @ddt.unpack
+ def test_course_start_date_label(self, self_paced, course_start, enrollment_created, expected_date, expected_title):
+ """
+ Test the CourseStartDate class has correct label for course start date
+ """
+ course = CourseFactory(self_paced=self_paced, start=course_start)
+ user = create_user()
+ if enrollment_created:
+ enrollment = CourseEnrollmentFactory(course_id=course.id, user=user, mode=CourseMode.VERIFIED)
+ enrollment.created = enrollment_created
+ enrollment.save()
+ date_summary = CourseStartDate(user=user, course=course)
+ self.assertEqual(date_summary.date, expected_date)
+ self.assertEqual(str(date_summary.title), expected_title)
+
## Tests Course End Date Block
def test_course_end_date_for_certificate_eligible_mode(self):
course = create_course_run(days_till_start=-1)
diff --git a/lms/djangoapps/program_enrollments/management/commands/send_program_course_nudge_email.py b/lms/djangoapps/program_enrollments/management/commands/send_program_course_nudge_email.py
index c095b2d161a1..af2bfdca752d 100644
--- a/lms/djangoapps/program_enrollments/management/commands/send_program_course_nudge_email.py
+++ b/lms/djangoapps/program_enrollments/management/commands/send_program_course_nudge_email.py
@@ -15,6 +15,7 @@
from django.contrib.sites.models import Site
from django.core.management import BaseCommand
from django.utils import timezone
+from opaque_keys.edx.keys import CourseKey
from opaque_keys.edx.locator import CourseLocator
from common.djangoapps.track import segment
@@ -140,7 +141,9 @@ def get_course_run_to_suggest(self, candidate_programs, completed_course_id, use
)
break
for course_run in candidate_course['course_runs']:
- if self.valid_course_run(course_run) and course_run['key'] != completed_course_id:
+ course_org = CourseKey.from_string(course_run['key']).org
+ if self.valid_course_run(course_run) and course_run['key'] != completed_course_id \
+ and course_org not in settings.DISABLED_ORGS_FOR_PROGRAM_NUDGE:
return program, course_run, candidate_course
return None, None, None
diff --git a/lms/envs/common.py b/lms/envs/common.py
index e354f75a8530..cb7643c3668e 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -5376,6 +5376,14 @@ def _make_locale_paths(settings): # pylint: disable=missing-function-docstring
NOTIFICATION_TYPE_ICONS = {}
DEFAULT_NOTIFICATION_ICON_URL = ""
+############## NUDGE EMAILS ###############
+# .. setting_name: DISABLED_ORGS_FOR_PROGRAM_NUDGE
+# .. setting_default: []
+# .. setting_description: List of organization codes that should be disabled
+# .. for program nudge emails.
+# .. eg ['BTDx', 'MYTx']
+DISABLED_ORGS_FOR_PROGRAM_NUDGE = []
+
############################ AI_TRANSLATIONS ##################################
AI_TRANSLATIONS_API_URL = 'http://localhost:18760/api/v1'
diff --git a/lms/envs/production.py b/lms/envs/production.py
index 6dc6be634178..addcea0e6028 100644
--- a/lms/envs/production.py
+++ b/lms/envs/production.py
@@ -185,7 +185,6 @@ def get_env_setting(setting):
CMS_BASE = ENV_TOKENS.get('CMS_BASE', 'studio.edx.org')
ALLOWED_HOSTS = [
- # TODO: bbeggs remove this before prod, temp fix to get load testing running
"*",
ENV_TOKENS.get('LMS_BASE'),
FEATURES['PREVIEW_LMS_BASE'],
diff --git a/lms/templates/header/navbar-authenticated.html b/lms/templates/header/navbar-authenticated.html
index 58c3924ea9a7..c9ea97a423b5 100644
--- a/lms/templates/header/navbar-authenticated.html
+++ b/lms/templates/header/navbar-authenticated.html
@@ -48,7 +48,7 @@
% endif
diff --git a/lms/templates/header/navbar-not-authenticated.html b/lms/templates/header/navbar-not-authenticated.html
index 61448b73bd84..b50e535acda6 100644
--- a/lms/templates/header/navbar-not-authenticated.html
+++ b/lms/templates/header/navbar-not-authenticated.html
@@ -39,7 +39,7 @@
% if allows_login:
% if can_discover_courses:
%endif
% endif
diff --git a/openedx/core/djangoapps/content/search/documents.py b/openedx/core/djangoapps/content/search/documents.py
index 40fe4529272b..98cd7d576e0a 100644
--- a/openedx/core/djangoapps/content/search/documents.py
+++ b/openedx/core/djangoapps/content/search/documents.py
@@ -14,6 +14,7 @@
from rest_framework.exceptions import NotFound
from openedx.core.djangoapps.content.search.models import SearchAccess
+from openedx.core.djangoapps.content.search.plain_text_math import process_mathjax
from openedx.core.djangoapps.content_libraries import api as lib_api
from openedx.core.djangoapps.content_tagging import api as tagging_api
from openedx.core.djangoapps.xblock import api as xblock_api
@@ -220,7 +221,7 @@ class implementation returns only:
# Generate description from the content
description = _get_description_from_block_content(block_type, content_data)
if description:
- block_data[Fields.description] = description
+ block_data[Fields.description] = process_mathjax(description)
except Exception as err: # pylint: disable=broad-except
log.exception(f"Failed to process index_dictionary for {block.usage_key}: {err}")
diff --git a/openedx/core/djangoapps/content/search/plain_text_math.py b/openedx/core/djangoapps/content/search/plain_text_math.py
new file mode 100644
index 000000000000..70f6c3fd2cf0
--- /dev/null
+++ b/openedx/core/djangoapps/content/search/plain_text_math.py
@@ -0,0 +1,161 @@
+"""
+Helper class to convert mathjax equations to plain text.
+"""
+
+import re
+
+import unicodeit
+
+
+class InvalidMathEquation(Exception):
+ """Raised when mathjax equation is invalid. This is used to skip all transformations."""
+
+
+class EqnPatternNotFound(Exception):
+ """Raised when a pattern is not found in equation. This is used to skip a specific transformation."""
+
+
+class PlainTextMath:
+ """
+ Converts mathjax equations to plain text using unicodeit and some preprocessing.
+ """
+ equation_pattern = re.compile(
+ r'\[mathjaxinline\](.*?)\[\/mathjaxinline\]|\[mathjax\](.*?)\[\/mathjax\]|\\\((.*?)\\\)|\\\[(.*?)\\\]'
+ )
+ eqn_replacements = (
+ # just remove prefix `\`
+ ("\\sin", "sin"),
+ ("\\cos", "cos"),
+ ("\\tan", "tan"),
+ ("\\arcsin", "arcsin"),
+ ("\\arccos", "arccos"),
+ ("\\arctan", "arctan"),
+ ("\\cot", "cot"),
+ ("\\sec", "sec"),
+ ("\\csc", "csc"),
+ # Is used for matching brackets in mathjax, should not be required in plain text.
+ ("\\left", ""),
+ ("\\right", ""),
+ )
+ regex_replacements = (
+ # Makes text bold, so not required in plain text.
+ (re.compile(r'{\\bf (.*?)}'), r"\1"),
+ )
+ extract_inner_texts = (
+ # Replaces any eqn: `\name{inner_text}` with `inner_text`
+ "\\mathbf{",
+ "\\bm{",
+ )
+ frac_open_close_pattern = re.compile(r"}\s*{")
+
+ @staticmethod
+ def _nested_bracket_matcher(equation: str, opening_pattern: str) -> str:
+ r"""
+ Matches opening and closing brackets in given string.
+
+ Args:
+ equation: string
+ opening_pattern: for example, `\mathbf{`
+
+ Returns:
+ String inside the eqn brackets
+ """
+ start = equation.find(opening_pattern)
+ if start == -1:
+ raise EqnPatternNotFound()
+ open_count = 0
+ inner_start = start + len(opening_pattern)
+ for i, char in enumerate(equation[inner_start:]):
+ if char == "{":
+ open_count += 1
+ if char == "}":
+ if open_count == 0:
+ break
+ open_count -= 1
+ else:
+ raise InvalidMathEquation()
+ # In below example `|` symbol is used to denote index position
+ # |\mathbf{, \mathbf{|, \mathbf{some_text|}, \mathbf{some_text}|
+ return (start, inner_start, inner_start + i, inner_start + i + 1)
+
+ def _fraction_handler(self, equation: str) -> str:
+ r"""
+ Converts `\frac{x}{y}` to `(x/y)` while handling nested `{}`.
+
+ For example: `\frac{2}{\sqrt{1+y}}` is converted to `(2/\sqrt{1+y})`.
+
+ Args:
+ equation: string
+
+ Returns:
+ String with `\frac` replaced by normal `/` symbol.
+ """
+ try:
+ n_start, n_inner_start, n_inner_end, n_end = self._nested_bracket_matcher(equation, "\\frac{")
+ except EqnPatternNotFound:
+ return equation
+
+ numerator = equation[n_inner_start:n_inner_end]
+ # Handle nested fractions
+ numerator = self._fraction_handler(numerator)
+
+ try:
+ _, d_inner_start, d_inner_end, d_end = self._nested_bracket_matcher(equation[n_end:], "{")
+ except EqnPatternNotFound:
+ return equation
+
+ denominator = equation[n_end + d_inner_start:n_end + d_inner_end]
+ # Handle nested fractions
+ denominator = self._fraction_handler(denominator)
+ # Now re-create the equation with `(numerator / denominator)`
+ equation = equation[:n_start] + f"({numerator}/{denominator})" + equation[n_end + d_end:]
+ return equation
+
+ def _nested_text_extractor(self, equation: str, pattern: str) -> str:
+ """
+ Recursively extracts text from equation for given pattern
+ """
+ try:
+ start, inner_start, inner_end, end = self._nested_bracket_matcher(equation, pattern)
+ inner_text = equation[inner_start:inner_end]
+ inner_text = self._nested_text_extractor(inner_text, pattern)
+ equation = equation[:start] + inner_text + equation[end:]
+ except EqnPatternNotFound:
+ pass
+ return equation
+
+ def _handle_replacements(self, equation: str) -> str:
+ """
+ Makes a bunch of replacements in equation string.
+ """
+ for q, replacement in self.eqn_replacements:
+ equation = equation.replace(q, replacement)
+ for pattern in self.extract_inner_texts:
+ equation = self._nested_text_extractor(equation, pattern)
+ for pattern, replacement in self.regex_replacements:
+ equation = re.sub(pattern, replacement, equation)
+ return equation
+
+ def run(self, eqn_matches: re.Match) -> str:
+ """
+ Takes re.Match object and runs conversion process on each match group.
+ """
+ groups = eqn_matches.groups()
+ for group in groups:
+ if not group:
+ continue
+ original = group
+ try:
+ group = self._handle_replacements(group)
+ group = self._fraction_handler(group)
+ return unicodeit.replace(group)
+ except Exception: # pylint: disable=broad-except
+ return original
+ return None
+
+
+processor = PlainTextMath()
+
+
+def process_mathjax(content: str) -> str:
+ return re.sub(processor.equation_pattern, processor.run, content)
diff --git a/openedx/core/djangoapps/content/search/tests/test_documents.py b/openedx/core/djangoapps/content/search/tests/test_documents.py
index 603cc8d92f5e..a97caae168d6 100644
--- a/openedx/core/djangoapps/content/search/tests/test_documents.py
+++ b/openedx/core/djangoapps/content/search/tests/test_documents.py
@@ -477,3 +477,121 @@ def test_collection_with_published_library(self):
"num_children": 1
}
}
+
+ def test_mathjax_plain_text_conversion_for_search(self):
+ """
+ Test how an HTML block with mathjax equations gets converted to plain text in search description.
+ """
+ # pylint: disable=line-too-long
+ eqns = [
+ # (input, expected output)
+ ('Simple addition: \\( 2 + 3 \\)', 'Simple addition: 2 + 3'),
+ ('Simple subtraction: \\( 5 - 2 \\)', 'Simple subtraction: 5 − 2'),
+ ('Simple multiplication: \\( 4 * 6 \\)', 'Simple multiplication: 4 * 6'),
+ ('Simple division: \\( 8 / 2 \\)', 'Simple division: 8 / 2'),
+ ('Mixed arithmetic: \\( 2 + 3 4 \\)', 'Mixed arithmetic: 2 + 3 4'),
+ ('Simple exponentiation: \\[ 2^3 \\]', 'Simple exponentiation: 2³'),
+ ('Root extraction: \\[ 16^{1/2} \\]', 'Root extraction: 16¹^/²'),
+ ('Exponent with multiple terms: \\[ (2 + 3)^2 \\]', 'Exponent with multiple terms: (2 + 3)²'),
+ ('Nested exponents: \\[ 2^(3^2) \\]', 'Nested exponents: 2⁽3²)'),
+ ('Mixed roots: \\[ 8^{1/2} 3^2 \\]', 'Mixed roots: 8¹^/² 3²'),
+ ('Simple fraction: [mathjaxinline] 3/4 [/mathjaxinline]', 'Simple fraction: 3/4'),
+ (
+ 'Decimal to fraction conversion: [mathjaxinline] 0.75 = 3/4 [/mathjaxinline]',
+ 'Decimal to fraction conversion: 0.75 = 3/4',
+ ),
+ ('Mixed fractions: [mathjaxinline] 1 1/2 = 3/2 [/mathjaxinline]', 'Mixed fractions: 1 1/2 = 3/2'),
+ (
+ 'Converting decimals to mixed fractions: [mathjaxinline] 2.5 = 5/2 [/mathjaxinline]',
+ 'Converting decimals to mixed fractions: 2.5 = 5/2',
+ ),
+ (
+ 'Trig identities: [mathjaxinline] \\sin(x + y) = \\sin(x) \\cos(y) + \\cos(x) \\sin(y) [/mathjaxinline]',
+ 'Trig identities: sin(x + y) = sin(x) cos(y) + cos(x) sin(y)',
+ ),
+ (
+ 'Sine, cosine, and tangent: [mathjaxinline] \\sin(x) [/mathjaxinline] [mathjaxinline] \\cos(x) [/mathjaxinline] [mathjaxinline] \\tan(x) [/mathjaxinline]',
+ 'Sine, cosine, and tangent: sin(x) cos(x) tan(x)',
+ ),
+ (
+ 'Hyperbolic trig functions: [mathjaxinline] \\sinh(x) [/mathjaxinline] [mathjaxinline] \\cosh(x) [/mathjaxinline]',
+ 'Hyperbolic trig functions: sinh(x) cosh(x)',
+ ),
+ (
+ "Simple derivative: [mathjax] f(x) = x^2, f'(x) = 2x [/mathjax]",
+ "Simple derivative: f(x) = x², f'(x) = 2x",
+ ),
+ ('Double integral: [mathjax] int\\int (x + y) dxdy [/mathjax]', 'Double integral: int∫ (x + y) dxdy'),
+ (
+ 'Partial derivatives: [mathjax] f(x,y) = xy, \\frac{\\partial f}{\\partial x} = y [/mathjax] [mathjax] \\frac{\\partial f}{\\partial y} = x [/mathjax]',
+ 'Partial derivatives: f(x,y) = xy, (∂ f/∂ x) = y (∂ f/∂ y) = x',
+ ),
+ (
+ 'Mean and standard deviation: [mathjax] mu = 2, \\sigma = 1 [/mathjax]',
+ 'Mean and standard deviation: mu = 2, σ = 1',
+ ),
+ (
+ 'Binomial probability: [mathjax] P(X = k) = (\\binom{n}{k} p^k (1-p)^{n-k}) [/mathjax]',
+ 'Binomial probability: P(X = k) = (\\binom{n}{k} pᵏ (1−p)ⁿ⁻ᵏ)',
+ ),
+ ('Gaussian distribution: [mathjax] N(\\mu, \\sigma^2) [/mathjax]', 'Gaussian distribution: N(μ, σ²)'),
+ (
+ 'Greek letters: [mathjaxinline] \\alpha [/mathjaxinline] [mathjaxinline] \\beta [/mathjaxinline] [mathjaxinline] \\gamma [/mathjaxinline]',
+ 'Greek letters: α β γ',
+ ),
+ (
+ 'Subscripted variables: [mathjaxinline] x_i [/mathjaxinline] [mathjaxinline] y_j [/mathjaxinline]',
+ 'Subscripted variables: xᵢ yⱼ',
+ ),
+ ('Superscripted variables: [mathjaxinline] x^{i} [/mathjaxinline]', 'Superscripted variables: xⁱ'),
+ (
+ 'Not supported: \\( \\begin{bmatrix} 1 & 0 \\ 0 & 1 \\end{bmatrix} = I \\)',
+ 'Not supported: \\begin{bmatrix} 1 & 0 \\ 0 & 1 \\end{bmatrix} = I',
+ ),
+ (
+ 'Bold text: \\( {\\bf a} \\cdot {\\bf b} = |{\\bf a}| |{\\bf b}| \\cos(\\theta) \\)',
+ 'Bold text: a ⋅ b = |a| |b| cos(θ)',
+ ),
+ ('Bold text: \\( \\frac{\\sqrt{\\mathbf{2}+3}}{\\sqrt{4}} \\)', 'Bold text: (√{2+3}/√{4})'),
+ ('Nested Bold text 1: \\( \\mathbf{ \\frac{1}{2} } \\)', 'Nested Bold text 1: (1/2)'),
+ (
+ 'Nested Bold text 2: \\( \\mathbf{a \\cdot (a \\mathbf{\\times} b)} \\)',
+ 'Nested Bold text 2: a ⋅ (a × b)'
+ ),
+ (
+ 'Nested Bold text 3: \\( \\mathbf{a \\cdot (a \\bm{\\times} b)} \\)',
+ 'Nested Bold text 3: a ⋅ (a × b)'
+ ),
+ ('Sqrt test 1: \\(\\sqrt\\)', 'Sqrt test 1: √'),
+ ('Sqrt test 2: \\(x^2 + \\sqrt(y)\\)', 'Sqrt test 2: x² + √(y)'),
+ ('Sqrt test 3: [mathjaxinline]x^2 + \\sqrt(y)[/mathjaxinline]', 'Sqrt test 3: x² + √(y)'),
+ ('Fraction test 1: \\( \\frac{2} {3} \\)', 'Fraction test 1: (2/3)'),
+ ('Fraction test 2: \\( \\frac{2}{3} \\)', 'Fraction test 2: (2/3)'),
+ ('Fraction test 3: \\( \\frac{\\frac{2}{3}}{4} \\)', 'Fraction test 3: ((2/3)/4)'),
+ ('Fraction test 4: \\( \\frac{\\frac{2} {3}}{4} \\)', 'Fraction test 4: ((2/3)/4)'),
+ ('Fraction test 5: \\( \\frac{\\frac{2} {3}}{\\frac{4}{3}} \\)', 'Fraction test 5: ((2/3)/(4/3))'),
+ # Invalid equations.
+ ('Fraction error: \\( \\frac{2} \\)', 'Fraction error: \\frac{2}'),
+ ('Fraction error 2: \\( \\frac{\\frac{2}{3}{4} \\)', 'Fraction error 2: \\frac{\\frac{2}{3}{4}'),
+ ('Unclosed: [mathjaxinline]x^2', 'Unclosed: [mathjaxinline]x^2'),
+ (
+ 'Missing closing bracket: \\( \\frac{\\frac{2} {3}{\\frac{4}{3}} \\)',
+ 'Missing closing bracket: \\frac{\\frac{2} {3}{\\frac{4}{3}}'
+ ),
+ ('No equation: normal text', 'No equation: normal text'),
+ ]
+ # pylint: enable=line-too-long
+ block = BlockFactory.create(
+ parent_location=self.toy_course.location,
+ category="html",
+ display_name="Non-default HTML Block",
+ editor="raw",
+ use_latex_compiler=True,
+ data="|||".join(e[0] for e in eqns),
+ )
+ doc = {}
+ doc.update(searchable_doc_for_course_block(block))
+ doc.update(searchable_doc_tags(block.usage_key))
+ result = doc['description'].split('|||')
+ for i, eqn in enumerate(result):
+ assert eqn.strip() == eqns[i][1]
diff --git a/openedx/core/djangoapps/content_libraries/tests/test_content_libraries.py b/openedx/core/djangoapps/content_libraries/tests/test_content_libraries.py
index 83b277604071..f3a111cb0561 100644
--- a/openedx/core/djangoapps/content_libraries/tests/test_content_libraries.py
+++ b/openedx/core/djangoapps/content_libraries/tests/test_content_libraries.py
@@ -8,6 +8,7 @@
import ddt
from django.contrib.auth.models import Group
+from django.test import override_settings
from django.test.client import Client
from freezegun import freeze_time
from opaque_keys.edx.locator import LibraryLocatorV2, LibraryUsageLocatorV2
@@ -139,6 +140,63 @@ def test_library_validation(self):
'slug': ['Enter a valid “slug” consisting of Unicode letters, numbers, underscores, or hyphens.'],
}
+ def test_library_org_validation(self):
+ """
+ Staff users can create libraries in any existing or auto-created organization.
+ """
+ assert Organization.objects.filter(short_name='auto-created-org').count() == 0
+ self._create_library(slug="auto-created-org-1", title="Library in an auto-created org", org='auto-created-org')
+ assert Organization.objects.filter(short_name='auto-created-org').count() == 1
+ self._create_library(slug="existing-org-1", title="Library in an existing org", org="CL-TEST")
+
+ @patch(
+ "openedx.core.djangoapps.content_libraries.views.user_can_create_organizations",
+ )
+ @patch(
+ "openedx.core.djangoapps.content_libraries.views.get_allowed_organizations_for_libraries",
+ )
+ @override_settings(ORGANIZATIONS_AUTOCREATE=False)
+ def test_library_org_no_autocreate(self, mock_get_allowed_organizations, mock_can_create_organizations):
+ """
+ When org auto-creation is disabled, user must use one of their allowed orgs.
+ """
+ mock_can_create_organizations.return_value = False
+ mock_get_allowed_organizations.return_value = ["CL-TEST"]
+ assert Organization.objects.filter(short_name='auto-created-org').count() == 0
+ response = self._create_library(
+ slug="auto-created-org-2",
+ org="auto-created-org",
+ title="Library in an auto-created org",
+ expect_response=400,
+ )
+ assert response == {
+ 'org': "No such organization 'auto-created-org' found.",
+ }
+
+ Organization.objects.get_or_create(
+ short_name="not-allowed-org",
+ defaults={"name": "Content Libraries Test Org Membership"},
+ )
+ response = self._create_library(
+ slug="not-allowed-org",
+ org="not-allowed-org",
+ title="Library in an not-allowed org",
+ expect_response=400,
+ )
+ assert response == {
+ 'org': "User not allowed to create libraries in 'not-allowed-org'.",
+ }
+ assert mock_can_create_organizations.call_count == 1
+ assert mock_get_allowed_organizations.call_count == 1
+
+ self._create_library(
+ slug="allowed-org-2",
+ org="CL-TEST",
+ title="Library in an allowed org",
+ )
+ assert mock_can_create_organizations.call_count == 2
+ assert mock_get_allowed_organizations.call_count == 2
+
@skip("This endpoint shouldn't support num_blocks and has_unpublished_*.")
@patch("openedx.core.djangoapps.content_libraries.views.LibraryRootView.pagination_class.page_size", new=2)
def test_list_library(self):
diff --git a/openedx/core/djangoapps/content_libraries/views.py b/openedx/core/djangoapps/content_libraries/views.py
index 4c14651c7961..048226c5b16c 100644
--- a/openedx/core/djangoapps/content_libraries/views.py
+++ b/openedx/core/djangoapps/content_libraries/views.py
@@ -99,6 +99,10 @@
from rest_framework.views import APIView
from rest_framework.viewsets import GenericViewSet
+from cms.djangoapps.contentstore.views.course import (
+ get_allowed_organizations_for_libraries,
+ user_can_create_organizations,
+)
from openedx.core.djangoapps.content_libraries import api, permissions
from openedx.core.djangoapps.content_libraries.serializers import (
ContentLibraryBlockImportTaskCreateSerializer,
@@ -269,6 +273,14 @@ def post(self, request):
raise ValidationError( # lint-amnesty, pylint: disable=raise-missing-from
detail={"org": f"No such organization '{org_name}' found."}
)
+ # Ensure the user is allowed to create libraries under this org
+ if not (
+ user_can_create_organizations(request.user) or
+ org_name in get_allowed_organizations_for_libraries(request.user)
+ ):
+ raise ValidationError( # lint-amnesty, pylint: disable=raise-missing-from
+ detail={"org": f"User not allowed to create libraries in '{org_name}'."}
+ )
org = Organization.objects.get(short_name=org_name)
try:
diff --git a/openedx/core/djangoapps/notifications/email/utils.py b/openedx/core/djangoapps/notifications/email/utils.py
index 34c245308785..ad8b8b85dfd8 100644
--- a/openedx/core/djangoapps/notifications/email/utils.py
+++ b/openedx/core/djangoapps/notifications/email/utils.py
@@ -100,7 +100,7 @@ def create_email_template_context(username):
"mailing_address": settings.CONTACT_MAILING_ADDRESS,
"logo_url": get_logo_url_for_email(),
"social_media": social_media_info,
- "notification_settings_url": f"{settings.ACCOUNT_MICROFRONTEND_URL}/notifications",
+ "notification_settings_url": f"{settings.ACCOUNT_MICROFRONTEND_URL}/#notifications",
"unsubscribe_url": get_unsubscribe_link(username, patch)
}
diff --git a/openedx/core/djangoapps/notifications/serializers.py b/openedx/core/djangoapps/notifications/serializers.py
index 80b1577b6355..b5e22a36a682 100644
--- a/openedx/core/djangoapps/notifications/serializers.py
+++ b/openedx/core/djangoapps/notifications/serializers.py
@@ -202,6 +202,7 @@ class Meta:
'content_context',
'content',
'content_url',
+ 'course_id',
'last_read',
'last_seen',
'created',
diff --git a/requirements/constraints.txt b/requirements/constraints.txt
index 79e55d633c7d..f99c41c6947b 100644
--- a/requirements/constraints.txt
+++ b/requirements/constraints.txt
@@ -80,7 +80,7 @@ django-storages<1.14.4
# The team that owns this package will manually bump this package rather than having it pulled in automatically.
# This is to allow them to better control its deployment and to do it in a process that works better
# for them.
-edx-enterprise==5.5.2
+edx-enterprise==5.6.1
# Date: 2024-05-09
# This has to be constrained as well because newer versions of edx-i18n-tools need the
@@ -184,8 +184,3 @@ social-auth-app-django<=5.4.1
# We are pinning this until we can upgrade to a version of elasticsearch that uses a more recent version of urllib3.
# Issue for unpinning: https://github.com/openedx/edx-platform/issues/35126
elasticsearch==7.9.1
-
-# Date 2025-01-10
-# Cause: https://github.com/openedx/edx-platform/issues/36095
-# Issue for unpinning https://github.com/openedx/edx-platform/issues/36096
-lti-consumer-xblock==9.12.1
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index d73ac89b2a0a..d202a8be1f60 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -468,7 +468,7 @@ edx-drf-extensions==10.5.0
# edx-when
# edxval
# openedx-learning
-edx-enterprise==5.5.2
+edx-enterprise==5.6.1
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/kernel.in
@@ -705,10 +705,8 @@ lazy==1.6
# xblock
loremipsum==1.0.5
# via ora2
-lti-consumer-xblock==9.12.1
- # via
- # -c requirements/edx/../constraints.txt
- # -r requirements/edx/kernel.in
+lti-consumer-xblock==9.13.1
+ # via -r requirements/edx/kernel.in
lxml[html-clean,html_clean]==5.3.0
# via
# -r requirements/edx/kernel.in
@@ -944,6 +942,7 @@ pyjwt[crypto]==2.10.1
# edx-proctoring
# edx-rest-api-client
# firebase-admin
+ # lti-consumer-xblock
# pylti1p3
# snowflake-connector-python
# social-auth-core
@@ -1208,6 +1207,8 @@ unicodecsv==0.14.1
# via
# -r requirements/edx/kernel.in
# edx-enterprise
+unicodeit==0.7.5
+ # via -r requirements/edx/kernel.in
uritemplate==4.1.1
# via
# drf-spectacular
diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
index a153f18be7a3..bd1d6b02bd8d 100644
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -747,7 +747,7 @@ edx-drf-extensions==10.5.0
# edx-when
# edxval
# openedx-learning
-edx-enterprise==5.5.2
+edx-enterprise==5.6.1
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/doc.txt
@@ -1189,9 +1189,8 @@ loremipsum==1.0.5
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
# ora2
-lti-consumer-xblock==9.12.1
+lti-consumer-xblock==9.13.1
# via
- # -c requirements/edx/../constraints.txt
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
lxml[html-clean]==5.3.0
@@ -1611,6 +1610,7 @@ pyjwt[crypto]==2.10.1
# edx-proctoring
# edx-rest-api-client
# firebase-admin
+ # lti-consumer-xblock
# pylti1p3
# snowflake-connector-python
# social-auth-core
@@ -2160,6 +2160,10 @@ unicodecsv==0.14.1
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
# edx-enterprise
+unicodeit==0.7.5
+ # via
+ # -r requirements/edx/doc.txt
+ # -r requirements/edx/testing.txt
unidiff==0.7.5
# via -r requirements/edx/testing.txt
uritemplate==4.1.1
diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt
index f715e876d7f6..52a4c067c0de 100644
--- a/requirements/edx/doc.txt
+++ b/requirements/edx/doc.txt
@@ -555,7 +555,7 @@ edx-drf-extensions==10.5.0
# edx-when
# edxval
# openedx-learning
-edx-enterprise==5.5.2
+edx-enterprise==5.6.1
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/base.txt
@@ -860,10 +860,8 @@ loremipsum==1.0.5
# via
# -r requirements/edx/base.txt
# ora2
-lti-consumer-xblock==9.12.1
- # via
- # -c requirements/edx/../constraints.txt
- # -r requirements/edx/base.txt
+lti-consumer-xblock==9.13.1
+ # via -r requirements/edx/base.txt
lxml[html-clean]==5.3.0
# via
# -r requirements/edx/base.txt
@@ -1160,6 +1158,7 @@ pyjwt[crypto]==2.10.1
# edx-proctoring
# edx-rest-api-client
# firebase-admin
+ # lti-consumer-xblock
# pylti1p3
# snowflake-connector-python
# social-auth-core
@@ -1521,6 +1520,8 @@ unicodecsv==0.14.1
# via
# -r requirements/edx/base.txt
# edx-enterprise
+unicodeit==0.7.5
+ # via -r requirements/edx/base.txt
uritemplate==4.1.1
# via
# -r requirements/edx/base.txt
diff --git a/requirements/edx/kernel.in b/requirements/edx/kernel.in
index d2ec04314801..d1a132778133 100644
--- a/requirements/edx/kernel.in
+++ b/requirements/edx/kernel.in
@@ -163,3 +163,4 @@ web-fragments # Provides the ability to render fragments o
wrapt # Better functools.wrapped. TODO: functools has since improved, maybe we can switch?
XBlock[django] # Courseware component architecture
xss-utils # https://github.com/openedx/edx-platform/pull/20633 Fix XSS via Translations
+unicodeit # Converts mathjax equation to plain text by using unicode symbols
diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
index f6ad62bf0d5d..672c51c48ae7 100644
--- a/requirements/edx/testing.txt
+++ b/requirements/edx/testing.txt
@@ -576,7 +576,7 @@ edx-drf-extensions==10.5.0
# edx-when
# edxval
# openedx-learning
-edx-enterprise==5.5.2
+edx-enterprise==5.6.1
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/base.txt
@@ -903,10 +903,8 @@ loremipsum==1.0.5
# via
# -r requirements/edx/base.txt
# ora2
-lti-consumer-xblock==9.12.1
- # via
- # -c requirements/edx/../constraints.txt
- # -r requirements/edx/base.txt
+lti-consumer-xblock==9.13.1
+ # via -r requirements/edx/base.txt
lxml[html-clean]==5.3.0
# via
# -r requirements/edx/base.txt
@@ -1224,6 +1222,7 @@ pyjwt[crypto]==2.10.1
# edx-proctoring
# edx-rest-api-client
# firebase-admin
+ # lti-consumer-xblock
# pylti1p3
# snowflake-connector-python
# social-auth-core
@@ -1605,6 +1604,8 @@ unicodecsv==0.14.1
# via
# -r requirements/edx/base.txt
# edx-enterprise
+unicodeit==0.7.5
+ # via -r requirements/edx/base.txt
unidiff==0.7.5
# via -r requirements/edx/testing.in
uritemplate==4.1.1
diff --git a/scripts/vulture/find-dead-code.sh b/scripts/vulture/find-dead-code.sh
index e24882595ebb..c78793ec3a6d 100755
--- a/scripts/vulture/find-dead-code.sh
+++ b/scripts/vulture/find-dead-code.sh
@@ -35,9 +35,9 @@ mkdir -p "$OUTPUT_DIR"
OUTPUT_FILE="${OUTPUT_DIR}/vulture-report.txt"
echo '' > "$OUTPUT_FILE"
# exclude test code from analysis, as it isn't explicitly called by other
-# code. Additionally, application code that is only called by tests
+# code. Additionally, application code that is only called by tests
# should be considered dead
-EXCLUSIONS='/test,/acceptance,cms/envs,lms/envs,/terrain,migrations/,signals.py'
+EXCLUSIONS='/test,/acceptance,cms/envs,lms/envs,migrations/,signals.py'
MIN_CONFIDENCE=90
# paths to the code on which to run the analysis
CODE_PATHS=('cms' 'common' 'lms' 'openedx')