[Platform][Albert] Improve validation

Author: sadiqk2

src/platform/src/Bridge/Albert/EmbeddingsModelClient.php

@@ -12,7 +12,6 @@
 namespace Symfony\AI\Platform\Bridge\Albert;
 
 use Symfony\AI\Platform\Bridge\OpenAi\Embeddings;
-use Symfony\AI\Platform\Exception\InvalidArgumentException;
 use Symfony\AI\Platform\Model;
 use Symfony\AI\Platform\ModelClientInterface;
 use Symfony\AI\Platform\Result\RawHttpResult;
@@ -29,8 +28,6 @@ public function __construct(
         #[\SensitiveParameter] private string $apiKey,
         private string $baseUrl,
     ) {
-        '' !== $apiKey || throw new InvalidArgumentException('The API key must not be empty.');
-        '' !== $baseUrl || throw new InvalidArgumentException('The base URL must not be empty.');
     }
 
     public function supports(Model $model): bool

src/platform/src/Bridge/Albert/GptModelClient.php

@@ -12,7 +12,6 @@
 namespace Symfony\AI\Platform\Bridge\Albert;
 
 use Symfony\AI\Platform\Bridge\OpenAi\Gpt;
-use Symfony\AI\Platform\Exception\InvalidArgumentException;
 use Symfony\AI\Platform\Model;
 use Symfony\AI\Platform\ModelClientInterface;
 use Symfony\AI\Platform\Result\RawHttpResult;
@@ -33,9 +32,6 @@ public function __construct(
         private string $baseUrl,
     ) {
         $this->httpClient = $httpClient instanceof EventSourceHttpClient ? $httpClient : new EventSourceHttpClient($httpClient);
-
-        '' !== $apiKey || throw new InvalidArgumentException('The API key must not be empty.');
-        '' !== $baseUrl || throw new InvalidArgumentException('The base URL must not be empty.');
     }
 
     public function supports(Model $model): bool

src/platform/src/Bridge/Albert/PlatformFactory.php

@@ -32,6 +32,7 @@ public static function create(
         str_starts_with($baseUrl, 'https://') || throw new InvalidArgumentException('The Albert URL must start with "https://".');
         !str_ends_with($baseUrl, '/') || throw new InvalidArgumentException('The Albert URL must not end with a trailing slash.');
         preg_match('/\/v\d+$/', $baseUrl) || throw new InvalidArgumentException('The Albert URL must include an API version (e.g., /v1, /v2).');
+        '' !== $apiKey || throw new InvalidArgumentException('The API key must not be empty.');
 
         $httpClient = $httpClient instanceof EventSourceHttpClient ? $httpClient : new EventSourceHttpClient($httpClient);
 

src/platform/tests/Bridge/Albert/EmbeddingsModelClientTest.php

@@ -18,38 +18,13 @@
 use Symfony\AI\Platform\Bridge\Albert\EmbeddingsModelClient;
 use Symfony\AI\Platform\Bridge\OpenAi\Embeddings;
 use Symfony\AI\Platform\Bridge\OpenAi\Gpt;
-use Symfony\AI\Platform\Exception\InvalidArgumentException;
 use Symfony\Component\HttpClient\MockHttpClient;
 use Symfony\Component\HttpClient\Response\JsonMockResponse;
 
 #[CoversClass(EmbeddingsModelClient::class)]
 #[Small]
 final class EmbeddingsModelClientTest extends TestCase
 {
-    public function testConstructorThrowsExceptionForEmptyApiKey()
-    {
-        $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('The API key must not be empty.');
-
-        new EmbeddingsModelClient(
-            new MockHttpClient(),
-            '',
-            'https://albert.example.com/'
-        );
-    }
-
-    public function testConstructorThrowsExceptionForEmptyBaseUrl()
-    {
-        $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('The base URL must not be empty.');
-
-        new EmbeddingsModelClient(
-            new MockHttpClient(),
-            'test-api-key',
-            ''
-        );
-    }
-
     public function testSupportsEmbeddingsModel()
     {
         $client = new EmbeddingsModelClient(

src/platform/tests/Bridge/Albert/GptModelClientTest.php

@@ -18,7 +18,6 @@
 use Symfony\AI\Platform\Bridge\Albert\GptModelClient;
 use Symfony\AI\Platform\Bridge\OpenAi\Embeddings;
 use Symfony\AI\Platform\Bridge\OpenAi\Gpt;
-use Symfony\AI\Platform\Exception\InvalidArgumentException;
 use Symfony\Component\HttpClient\EventSourceHttpClient;
 use Symfony\Component\HttpClient\MockHttpClient;
 use Symfony\Component\HttpClient\Response\JsonMockResponse;
@@ -27,30 +26,6 @@
 #[Small]
 final class GptModelClientTest extends TestCase
 {
-    public function testConstructorThrowsExceptionForEmptyApiKey()
-    {
-        $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('The API key must not be empty.');
-
-        new GptModelClient(
-            new MockHttpClient(),
-            '',
-            'https://albert.example.com/'
-        );
-    }
-
-    public function testConstructorThrowsExceptionForEmptyBaseUrl()
-    {
-        $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('The base URL must not be empty.');
-
-        new GptModelClient(
-            new MockHttpClient(),
-            'test-api-key',
-            ''
-        );
-    }
-
     public function testConstructorWrapsHttpClientInEventSourceHttpClient()
     {
         self::expectNotToPerformAssertions();

src/platform/tests/Bridge/Albert/PlatformFactoryTest.php

@@ -55,6 +55,14 @@ public function testThrowsExceptionForNonHttpsUrl()
         PlatformFactory::create('test-key', 'http://albert.example.com');
     }
 
+    public function testPlatformThrowsExceptionForEmptyApiKey()
+    {
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('The API key must not be empty.');
+
+        PlatformFactory::create('', 'https://albert.example.com/v2');
+    }
+
     #[DataProvider('provideUrlsWithTrailingSlash')]
     public function testThrowsExceptionForUrlsWithTrailingSlash(string $url)
     {