Merge branch 'master' of github.com:chamilo/chamilo-lms

Author: AngelFQC

public/main/inc/ajax/record_audio_rtc.ajax.php

@@ -44,18 +44,25 @@
         break;
 
     case Asset::EXERCISE_FEEDBACK:
+        /** @var TrackEExercise|null $exeAttempt */
+        $exeAttempt = Container::getTrackEExerciseRepository()->find($trackExerciseId);
+
+        if (null === $exeAttempt) {
+            exit;
+        }
+
+        // Make feedback asset unique per attempt + question (not only per question)
+        $assetTitle = sprintf('feedback_%d_%d', $questionId, $trackExerciseId);
         $asset = (new Asset())
             ->setCategory(Asset::EXERCISE_FEEDBACK)
-            ->setTitle("feedback_$questionId")
+            ->setTitle($assetTitle)
         ;
 
         $asset = $assetRepo->createFromRequest($asset, $_FILES['audio_blob']);
 
         $attemptFeedback = (new AttemptFeedback())
             ->setAsset($asset);
 
-        /** @var TrackEExercise $exeAttempt */
-        $exeAttempt = Container::getTrackEExerciseRepository()->find($trackExerciseId);
         $attempt = $exeAttempt->getAttemptByQuestionId($questionId);
 
         if (null === $attempt) {

public/main/inc/lib/diagnoser.lib.php

@@ -718,6 +718,7 @@ public function get_php_data()
             'OPcache' => ['link' => 'https://php.net/opcache', 'expected' => 2, 'comment' => get_lang('This extension should be loaded.')],
             'openssl' => ['link' => 'https://php.net/openssl', 'expected' => 2, 'comment' => get_lang('This extension should be loaded.')],
             'xsl' => ['link' => 'https://php.net/xsl', 'expected' => 2, 'comment' => get_lang('This extension should be loaded.')],
+            'xapian' => ['link' => 'https://xapian.org/docs/bindings/php/', 'expected' => 2, 'comment' => get_lang('This extension should be loaded.')],
         ];
 
         foreach ($extensions as $extension => $data) {

public/main/inc/lib/exercise.lib.php

@@ -5593,7 +5593,7 @@ public static function getOralFileAudio(int $trackExerciseId, int $questionId, b
      */
     public static function getOralFeedbackAudio(int $attemptId, int $questionId): string
     {
-        /** @var TrackEExercise $tExercise */
+        /** @var TrackEExercise|null $tExercise */
         $tExercise = Container::getTrackEExerciseRepository()->find($attemptId);
 
         if (null === $tExercise) {
@@ -5606,23 +5606,45 @@ public static function getOralFeedbackAudio(int $attemptId, int $questionId): st
             return '';
         }
 
-        $assetRepo = Container::getAssetRepository();
-        $html = '';
+        $feedbacks = $qAttempt->getAttemptFeedbacks();
 
-        // Keep only the latest audio feedback to avoid duplicated players
-        foreach ($qAttempt->getAttemptFeedbacks() as $attemptFeedback) {
-            $html = Display::tag(
-                'audio',
-                '',
-                [
-                    'src' => $assetRepo->getAssetUrl($attemptFeedback->getAsset()),
-                    'controls' => '',
-                ]
+        if ($feedbacks->isEmpty()) {
+            return '';
+        }
 
-            );
+        $latestFeedback = null;
+
+        foreach ($feedbacks as $feedback) {
+            // Skip feedbacks without asset, just in case
+            if (null === $feedback->getAsset()) {
+                continue;
+            }
+
+            if (null === $latestFeedback) {
+                $latestFeedback = $feedback;
+                continue;
+            }
+
+            // Choose the feedback with the latest createdAt
+            if ($feedback->getCreatedAt() > $latestFeedback->getCreatedAt()) {
+                $latestFeedback = $feedback;
+            }
         }
 
-        return $html;
+        if (null === $latestFeedback) {
+            return '';
+        }
+
+        $assetRepo = Container::getAssetRepository();
+
+        return Display::tag(
+            'audio',
+            '',
+            [
+                'src' => $assetRepo->getAssetUrl($latestFeedback->getAsset()),
+                'controls' => '',
+            ]
+        );
     }
 
     public static function getUploadAnswerFiles(int $trackExerciseId, int $questionId, bool $returnUrls = false)

tests/scripts/lang/ai_translate.php

@@ -45,24 +45,35 @@
 $logFile = __DIR__ . "/grok_translate.log";
 
 // Batch size for API calls
-$batchSize = 50;
+$batchSize = 100;
+$batchSizeInTestMode = 20;
 
 // ===================== HELPER FUNCTIONS =====================
 
 /**
  * Simple stderr output.
  */
-function eprintln(string $msg): void {
+function eprintln(string $msg, bool $timestam = false): void {
+    if ($timestam) {
+        $msg = '[' . date('H:i:s') . '] ' . $msg;
+    }
     fwrite(STDERR, $msg . PHP_EOL);
 }
 
 /**
- * Get human-readable language name from code (best-effort).
+ * Get a human-readable language name from code (best-effort).
  */
 function getLanguageName(string $code): string {
     static $map = [
         'fr'    => 'French',
+        'bg'    => 'Bulgarian',
+        'bn_BD' => 'Bengali (Bangladesh)',
+        'bo_CN' => 'Tibetan (China)',
+        'bs_BA' => 'Bosnian (Bosnia and Herzegovina)',
+        'cs_CZ' => 'Czech (Czech Republic)',
+        'eo'    => 'Esperanto',
         'es'    => 'Spanish',
+        'es_MX'    => 'Spanish (Mexico)',
         'de'    => 'German',
         'it'    => 'Italian',
         'nl'    => 'Dutch',
@@ -483,7 +494,7 @@ function callGrokTranslateBatch(
             'Authorization: Bearer ' . $apiKey,
         ],
         CURLOPT_POSTFIELDS     => $payloadJson,
-        CURLOPT_TIMEOUT        => 60,
+        CURLOPT_TIMEOUT        => 600,
     ]);
 
     $responseBody = curl_exec($ch);
@@ -642,10 +653,10 @@ function buildTargetPoContent(
 }
 
 // Parse base messages.en.po
-eprintln("Loading base file: {$basePoFile}");
+eprintln("Loading base file: {$basePoFile}", true);
 $baseEntries = parseBasePoFile($basePoFile);
 $totalTerms = count($baseEntries);
-eprintln("Base entries loaded: {$totalTerms} (including header and plurals).");
+eprintln("Base entries loaded: {$totalTerms} (including header and plurals).", true);
 
 foreach ($langCodes as $lang) {
     $lang = trim($lang);
@@ -657,7 +668,7 @@ function buildTargetPoContent(
 
     $targetFile = $translationsDir . "messages.{$lang}.po";
     eprintln("------------------------------------------------------------");
-    eprintln("Processing language: {$lang} ({$targetLangName})");
+    eprintln("Processing language: {$lang} ({$targetLangName})", true);
     eprintln("Target file: {$targetFile}");
 
     if (is_file($targetFile)) {
@@ -682,7 +693,7 @@ function buildTargetPoContent(
     $keepRawSingular = [];    // msgid => true for entries that we don't modify at all
     $processedCount = 0;
     $apiBatchCount = 0;
-    $maxBatches = $testMode ? 1 : PHP_INT_MAX;
+    $maxBatches = $testMode ? $batchSizeInTestMode : PHP_INT_MAX;
 
     $pendingBatch = [];
     $pendingMap = []; // id => ['msgid'=>..., 'action'=>...]
@@ -696,7 +707,7 @@ function buildTargetPoContent(
             // Header and plural entries are not sent to API
             $processedCount++;
             if ($processedCount % 50 === 0) {
-                eprintln("[{$lang}] Progress: {$processedCount} / {$totalTerms} entries processed (header/plurals included).");
+                eprintln("[{$lang}] Progress: {$processedCount} / {$totalTerms} entries processed (header/plurals included).", true);
             }
             continue;
         }
@@ -738,7 +749,7 @@ function buildTargetPoContent(
             if (count($pendingBatch) >= $batchSize) {
                 $apiBatchCount++;
                 eprintln("[{$lang}] Sending batch {$apiBatchCount} to Grok API ("
-                    . count($pendingBatch) . " terms).");
+                    . count($pendingBatch) . " terms).", true);
 
                 try {
                     $translations = callGrokTranslateBatch(
@@ -749,9 +760,9 @@ function buildTargetPoContent(
                         $pendingBatch
                     );
                     eprintln("[{$lang}] Grok API batch {$apiBatchCount} completed, "
-                        . count($translations) . " translations received.");
+                        . count($translations) . " translations received.", true);
                 } catch (Throwable $ex) {
-                    eprintln("[{$lang}] ERROR while calling Grok API: " . $ex->getMessage());
+                    eprintln("[{$lang}] ERROR while calling Grok API: " . $ex->getMessage(), true);
                     exit(1);
                 }
 
@@ -772,14 +783,15 @@ function buildTargetPoContent(
 
                     $targetTranslations[$msgidBatch] = $translated;
                     logAction($logFile, $lang, $msgidBatch, $actionBatch);
+                    sleep(1);
                 }
 
                 $pendingBatch = [];
                 $pendingMap = [];
 
                 if ($testMode && $apiBatchCount >= $maxBatches) {
-                    eprintln("[{$lang}] Test mode: only one batch has been sent to Grok. "
-                        . "Remaining untranslated entries will be left as-is.");
+                    eprintln("[{$lang}] Test mode: only $batchSizeInTestMode batches have been sent to Grok. "
+                        . "Remaining untranslated entries will be left as-is.", true);
                 }
             }
         } elseif ($needsTranslation && $apiBatchCount >= $maxBatches) {
@@ -791,15 +803,15 @@ function buildTargetPoContent(
 
         $processedCount++;
         if ($processedCount % 50 === 0) {
-            eprintln("[{$lang}] Progress: {$processedCount} / {$totalTerms} entries processed (header/plurals included).");
+            eprintln("[{$lang}] Progress: {$processedCount} / {$totalTerms} entries processed (header/plurals included).", true);
         }
     }
 
     // Flush remaining pending batch (if any and allowed)
     if (!empty($pendingBatch) && $apiBatchCount < $maxBatches) {
         $apiBatchCount++;
         eprintln("[{$lang}] Sending final batch {$apiBatchCount} to Grok API ("
-            . count($pendingBatch) . " terms).");
+            . count($pendingBatch) . " terms).", true);
 
         try {
             $translations = callGrokTranslateBatch(
@@ -810,9 +822,9 @@ function buildTargetPoContent(
                 $pendingBatch
             );
             eprintln("[{$lang}] Grok API final batch {$apiBatchCount} completed, "
-                . count($translations) . " translations received.");
+                . count($translations) . " translations received.", true);
         } catch (Throwable $ex) {
-            eprintln("[{$lang}] ERROR while calling Grok API: " . $ex->getMessage());
+            eprintln("[{$lang}] ERROR while calling Grok API: " . $ex->getMessage(), true);
             exit(1);
         }
 
@@ -838,14 +850,14 @@ function buildTargetPoContent(
     $newContent = buildTargetPoContent($baseEntries, $targetParsed, $targetTranslations, $keepRawSingular);
 
     if (file_put_contents($targetFile, $newContent) === false) {
-        eprintln("[{$lang}] ERROR: Unable to write updated translation file: {$targetFile}");
+        eprintln("[{$lang}] ERROR: Unable to write updated translation file: {$targetFile}", true);
         exit(1);
     }
 
-    eprintln("[{$lang}] Updated translation file written: {$targetFile}");
+    eprintln("[{$lang}] Updated translation file written: {$targetFile}", true);
     if ($testMode) {
-        eprintln("[{$lang}] NOTE: Test mode was enabled; only one API batch of up to {$batchSize} terms was translated.");
+        eprintln("[{$lang}] NOTE: Test mode was enabled; only {$batchSizeInTestMode} API batch of up to {$batchSize} terms was translated.");
     }
 }
 
-eprintln("All requested languages processed.");
+eprintln("All requested languages processed.", true);