Fix issue that some commands throw unintended type of exceptions on timeout.

mkht · mkht · commit d46e4df3f67f · 2025-05-26T00:24:40.000+09:00
diff --git a/Public/Batch/Wait-Batch.ps1 b/Public/Batch/Wait-Batch.ps1
@@ -123,7 +123,7 @@ function Wait-Batch {
             } while ($innerBatchObject.status -and $innerBatchObject.status -in $innerStatusForWait)
         }
         catch [OperationCanceledException] {
-            Write-Error -ErrorRecord $_
+            Write-TimeoutError
             return
         }
         catch {
diff --git a/Public/Runs/Wait-ThreadRun.ps1 b/Public/Runs/Wait-ThreadRun.ps1
@@ -138,7 +138,7 @@ function Wait-ThreadRun {
             } while ($innerRunObject.status -and $innerRunObject.status -in $innerStatusForWait)
         }
         catch [OperationCanceledException] {
-            Write-Error -ErrorRecord $_
+            Write-TimeoutError
             return
         }
         catch {
diff --git a/Public/VectorStores/Batches/Wait-VectorStoreFileBatch.ps1 b/Public/VectorStores/Batches/Wait-VectorStoreFileBatch.ps1
@@ -134,7 +134,7 @@ function Wait-VectorStoreFileBatch {
             } while ($innerBatchObject.status -and $innerBatchObject.status -in $innerStatusForWait)
         }
         catch [OperationCanceledException] {
-            Write-Error -ErrorRecord $_
+            Write-TimeoutError
             return
         }
         catch {
diff --git a/Tests/Batch/Wait-Batch.tests.ps1 b/Tests/Batch/Wait-Batch.tests.ps1
@@ -69,7 +69,7 @@ Describe 'Wait-Batch' {
                 id         = 'batch_abc123'
                 status     = 'in_progress'
             }
-            { $script:Result = Wait-Batch -InputObject $InObject -StatusForWait ('cancelling', 'failed') -TimeoutSec 2 -ea Stop } | Should -Throw -ExceptionType ([System.OperationCanceledException])
+            { $script:Result = Wait-Batch -InputObject $InObject -StatusForWait ('cancelling', 'failed') -TimeoutSec 2 -ea Stop } | Should -Throw -ExceptionType ([System.TimeoutException])
             Should -Invoke Get-Batch -ModuleName $script:ModuleName -Times 1
         }
 
@@ -104,7 +104,7 @@ Describe 'Wait-Batch' {
                 id         = 'batch_abc123'
                 status     = 'in_progress'
             }
-            { $script:Result = Wait-Batch -InputObject $InObject -TimeoutSec 2 -ea Stop } | Should -Throw -ExceptionType ([OperationCanceledException])
+            { $script:Result = Wait-Batch -InputObject $InObject -TimeoutSec 2 -ea Stop } | Should -Throw -ExceptionType ([System.TimeoutException])
             Should -Invoke Get-Batch -ModuleName $script:ModuleName -Times 3
             $Result | Should -BeNullOrEmpty
         }
@@ -123,7 +123,7 @@ Describe 'Wait-Batch' {
                 id         = 'batch_abc123'
                 status     = 'in_progress'
             }
-            { $script:Result = Wait-Batch -InputObject $InObject -TimeoutSec 2 -PollIntervalSec 100 -ea Stop } | Should -Throw -ExceptionType ([OperationCanceledException])
+            { $script:Result = Wait-Batch -InputObject $InObject -TimeoutSec 2 -PollIntervalSec 100 -ea Stop } | Should -Throw -ExceptionType ([System.TimeoutException])
             Should -Invoke Get-Batch -ModuleName $script:ModuleName -Times 1 -Exactly
             $Result | Should -BeNullOrEmpty
         }
diff --git a/Tests/Runs/Wait-ThreadRun.tests.ps1 b/Tests/Runs/Wait-ThreadRun.tests.ps1
@@ -119,7 +119,7 @@ Describe 'Wait-ThreadRun' {
                 thread_id  = 'thread_abc123'
                 status     = 'in_progress'
             }
-            { $script:Result = Wait-ThreadRun -InputObject $InObject -TimeoutSec 2 -ea Stop } | Should -Throw -ExceptionType ([OperationCanceledException])
+            { $script:Result = Wait-ThreadRun -InputObject $InObject -TimeoutSec 2 -ea Stop } | Should -Throw -ExceptionType ([System.TimeoutException])
             Should -Invoke Get-ThreadRun -ModuleName $script:ModuleName -Times 3
             $Result | Should -BeNullOrEmpty
         }
@@ -141,7 +141,7 @@ Describe 'Wait-ThreadRun' {
                 thread_id  = 'thread_abc123'
                 status     = 'in_progress'
             }
-            { $script:Result = Wait-ThreadRun -InputObject $InObject -TimeoutSec 2 -PollIntervalSec 100 -ea Stop } | Should -Throw -ExceptionType ([OperationCanceledException])
+            { $script:Result = Wait-ThreadRun -InputObject $InObject -TimeoutSec 2 -PollIntervalSec 100 -ea Stop } | Should -Throw -ExceptionType ([System.TimeoutException])
             Should -Invoke Get-ThreadRun -ModuleName $script:ModuleName -Times 1
             $Result | Should -BeNullOrEmpty
         }
diff --git a/Tests/Threads/Add-ThreadMessage.tests.ps1 b/Tests/Threads/Add-ThreadMessage.tests.ps1
@@ -153,7 +153,7 @@ Describe 'Add-ThreadMessage' {
                     ErrorAction        = 'Stop'
                 }
                 $script:Result = Add-ThreadMessage @splat
-            } | Should -Throw -ExceptionType ([OperationCanceledException])
+            } | Should -Throw -ExceptionType ([System.TimeoutException])
             Should -Not -Invoke Invoke-OpenAIAPIRequest -ModuleName $script:ModuleName
             Should -Invoke Get-ThreadRun -ModuleName $script:ModuleName -Times 1
             $script:Result | Should -BeNullOrEmpty
diff --git a/Tests/VectorStores/Wait-VectorStoreFileBatch.tests.ps1 b/Tests/VectorStores/Wait-VectorStoreFileBatch.tests.ps1
@@ -115,7 +115,7 @@ Describe 'Wait-VectorStoreFileBatch' {
                 vector_store_id = 'vs_abc123'
                 status          = 'in_progress'
             }
-            { $script:Result = Wait-VectorStoreFileBatch -Batch $InObject -TimeoutSec 2 -ea Stop } | Should -Throw -ExceptionType ([OperationCanceledException])
+            { $script:Result = Wait-VectorStoreFileBatch -Batch $InObject -TimeoutSec 2 -ea Stop } | Should -Throw -ExceptionType ([System.TimeoutException])
             Should -Invoke Get-VectorStoreFileBatch -ModuleName $script:ModuleName -Times 3
             $Result | Should -BeNullOrEmpty
         }
@@ -136,7 +136,7 @@ Describe 'Wait-VectorStoreFileBatch' {
                 vector_store_id = 'vs_abc123'
                 status          = 'in_progress'
             }
-            { $script:Result = Wait-VectorStoreFileBatch -Batch $InObject -TimeoutSec 2 -PollIntervalSec 100 -ea Stop } | Should -Throw -ExceptionType ([OperationCanceledException])
+            { $script:Result = Wait-VectorStoreFileBatch -Batch $InObject -TimeoutSec 2 -PollIntervalSec 100 -ea Stop } | Should -Throw -ExceptionType ([System.TimeoutException])
             Should -Invoke Get-VectorStoreFileBatch -ModuleName $script:ModuleName -Times 1 -Exactly
         }
 

Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ function Wait-Batch {`
`123`	`123`	`} while ($innerBatchObject.status -and $innerBatchObject.status -in $innerStatusForWait)`
`124`	`124`	`}`
`125`	`125`	`catch [OperationCanceledException] {`
`126`		`- Write-Error -ErrorRecord $_`
	`126`	`+ Write-TimeoutError`
`127`	`127`	`return`
`128`	`128`	`}`
`129`	`129`	`catch {`
Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ function Wait-ThreadRun {`
`138`	`138`	`} while ($innerRunObject.status -and $innerRunObject.status -in $innerStatusForWait)`
`139`	`139`	`}`
`140`	`140`	`catch [OperationCanceledException] {`
`141`		`- Write-Error -ErrorRecord $_`
	`141`	`+ Write-TimeoutError`
`142`	`142`	`return`
`143`	`143`	`}`
`144`	`144`	`catch {`
Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ function Wait-VectorStoreFileBatch {`
`134`	`134`	`} while ($innerBatchObject.status -and $innerBatchObject.status -in $innerStatusForWait)`
`135`	`135`	`}`
`136`	`136`	`catch [OperationCanceledException] {`
`137`		`- Write-Error -ErrorRecord $_`
	`137`	`+ Write-TimeoutError`
`138`	`138`	`return`
`139`	`139`	`}`
`140`	`140`	`catch {`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ Describe 'Wait-Batch' {`
`69`	`69`	`id = 'batch_abc123'`
`70`	`70`	`status = 'in_progress'`
`71`	`71`	`}`
`72`		`- { $script:Result = Wait-Batch -InputObject $InObject -StatusForWait ('cancelling', 'failed') -TimeoutSec 2 -ea Stop } \| Should -Throw -ExceptionType ([System.OperationCanceledException])`
	`72`	`+ { $script:Result = Wait-Batch -InputObject $InObject -StatusForWait ('cancelling', 'failed') -TimeoutSec 2 -ea Stop } \| Should -Throw -ExceptionType ([System.TimeoutException])`
`73`	`73`	`Should -Invoke Get-Batch -ModuleName $script:ModuleName -Times 1`
`74`	`74`	`}`
`75`	`75`
`@@ -104,7 +104,7 @@ Describe 'Wait-Batch' {`
`104`	`104`	`id = 'batch_abc123'`
`105`	`105`	`status = 'in_progress'`
`106`	`106`	`}`
`107`		`- { $script:Result = Wait-Batch -InputObject $InObject -TimeoutSec 2 -ea Stop } \| Should -Throw -ExceptionType ([OperationCanceledException])`
	`107`	`+ { $script:Result = Wait-Batch -InputObject $InObject -TimeoutSec 2 -ea Stop } \| Should -Throw -ExceptionType ([System.TimeoutException])`
`108`	`108`	`Should -Invoke Get-Batch -ModuleName $script:ModuleName -Times 3`
`109`	`109`	`$Result \| Should -BeNullOrEmpty`
`110`	`110`	`}`
`@@ -123,7 +123,7 @@ Describe 'Wait-Batch' {`
`123`	`123`	`id = 'batch_abc123'`
`124`	`124`	`status = 'in_progress'`
`125`	`125`	`}`
`126`		`- { $script:Result = Wait-Batch -InputObject $InObject -TimeoutSec 2 -PollIntervalSec 100 -ea Stop } \| Should -Throw -ExceptionType ([OperationCanceledException])`
	`126`	`+ { $script:Result = Wait-Batch -InputObject $InObject -TimeoutSec 2 -PollIntervalSec 100 -ea Stop } \| Should -Throw -ExceptionType ([System.TimeoutException])`
`127`	`127`	`Should -Invoke Get-Batch -ModuleName $script:ModuleName -Times 1 -Exactly`
`128`	`128`	`$Result \| Should -BeNullOrEmpty`
`129`	`129`	`}`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ Describe 'Wait-ThreadRun' {`
`119`	`119`	`thread_id = 'thread_abc123'`
`120`	`120`	`status = 'in_progress'`
`121`	`121`	`}`
`122`		`- { $script:Result = Wait-ThreadRun -InputObject $InObject -TimeoutSec 2 -ea Stop } \| Should -Throw -ExceptionType ([OperationCanceledException])`
	`122`	`+ { $script:Result = Wait-ThreadRun -InputObject $InObject -TimeoutSec 2 -ea Stop } \| Should -Throw -ExceptionType ([System.TimeoutException])`
`123`	`123`	`Should -Invoke Get-ThreadRun -ModuleName $script:ModuleName -Times 3`
`124`	`124`	`$Result \| Should -BeNullOrEmpty`
`125`	`125`	`}`
`@@ -141,7 +141,7 @@ Describe 'Wait-ThreadRun' {`
`141`	`141`	`thread_id = 'thread_abc123'`
`142`	`142`	`status = 'in_progress'`
`143`	`143`	`}`
`144`		`- { $script:Result = Wait-ThreadRun -InputObject $InObject -TimeoutSec 2 -PollIntervalSec 100 -ea Stop } \| Should -Throw -ExceptionType ([OperationCanceledException])`
	`144`	`+ { $script:Result = Wait-ThreadRun -InputObject $InObject -TimeoutSec 2 -PollIntervalSec 100 -ea Stop } \| Should -Throw -ExceptionType ([System.TimeoutException])`
`145`	`145`	`Should -Invoke Get-ThreadRun -ModuleName $script:ModuleName -Times 1`
`146`	`146`	`$Result \| Should -BeNullOrEmpty`
`147`	`147`	`}`
Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ Describe 'Add-ThreadMessage' {`
`153`	`153`	`ErrorAction = 'Stop'`
`154`	`154`	`}`
`155`	`155`	`$script:Result = Add-ThreadMessage @splat`
`156`		`- } \| Should -Throw -ExceptionType ([OperationCanceledException])`
	`156`	`+ } \| Should -Throw -ExceptionType ([System.TimeoutException])`
`157`	`157`	`Should -Not -Invoke Invoke-OpenAIAPIRequest -ModuleName $script:ModuleName`
`158`	`158`	`Should -Invoke Get-ThreadRun -ModuleName $script:ModuleName -Times 1`
`159`	`159`	`$script:Result \| Should -BeNullOrEmpty`
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ Describe 'Wait-VectorStoreFileBatch' {`
`115`	`115`	`vector_store_id = 'vs_abc123'`
`116`	`116`	`status = 'in_progress'`
`117`	`117`	`}`
`118`		`- { $script:Result = Wait-VectorStoreFileBatch -Batch $InObject -TimeoutSec 2 -ea Stop } \| Should -Throw -ExceptionType ([OperationCanceledException])`
	`118`	`+ { $script:Result = Wait-VectorStoreFileBatch -Batch $InObject -TimeoutSec 2 -ea Stop } \| Should -Throw -ExceptionType ([System.TimeoutException])`
`119`	`119`	`Should -Invoke Get-VectorStoreFileBatch -ModuleName $script:ModuleName -Times 3`
`120`	`120`	`$Result \| Should -BeNullOrEmpty`
`121`	`121`	`}`
`@@ -136,7 +136,7 @@ Describe 'Wait-VectorStoreFileBatch' {`
`136`	`136`	`vector_store_id = 'vs_abc123'`
`137`	`137`	`status = 'in_progress'`
`138`	`138`	`}`
`139`		`- { $script:Result = Wait-VectorStoreFileBatch -Batch $InObject -TimeoutSec 2 -PollIntervalSec 100 -ea Stop } \| Should -Throw -ExceptionType ([OperationCanceledException])`
	`139`	`+ { $script:Result = Wait-VectorStoreFileBatch -Batch $InObject -TimeoutSec 2 -PollIntervalSec 100 -ea Stop } \| Should -Throw -ExceptionType ([System.TimeoutException])`
`140`	`140`	`Should -Invoke Get-VectorStoreFileBatch -ModuleName $script:ModuleName -Times 1 -Exactly`
`141`	`141`	`}`
`142`	`142`