Configure separate OpenAI and Grok keys

README.md

@@ -30,6 +30,6 @@ Szkielet komponentu Joomla 6 do gromadzenia pytań testowych.
 
 ## Instalacja
 
-W Joomla wybierz **System → Install → Install from Folder** i wskaż ten katalog. Manifestem instalacyjnym jest `com_testquestions.xml` (wersja 1.43.0).
+W Joomla wybierz **System → Install → Install from Folder** i wskaż ten katalog. Manifestem instalacyjnym jest `com_testquestions.xml` (wersja 1.43.3).
 
 Po instalacji komponent jest dostępny w panelu administratora jako **Pytania testowe**.

administrator/components/com_testquestions/language/en-GB/com_testquestions.ini

@@ -65,6 +65,8 @@ COM_TESTQUESTIONS_SET_VARIANT_DURATION_INFO="Czas testu jest pobierany z zestawu
 COM_TESTQUESTIONS_AI_SETTINGS="Ustawienia AI"
 COM_TESTQUESTIONS_AI_PROVIDER="Dostawca AI"
 COM_TESTQUESTIONS_AI_API_KEY="Klucz API"
+COM_TESTQUESTIONS_AI_OPENAI_KEY="Klucz API OpenAI"
+COM_TESTQUESTIONS_AI_GROK_KEY="Klucz API Grok"
 COM_TESTQUESTIONS_AI_SETTINGS_MENU="Konfiguracja AI"
 COM_TESTQUESTIONS_AI_SETTINGS_SAVED="Ustawienia AI zapisano."
 COM_TESTQUESTIONS_AI_SAVE_FAILED="Nie udało się zapisać ustawień AI."

administrator/components/com_testquestions/sql/updates/mysql/1.43.1.sql

@@ -0,0 +1 @@
+-- No database changes required for version 1.43.1.

administrator/components/com_testquestions/sql/updates/mysql/1.43.2.sql

@@ -0,0 +1 @@
+-- No database changes required for version 1.43.2.

administrator/components/com_testquestions/sql/updates/mysql/1.43.3.sql

@@ -0,0 +1 @@
+-- No database changes required for version 1.43.3.

administrator/components/com_testquestions/src/Controller/AiController.php

@@ -44,13 +44,23 @@ class AiController extends BaseController
 
         $settings = json_decode((string) $row->params, true);
         $settings = is_array($settings) ? $settings : [];
-        $apiKey = trim((string) $input->post->get('ai_api_key', '', 'RAW'));
+        $legacyKey = trim((string) ($settings['ai_api_key'] ?? ''));
 
         $settings['ai_provider'] = $provider;
+        foreach (['openai', 'grok'] as $keyProvider) {
+            $fieldName = 'ai_' . $keyProvider . '_api_key';
+            $apiKey = trim((string) $input->post->get($fieldName, '', 'RAW'));
+
             if ($apiKey !== '') {
-            $settings['ai_api_key'] = $apiKey;
+                $settings[$fieldName] = $apiKey;
             }
 
+            if ($keyProvider === $provider && empty($settings[$fieldName]) && $legacyKey !== '') {
+                $settings[$fieldName] = $legacyKey;
+            }
+        }
+        unset($settings['ai_api_key']);
+
         $extension = (object) [
             'extension_id' => (int) $row->extension_id,
             'params' => json_encode($settings, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES),

administrator/components/com_testquestions/src/Model/ResultModel.php

@@ -92,7 +92,9 @@ class ResultModel extends BaseDatabaseModel
 
         $params = ComponentHelper::getParams('com_testquestions');
         $provider = trim((string) $params->get('ai_provider', 'openai'));
-        $apiKey = trim((string) $params->get('ai_api_key', ''));
+        $provider = strtolower(preg_replace('/[^a-z]/', '', $provider));
+        $keyName = 'ai_' . $provider . '_api_key';
+        $apiKey = trim((string) $params->get($keyName, $params->get('ai_api_key', '')));
         $componentKeyLength = mb_strlen($apiKey);
 
         // Odczytaj zapisane parametry bezpośrednio z bazy. Dzięki temu nie użyjemy
@@ -115,14 +117,21 @@ class ResultModel extends BaseDatabaseModel
             if ($storedProvider !== '') {
                 $provider = $storedProvider;
             }
+        }
 
+        $provider = strtolower(preg_replace('/[^a-z]/', '', $provider));
+        $keyName = 'ai_' . $provider . '_api_key';
+        $apiKey = trim((string) $params->get($keyName, $params->get('ai_api_key', '')));
+        $componentKeyLength = mb_strlen($apiKey);
+        $storedApiKey = is_array($storedParams)
+            ? trim((string) ($storedParams[$keyName] ?? $storedParams['ai_api_key'] ?? ''))
+            : '';
         if ($storedApiKey !== '' && !preg_match('/^\*+$/', $storedApiKey)) {
             $apiKey = $storedApiKey;
         }
-        }
 
         if (trim($apiKey) === '') {
-            $databaseKey = is_array($storedParams) ? trim((string) ($storedParams['ai_api_key'] ?? '')) : '';
+            $databaseKey = $storedApiKey;
             $databaseKeyLength = preg_match('/^\*+$/', $databaseKey) ? 0 : mb_strlen($databaseKey);
             throw new \RuntimeException(
                 'AI_KEY_EMPTY|provider=' . ($provider !== '' ? $provider : '(pusty)')
@@ -132,26 +141,34 @@ class ResultModel extends BaseDatabaseModel
             );
         }
 
-        $feedback = (new AiService())->evaluate(
+        $aiResult = (new AiService())->evaluate(
             $provider,
             $apiKey,
             strip_tags((string) $question->question),
             (string) ($answer['selected'] ?? ''),
-            (string) $question->answer_open
+            (string) $question->answer_open,
+            (int) $question->points
         );
-        $item->answers[$questionId]['ai_feedback'] = $feedback;
+        $item->answers[$questionId]['ai_feedback'] = $aiResult['feedback'];
+        $item->answers[$questionId]['awarded_points'] = $aiResult['awarded_points'];
+
+        $correctionPoints = 0;
+        foreach ($item->answers as $savedAnswer) {
+            $correctionPoints += (int) ($savedAnswer['awarded_points'] ?? 0);
+        }
 
         $db = Factory::getContainer()->get('DatabaseDriver');
         $row = (object) [
             'id' => $id,
             'answers' => json_encode($item->answers, JSON_UNESCAPED_UNICODE),
+            'points_after' => (int) $item->points_before + $correctionPoints,
         ];
 
         if (!$db->updateObject('#__testquestions_results', $row, 'id')) {
             throw new \RuntimeException('Nie udało się zapisać oceny AI.');
         }
 
-        return $feedback;
+        return $aiResult['feedback'];
     }
 
     public function evaluateAllWithAi(int $id): array

administrator/components/com_testquestions/src/Service/AiService.php

@@ -8,7 +8,7 @@ use Joomla\CMS\Http\HttpFactory;
 
 class AiService
 {
-    public function evaluate(string $provider, string $apiKey, string $question, string $answer, string $pattern): string
+    public function evaluate(string $provider, string $apiKey, string $question, string $answer, string $pattern, int $maxPoints): array
     {
         $provider = strtolower(trim($provider));
         $provider = preg_replace('/[^a-z]/', '', $provider);
@@ -24,11 +24,13 @@ class AiService
             throw new \RuntimeException('Nieprawidłowy dostawca AI: ' . $provider);
         }
 
-        $input = "Oceń odpowiedź ucznia na pytanie otwarte.\n\n"
+        $input = "Oceń odpowiedź ucznia na pytanie otwarte i ustal liczbę uznanych punktów.\n"
+            . "Maksymalna liczba punktów za to pytanie: " . max(0, $maxPoints) . ".\n"
+            . "Przyznaj liczbę całkowitą od 0 do maksymalnej liczby punktów. Przyznaj punkty proporcjonalnie za poprawne elementy odpowiedzi; pełne punkty za komplet, część punktów za częściową odpowiedź. Nie przekraczaj limitu.\n\n"
             . "Pytanie:\n" . $question . "\n\n"
             . "Wzorzec odpowiedzi:\n" . $pattern . "\n\n"
             . "Odpowiedź ucznia:\n" . ($answer !== '' ? $answer : 'Brak odpowiedzi') . "\n\n"
-            . "Napisz po polsku krótką ocenę: czy odpowiedź może zostać uznana za poprawną, jakie elementy są poprawne lub błędne oraz czy warto przyznać punkty. Nie zmieniaj wzorca odpowiedzi.";
+            . "Zwróć wyłącznie poprawny obiekt JSON w formacie {\"awarded_points\": liczba_całkowita, \"feedback\": \"krótka ocena po polsku\"}. W ocenie opisz poprawne i brakujące elementy. Nie zmieniaj wzorca odpowiedzi.";
 
         $payload = json_encode([
             'model' => $config['model'],
@@ -56,7 +58,25 @@ class AiService
             throw new \RuntimeException('Brak treści odpowiedzi AI.');
         }
 
-        return $text;
+        $jsonText = preg_replace('/^```(?:json)?\s*|\s*```$/i', '', trim($text));
+        $result = json_decode($jsonText, true);
+
+        if (!is_array($result) || !isset($result['awarded_points']) || !is_numeric($result['awarded_points'])) {
+            $start = strpos($jsonText, '{');
+            $end = strrpos($jsonText, '}');
+            if ($start !== false && $end !== false && $end > $start) {
+                $result = json_decode(substr($jsonText, $start, $end - $start + 1), true);
+            }
+        }
+
+        if (!is_array($result) || !isset($result['awarded_points']) || !is_numeric($result['awarded_points'])) {
+            throw new \RuntimeException('AI zwróciło nieprawidłowy format oceny i punktów.');
+        }
+
+        return [
+            'awarded_points' => min(max(0, $maxPoints), max(0, (int) $result['awarded_points'])),
+            'feedback' => trim((string) ($result['feedback'] ?? '')),
+        ];
     }
 
     private function extractText(array $body): string

administrator/components/com_testquestions/tmpl/ai/default.php

@@ -2,7 +2,9 @@
 <?php use Joomla\CMS\HTML\HTMLHelper; ?>
 <?php use Joomla\CMS\Router\Route; ?>
 <?php $provider = (string) ($this->settings['ai_provider'] ?? 'openai'); ?>
-<?php $apiKey = (string) ($this->settings['ai_api_key'] ?? ''); ?>
+<?php $legacyKey = (string) ($this->settings['ai_api_key'] ?? ''); ?>
+<?php $openaiKey = (string) ($this->settings['ai_openai_api_key'] ?? ($provider === 'openai' ? $legacyKey : '')); ?>
+<?php $grokKey = (string) ($this->settings['ai_grok_api_key'] ?? ($provider === 'grok' ? $legacyKey : '')); ?>
 <form action="<?php echo Route::_('index.php?option=com_testquestions&view=ai'); ?>" method="post" name="adminForm" id="adminForm">
     <div class="card" style="max-width: 900px;">
         <div class="card-body">
@@ -14,13 +16,23 @@
                 </select>
             </div>
             <div class="mb-3">
-                <label for="ai-api-key" class="form-label"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_API_KEY'); ?></label>
+                <label for="ai-openai-api-key" class="form-label"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_OPENAI_KEY'); ?></label>
                 <div class="input-group">
-                    <input type="password" id="ai-api-key" name="ai_api_key" value="<?php echo htmlspecialchars($apiKey, ENT_QUOTES, 'UTF-8'); ?>" class="form-control" size="120" maxlength="4096" autocomplete="new-password">
-                    <button type="button" class="btn btn-outline-secondary" id="ai-key-toggle">Pokaż</button>
+                    <input type="password" id="ai-openai-api-key" name="ai_openai_api_key" value="<?php echo htmlspecialchars($openaiKey, ENT_QUOTES, 'UTF-8'); ?>" class="form-control" size="120" maxlength="4096" autocomplete="new-password">
+                    <button type="button" class="btn btn-outline-secondary" data-ai-key-toggle="ai-openai-api-key">Pokaż</button>
                 </div>
                 <small class="form-text text-muted">
-                    <?php echo $apiKey !== '' ? 'Zapisany klucz: ' . mb_strlen($apiKey) . ' znaków. Pozostaw pole bez zmian, aby zachować klucz.' : 'Nie zapisano jeszcze klucza API.'; ?>
+                    <?php echo $openaiKey !== '' ? 'Zapisany klucz: ' . mb_strlen($openaiKey) . ' znaków. Pozostaw pole bez zmian, aby go zachować.' : 'Nie zapisano klucza OpenAI.'; ?>
+                </small>
+            </div>
+            <div class="mb-3">
+                <label for="ai-grok-api-key" class="form-label"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_GROK_KEY'); ?></label>
+                <div class="input-group">
+                    <input type="password" id="ai-grok-api-key" name="ai_grok_api_key" value="<?php echo htmlspecialchars($grokKey, ENT_QUOTES, 'UTF-8'); ?>" class="form-control" size="120" maxlength="4096" autocomplete="new-password">
+                    <button type="button" class="btn btn-outline-secondary" data-ai-key-toggle="ai-grok-api-key">Pokaż</button>
+                </div>
+                <small class="form-text text-muted">
+                    <?php echo $grokKey !== '' ? 'Zapisany klucz: ' . mb_strlen($grokKey) . ' znaków. Pozostaw pole bez zmian, aby go zachować.' : 'Nie zapisano klucza Grok.'; ?>
                 </small>
             </div>
             <button type="submit" class="btn btn-primary" onclick="this.form.task.value='ai.save';">
@@ -35,10 +47,12 @@
     <?php echo HTMLHelper::_('form.token'); ?>
 </form>
 <script>
-document.getElementById('ai-key-toggle')?.addEventListener('click', function () {
-    const input = document.getElementById('ai-api-key');
+document.querySelectorAll('[data-ai-key-toggle]').forEach(function (button) {
+    button.addEventListener('click', function () {
+        const input = document.getElementById(this.dataset.aiKeyToggle);
         const visible = input.type === 'text';
         input.type = visible ? 'password' : 'text';
         this.textContent = visible ? 'Pokaż' : 'Ukryj';
+    });
 });
 </script>

administrator/components/com_testquestions/tmpl/result/default.php

@@ -60,6 +60,7 @@
                         <div class="alert alert-info mt-3"><strong><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_RESULT'); ?>:</strong><br><?php echo nl2br(htmlspecialchars((string) $answer['ai_feedback'], ENT_QUOTES, 'UTF-8')); ?></div>
                     <?php endif; ?>
                 <?php endif; ?>
+                <?php if ($question->question_type === 'open') : ?>
                     <div class="row mt-3">
                         <div class="col-md-3">
                             <label for="awarded-points-<?php echo (int) $questionId; ?>" class="form-label"><?php echo \Joomla\CMS\Language\Text::sprintf('COM_TESTQUESTIONS_RESULT_AWARDED_POINTS', (int) ($question->points ?? 0)); ?></label>
@@ -71,6 +72,7 @@
                         </div>
                     </div>
                 <?php endif; ?>
+            <?php endif; ?>
         </article>
     <?php endforeach; ?>
     <input type="hidden" name="task" value="result.save">

com_testquestions.xml

@@ -4,7 +4,7 @@
     <creationDate>2026-10-14</creationDate>
     <author>Komponent</author>
     <license>GNU General Public License version 2 or later</license>
-    <version>1.43.0</version>
+    <version>1.43.3</version>
     <description>COM_TESTQUESTIONS_DESCRIPTION</description>
     <element>com_testquestions</element>
     <namespace path="src">Komponent\Component\Testquestions</namespace>