psr/http-factory-implementation added. And HttpFactorytrait created. getScheme added into into Config.

Author: hkulekci

composer.json

@@ -10,14 +10,15 @@
         "psr/log": "^1.0|^2.0|^3.0",
         "webmozart/assert": "^1.11",
         "psr/http-factory": "^1.0",
-        "php-http/discovery": "^1.19"
+        "php-http/discovery": "^1.19",
+        "psr/http-factory-implementation": "^1.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^10.0",
         "mockery/mockery": "^1.5",
         "phpunit/php-code-coverage": "^10.1@dev",
-        "nyholm/psr7": "^1.8@dev",
-        "symfony/http-client": "^6.0|^7.0"
+        "symfony/http-client": "7.1.x-dev",
+        "nyholm/psr7": "^1.8@dev"
     },
     "autoload": {
         "psr-4": {

src/Config.php

@@ -16,16 +16,21 @@ public function __construct(protected string $host, protected int $port = 6333)
     {
     }
 
-    public function getHost()
+    public function getHost(): string
     {
-        return $this->host;
+        return parse_url($this->host, PHP_URL_HOST) ?: $this->host;
     }
 
-    public function getPort()
+    public function getPort(): int
     {
         return $this->port;
     }
 
+    public function getScheme(): string
+    {
+        return parse_url($this->host, PHP_URL_SCHEME) ?: 'http';
+    }
+
     public function getDomain(): string
     {
         return $this->host . ':' . $this->port;

src/Endpoints/AbstractEndpoint.php

@@ -7,15 +7,15 @@
  */
 namespace Qdrant\Endpoints;
 
-use Http\Discovery\Psr17FactoryDiscovery;
-use Psr\Http\Message\RequestInterface;
 use Qdrant\ClientInterface;
 use Qdrant\Exception\InvalidArgumentException;
 
 abstract class AbstractEndpoint
 {
     protected ?string $collectionName = null;
 
+    use HttpFactoryTrait;
+
     public function __construct(protected ClientInterface $client)
     {
     }
@@ -38,34 +38,4 @@ public function getCollectionName(): string
         }
         return $this->collectionName;
     }
-
-    protected function queryBuild(array $params): string
-    {
-        $p = [];
-        foreach ($params as $k => $v) {
-            $p[] = urldecode($k) . "=" . urlencode($v);
-        }
-
-        return '?' . implode('&', $p);
-    }
-
-    /**
-     * @throws InvalidArgumentException
-     */
-    protected function createRequest(string $method, string $uri, array $body = []): RequestInterface
-    {
-        $httpFactory = Psr17FactoryDiscovery::findRequestFactory();
-        $request = $httpFactory->createRequest($method, $uri);
-        if ($body) {
-            try {
-                $request = $request->withBody(
-                    $httpFactory->createStream(json_encode($body, JSON_THROW_ON_ERROR))
-                );
-            } catch (\JsonException $e) {
-                throw new InvalidArgumentException('Json parse error!');
-            }
-        }
-
-        return $request;
-    }
 }

src/Endpoints/HttpFactoryTrait.php

@@ -0,0 +1,57 @@
+<?php
+/**
+ * HttpFactoryTrait
+ *
+ * @since     Jan 2024
+ * @author    Haydar KULEKCI <haydarkulekci@gmail.com>
+ */
+
+namespace Qdrant\Endpoints;
+
+use Http\Discovery\Psr17FactoryDiscovery;
+use Psr\Http\Message\RequestFactoryInterface;
+use Psr\Http\Message\RequestInterface;
+use Qdrant\Exception\InvalidArgumentException;
+
+trait HttpFactoryTrait
+{
+    protected ?RequestFactoryInterface $httpFactory = null;
+
+    public function getHttpFactory(): RequestFactoryInterface
+    {
+        if ($this->httpFactory === null) {
+            $this->httpFactory = Psr17FactoryDiscovery::findRequestFactory();
+        }
+        return $this->httpFactory;
+    }
+
+    public function setHttpFactory(RequestFactoryInterface $httpFactory): void
+    {
+        $this->httpFactory = $httpFactory;
+    }
+
+    /**
+     * @throws InvalidArgumentException
+     */
+    protected function createRequest(string $method, string $uri, array $body = []): RequestInterface
+    {
+
+        $request = $this->getHttpFactory()->createRequest($method, $uri);
+        if ($body) {
+            try {
+                $request = $request->withBody(
+                    $this->getHttpFactory()->createStream(json_encode($body, JSON_THROW_ON_ERROR))
+                );
+            } catch (\JsonException $e) {
+                throw new InvalidArgumentException('Json parse error!');
+            }
+        }
+
+        return $request;
+    }
+
+    protected function queryBuild(array $params): string
+    {
+        return '?' . http_build_query($params);
+    }
+}

src/Http/Transport.php

@@ -30,7 +30,7 @@ private function prepareHeaders(RequestInterface $request): RequestInterface
                 $request->getUri()
                     ->withHost($this->config->getHost())
                     ->withPort($this->config->getPort())
-                    ->withScheme('http')
+                    ->withScheme($this->config->getScheme())
             );
 
         if ($this->config->getApiKey()) {

src/Qdrant.php

@@ -11,6 +11,8 @@
 use Qdrant\Endpoints\Collections;
 use Qdrant\Endpoints\Service;
 use Qdrant\Endpoints\Snapshots;
+use Qdrant\Exception\InvalidArgumentException;
+use Qdrant\Exception\ServerException;
 use Qdrant\Http\Transport;
 
 class Qdrant implements ClientInterface
@@ -41,22 +43,22 @@ public function service(): Service
 
     public function execute(RequestInterface $request): Response
     {
-        try {
-            $res = $this->transport->sendRequest($request);
-
-            return new Response($res);
-        } catch (RequestExceptionInterface $e) {
-            var_dump('RequestException', $e->getMessage(), $request); exit();
-            /*$statusCode = $e->getResponse()->getStatusCode();
-            if ($statusCode >= 400 && $statusCode < 500) {
-                $errorResponse = new Response($e->getResponse());
-                throw (new InvalidArgumentException($e->getMessage(), $statusCode))
-                    ->setResponse($errorResponse);
-            } elseif ($statusCode >= 500) {
-                $errorResponse = new Response($e->getResponse());
-                throw (new ServerException($e->getMessage(), $statusCode))
-                    ->setResponse($errorResponse);
-            }*/
+        $res = $this->transport->sendRequest($request);
+        $statusCode = $res->getStatusCode();
+        if ($statusCode >= 400 && $statusCode < 500) {
+            $errorResponse = new Response($res);
+            throw (new InvalidArgumentException(
+                $errorResponse['status']['error'] ?? 'Invalid Argument Exception',
+                $statusCode)
+            )->setResponse($errorResponse);
+        } elseif ($statusCode >= 500) {
+            $errorResponse = new Response($res);
+            throw (new ServerException(
+                $errorResponse['status']['error'] ?? '500 Interval Service Error',
+                $statusCode)
+            )->setResponse($errorResponse);
         }
+
+        return new Response($res);
     }
 }

tests/Integration/Endpoints/ClusterTest.php

@@ -31,7 +31,6 @@ public function testClusterInfo(): void
     public function testClusterRecover(): void
     {
         $this->expectException(ServerException::class);
-        $this->expectExceptionMessage('500 Internal Server Error');
         $this->expectExceptionCode(500);
 
         $cluster = new Cluster($this->client);