Compare commits

..
2 Commits
Author SHA1 Message Date
Wojtek 8693720b78 Replace AI balance with usage counters 2026-10-16 19:36:42 +02:00
Wojtek 37d8c6040c Show remaining API credits in AI settings 2026-10-16 15:12:33 +02:00
9 changed files with 118 additions and 10 deletions
+1 -1
View File
@@ -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.6).
W Joomla wybierz **System → Install → Install from Folder** i wskaż ten katalog. Manifestem instalacyjnym jest `com_testquestions.xml` (wersja 1.43.8).
Po instalacji komponent jest dostępny w panelu administratora jako **Pytania testowe**.
@@ -70,6 +70,13 @@ COM_TESTQUESTIONS_AI_GROK_KEY="Klucz API Grok"
COM_TESTQUESTIONS_AI_OPENAI_MODEL="Model OpenAI"
COM_TESTQUESTIONS_AI_GROK_MODEL="Model Grok"
COM_TESTQUESTIONS_AI_MODEL_INVALID="Wybierz prawidłowy model dla każdego dostawcy AI."
COM_TESTQUESTIONS_AI_TOKEN_USAGE="Wykorzystanie tokenów API"
COM_TESTQUESTIONS_AI_TOKEN_USAGE_INFO="Suma użycia zapisanego przy ocenach AI we wszystkich wynikach testów. Powtórne oceny są zliczane, jeśli zostały wykonane po tej aktualizacji."
COM_TESTQUESTIONS_AI_USAGE_CALLS="Liczba ocen"
COM_TESTQUESTIONS_AI_USAGE_INPUT="Tokeny wejściowe"
COM_TESTQUESTIONS_AI_USAGE_OUTPUT="Tokeny wyjściowe"
COM_TESTQUESTIONS_AI_USAGE_TOTAL="Razem tokenów"
COM_TESTQUESTIONS_AI_USAGE_COST="Koszt zapisany"
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."
@@ -0,0 +1 @@
-- No database changes required for version 1.43.7.
@@ -0,0 +1,5 @@
UPDATE `#__extensions`
SET `params` = JSON_REMOVE(`params`, '$.ai_grok_team_id', '$.ai_grok_management_key')
WHERE `type` = 'component'
AND `element` = 'com_testquestions'
AND JSON_VALID(`params`);
@@ -14,6 +14,16 @@ use Komponent\Component\Testquestions\Administrator\Service\AiService;
class AiController extends BaseController
{
public function save(): void
{
$this->saveSettings();
$this->setRedirect(
Route::_('index.php?option=com_testquestions&view=ai', false),
Text::_('COM_TESTQUESTIONS_AI_SETTINGS_SAVED')
);
}
private function saveSettings(): array
{
if (!Session::checkToken()) {
throw new \RuntimeException(Text::_('JINVALID_TOKEN'), 403);
@@ -56,38 +66,34 @@ class AiController extends BaseController
$settings = json_decode((string) $row->params, true);
$settings = is_array($settings) ? $settings : [];
$legacyKey = trim((string) ($settings['ai_api_key'] ?? ''));
$settings['ai_provider'] = $provider;
foreach ($selectedModels as $modelProvider => $model) {
$settings['ai_' . $modelProvider . '_model'] = $model;
}
foreach (['openai', 'grok'] as $keyProvider) {
$fieldName = 'ai_' . $keyProvider . '_api_key';
$apiKey = trim((string) $input->post->get($fieldName, '', 'RAW'));
if ($apiKey !== '') {
$settings[$fieldName] = $apiKey;
}
if ($keyProvider === $provider && empty($settings[$fieldName]) && $legacyKey !== '') {
$settings[$fieldName] = $legacyKey;
}
}
unset($settings['ai_api_key']);
unset($settings['ai_grok_team_id'], $settings['ai_grok_management_key']);
$extension = (object) [
'extension_id' => (int) $row->extension_id,
'params' => json_encode($settings, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES),
];
if (!$db->updateObject('#__extensions', $extension, 'extension_id')) {
throw new \RuntimeException(Text::_('COM_TESTQUESTIONS_AI_SAVE_FAILED'));
}
$this->setRedirect(
Route::_('index.php?option=com_testquestions&view=ai', false),
Text::_('COM_TESTQUESTIONS_AI_SETTINGS_SAVED')
);
return $settings;
}
public function cancel(): void
@@ -161,6 +161,14 @@ class ResultModel extends BaseDatabaseModel
$item->answers[$questionId]['ai_feedback'] = $aiResult['feedback'];
$item->answers[$questionId]['awarded_points'] = $aiResult['awarded_points'];
if ($aiResult['usage'] !== null) {
$history = $item->answers[$questionId]['ai_usage_history'] ?? null;
if (!is_array($history)) {
$history = !empty($item->answers[$questionId]['ai_usage']) && is_array($item->answers[$questionId]['ai_usage'])
? [$item->answers[$questionId]['ai_usage']]
: [];
}
$history[] = $aiResult['usage'];
$item->answers[$questionId]['ai_usage_history'] = $history;
$item->answers[$questionId]['ai_usage'] = $aiResult['usage'];
}
@@ -12,6 +12,7 @@ use Joomla\CMS\Toolbar\ToolbarHelper;
class HtmlView extends BaseHtmlView
{
protected array $settings = [];
protected array $usageTotals = [];
public function display($tpl = null)
{
@@ -24,6 +25,54 @@ class HtmlView extends BaseHtmlView
->where($db->quoteName('element') . ' = ' . $db->quote('com_testquestions'))
)->loadResult();
$this->settings = json_decode($raw, true) ?: [];
$this->usageTotals = [
'openai' => ['calls' => 0, 'input_tokens' => 0, 'output_tokens' => 0, 'total_tokens' => 0, 'cost_usd' => 0.0, 'cost_calls' => 0],
'grok' => ['calls' => 0, 'input_tokens' => 0, 'output_tokens' => 0, 'total_tokens' => 0, 'cost_usd' => 0.0, 'cost_calls' => 0],
];
$usageRows = $db->setQuery(
$db->getQuery(true)
->select($db->quoteName('answers'))
->from($db->quoteName('#__testquestions_results'))
->where($db->quoteName('answers') . ' LIKE ' . $db->quote('%ai_usage%'))
)->loadColumn();
foreach ($usageRows as $answersJson) {
$answers = json_decode((string) $answersJson, true);
if (!is_array($answers)) {
continue;
}
foreach ($answers as $answer) {
if (!is_array($answer)) {
continue;
}
$usages = $answer['ai_usage_history'] ?? (isset($answer['ai_usage']) ? [$answer['ai_usage']] : []);
if (!is_array($usages)) {
continue;
}
foreach ($usages as $usage) {
if (!is_array($usage)) {
continue;
}
$provider = (string) ($usage['provider'] ?? '');
if (!isset($this->usageTotals[$provider])) {
continue;
}
$this->usageTotals[$provider]['calls']++;
$this->usageTotals[$provider]['input_tokens'] += (int) ($usage['input_tokens'] ?? 0);
$this->usageTotals[$provider]['output_tokens'] += (int) ($usage['output_tokens'] ?? 0);
$this->usageTotals[$provider]['total_tokens'] += (int) ($usage['total_tokens'] ?? 0);
if (is_numeric($usage['cost_usd'] ?? null)) {
$this->usageTotals[$provider]['cost_usd'] += (float) $usage['cost_usd'];
$this->usageTotals[$provider]['cost_calls']++;
}
}
}
}
ToolbarHelper::title(Text::_('COM_TESTQUESTIONS_AI_SETTINGS'));
ToolbarHelper::link('index.php?option=com_testquestions&view=questions', 'COM_TESTQUESTIONS_QUESTIONS', 'arrow-left');
@@ -2,6 +2,7 @@
<?php use Joomla\CMS\HTML\HTMLHelper; ?>
<?php use Joomla\CMS\Router\Route; ?>
<?php $availableModels = \Komponent\Component\Testquestions\Administrator\Service\AiService::availableModels(); ?>
<?php $usageTotals = $this->usageTotals; ?>
<?php $provider = (string) ($this->settings['ai_provider'] ?? 'openai'); ?>
<?php $legacyKey = (string) ($this->settings['ai_api_key'] ?? ''); ?>
<?php $openaiKey = (string) ($this->settings['ai_openai_api_key'] ?? ($provider === 'openai' ? $legacyKey : '')); ?>
@@ -54,6 +55,37 @@
<?php endforeach; ?>
</select>
</div>
<hr>
<h3><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_TOKEN_USAGE'); ?></h3>
<p class="text-muted"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_TOKEN_USAGE_INFO'); ?></p>
<div class="table-responsive">
<table class="table table-striped">
<thead>
<tr>
<th><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_PROVIDER'); ?></th>
<th><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_USAGE_CALLS'); ?></th>
<th><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_USAGE_INPUT'); ?></th>
<th><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_USAGE_OUTPUT'); ?></th>
<th><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_USAGE_TOTAL'); ?></th>
<th><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_USAGE_COST'); ?></th>
</tr>
</thead>
<tbody>
<?php foreach (['openai' => 'OpenAI', 'grok' => 'Grok'] as $usageProvider => $usageProviderLabel) : ?>
<?php $providerUsage = $usageTotals[$usageProvider]; ?>
<tr>
<th><?php echo $usageProviderLabel; ?></th>
<td><?php echo number_format($providerUsage['calls'], 0, ',', ' '); ?></td>
<td><?php echo number_format($providerUsage['input_tokens'], 0, ',', ' '); ?></td>
<td><?php echo number_format($providerUsage['output_tokens'], 0, ',', ' '); ?></td>
<td><?php echo number_format($providerUsage['total_tokens'], 0, ',', ' '); ?></td>
<td><?php echo $providerUsage['cost_calls'] > 0 ? number_format($providerUsage['cost_usd'], 8, ',', ' ') . ' USD' : '—'; ?></td>
</tr>
<?php endforeach; ?>
</tbody>
</table>
</div>
<hr>
<button type="submit" class="btn btn-primary" onclick="this.form.task.value='ai.save';">
<?php echo \Joomla\CMS\Language\Text::_('JTOOLBAR_SAVE'); ?>
</button>
+1 -1
View File
@@ -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.6</version>
<version>1.43.8</version>
<description>COM_TESTQUESTIONS_DESCRIPTION</description>
<element>com_testquestions</element>
<namespace path="src">Komponent\Component\Testquestions</namespace>