decouple guzzle

Author: hkulekci

composer.json

@@ -8,16 +8,16 @@
         "psr/http-client": "^1.0",
         "psr/http-message": "^1.0|^2.0",
         "psr/log": "^1.0|^2.0|^3.0",
-        "guzzlehttp/guzzle": "^7.5",
-        "guzzlehttp/psr7": "^2.0",
-        "webmozart/assert": "^1.11"
+        "webmozart/assert": "^1.11",
+        "psr/http-factory": "^1.0",
+        "php-http/discovery": "^1.19"
     },
     "require-dev": {
         "phpunit/phpunit": "^10.0",
         "mockery/mockery": "^1.5",
-        "openai-php/client": "^0.3.5",
-        "hkulekci/cohere": "dev-main",
-        "phpunit/php-code-coverage": "^10.1@dev"
+        "phpunit/php-code-coverage": "^10.1@dev",
+        "nyholm/psr7": "^1.8@dev",
+        "symfony/http-client": "^6.0|^7.0"
     },
     "autoload": {
         "psr-4": {
@@ -38,5 +38,10 @@
     "scripts": {
         "test": "vendor/bin/phpunit --display-warnings --display-deprecations",
         "coverage": "vendor/bin/phpunit --display-warnings --display-deprecations --coverage-html coverage/"
+    },
+    "config": {
+        "allow-plugins": {
+            "php-http/discovery": false
+        }
     }
 }

src/ClientInterface.php

@@ -5,19 +5,9 @@
  */
 namespace Qdrant;
 
-use Qdrant\Endpoints\Cluster;
-use Qdrant\Endpoints\Collections;
-use Qdrant\Endpoints\Service;
-use Qdrant\Endpoints\Snapshots;
-use Qdrant\Http\HttpClientInterface;
+use Psr\Http\Message\RequestInterface;
 
-interface ClientInterface extends HttpClientInterface
+interface ClientInterface
 {
-    public function collections(string $collectionName = null): Collections;
-
-    public function snapshots(): Snapshots;
-
-    public function cluster(): Cluster;
-
-    public function service(): Service;
+    public function execute(RequestInterface $request): Response;
 }

src/Config.php

@@ -10,13 +10,22 @@
 
 class Config
 {
-
     protected ?string $apiKey = null;
 
     public function __construct(protected string $host, protected int $port = 6333)
     {
     }
 
+    public function getHost()
+    {
+        return $this->host;
+    }
+
+    public function getPort()
+    {
+        return $this->port;
+    }
+
     public function getDomain(): string
     {
         return $this->host . ':' . $this->port;

src/Endpoints/AbstractEndpoint.php

@@ -7,17 +7,16 @@
  */
 namespace Qdrant\Endpoints;
 
-use GuzzleHttp\Psr7\HttpFactory;
-use GuzzleHttp\Psr7\Query;
+use Http\Discovery\Psr17FactoryDiscovery;
 use Psr\Http\Message\RequestInterface;
+use Qdrant\ClientInterface;
 use Qdrant\Exception\InvalidArgumentException;
-use Qdrant\Http\HttpClientInterface;
 
 abstract class AbstractEndpoint
 {
     protected ?string $collectionName = null;
 
-    public function __construct(protected HttpClientInterface $client)
+    public function __construct(protected ClientInterface $client)
     {
     }
 
@@ -42,18 +41,20 @@ public function getCollectionName(): string
 
     protected function queryBuild(array $params): string
     {
-        if ($params) {
-            return '?' . Query::build($params);
+        $p = [];
+        foreach ($params as $k => $v) {
+            $p[] = urldecode($k) . "=" . urlencode($v);
         }
-        return '';
+
+        return '?' . implode('&', $p);
     }
 
     /**
      * @throws InvalidArgumentException
      */
     protected function createRequest(string $method, string $uri, array $body = []): RequestInterface
     {
-        $httpFactory = new HttpFactory();
+        $httpFactory = Psr17FactoryDiscovery::findRequestFactory();
         $request = $httpFactory->createRequest($method, $uri);
         if ($body) {
             try {

src/Http/Builder.php

@@ -0,0 +1,35 @@
+<?php
+/**
+ * Builder
+ *
+ * @since     Jan 2024
+ * @author    Haydar KULEKCI <haydarkulekci@gmail.com>
+ */
+
+namespace Qdrant\Http;
+
+use Http\Discovery\Psr18ClientDiscovery;
+use Psr\Http\Client\ClientInterface;
+use Qdrant\Config;
+
+class Builder
+{
+    protected ClientInterface $baseClient;
+
+    public function getClient(): ClientInterface
+    {
+        if (empty($this->baseClient)) {
+            $this->baseClient = Psr18ClientDiscovery::find();
+        }
+
+        return $this->baseClient;
+    }
+
+    public function build(Config $config): Transport
+    {
+        return new Transport(
+            $this->getClient(),
+            $config
+        );
+    }
+}

src/Http/GuzzleClient.php

@@ -0,0 +1,49 @@
+<?php
+/**
+ * Transport.php
+ *
+ * @since     Jan 2024
+ * @author    Haydar KULEKCI <haydarkulekci@gmail.com>
+ */
+
+namespace Qdrant\Http;
+
+use Psr\Http\Client\ClientInterface;
+use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ResponseInterface;
+use Qdrant\Config;
+
+class Transport implements ClientInterface
+{
+    public function __construct(
+        private readonly ClientInterface $client,
+        private readonly Config $config
+    )
+    {
+    }
+
+    private function prepareHeaders(RequestInterface $request): RequestInterface
+    {
+        $request = $request->withHeader('content-type', 'application/json')
+            ->withHeader('accept', 'application/json')
+            ->withUri(
+                $request->getUri()
+                    ->withHost($this->config->getHost())
+                    ->withPort($this->config->getPort())
+                    ->withScheme('http')
+            );
+
+        if ($this->config->getApiKey()) {
+            $request = $request->withHeader('api-key', $this->config->getApiKey());
+        }
+
+        return $request;
+    }
+
+    public function sendRequest(RequestInterface $request): ResponseInterface
+    {
+        $request = $this->prepareHeaders($request);
+
+        return $this->client->sendRequest($request);
+    }
+}

src/Http/HttpClientInterface.php

@@ -5,42 +5,58 @@
  */
 namespace Qdrant;
 
+use Psr\Http\Client\RequestExceptionInterface;
 use Psr\Http\Message\RequestInterface;
 use Qdrant\Endpoints\Cluster;
 use Qdrant\Endpoints\Collections;
 use Qdrant\Endpoints\Service;
 use Qdrant\Endpoints\Snapshots;
-use Qdrant\Http\HttpClientInterface;
+use Qdrant\Http\Transport;
 
 class Qdrant implements ClientInterface
 {
-
-    public function __construct(private HttpClientInterface $client)
+    public function __construct(private readonly Transport $transport)
     {
     }
 
     public function collections(string $collectionName = null): Collections
     {
-        return (new Collections($this->client))->setCollectionName($collectionName);
+        return (new Collections($this))->setCollectionName($collectionName);
     }
 
     public function snapshots(): Snapshots
     {
-        return new Snapshots($this->client);
+        return new Snapshots($this);
     }
 
     public function cluster(): Cluster
     {
-        return new Cluster($this->client);
+        return new Cluster($this);
     }
 
     public function service(): Service
     {
-        return new Service($this->client);
+        return new Service($this);
     }
 
     public function execute(RequestInterface $request): Response
     {
-        return $this->client->execute($request);
+        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);
+            }*/
+        }
     }
 }

src/Http/Transport.php

@@ -10,6 +10,7 @@
 use Qdrant\Config;
 use Qdrant\Endpoints\Collections;
 use Qdrant\Exception\InvalidArgumentException;
+use Qdrant\Http\Builder;
 use Qdrant\Http\GuzzleClient;
 use Qdrant\Http\HttpClientInterface;
 use Qdrant\Models\Request\CreateCollection;
@@ -18,14 +19,15 @@
 
 abstract class AbstractIntegration extends TestCase
 {
-    protected HttpClientInterface $client;
+    protected Qdrant $client;
     private ?Collections $collections = null;
 
     protected function setUp(): void
     {
         parent::setUp();
-        $config = (new Config('http://127.0.0.1'));
-        $this->client = new GuzzleClient($config);
+        $config = (new Config('127.0.0.1'));
+        $transform = (new Builder())->build($config);
+        $this->client = new Qdrant($transform);
     }
 
     /**