Merge branch 'main' into multi_response_test

Author: marcusgreen

amd/src/editformhelper.js.org

@@ -12,11 +12,15 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-import {get_strings} from 'core/str';
+import {
+    get_strings
+} from 'core/str';
 import Ajax from 'core/ajax';
 import Log from 'core/log';
 import Notify from 'core/notification';
-import {exception as displayException} from 'core/notification';
+import {
+    exception as displayException
+} from 'core/notification';
 
 /**
  * Question AI Text Edit Form Helper
@@ -44,12 +48,17 @@ export const init = (contextid) => {
     return;
 
     // Set up strings
-    var strings={};
-    get_strings([
-        { "key": "prompttester", "component": 'qtype_aitext'},
-        { "key": "sampleanswerempty", "component": 'qtype_aitext'},
+    var strings = {};
+    get_strings([{
+            "key": "prompttester",
+            "component": 'qtype_aitext'
+        },
+        {
+            "key": "sampleanswerempty",
+            "component": 'qtype_aitext'
+        },
 
-    ]).done(function (s) {
+    ]).done(function(s) {
         var i = 0;
         strings.prompttester = s[i++];
         strings.sampleanswerempty = s[i++];
@@ -70,7 +79,8 @@ export const init = (contextid) => {
         }
 
         //put  spinner in place
-        sampleanswereval.innerHTML='<i class="icon fa fa-spinner fa-spin fa-2x"></i>';
+        // This is an alternative https://github.com/moodle/moodle/blob/main/lib/amd/src/loadingicon.js.
+        sampleanswereval.innerHTML = '<i class="icon fa fa-spinner fa-spin fa-2x"></i>';
 
         Ajax.call([{
             methodname: 'qtype_aitext_fetch_ai_grade',
@@ -91,5 +101,5 @@ export const init = (contextid) => {
             displayException(error);
             sampleanswereval.innerHTML = '';
         });
-    });//end of click
-};
+    }); //end of click
+};

question.php

@@ -176,9 +176,14 @@ public function perform_request(string $prompt, string $purpose = 'feedback'): s
             }
             return $llmresponse->get_content();
         } else if ($backend == 'core_ai_subsystem') {
+<<<<<<< HEAD
             global $USER, $CFG, $DB;
             // There was a breaking change in the move to Moodle 5x.
             if (str_starts_with($CFG->release, '5')) {
+=======
+            global $USER,$CFG, $DB;
+            if(str_starts_with($CFG->release, '5')) {
+>>>>>>> main
                 $manager = new \core_ai\manager($DB);
             } else {
                 $manager = new \core_ai\manager();
@@ -271,6 +276,12 @@ public function grade_response(array $response): array {
      * @return string;
      */
     public function build_full_ai_prompt($response, $aiprompt, $defaultmark, $markscheme): string {
+
+        // Check if [questiontext] is in the aiprompt and replace it with the question text
+        if (strpos($aiprompt, '[questiontext]') !== false) {
+            $aiprompt = str_replace('[questiontext]', strip_tags($this->questiontext), $aiprompt);
+        }
+
         $responsetext = strip_tags($response);
             $responsetext = '[['.$responsetext.']]';
             $prompt = get_config('qtype_aitext', 'prompt');

tests/question_test.php

@@ -17,6 +17,7 @@
 namespace qtype_aitext;
 
 use coding_exception;
+use core_reportbuilder\external\filters\set;
 use PHPUnit\Framework\ExpectationFailedException;
 use question_attempt_step;
 use SebastianBergmann\RecursionContext\InvalidArgumentException;
@@ -42,9 +43,13 @@ final class question_test extends \advanced_testcase {
 
     /**
      * Instance of the question type class
-     * @var qtype_aitext
+     * @var question
      */
     public $question;
+<<<<<<< HEAD
+=======
+
+>>>>>>> main
     /**
      * There is a live connection to the External AI system
      * When run locally it will make a connection. Otherwise the
@@ -119,6 +124,32 @@ public function test_get_question_summary(): void {
             $this->assertEquals('Hello [world]', $aitext->get_question_summary());
     }
 
+    /**
+     * Check on some permutations of how the prompt that is sent to the
+     * LLM is constructed
+     * @covers ::build_full_ai_prompt
+     */
+    public function test_build_full_ai_prompt() :void {
+        $this->resetAfterTest();
+
+        $question = qtype_aitext_test_helper::make_aitext_question([]);
+        set_config('prompt', 'in [responsetext] ','qtype_aitext');
+        set_config('defaultprompt', 'check this','qtype_aitext');
+        set_config('markscheme', 'one mark','qtype_aitext');
+        set_config('jsonprompt', 'testprompt','qtype_aitext');
+
+        $response = '<p> Thank you </p>';
+        $result = $question->build_full_ai_prompt($response, $aiprompt, $defaultmark, $markscheme);
+
+        $this->assertStringContainsString('[[ Thank you ]]', $result);
+        // HTML tags should be stripped out.
+        $this->assertStringNotContainsString('<p>', $result);
+
+        $markscheme = "2 points";
+        $result = $question->build_full_ai_prompt($response, $aiprompt, $defaultmark, $markscheme);
+        $this->assertStringContainsString('2 points', $result);
+}
+
     /**
      * Check that non valid json returned from the LLM is
      * dealt with gracefully