fix(OpenAI): support nested file search properties

src/Responses/Responses/Tool/FileSearchCompoundFilter.php

@@ -11,7 +11,8 @@
 /**
  * @phpstan-import-type ComparisonFilterType from FileSearchComparisonFilter
  *
- * @phpstan-type CompoundFilterType array{filters: array<int, ComparisonFilterType>, type: 'and'|'or'}
+ * @phpstan-type CompoundFilterNodeType array{filters: array<int, ComparisonFilterType>, type: 'and'|'or'}
+ * @phpstan-type CompoundFilterType array{filters: array<int, ComparisonFilterType|CompoundFilterNodeType>, type: 'and'|'or'}
  *
  * @implements ResponseContract<CompoundFilterType>
  */
@@ -25,7 +26,7 @@ final class FileSearchCompoundFilter implements ResponseContract
     use Fakeable;
 
     /**
-     * @param  array<int, FileSearchComparisonFilter>  $filters
+     * @param  array<int, FileSearchComparisonFilter|FileSearchCompoundFilter>  $filters
      * @param  'and'|'or'  $type
      */
     private function __construct(
@@ -39,7 +40,10 @@ private function __construct(
     public static function from(array $attributes): self
     {
         $filters = array_map(
-            static fn (array $filter): FileSearchComparisonFilter => FileSearchComparisonFilter::from($filter),
+            static fn (array $filter): FileSearchComparisonFilter|FileSearchCompoundFilter => match ($filter['type']) {
+                'eq', 'ne', 'gt', 'gte', 'lt', 'lte' => FileSearchComparisonFilter::from($filter),
+                'and', 'or' => FileSearchCompoundFilter::from($filter),
+            },
             $attributes['filters'],
         );
 
@@ -54,9 +58,10 @@ public static function from(array $attributes): self
      */
     public function toArray(): array
     {
+        // @phpstan-ignore-next-line
         return [
             'filters' => array_map(
-                static fn (FileSearchComparisonFilter $filter): array => $filter->toArray(),
+                static fn (FileSearchComparisonFilter|FileSearchCompoundFilter $filter): array => $filter->toArray(),
                 $this->filters,
             ),
             'type' => $this->type,

tests/Fixtures/Responses.php

@@ -690,6 +690,45 @@ function toolFileSearch(): array
     ];
 }
 
+/**
+ * @return array<string, mixed>
+ */
+function toolFileSearchNestedFilters(): array
+{
+    return [
+        'type' => 'file_search',
+        'filters' => [
+            'type' => 'and',
+            'filters' => [
+                [
+                    'type' => 'and',
+                    'filters' => [
+                        [
+                            'type' => 'ne',
+                            'key' => 'state',
+                            'value' => 'ks',
+                        ],
+                        [
+                            'type' => 'ne',
+                            'key' => 'state',
+                            'value' => 'mo',
+                        ],
+                    ],
+                ],
+            ],
+        ],
+        'max_num_results' => 5,
+        'ranking_options' => [
+            'ranker' => 'auto',
+            'score_threshold' => 0.1,
+        ],
+        'vector_store_ids' => [
+            'vector_store_id_1',
+            'vector_store_id_2',
+        ],
+    ];
+}
+
 /**
  * @return resource
  */

tests/Responses/Responses/Tool/FileSearchTool.php

@@ -1,6 +1,7 @@
 <?php
 
 use OpenAI\Responses\Responses\Tool\FileSearchComparisonFilter;
+use OpenAI\Responses\Responses\Tool\FileSearchCompoundFilter;
 use OpenAI\Responses\Responses\Tool\FileSearchRankingOption;
 use OpenAI\Responses\Responses\Tool\FileSearchTool;
 
@@ -31,6 +32,22 @@
         ->filters->toBeNull();
 });
 
+test('from complex nested filters', function () {
+    $response = FileSearchTool::from(toolFileSearchNestedFilters());
+
+    expect($response)
+        ->toBeInstanceOf(FileSearchTool::class)
+        ->filters->toBeInstanceOf(FileSearchCompoundFilter::class)
+        ->filters->filters->toBeArray()
+        ->and($response->filters->filters[0])
+        ->toBeInstanceOf(FileSearchCompoundFilter::class)
+        ->filters->toBeArray()
+        ->and($response->filters->filters[0]->filters[0])
+        ->toBeInstanceOf(FileSearchComparisonFilter::class)
+        ->and($response->filters->filters[0]->filters[1])
+        ->toBeInstanceOf(FileSearchComparisonFilter::class);
+});
+
 test('from results', function () {
     $response = FileSearchTool::from(toolFileSearch());