Compare commits

...
3 Commits
Author SHA1 Message Date
Wojtek 7f4f86080a Prefer stored AI configuration values 2026-10-16 12:14:39 +02:00
Wojtek 9e940c5710 Read saved AI component parameters 2026-10-16 12:07:29 +02:00
Wojtek 62befb825e Fix component AI configuration form 2026-10-16 11:56:56 +02:00
7 changed files with 49 additions and 15 deletions
+1 -1
View File
@@ -30,6 +30,6 @@ Szkielet komponentu Joomla 6 do gromadzenia pytań testowych.
## Instalacja ## Instalacja
W Joomla wybierz **System → Install → Install from Folder** i wskaż ten katalog. Manifestem instalacyjnym jest `com_testquestions.xml` (wersja 1.42.0). W Joomla wybierz **System → Install → Install from Folder** i wskaż ten katalog. Manifestem instalacyjnym jest `com_testquestions.xml` (wersja 1.42.3).
Po instalacji komponent jest dostępny w panelu administratora jako **Pytania testowe**. Po instalacji komponent jest dostępny w panelu administratora jako **Pytania testowe**.
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<config>
<fields name="params">
<fieldset name="basic" label="COM_TESTQUESTIONS_AI_SETTINGS">
<field name="ai_provider" type="list" label="COM_TESTQUESTIONS_AI_PROVIDER">
<option value="openai">OpenAI</option>
<option value="grok">Grok</option>
</field>
<field name="ai_api_key" type="password" label="COM_TESTQUESTIONS_AI_API_KEY" filter="raw" autocomplete="off" />
</fieldset>
</fields>
</config>
@@ -0,0 +1 @@
-- No database changes required for version 1.42.1.
@@ -0,0 +1 @@
-- No database changes required for version 1.42.2.
@@ -0,0 +1 @@
-- No database changes required for version 1.42.3.
@@ -91,9 +91,38 @@ class ResultModel extends BaseDatabaseModel
} }
$params = ComponentHelper::getParams('com_testquestions'); $params = ComponentHelper::getParams('com_testquestions');
$provider = trim((string) $params->get('ai_provider', 'openai'));
$apiKey = trim((string) $params->get('ai_api_key', ''));
// Odczytaj zapisane parametry bezpośrednio z bazy. Dzięki temu nie użyjemy
// nieaktualnej wartości z pamięci ComponentHelper, a maska pola hasła
// (np. ********) nie zostanie potraktowana jako prawdziwy klucz.
$db = Factory::getContainer()->get('DatabaseDriver');
$storedParams = (string) $db->setQuery(
$db->getQuery(true)
->select($db->quoteName('params'))
->from($db->quoteName('#__extensions'))
->where($db->quoteName('type') . ' = ' . $db->quote('component'))
->where($db->quoteName('element') . ' = ' . $db->quote('com_testquestions'))
)->loadResult();
$storedParams = json_decode($storedParams, true);
if (is_array($storedParams)) {
$storedProvider = trim((string) ($storedParams['ai_provider'] ?? ''));
$storedApiKey = trim((string) ($storedParams['ai_api_key'] ?? ''));
if ($storedProvider !== '') {
$provider = $storedProvider;
}
if ($storedApiKey !== '' && !preg_match('/^\*+$/', $storedApiKey)) {
$apiKey = $storedApiKey;
}
}
$feedback = (new AiService())->evaluate( $feedback = (new AiService())->evaluate(
(string) $params->get('ai_provider', 'openai'), $provider,
(string) $params->get('ai_api_key', ''), $apiKey,
strip_tags((string) $question->question), strip_tags((string) $question->question),
(string) ($answer['selected'] ?? ''), (string) ($answer['selected'] ?? ''),
(string) $question->answer_open (string) $question->answer_open
+2 -12
View File
@@ -4,7 +4,7 @@
<creationDate>2026-10-14</creationDate> <creationDate>2026-10-14</creationDate>
<author>Komponent</author> <author>Komponent</author>
<license>GNU General Public License version 2 or later</license> <license>GNU General Public License version 2 or later</license>
<version>1.42.0</version> <version>1.42.3</version>
<description>COM_TESTQUESTIONS_DESCRIPTION</description> <description>COM_TESTQUESTIONS_DESCRIPTION</description>
<element>com_testquestions</element> <element>com_testquestions</element>
<namespace path="src">Komponent\Component\Testquestions</namespace> <namespace path="src">Komponent\Component\Testquestions</namespace>
@@ -19,6 +19,7 @@
<administration> <administration>
<menu link="index.php?option=com_testquestions&amp;view=questions">COM_TESTQUESTIONS</menu> <menu link="index.php?option=com_testquestions&amp;view=questions">COM_TESTQUESTIONS</menu>
<files folder="administrator/components/com_testquestions"> <files folder="administrator/components/com_testquestions">
<filename>config.xml</filename>
<folder>forms</folder> <folder>forms</folder>
<folder>services</folder> <folder>services</folder>
<folder>sql</folder> <folder>sql</folder>
@@ -30,17 +31,6 @@
<language tag="en-GB">en-GB/com_testquestions.sys.ini</language> <language tag="en-GB">en-GB/com_testquestions.sys.ini</language>
</languages> </languages>
</administration> </administration>
<config>
<fields name="params">
<fieldset name="basic" label="COM_TESTQUESTIONS_AI_SETTINGS">
<field name="ai_provider" type="list" label="COM_TESTQUESTIONS_AI_PROVIDER">
<option value="openai">OpenAI</option>
<option value="grok">Grok</option>
</field>
<field name="ai_api_key" type="password" label="COM_TESTQUESTIONS_AI_API_KEY" filter="raw" autocomplete="off" />
</fieldset>
</fields>
</config>
<install> <install>
<sql> <sql>
<file driver="mysql" charset="utf8mb4">sql/install.mysql.utf8mb4.sql</file> <file driver="mysql" charset="utf8mb4">sql/install.mysql.utf8mb4.sql</file>