Merge remote-tracking branch 'origin/MBS-10346_Allow_blank_spaces_in_tenant' into MBS-10346_Allow_blank_spaces_in_tenant

Author: Hannes Funk

classes/base_instance.php

@@ -580,7 +580,8 @@ final public function store_formdata(stdClass $data): void {
         $this->set_apikey(!empty($data->apikey) ? trim($data->apikey) : '');
         $this->set_useglobalapikey(!empty($data->useglobalapikey));
         $this->set_connector($data->connector);
-        $this->set_tenant(trim($data->tenant));
+        $tenantvalue = trim($data->tenant);
+        $this->set_tenant(empty($tenantvalue) ? tenant::DEFAULT_IDENTIFIER : $tenantvalue);
         if (empty($data->model)) {
             // This is only a fallback. If the connector does not support the selection of a model,
             // it is supposed to overwrite this default value in the extend_store_formdata function.
@@ -679,10 +680,6 @@ final public function supported_purposes(): array {
             return [];
         }
         $connector = \core\di::get(connector_factory::class)->get_connector_by_connectorname($this->connector);
-        if (!in_array($this->get_model(), $connector->get_models())) {
-            // This typically is the case if we are using a model that is preconfigured (for example when using Azure).
-            return array_keys($connector->get_models_by_purpose());
-        }
         $purposesofcurrentmodel = [];
         foreach ($connector->get_models_by_purpose() as $purpose => $models) {
             if (in_array($this->get_model(), $models)) {

classes/local/admin_setting_configdate.php

@@ -54,8 +54,15 @@ public function write_setting($data) {
     #[\Override]
     public function output_html($data, $query = '') {
         $default = $this->get_defaultsetting();
-        if ($default) {
-            $defaultinfo = userdate($default, get_string('strftimedatetime', 'langconfig'));
+        if ($default && is_array($default)) {
+            $defaultinfo = sprintf(
+                '%02d.%02d.%04d %02d:%02d',
+                $default['mday'],
+                $default['mon'],
+                $default['year'],
+                $default['hours'],
+                $default['minutes']
+            );
         } else {
             $defaultinfo = 0;
         }

lang/en/local_ai_manager.php

@@ -225,6 +225,7 @@
 $string['purposesdescription'] = 'Which of your configured AI tools should be used for which purpose?';
 $string['purposesheading'] = 'Purposes for {$a->role} ({$a->currentcount}/{$a->maxcount} assigned)';
 $string['purposeusageinfoheading'] = 'Usage of the purpose "{$a}"';
+$string['purposeusedbytool'] = 'This purpose is being used by the tool from which you landed on this page';
 $string['quotaconfig'] = 'Limits configuration';
 $string['quotadescription'] = 'Set the time window and the maximum number of requests per student and teacher here. After the time window expires, the number of requests will automatically reset.';
 $string['request_count'] = 'Request count';

settings.php

@@ -171,15 +171,15 @@
                 'local_ai_manager/datawiperanonymizedate',
                 get_string('datawiperanonymizedate', 'local_ai_manager'),
                 get_string('datawiperanonymizedatedesc', 'local_ai_manager'),
-                '1759269600'
+                ['year' => 2025, 'mon' => 10, 'mday' => 1, 'hours' => 0, 'minutes' => 0]
             )
         );
         $settings->add(
             new admin_setting_configdate(
                 'local_ai_manager/datawiperdeletedate',
                 get_string('datawiperdeletedate', 'local_ai_manager'),
                 get_string('datawiperdeletedatedesc', 'local_ai_manager'),
-                '1759269600'
+                ['year' => 2025, 'mon' => 10, 'mday' => 1, 'hours' => 0, 'minutes' => 0]
             )
         );
     }

styles.css

@@ -206,3 +206,8 @@ body.limitcontentwidth #page-content {
 #page-local-ai_manager-tenant_config .instanceaddmodal a:hover .card-title {
     text-decoration: underline;
 }
+
+.local_ai_manager-purposeinfo table tr.local_ai_manager-purpose-highlight {
+    background-color: var(--bs-info-bg-subtle);
+    color: var(--bs-info-text-emphasis);
+}

templates/purpose_info.mustache

@@ -82,7 +82,7 @@
         </thead>
         <tbody>
         {{#purposes}}
-            <tr class="{{#highlight}}table-info{{/highlight}}">
+            <tr class="{{#highlight}}local_ai_manager-purpose-highlight{{/highlight}}"{{#highlight}} title="{{#str}}purposeusedbytool, local_ai_manager{{/str}}"{{/highlight}}>
                 <td>
                     <div class="d-flex flex-row justify-content-between align-items-center">
                         <span>{{purpose}}</span>

tools/chatgpt/classes/connector.php

@@ -40,7 +40,7 @@ class connector extends \local_ai_manager\base_connector {
     public function get_models_by_purpose(): array {
         $chatgptmodels =
                 ['gpt-3.5-turbo', 'gpt-4-turbo', 'gpt-4o', 'gpt-4o-mini', 'o1', 'o1-mini', 'o3', 'o3-mini', 'o4-mini'];
-        return [
+        $modelsbypurpose = [
                 'chat' => $chatgptmodels,
                 'feedback' => $chatgptmodels,
                 'singleprompt' => $chatgptmodels,
@@ -52,7 +52,13 @@ public function get_models_by_purpose(): array {
                 'agent' => $chatgptmodels,
         ];
         foreach ($modelsbypurpose as $purpose => $models) {
-            $modelsbypurpose[$purpose][] = aitool_option_azure::get_azure_model_name('chatgpt');
+            // We assume that the azure models support all the purposes. This is kind of a blind guess, because in case
+            // of azure we do not have any information which model lies behind the azure endpoint. So we will go for the less
+            // restrictive definition, but of course it could be that there's a model behind the azure endpoint that, for example,
+            // does not support vision (itt). In this case we let the user run into an error, but that's not avoidable right now.
+            if (!empty($models)) {
+                $modelsbypurpose[$purpose][] = aitool_option_azure::get_azure_model_name('chatgpt');
+            }
         }
         return $modelsbypurpose;
     }

tools/chatgpt/tests/connector_test.php

@@ -0,0 +1,50 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace aitool_chatgpt;
+
+use local_ai_manager\local\aitool_option_azure;
+use local_ai_manager\local\connector_factory;
+
+/**
+ * Tests for ChatGPT connector.
+ *
+ * @package   aitool_chatgpt
+ * @copyright 2026 ISB Bayern
+ * @author    Philipp Memmel
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+final class connector_test extends \advanced_testcase {
+    /**
+     * Test that the Azure model is only available for supported purposes.
+     *
+     * @throws \coding_exception
+     * @covers \aitool_chatgpt\connector::get_models_by_purpose
+     */
+    public function test_get_models_by_purpose_contains_azure_model_only_for_supported_purposes(): void {
+        $connectorfactory = \core\di::get(connector_factory::class);
+        $connector = $connectorfactory->get_connector_by_connectorname('chatgpt');
+        $modelname = aitool_option_azure::get_azure_model_name('chatgpt');
+        $modelsbypurpose = $connector->get_models_by_purpose();
+
+        foreach (['chat', 'feedback', 'singleprompt', 'translate', 'itt', 'questiongeneration', 'agent'] as $purpose) {
+            $this->assertContains($modelname, $modelsbypurpose[$purpose]);
+        }
+
+        $this->assertNotContains($modelname, $modelsbypurpose['tts']);
+        $this->assertNotContains($modelname, $modelsbypurpose['imggen']);
+    }
+}