JavaScript in Attempts ermöglichen (ohne Unterstützung im SDK-Webserver)

examples/static-files/js/test.js

@@ -1 +1,18 @@
-console.log("Hello world!");
+import { returnTest2 } from './test2.js';
+
+export function initButton(attempt, [buttonId, inputId, secretValue]) {
+    console.log("called initButton");
+
+    if (returnTest2() !== "test2") {
+        console.error("method did not return 'test2'");
+    }
+
+    document.getElementById(buttonId).addEventListener("click", function (event) {
+        event.target.disabled = true;
+        document.getElementById(inputId).value = secretValue;
+    })
+}
+
+export function hello(attempt, param) {
+    console.log("hello " + param);
+}

examples/static-files/js/test2.js

@@ -0,0 +1,3 @@
+export function returnTest2() {
+  return 'test2';
+}

examples/static-files/python/local/static_files_example/question_type.py

@@ -1,10 +1,23 @@
-from questionpy import Attempt, Question
+from questionpy import Attempt, FeedbackType, Question, ResponseNotScorableError
 
 from .form import MyModel
 
 
 class ExampleAttempt(Attempt):
+    def _init_attempt(self) -> None:
+        self.call_js("@local/static_files_example/test.js", "initButton", ["mybutton", "hiddenInput", "secret"])
+        self.call_js(
+            "@local/static_files_example/test.js", "hello", "world", if_feedback_type=FeedbackType.GENERAL_FEEDBACK
+        )
+
     def _compute_score(self) -> float:
+        if not self.response or "hidden_value" not in self.response:
+            msg = "'hidden_value' is missing"
+            raise ResponseNotScorableError(msg)
+
+        if self.response["hidden_value"] == "secret":
+            return 1
+
         return 0
 
     @property

examples/static-files/templates/formulation.xhtml.j2

@@ -1,4 +1,6 @@
 <div xmlns="http://www.w3.org/1999/xhtml"
      xmlns:qpy="http://questionpy.org/ns/question">
     <div class="my-custom-class">I have custom styling!</div>
+    <input type="hidden" name="hidden_value" id="hiddenInput" />
+    <input type="button" id="mybutton" value="click here for a 1.0 score" />
 </div>

pyproject.toml

@@ -28,7 +28,7 @@ python = "^3.11"
 aiohttp = "^3.9.3"
 pydantic = "^2.6.4"
 PyYAML = "^6.0.1"
-questionpy-server = { git = "https://github.com/questionpy-org/questionpy-server.git", rev = "aca709b1dd8cef935ac4bf4bb47471959aac6779" }
+questionpy-server = { git = "https://github.com/questionpy-org/questionpy-server.git", rev = "3f8f2e6199d2c718aef79b07e3fcd5234282a2b3" }
 jinja2 = "^3.1.3"
 aiohttp-jinja2 = "^1.6"
 lxml = "~5.1.0"

questionpy/__init__.py

@@ -11,6 +11,8 @@
     AttemptUi,
     CacheControl,
     ClassifiedResponse,
+    DisplayRole,
+    FeedbackType,
     ScoreModel,
     ScoringCode,
 )
@@ -61,7 +63,9 @@
     "BaseScoringState",
     "CacheControl",
     "ClassifiedResponse",
+    "DisplayRole",
     "Environment",
+    "FeedbackType",
     "InvalidResponseError",
     "Manifest",
     "NeedsManualScoringError",

questionpy/_attempt.py

@@ -1,3 +1,4 @@
+import json
 from abc import ABC, abstractmethod
 from collections.abc import Mapping, Sequence
 from functools import cached_property
@@ -6,7 +7,16 @@
 import jinja2
 from pydantic import BaseModel, JsonValue
 
-from questionpy_common.api.attempt import AttemptFile, AttemptUi, CacheControl, ScoredInputModel, ScoringCode
+from questionpy_common.api.attempt import (
+    AttemptFile,
+    AttemptUi,
+    CacheControl,
+    DisplayRole,
+    FeedbackType,
+    JsModuleCall,
+    ScoredInputModel,
+    ScoringCode,
+)
 
 from ._ui import create_jinja2_environment
 from ._util import reify_type_hint
@@ -75,6 +85,10 @@ def placeholders(self) -> dict[str, str]:
     def css_files(self) -> list[str]:
         pass
 
+    @property
+    def javascript_calls(self) -> list[JsModuleCall]:
+        pass
+
     @property
     def files(self) -> dict[str, AttemptFile]:
         pass
@@ -156,6 +170,9 @@ def __init__(
         self.cache_control = CacheControl.PRIVATE_CACHE
         self.placeholders: dict[str, str] = {}
         self.css_files: list[str] = []
+        self._javascript_calls: list[JsModuleCall] = []
+        """LMS has to call these JS modules/functions."""
+
         self.files: dict[str, AttemptFile] = {}
 
         self.scoring_code: ScoringCode | None = None
@@ -187,6 +204,11 @@ def __init__(
         only be viewed as an output.
         """
 
+        self._init_attempt()
+
+    def _init_attempt(self) -> None:  # noqa: B027
+        """A place for the question to initialize the attempt (set up fields, JavaScript calls, etc.)."""
+
     @property
     @abstractmethod
     def formulation(self) -> str:
@@ -243,6 +265,38 @@ def jinja2(self) -> jinja2.Environment:
     def variant(self) -> int:
         return self.attempt_state.variant
 
+    def call_js(
+        self,
+        module: str,
+        function: str,
+        data: JsonValue = None,
+        *,
+        if_role: DisplayRole | None = None,
+        if_feedback_type: FeedbackType | None = None,
+    ) -> None:
+        """Call a javascript function when the LMS displays this question attempt.
+
+        The function is called when both the `if_role` and `if_feedback_type` conditions are met.
+
+        Args:
+            module: JS module name specified as:
+                @[package namespace]/[package short name]/[subdir]/[module name] (full reference) or
+                TODO [subdir]/[module name] (referencing a module within the package where this class is subclassed) or
+            function: Name of a callable value within the JS module
+            data: arbitrary data to pass to the function
+            if_role: Function is only called if the user has this role.
+            if_feedback_type: Function is only called if the user is allowed to view this feedback type.
+        """
+        data_json = None if data is None else json.dumps(data)
+        call = JsModuleCall(
+            module=module, function=function, data=data_json, if_role=if_role, if_feedback_type=if_feedback_type
+        )
+        self._javascript_calls.append(call)
+
+    @property
+    def javascript_calls(self) -> list[JsModuleCall]:
+        return self._javascript_calls
+
     def __init_subclass__(cls, *args: object, **kwargs: object):
         super().__init_subclass__(*args, **kwargs)
 

questionpy/_wrappers/_question.py

@@ -55,6 +55,7 @@ def _export_attempt(attempt: AttemptProtocol) -> dict:
             right_answer=attempt.right_answer_description,
             placeholders=attempt.placeholders,
             css_files=attempt.css_files,
+            javascript_calls=attempt.javascript_calls,
             files=attempt.files,
             cache_control=attempt.cache_control,
         ),

questionpy_sdk/commands/_helper.py

@@ -12,6 +12,7 @@
 from questionpy_sdk.package.builder import DirPackageBuilder
 from questionpy_sdk.package.errors import PackageBuildError, PackageSourceValidationError
 from questionpy_sdk.package.source import PackageSource
+from questionpy_server.hash import calculate_hash
 from questionpy_server.worker.runtime.package_location import (
     DirPackageLocation,
     PackageLocation,
@@ -53,7 +54,7 @@ def get_package_location(pkg_string: str, pkg_path: Path) -> PackageLocation:
         return _get_dir_package_location_from_source(pkg_string, pkg_path)
 
     if zipfile.is_zipfile(pkg_path):
-        return ZipPackageLocation(pkg_path)
+        return ZipPackageLocation(pkg_path, calculate_hash(pkg_path))
 
     msg = f"'{pkg_string}' doesn't look like a QPy package file, source directory, or dist directory."
     raise click.ClickException(msg)

questionpy_sdk/watcher.py

@@ -32,7 +32,7 @@
 
 log = logging.getLogger("questionpy-sdk:watcher")
 
-_DEBOUNCE_INTERVAL = 0.5  # seconds
+_DEBOUNCE_INTERVAL = 1  # seconds
 
 
 class _EventHandler(FileSystemEventHandler):
@@ -78,6 +78,9 @@ def _ignore_event(self, event: FileSystemEvent) -> bool:
 
         # ignore events events in `dist` dir
         relevant_path = event.dest_path if isinstance(event, FileSystemMovedEvent) else event.src_path
+        if isinstance(relevant_path, bytes):
+            relevant_path = relevant_path.decode()
+
         try:
             return Path(relevant_path).relative_to(self._watch_path).parts[0] == DIST_DIR
         except IndexError:
@@ -119,7 +122,7 @@ async def __aexit__(
     def _schedule(self) -> None:
         if self._watch is None:
             log.debug("Starting file watching...")
-            self._watch = self._observer.schedule(self._event_handler, self._source_path, recursive=True)
+            self._watch = self._observer.schedule(self._event_handler, str(self._source_path), recursive=True)
 
     def _unschedule(self) -> None:
         if self._watch:

questionpy_sdk/webserver/attempt.py

@@ -68,7 +68,7 @@ def get_attempt_render_context(
         context["general_feedback"] = html
         if errors:
             context["render_errors"]["General Feedback"] = errors
-    if display_options.feedback and attempt.ui.specific_feedback:
+    if display_options.specific_feedback and attempt.ui.specific_feedback:
         html, errors = QuestionUIRenderer(attempt.ui.specific_feedback, *renderer_args).render()
         context["specific_feedback"] = html
         if errors:

questionpy_sdk/webserver/question_ui/__init__.py

@@ -4,7 +4,6 @@
 from __future__ import annotations
 
 import re
-from enum import StrEnum
 from random import Random
 from typing import Any
 
@@ -13,6 +12,7 @@
 from lxml import etree
 from pydantic import BaseModel
 
+from questionpy_common.api.attempt import DisplayRole
 from questionpy_sdk.webserver.question_ui.errors import (
     ConversionError,
     ExpectedAncestorError,
@@ -185,22 +185,15 @@ def __init__(self) -> None:
         self.required_fields: list[str] = []
 
 
-class QuestionDisplayRole(StrEnum):
-    DEVELOPER = "DEVELOPER"
-    PROCTOR = "PROCTOR"
-    SCORER = "SCORER"
-    TEACHER = "TEACHER"
-
-
 class QuestionDisplayOptions(BaseModel):
     general_feedback: bool = True
-    feedback: bool = True
+    specific_feedback: bool = True
     right_answer: bool = True
-    roles: set[QuestionDisplayRole] = {
-        QuestionDisplayRole.DEVELOPER,
-        QuestionDisplayRole.PROCTOR,
-        QuestionDisplayRole.SCORER,
-        QuestionDisplayRole.TEACHER,
+    roles: set[DisplayRole] = {
+        DisplayRole.DEVELOPER,
+        DisplayRole.PROCTOR,
+        DisplayRole.SCORER,
+        DisplayRole.TEACHER,
     }
     readonly: bool = False
 
@@ -318,7 +311,7 @@ def _hide_unwanted_feedback(self) -> None:
             # Check conditions to remove the element
             if not (
                 (feedback_type == "general" and self._options.general_feedback)
-                or (feedback_type == "specific" and self._options.feedback)
+                or (feedback_type == "specific" and self._options.specific_feedback)
             ):
                 _remove_element(element)
 
@@ -330,7 +323,7 @@ def _hide_if_role(self) -> None:
         for element in _assert_element_list(self._xpath("//*[@qpy:if-role]")):
             if attr := element.get(f"{{{_QPY_NAMESPACE}}}if-role"):
                 allowed_roles = [role.upper() for role in re.split(r"[\s|]+", attr)]
-                has_role = any(role in allowed_roles and role in self._options.roles for role in QuestionDisplayRole)
+                has_role = any(role in allowed_roles and role in self._options.roles for role in DisplayRole)
 
                 if not has_role and (parent := element.getparent()) is not None:
                     parent.remove(element)
@@ -648,7 +641,7 @@ def _validate_if_role(self) -> None:
         for element in _assert_element_list(self._xpath("//*[@qpy:if-role]")):
             if attr := element.get(f"{{{_QPY_NAMESPACE}}}if-role"):
                 allowed_roles = [role.upper() for role in re.split(r"[\s|]+", attr)]
-                expected = list(QuestionDisplayRole)
+                expected = list(DisplayRole)
                 if unexpected := [role for role in allowed_roles if role not in expected]:
                     error = InvalidAttributeValueError(
                         element=element,

questionpy_sdk/webserver/routes/attempt.py

@@ -80,7 +80,7 @@ async def get_attempt(request: web.Request) -> web.Response:
     if not score:
         # TODO: Allow manually set display options to override this.
         display_options.readonly = False
-        display_options.general_feedback = display_options.feedback = display_options.right_answer = False
+        display_options.general_feedback = display_options.specific_feedback = display_options.right_answer = False
 
     context = get_attempt_render_context(
         attempt,

tests/questionpy_sdk/webserver/test_question_ui.py

@@ -7,8 +7,8 @@
 import pytest
 
 from questionpy_sdk.webserver.question_ui import (
+    DisplayRole,
     QuestionDisplayOptions,
-    QuestionDisplayRole,
     QuestionFormulationUIRenderer,
     QuestionMetadata,
     QuestionUIRenderer,
@@ -112,7 +112,7 @@ def test_should_resolve_placeholders(renderer: QuestionUIRenderer) -> None:
 
 
 @pytest.mark.ui_file("feedbacks")
-@pytest.mark.render_params(options=QuestionDisplayOptions(general_feedback=False, feedback=False))
+@pytest.mark.render_params(options=QuestionDisplayOptions(general_feedback=False, specific_feedback=False))
 def test_should_hide_inline_feedback(renderer: QuestionUIRenderer) -> None:
     expected = """
         <div>
@@ -146,7 +146,7 @@ def test_should_show_inline_feedback(renderer: QuestionUIRenderer) -> None:
             "<div></div>",
         ),
         (
-            QuestionDisplayOptions(roles={QuestionDisplayRole.SCORER}),
+            QuestionDisplayOptions(roles={DisplayRole.SCORER}),
             """
                 <div>
                     <div>You're a scorer!</div>