Merge pull request hkulekci#47 from hkulekci/decoupling-guzzle

decouple guzzle

Author: hkulekci

composer.json

@@ -8,16 +8,19 @@
         "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",
+        "psr/http-factory-implementation": "^1.0",
+        "psr/http-client-implementation": "^1.0"
     },
     "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",
+        "symfony/http-client": "^6.4.3|^7.1.0",
+        "nyholm/psr7": "^1.8@dev",
+        "php-http/mock-client": "1.x-dev"
     },
     "autoload": {
         "psr-4": {
@@ -38,5 +41,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,27 @@
 
 class Config
 {
-
     protected ?string $apiKey = null;
 
     public function __construct(protected string $host, protected int $port = 6333)
     {
     }
 
+    public function getHost(): string
+    {
+        return parse_url($this->host, PHP_URL_HOST) ?: $this->host;
+    }
+
+    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,17 +7,16 @@
  */
 namespace Qdrant\Endpoints;
 
-use GuzzleHttp\Psr7\HttpFactory;
-use GuzzleHttp\Psr7\Query;
-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)
+    use HttpFactoryTrait;
+
+    public function __construct(protected ClientInterface $client)
     {
     }
 
@@ -39,32 +38,4 @@ public function getCollectionName(): string
         }
         return $this->collectionName;
     }
-
-    protected function queryBuild(array $params): string
-    {
-        if ($params) {
-            return '?' . Query::build($params);
-        }
-        return '';
-    }
-
-    /**
-     * @throws InvalidArgumentException
-     */
-    protected function createRequest(string $method, string $uri, array $body = []): RequestInterface
-    {
-        $httpFactory = new HttpFactory();
-        $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!', $e->getCode(), $e);
+            }
+        }
+
+        return $request;
+    }
+
+    protected function queryBuild(array $params): string
+    {
+        return '?' . http_build_query($params);
+    }
+}

src/Http/Builder.php

@@ -0,0 +1,29 @@
+<?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 $client;
+    public function __construct(ClientInterface $client = null) {
+        $this->client = $client ?: Psr18ClientDiscovery::find();
+    }
+
+    public function build(Config $config): Transport
+    {
+        return new Transport(
+            $this->client,
+            $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($this->config->getScheme())
+            );
+
+        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);
+    }
+}