Merge pull request #28 from moe-mizrak/fix/wrong-int-types-to-float

wrong int types in ResponseData, LimitResponseData and CostResponseDa…

Author: moe-mizrak

.github/workflows/main.yml

@@ -13,8 +13,8 @@ jobs:
       fail-fast: true
       matrix:
         os: [ ubuntu-latest ]
-        php: [ 8.1 ]
-        laravel: [ 10.* ]
+        php: [ 8.1, 8.2, 8.3, 8.4 ]
+        laravel: [ 10.*, 11.* ]
         dependency-version: [ prefer-lowest, prefer-stable ]
         exclude:
           - php: 8.1

src/DTO/CostResponseData.php

@@ -176,7 +176,7 @@ class CostResponseData extends DataTransferObject
     /**
      * Usage associated with the request
      *
-     * @var int|null
+     * @var float|null
      */
-    public ?int $usage;
+    public ?float $usage;
 }

src/DTO/LimitResponseData.php

@@ -28,9 +28,14 @@ class LimitResponseData extends DataTransferObject
     /**
      * Number of credits used.
      *
-     * @var int|null
+     * @var float|null
+     */
+    public ?float $usage;
+
+    /**
+     * @var float|null
      */
-    public ?int $usage;
+    public ?float $limit_remaining;
 
     /**
      * Credit limit for the key, or null if unlimited.

src/DTO/ResponseData.php

@@ -7,6 +7,7 @@
 /**
  * ResponseData is the general response DTO which consists of:
  * - id
+ * - provider
  * - model
  * - object
  * - created
@@ -25,6 +26,13 @@ class ResponseData extends DataTransferObject
      */
     public string $id;
 
+    /**
+     * Model provider e.g. HuggingFace
+     *
+     * @var string|null
+     */
+    public ?string $provider;
+
     /**
      * Name of the model e.g. mistralai/mistral-7b-instruct:free
      *

src/OpenRouterRequest.php

@@ -244,12 +244,13 @@ private function formChatResponse(mixed $response = null) : ResponseData
     {
         // Map the response data to ResponseData and return it.
         return new ResponseData([
-            'id'      => Arr::get($response, 'id'),
-            'model'   => Arr::get($response, 'model'),
-            'object'  => Arr::get($response, 'object'),
-            'created' => Arr::get($response, 'created'),
-            'choices' => Arr::get($response, 'choices'),
-            'usage'   => Arr::get($response, 'usage'),
+            'id'       => Arr::get($response, 'id'),
+            'provider' => Arr::get($response, 'provider'),
+            'model'    => Arr::get($response, 'model'),
+            'object'   => Arr::get($response, 'object'),
+            'created'  => Arr::get($response, 'created'),
+            'choices'  => Arr::get($response, 'choices'),
+            'usage'    => Arr::get($response, 'usage'),
         ]);
     }
 

tests/OpenRouterAPITest.php

@@ -55,6 +55,7 @@ private function mockBasicBody(): array
     {
         return [
             'id' => 'gen-QcWgjEtiEDNHgomV2jjoQpCZlkRZ',
+            'provider' => 'HuggingFace',
             'model' => $this->model,
             'object' => 'chat.completion',
             'created' => 1718888436,
@@ -82,7 +83,7 @@ private function mockBasicCostBody(): array
             'data' => [
                 'id'                       => "gen-QcWgjEtiEDNHgomV2jjoQpCZlkRZ",
                 'model'                    => $this->model,
-                'total_cost'               => 0,
+                'total_cost'               => 0.00492,
                 'streamed'                 => true,
                 'origin'                   => "https://github.com/moe-mizrak/laravel-openrouter",
                 'cancelled'                => false,
@@ -110,10 +111,10 @@ private function mockBasicLimitBody(): array
         return [
             'data' => [
                 'label'           => 'sk-or-v1-7a3...1f9',
-                'usage'           => 0,
+                'usage'           => 7.2E-5,
                 'limit'           => 1,
                 'is_free_tier'    => true,
-                'limit_remaining' => 12,
+                'limit_remaining' => -0.0369027621,
                 'rate_limit'      => [
                     'requests'  => 10,
                     'interval' => '10s',
@@ -808,6 +809,8 @@ public function it_makes_a_limit_open_route_api_request_and_gets_rate_limit_and_
         $this->assertNotNull($response->label);
         $this->assertNotNull($response->usage);
         $this->assertNotNull($response->is_free_tier);
+        $this->assertNotNull($response->limit);
+        $this->assertNotNull($response->limit_remaining);
         $this->assertNotNull($response->rate_limit);
         $this->assertNotNull($response->rate_limit->requests);
         $this->assertNotNull($response->rate_limit->interval);