Skip to content

Commit 1f99ac3

Browse files
feat: Revert "[STG-1573] Add providerOptions for extensible model auth (#1822)"
1 parent 52c4636 commit 1f99ac3

27 files changed

Lines changed: 57 additions & 2078 deletions

.stats.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
configured_endpoints: 8
2-
openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/browserbase%2Fstagehand-a8db51c6460b3daff67b35262517848a0d4e783c6805c2edd531b155a5db71dd.yml
3-
openapi_spec_hash: c6e7127f211f946673d6389e1d8db1ba
2+
openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/browserbase%2Fstagehand-1c6caa2891a7f3bdfc0caab143f285badc9145220c9b29cd5e4cf1a9b3ac11cf.yml
3+
openapi_spec_hash: 28c4b734a5309067c39bb4c4b709b9ab
44
config_hash: a962ae71493deb11a1c903256fb25386

src/ServiceContracts/SessionsContract.php

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,13 @@
2121
use Stagehand\Sessions\SessionReplayResponse;
2222
use Stagehand\Sessions\SessionStartParams\Browser;
2323
use Stagehand\Sessions\SessionStartParams\BrowserbaseSessionCreateParams;
24-
use Stagehand\Sessions\SessionStartParams\ModelClientOptions\BedrockAPIKeyModelClientOptions;
25-
use Stagehand\Sessions\SessionStartParams\ModelClientOptions\BedrockAwsCredentialsModelClientOptions;
26-
use Stagehand\Sessions\SessionStartParams\ModelClientOptions\GenericModelClientOptions;
2724
use Stagehand\Sessions\SessionStartResponse;
2825
use Stagehand\Sessions\StreamEvent;
2926

3027
/**
3128
* @phpstan-import-type OptionsShape from \Stagehand\Sessions\SessionNavigateParams\Options
3229
* @phpstan-import-type BrowserShape from \Stagehand\Sessions\SessionStartParams\Browser
3330
* @phpstan-import-type BrowserbaseSessionCreateParamsShape from \Stagehand\Sessions\SessionStartParams\BrowserbaseSessionCreateParams
34-
* @phpstan-import-type ModelClientOptionsShape from \Stagehand\Sessions\SessionStartParams\ModelClientOptions
3531
* @phpstan-import-type InputShape from \Stagehand\Sessions\SessionActParams\Input
3632
* @phpstan-import-type OptionsShape from \Stagehand\Sessions\SessionActParams\Options as OptionsShape1
3733
* @phpstan-import-type RequestOpts from \Stagehand\RequestOptions
@@ -289,7 +285,6 @@ public function replay(
289285
* @param string $browserbaseSessionID Body param: Existing Browserbase session ID to resume
290286
* @param float $domSettleTimeoutMs Body param: Timeout in ms to wait for DOM to settle
291287
* @param bool $experimental Body param
292-
* @param ModelClientOptionsShape $modelClientOptions Body param: Optional provider-specific configuration for the session model (for example Bedrock region and credentials)
293288
* @param bool $selfHeal Body param: Enable self-healing for failed actions
294289
* @param string $systemPrompt Body param: Custom system prompt for AI operations
295290
* @param float $verbose Body param: Logging verbosity level (0=quiet, 1=normal, 2=debug)
@@ -307,7 +302,6 @@ public function start(
307302
?string $browserbaseSessionID = null,
308303
?float $domSettleTimeoutMs = null,
309304
?bool $experimental = null,
310-
BedrockAPIKeyModelClientOptions|array|BedrockAwsCredentialsModelClientOptions|GenericModelClientOptions|null $modelClientOptions = null,
311305
?bool $selfHeal = null,
312306
?string $systemPrompt = null,
313307
?float $verbose = null,

src/Services/SessionsRawService.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
* @phpstan-import-type OptionsShape from \Stagehand\Sessions\SessionNavigateParams\Options
4141
* @phpstan-import-type BrowserShape from \Stagehand\Sessions\SessionStartParams\Browser
4242
* @phpstan-import-type BrowserbaseSessionCreateParamsShape from \Stagehand\Sessions\SessionStartParams\BrowserbaseSessionCreateParams
43-
* @phpstan-import-type ModelClientOptionsShape from \Stagehand\Sessions\SessionStartParams\ModelClientOptions
4443
* @phpstan-import-type InputShape from \Stagehand\Sessions\SessionActParams\Input
4544
* @phpstan-import-type OptionsShape from \Stagehand\Sessions\SessionActParams\Options as OptionsShape1
4645
* @phpstan-import-type RequestOpts from \Stagehand\RequestOptions
@@ -589,7 +588,6 @@ public function replay(
589588
* browserbaseSessionID?: string,
590589
* domSettleTimeoutMs?: float,
591590
* experimental?: bool,
592-
* modelClientOptions?: ModelClientOptionsShape,
593591
* selfHeal?: bool,
594592
* systemPrompt?: string,
595593
* verbose?: float,

src/Services/SessionsService.php

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,13 @@
2424
use Stagehand\Sessions\SessionReplayResponse;
2525
use Stagehand\Sessions\SessionStartParams\Browser;
2626
use Stagehand\Sessions\SessionStartParams\BrowserbaseSessionCreateParams;
27-
use Stagehand\Sessions\SessionStartParams\ModelClientOptions\BedrockAPIKeyModelClientOptions;
28-
use Stagehand\Sessions\SessionStartParams\ModelClientOptions\BedrockAwsCredentialsModelClientOptions;
29-
use Stagehand\Sessions\SessionStartParams\ModelClientOptions\GenericModelClientOptions;
3027
use Stagehand\Sessions\SessionStartResponse;
3128
use Stagehand\Sessions\StreamEvent;
3229

3330
/**
3431
* @phpstan-import-type OptionsShape from \Stagehand\Sessions\SessionNavigateParams\Options
3532
* @phpstan-import-type BrowserShape from \Stagehand\Sessions\SessionStartParams\Browser
3633
* @phpstan-import-type BrowserbaseSessionCreateParamsShape from \Stagehand\Sessions\SessionStartParams\BrowserbaseSessionCreateParams
37-
* @phpstan-import-type ModelClientOptionsShape from \Stagehand\Sessions\SessionStartParams\ModelClientOptions
3834
* @phpstan-import-type InputShape from \Stagehand\Sessions\SessionActParams\Input
3935
* @phpstan-import-type OptionsShape from \Stagehand\Sessions\SessionActParams\Options as OptionsShape1
4036
* @phpstan-import-type RequestOpts from \Stagehand\RequestOptions
@@ -466,7 +462,6 @@ public function replay(
466462
* @param string $browserbaseSessionID Body param: Existing Browserbase session ID to resume
467463
* @param float $domSettleTimeoutMs Body param: Timeout in ms to wait for DOM to settle
468464
* @param bool $experimental Body param
469-
* @param ModelClientOptionsShape $modelClientOptions Body param: Optional provider-specific configuration for the session model (for example Bedrock region and credentials)
470465
* @param bool $selfHeal Body param: Enable self-healing for failed actions
471466
* @param string $systemPrompt Body param: Custom system prompt for AI operations
472467
* @param float $verbose Body param: Logging verbosity level (0=quiet, 1=normal, 2=debug)
@@ -484,7 +479,6 @@ public function start(
484479
?string $browserbaseSessionID = null,
485480
?float $domSettleTimeoutMs = null,
486481
?bool $experimental = null,
487-
BedrockAPIKeyModelClientOptions|array|BedrockAwsCredentialsModelClientOptions|GenericModelClientOptions|null $modelClientOptions = null,
488482
?bool $selfHeal = null,
489483
?string $systemPrompt = null,
490484
?float $verbose = null,
@@ -501,7 +495,6 @@ public function start(
501495
'browserbaseSessionID' => $browserbaseSessionID,
502496
'domSettleTimeoutMs' => $domSettleTimeoutMs,
503497
'experimental' => $experimental,
504-
'modelClientOptions' => $modelClientOptions,
505498
'selfHeal' => $selfHeal,
506499
'systemPrompt' => $systemPrompt,
507500
'verbose' => $verbose,

src/Sessions/ModelConfig.php

Lines changed: 2 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,14 @@
99
use Stagehand\Core\Concerns\SdkModel;
1010
use Stagehand\Core\Contracts\BaseModel;
1111
use Stagehand\Sessions\ModelConfig\Provider;
12-
use Stagehand\Sessions\ModelConfig\ProviderOptions\BedrockAPIKeyProviderOptions;
13-
use Stagehand\Sessions\ModelConfig\ProviderOptions\BedrockAwsCredentialsProviderOptions;
14-
use Stagehand\Sessions\ModelConfig\ProviderOptions\GoogleVertexProviderOptions;
1512

1613
/**
17-
* @phpstan-import-type ProviderOptionsVariants from \Stagehand\Sessions\ModelConfig\ProviderOptions
18-
* @phpstan-import-type ProviderOptionsShape from \Stagehand\Sessions\ModelConfig\ProviderOptions
19-
*
2014
* @phpstan-type ModelConfigShape = array{
2115
* modelName: string,
2216
* apiKey?: string|null,
2317
* baseURL?: string|null,
2418
* headers?: array<string,string>|null,
2519
* provider?: null|Provider|value-of<Provider>,
26-
* providerOptions?: ProviderOptionsShape|null,
27-
* skipAPIKeyFallback?: bool|null,
2820
* }
2921
*/
3022
final class ModelConfig implements BaseModel
@@ -51,7 +43,7 @@ final class ModelConfig implements BaseModel
5143
public ?string $baseURL;
5244

5345
/**
54-
* Custom headers for the model provider.
46+
* Custom headers sent with every request to the model provider.
5547
*
5648
* @var array<string,string>|null $headers
5749
*/
@@ -66,20 +58,6 @@ final class ModelConfig implements BaseModel
6658
#[Optional(enum: Provider::class)]
6759
public ?string $provider;
6860

69-
/**
70-
* Provider-specific options passed through to the AI SDK provider constructor. For Bedrock: { region, accessKeyId, secretAccessKey, sessionToken }. For Vertex: { project, location, googleAuthOptions }.
71-
*
72-
* @var ProviderOptionsVariants|null $providerOptions
73-
*/
74-
#[Optional]
75-
public BedrockAPIKeyProviderOptions|BedrockAwsCredentialsProviderOptions|GoogleVertexProviderOptions|null $providerOptions;
76-
77-
/**
78-
* When true, hosted sessions will not copy x-model-api-key into model.apiKey. Use this when auth is carried through providerOptions instead of an API key.
79-
*/
80-
#[Optional('skipApiKeyFallback')]
81-
public ?bool $skipAPIKeyFallback;
82-
8361
/**
8462
* `new ModelConfig()` is missing required properties by the API.
8563
*
@@ -106,16 +84,13 @@ public function __construct()
10684
*
10785
* @param array<string,string>|null $headers
10886
* @param Provider|value-of<Provider>|null $provider
109-
* @param ProviderOptionsShape|null $providerOptions
11087
*/
11188
public static function with(
11289
string $modelName,
11390
?string $apiKey = null,
11491
?string $baseURL = null,
11592
?array $headers = null,
11693
Provider|string|null $provider = null,
117-
BedrockAPIKeyProviderOptions|array|BedrockAwsCredentialsProviderOptions|GoogleVertexProviderOptions|null $providerOptions = null,
118-
?bool $skipAPIKeyFallback = null,
11994
): self {
12095
$self = new self;
12196

@@ -125,8 +100,6 @@ public static function with(
125100
null !== $baseURL && $self['baseURL'] = $baseURL;
126101
null !== $headers && $self['headers'] = $headers;
127102
null !== $provider && $self['provider'] = $provider;
128-
null !== $providerOptions && $self['providerOptions'] = $providerOptions;
129-
null !== $skipAPIKeyFallback && $self['skipAPIKeyFallback'] = $skipAPIKeyFallback;
130103

131104
return $self;
132105
}
@@ -165,7 +138,7 @@ public function withBaseURL(string $baseURL): self
165138
}
166139

167140
/**
168-
* Custom headers for the model provider.
141+
* Custom headers sent with every request to the model provider.
169142
*
170143
* @param array<string,string> $headers
171144
*/
@@ -189,29 +162,4 @@ public function withProvider(Provider|string $provider): self
189162

190163
return $self;
191164
}
192-
193-
/**
194-
* Provider-specific options passed through to the AI SDK provider constructor. For Bedrock: { region, accessKeyId, secretAccessKey, sessionToken }. For Vertex: { project, location, googleAuthOptions }.
195-
*
196-
* @param ProviderOptionsShape $providerOptions
197-
*/
198-
public function withProviderOptions(
199-
BedrockAPIKeyProviderOptions|array|BedrockAwsCredentialsProviderOptions|GoogleVertexProviderOptions $providerOptions,
200-
): self {
201-
$self = clone $this;
202-
$self['providerOptions'] = $providerOptions;
203-
204-
return $self;
205-
}
206-
207-
/**
208-
* When true, hosted sessions will not copy x-model-api-key into model.apiKey. Use this when auth is carried through providerOptions instead of an API key.
209-
*/
210-
public function withSkipAPIKeyFallback(bool $skipAPIKeyFallback): self
211-
{
212-
$self = clone $this;
213-
$self['skipAPIKeyFallback'] = $skipAPIKeyFallback;
214-
215-
return $self;
216-
}
217165
}

src/Sessions/ModelConfig/ProviderOptions.php

Lines changed: 0 additions & 39 deletions
This file was deleted.

src/Sessions/ModelConfig/ProviderOptions/BedrockAPIKeyProviderOptions.php

Lines changed: 0 additions & 68 deletions
This file was deleted.

0 commit comments

Comments
 (0)