Merge pull request #43 from google-gemini-php/main-beta-conflict

main --> beta
google-gemini-php · Oct 11, 2024 · 0c2c75c · 0c2c75c
2 parents 1f3a155 + 2c9b4d8
commit 0c2c75c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/Concerns/HasModel.php b/src/Concerns/HasModel.php
@@ -13,7 +13,8 @@ public function parseModel(ModelType|string $model): string
     {
         return match (true) {
             $model instanceof BackedEnum => $model->value,
-            str_starts_with($model, 'models') => $model,
+            str_starts_with($model, 'models/') => $model,
+            str_starts_with($model, 'tunedModels/') => $model,
             default => "models/$model"
         };
     }

diff --git a/src/Data/UsageMetadata.php b/src/Data/UsageMetadata.php
@@ -21,8 +21,8 @@ final class UsageMetadata implements Arrayable
      */
     public function __construct(
         public readonly int $promptTokenCount,
-        public readonly ?int $candidatesTokenCount,
         public readonly int $totalTokenCount,
+        public readonly ?int $candidatesTokenCount = null,
         public readonly ?int $cachedContentTokenCount = null,
     ) {}
 
@@ -33,8 +33,8 @@ public static function from(array $attributes): self
     {
         return new self(
             promptTokenCount: $attributes['promptTokenCount'],
-            candidatesTokenCount: $attributes['candidatesTokenCount'] ?? null,
             totalTokenCount: $attributes['totalTokenCount'],
+            candidatesTokenCount: $attributes['candidatesTokenCount'] ?? null,
             cachedContentTokenCount: $attributes['cachedContentTokenCount'] ?? null
         );
     }

diff --git a/src/Enums/MimeType.php b/src/Enums/MimeType.php
@@ -54,4 +54,6 @@ enum MimeType: string
     case APPLICATION_RTF = 'application/rtf';
     case TEXT_RTF = 'text/rtf';
 
+    // Pdf
+    case APPLICATION_PDF = 'application/pdf';
 }