Simplify the prompt && increase timeout

Author: ogorzalka

composer.json

@@ -15,7 +15,8 @@
         "openai-php/client": "^0.8.0",
         "patrickschur/language-detection": "^5.0",
         "symfony/http-client": "^6.0|^7.0",
-        "vlucas/phpdotenv": "^5.6"
+        "vlucas/phpdotenv": "^5.6",
+        "guzzlehttp/guzzle": "^7.0"
     },
     "require-dev": {
         "laravel/pint": "^1.18.1",

src/Services/OpenAITranslator.php

@@ -10,6 +10,7 @@
 use Pollora\Pollingo\DTO\TranslationGroup;
 use Pollora\Pollingo\DTO\TranslationString;
 use RuntimeException;
+use GuzzleHttp\Client as GuzzleClient;
 
 /**
  * @template TKey of string
@@ -24,9 +25,14 @@ final class OpenAITranslator implements Translator
 
     public function __construct(
         string $apiKey,
-        private readonly string $model = 'gpt-4o',
+        private readonly string $model = 'gpt-4',
+        private readonly int $timeout = 30 // default timeout in seconds
     ) {
-        $this->client = (new Factory())->withApiKey($apiKey)->make();
+        $httpClient = new GuzzleClient(['timeout' => $this->timeout]);
+        $this->client = (new Factory())
+            ->withApiKey($apiKey)
+            ->withHttpClient($httpClient)
+            ->make();
         $this->languageCodeService = new LanguageCodeService();
     }
 
@@ -82,7 +88,7 @@ public function translate(array $groups, string $targetLanguage, ?string $source
                 throw new RuntimeException('Invalid JSON in response');
             }
 
-            // Verify translations are valid
+            // Verify that translations are different from the original text
             foreach ($translations as $key => $translation) {
                 if (! isset($strings[$key])) {
                     throw new RuntimeException(sprintf(
@@ -95,6 +101,10 @@ public function translate(array $groups, string $targetLanguage, ?string $source
                 if (! is_string($translation)) {
                     throw new RuntimeException("Invalid translation for key '{$key}': expected string, got ".gettype($translation));
                 }
+
+                if (mb_strtolower($translation) === mb_strtolower($strings[$key]['text'])) {
+                    throw new RuntimeException("Translation for '{$key}' is the same as the original text");
+                }
             }
 
             // Verify all strings are translated
@@ -164,7 +174,7 @@ private function getSystemPrompt(): string
 Your task is to translate text while preserving meaning and context.
 
 Important rules to follow:
-1. Translate the text to the target language, keeping the original text if it's already appropriate in the target language
+1. Always translate the text to the target language, never return it unchanged
 2. Preserve the meaning and context of each string
 3. Use appropriate translations based on context
 4. Return ONLY a valid JSON object with translations, nothing else
@@ -184,15 +194,6 @@ private function getSystemPrompt(): string
     "action": "Sauvegarder"
 }
 
-Common translations from English to French:
-- "Hello" → "Bonjour" or "Salut"
-- "Save" → "Sauvegarder" or "Enregistrer"
-- "Welcome" → "Bienvenue"
-- "Error occurred" → "Une erreur est survenue"
-- "Cancel" → "Annuler"
-- "Success" → "Succès"
-- "Operation completed" → "Opération terminée"
-
 IMPORTANT: Return ONLY the JSON object, no other text or explanations.
 PROMPT;
     }

tests/Feature/TranslationTest.php

@@ -126,38 +126,3 @@ public function translate(array $groups, string $targetLanguage, ?string $source
 
     expect($translation)->toBe('translated_Welcome');
 });
-
-test('it allows translations that are similar to the original text', function () {
-    $similarTranslator = new class implements Translator {
-        public function translate(array $groups, string $targetLanguage, ?string $sourceLanguage = null, ?string $globalContext = null): array
-        {
-            $result = [];
-            foreach ($groups as $groupName => $group) {
-                $translatedStrings = [];
-                foreach ($group->getStrings() as $key => $string) {
-                    // For some words like "OK" or "Menu", the translation might be the same in many languages
-                    $translatedStrings[$key] = new TranslationString(
-                        text: $string->getText(),
-                        translatedText: $string->getText(), // Same as original
-                        context: $string->getContext(),
-                    );
-                }
-                $result[$groupName] = new TranslationGroup($groupName, $translatedStrings);
-            }
-
-            return $result;
-        }
-    };
-
-    $pollingo = Pollingo::make(translator: $similarTranslator);
-    $translation = $pollingo
-        ->to('fr')
-        ->group('ui', [
-            'ok' => 'OK',
-            'menu' => 'Menu',
-        ])
-        ->translate();
-
-    expect($translation['ui']['ok'])->toBe('OK');
-    expect($translation['ui']['menu'])->toBe('Menu');
-});