made changes

Author: ay4t

.continueignore

@@ -2,3 +2,5 @@ vendor/*
 *.lock
 *.cache
 phpunit.phar
+.env
+.prompts/*

.gitignore

@@ -2,3 +2,5 @@ vendor/*
 *.lock
 *.cache
 phpunit.phar
+.env
+.prompts/*

composer.json

@@ -23,6 +23,8 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require-dev": {
-        "phpunit/phpunit": "^11.4"
+        "phpunit/phpunit": "^11.4",
+        "vlucas/phpdotenv": "^v5.6.1",
+        "kint-php/kint": "^5.1"
     }
 }

readme.md

@@ -0,0 +1,51 @@
+Multipurpose PHP Rest Client
+=============================
+
+A multipurpose PHP rest client for consuming RESTful web services. This package is designed to be very simple and easy to use.
+
+### Installation
+
+You can install the package via composer:
+
+```bash
+composer require ay4t/php-rest-client
+```
+
+### Description
+Example usage of the `Client` class.
+
+### Example Usage
+
+```php
+
+$config = new Config();
+$config->setBaseUri('https://api.openai.com/v1/')
+    ->setApiKey('your-api-key-here')
+    // optional
+    ->setSecretKey('your-secret-key-here');
+
+$client = new Client($config);
+$response = $client->cmd('GET', 'models');
+
+echo '<pre>';
+print_r($response);
+echo '</pre>';
+```
+
+or
+
+```php
+$cmd = $client->cmd('POST', 'chat/completions', [
+    'model' => 'llama-3.1-70b-versatile',
+    'messages' => [
+        [
+            'role' => 'user',
+            'content'  => 'hi, why is sea water salty?',
+        ]
+    ]
+]);
+
+echo '<pre>';
+print_r($cmd);
+echo '</pre>';
+```

src/Abstracts/AbstractClient.php

@@ -14,13 +14,13 @@ abstract class AbstractClient implements ClientInterface
     public function __construct(Config $config)
     {
         $this->config = $config;
-        $this->client = new GuzzleClient(['base_uri' => $config->apiUrl]);
+        $this->client = new GuzzleClient(['base_uri' => $config->getBaseUri()]);
     }
 
     protected function prepareHeaders(): array
     {
         return [
-            'Authorization' => 'Bearer ' . $this->config->apiKey,
+            'Authorization' => 'Bearer ' . $this->config->getApiKey(),
             'Accept' => 'application/json',
         ];
     }

src/Client.php

@@ -12,6 +12,23 @@ class Client extends AbstractClient implements ClientInterface
 {
     use RequestTrait;
 
+    /**
+     * $request_options
+     * @var array
+     */
+    private $request_options = [];
+
+    /**
+     * setRequestOptions
+     * @param array $request_options
+     * @return void
+     */
+    public function setRequestOptions(array $request_options) {
+        $this->request_options = $request_options;
+        return $this;
+    }
+    
+
     /**
      * Perform a request to the API server.
      *
@@ -23,15 +40,25 @@ class Client extends AbstractClient implements ClientInterface
      */
     public function cmd(string $method = 'GET', string $command, array $params = [])
     {
-        $url = $this->config->apiUrl . '/' . $command;
-        $options = [
-            'headers'   => $this->prepareHeaders(),
-            'query'     => $method === 'GET' ? $params : [],
-            'json'      => $method === 'POST' ? $params : [],
+        $url = $this->config->getBaseUri() . '/' . $command;
+        $requestOptions     = [];
+
+        // Merge default options with user-provided options
+        $defaultOptions = [
+            'headers' => $this->prepareHeaders(),
         ];
 
+        // Handle different HTTP methods and params
+        if (in_array(strtoupper($method), ['GET', 'DELETE'])) {
+            $defaultOptions['query'] = $params;
+        } elseif (in_array(strtoupper($method), ['POST', 'PUT', 'PATCH'])) {
+            $defaultOptions['json'] = $params;
+        }
+
+        $requestOptions = array_merge($defaultOptions, $this->request_options);
+
         try {
-            $response = $this->client->request($method, $url, $options);
+            $response = $this->client->request($method, $url, $requestOptions);
             return json_decode($response->getBody()->getContents(), $this->response_associative);
         } catch (GuzzleException $e) {
             // Error handling

src/Config/Config.php

@@ -4,53 +4,149 @@
 
 class Config
 {
+	/**
+	 * The base URI of the API endpoint.
+	 * @var string
+	 */
+	private $baseUri;
+
 	/**
 	 * The API key used for authentication.
 	 * @var string
 	 */
-	public $apiKey;
+	private $apiKey;
 
+	/**
+	 * The secret key used for authentication (optional).
+	 * @var string|null
+	 */
+	private $secretKey;
 
 	/**
-	 * The secret key used for authentication.
-	 * @var string
+     * Constructor.
+     *
+     * @param string|null $baseUri
+     * @param string|null $apiKey
+     * @param string|null $secretKey
+     */
+    public function __construct(?string $baseUri = null, ?string $apiKey = null, ?string $secretKey = null)
+    {
+        if ($baseUri !== null) {
+            $this->setBaseUri($baseUri);
+        }
+        if ($apiKey !== null) {
+            $this->setApiKey($apiKey);
+        }
+        if ($secretKey !== null) {
+            $this->setSecretKey($secretKey);
+        }
+    }
+
+	/**
+	 * Set the base URI for the API.
+	 * 
+	 * @param string $baseUri
+	 * @return self
 	 */
-	public $secretKey;
+	public function setBaseUri(string $baseUri): self
+	{
+		$this->validateBaseUri($baseUri);
+		$this->baseUri = $baseUri;
+		return $this;
+	}
 
 	/**
-	 * The base URL of the API endpoint.
-	 * @var string
+	 * Set the API key.
+	 * 
+	 * @param string $apiKey
+	 * @return self
 	 */
-	public $apiUrl;
-
-	private function validateParameters(string $apiKey, string $secretKey, string $apiUrl): bool
-	{
-	  if (empty($apiKey) || empty($secretKey) || empty($apiUrl)) {
-	        throw new \InvalidArgumentException('API key, secret key, dan API URL tidak boleh kosong');
-	    }
-	
-	    if (!is_string($apiKey) || !is_string($secretKey) || !is_string($apiUrl)) {
-	        throw new \InvalidArgumentException('Semua parameter harus berupa string');
-	    }
-	
-	    if (strlen($apiKey) < 10 || strlen($secretKey) < 10) {
-	        throw new \InvalidArgumentException('API key dan secret key harus memiliki panjang minimal 10 karakter');
-	    }
-	
-	    if (!preg_match('/^https?:\/\//', $apiUrl)) {
-	        throw new \InvalidArgumentException('API URL tidak valid');
-	    }
-	
-	    return true;
-	}
-	
-	public function __construct(string $apiKey, string $secretKey, string $apiUrl)
-	{
-	    if ($this->validateParameters($apiKey, $secretKey, $apiUrl)) {
-	        $this->apiKey = $apiKey;
-	        $this->secretKey = $secretKey;
-	        $this->apiUrl = $apiUrl;
-	    }
-	}
-
-}
+	public function setApiKey(string $apiKey): self
+	{
+		$this->validateApiKey($apiKey);
+		$this->apiKey = $apiKey;
+		return $this;
+	}
+
+	/**
+	 * Set the secret key (optional).
+	 * 
+	 * @param string $secretKey
+	 * @return self
+	 */
+	public function setSecretKey(string $secretKey): self
+	{
+		$this->validateSecretKey($secretKey);
+		$this->secretKey = $secretKey;
+		return $this;
+	}
+
+	/**
+	 * Get the base URI.
+	 * 
+	 * @return string
+	 */
+	public function getBaseUri(): string
+	{
+		return $this->baseUri;
+	}
+
+	/**
+	 * Get the API key.
+	 * 
+	 * @return string
+	 */
+	public function getApiKey(): string
+	{
+		return $this->apiKey;
+	}
+
+	/**
+	 * Get the secret key.
+	 * 
+	 * @return string|null
+	 */
+	public function getSecretKey(): ?string
+	{
+		return $this->secretKey;
+	}
+
+	/**
+	 * Validate the base URI.
+	 * 
+	 * @param string $baseUri
+	 * @throws \InvalidArgumentException
+	 */
+	private function validateBaseUri(string $baseUri): void
+	{
+		if (empty($baseUri) || !filter_var($baseUri, FILTER_VALIDATE_URL)) {
+			throw new \InvalidArgumentException('Base URI is not valid');
+		}
+	}
+
+	/**
+	 * Validate the API key.
+	 * 
+	 * @param string $apiKey
+	 * @throws \InvalidArgumentException
+	 */
+	private function validateApiKey(string $apiKey): void
+	{
+		if (empty($apiKey) || strlen($apiKey) < 10) {
+			throw new \InvalidArgumentException('API key must be at least 10 characters long');
+		}
+	}
+
+	/**
+	 * Validate the secret key.
+	 * 
+	 * @param string $secretKey
+	 * @throws \InvalidArgumentException
+	 */
+	private function validateSecretKey(string $secretKey): void
+	{
+		if (!empty($secretKey) && strlen($secretKey) < 10) {
+			throw new \InvalidArgumentException('Secret key, if provided, must be at least 10 characters long');
+		}
+	}
+}

tests/test.php

@@ -0,0 +1,50 @@
+<?php
+
+use Ay4t\RestClient\Client;
+use Ay4t\RestClient\Config\Config;
+use Kint\Kint;
+
+require_once __DIR__ . '/../vendor/autoload.php';
+
+$dotenv = Dotenv\Dotenv::createImmutable(__DIR__ . '/../');
+$env = $dotenv->load();
+
+
+/* Kint::dump( $env );
+die; */
+
+$groq_api_key       = $env['GROQ_API_KEY'];
+$groq_secret_key    = $env['GROQ_SECRET_KEY'];
+$groq_api_url       = $env['GROQ_API_URL'];
+
+$config     = new Config();
+$config->setBaseUri($groq_api_url)
+    ->setApiKey($groq_api_key);
+    
+$client     = new Client($config);
+
+/* list all models */
+$cmd = $client->cmd('GET', 'models', [
+
+]);
+echo '<pre>';
+print_r($cmd);
+echo '</pre>';
+die;
+
+/* chat/completions */
+$cmd = $client->cmd('POST', 'chat/completions', [
+    'model' => 'llama-3.1-70b-versatile',
+    'messages' => [
+        [
+            'role' => 'user',
+            'content'  => 'hi, why is sea water salty?',
+        ]
+    ]
+]);
+
+
+echo '<pre>';
+print_r($cmd);
+echo '</pre>';
+die;