Skip to content

Commit 946c448

Browse files
felixarntzfelixarntz
committed
Use camelCase arguments for model params for more consistency with underlying APIs.
1 parent 4e6925a commit 946c448

11 files changed

+100
-118
lines changed

‎includes/Anthropic/Anthropic_AI_Model.php

+6-6
Original file line numberDiff line numberDiff line change
@@ -90,16 +90,16 @@ public function __construct( Anthropic_AI_API_Client $api, string $model, array
9090

9191
$this->model = $model;
9292

93-
if ( isset( $model_params['generation_config'] ) ) {
94-
if ( $model_params['generation_config'] instanceof Generation_Config ) {
95-
$this->generation_config = $model_params['generation_config'];
93+
if ( isset( $model_params['generationConfig'] ) ) {
94+
if ( $model_params['generationConfig'] instanceof Generation_Config ) {
95+
$this->generation_config = $model_params['generationConfig'];
9696
} else {
97-
$this->generation_config = Generation_Config::from_array( $model_params['generation_config'] );
97+
$this->generation_config = Generation_Config::from_array( $model_params['generationConfig'] );
9898
}
9999
}
100100

101-
if ( isset( $model_params['system_instruction'] ) ) {
102-
$this->system_instruction = Formatter::format_system_instruction( $model_params['system_instruction'] );
101+
if ( isset( $model_params['systemInstruction'] ) ) {
102+
$this->system_instruction = Formatter::format_system_instruction( $model_params['systemInstruction'] );
103103
}
104104
}
105105

‎includes/Anthropic/Anthropic_AI_Service.php

+10-11
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
use Felix_Arntz\AI_Services\Services\Contracts\With_API_Client;
1616
use Felix_Arntz\AI_Services\Services\Exception\Generative_AI_Exception;
1717
use Felix_Arntz\AI_Services\Services\Types\Content;
18-
use Felix_Arntz\AI_Services\Services\Types\Generation_Config;
1918
use Felix_Arntz\AI_Services\Services\Types\Parts;
2019
use Felix_Arntz\AI_Services\Services\Util\AI_Capabilities;
2120
use Felix_Arntz\AI_Services_Dependencies\Felix_Arntz\WP_OOP_Plugin_Lib\HTTP\HTTP;
@@ -118,16 +117,16 @@ public function list_models( array $request_options = array() ): array {
118117
* @param array<string, mixed> $model_params {
119118
* Optional. Model parameters. Default empty array.
120119
*
121-
* @type string $feature Required. Unique identifier of the feature that the model
122-
* will be used for. Must only contain lowercase letters,
123-
* numbers, hyphens.
124-
* @type string $model The model slug. By default, the model will be determined
125-
* based on heuristics such as the requested capabilities.
126-
* @type string[] $capabilities Capabilities requested for the model to support. It is
127-
* recommended to specify this if you do not explicitly specify
128-
* a model slug.
129-
* @type Generation_Config? $generation_config Model generation configuration options. Default none.
130-
* @type string|Parts|Content $system_instruction The system instruction for the model. Default none.
120+
* @type string $feature Required. Unique identifier of the feature that the model
121+
* will be used for. Must only contain lowercase letters,
122+
* numbers, hyphens.
123+
* @type string $model The model slug. By default, the model will be determined
124+
* based on heuristics such as the requested capabilities.
125+
* @type string[] $capabilities Capabilities requested for the model to support. It is
126+
* recommended to specify this if you do not explicitly specify a
127+
* model slug.
128+
* @type Generation_Config? $generationConfig Model generation configuration options. Default none.
129+
* @type string|Parts|Content $systemInstruction The system instruction for the model. Default none.
131130
* }
132131
* @param array<string, mixed> $request_options Optional. The request options. Default empty array.
133132
* @return Generative_AI_Model The generative model.

‎includes/Chatbot/Chatbot.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ public function add_hooks(): void {
116116
*/
117117
public function get_model_params(): array {
118118
return array(
119-
'system_instruction' => $this->ai->get_system_instruction(),
119+
'systemInstruction' => $this->ai->get_system_instruction(),
120120
);
121121
}
122122

@@ -186,9 +186,9 @@ public function render_app_root(): void {
186186
* @return array<string, mixed> The filtered model parameters.
187187
*/
188188
public function filter_rest_model_params( array $model_params ): array {
189-
if ( isset( $model_params['use_wpps_chatbot'] ) || isset( $model_params['useWppsChatbot'] ) ) {
189+
if ( isset( $model_params['useWppsChatbot'] ) ) {
190190
$model_params = array_merge( $model_params, $this->get_model_params() );
191-
unset( $model_params['use_wpps_chatbot'], $model_params['useWppsChatbot'] );
191+
unset( $model_params['useWppsChatbot'] );
192192
}
193193
return $model_params;
194194
}

‎includes/Google/Google_AI_Model.php

+11-11
Original file line numberDiff line numberDiff line change
@@ -100,31 +100,31 @@ public function __construct( Google_AI_API_Client $api, string $model, array $mo
100100
$this->model = 'models/' . $model;
101101
}
102102

103-
if ( isset( $model_params['generation_config'] ) ) {
104-
if ( $model_params['generation_config'] instanceof Generation_Config ) {
105-
$this->generation_config = $model_params['generation_config'];
103+
if ( isset( $model_params['generationConfig'] ) ) {
104+
if ( $model_params['generationConfig'] instanceof Generation_Config ) {
105+
$this->generation_config = $model_params['generationConfig'];
106106
} else {
107-
$this->generation_config = Generation_Config::from_array( $model_params['generation_config'] );
107+
$this->generation_config = Generation_Config::from_array( $model_params['generationConfig'] );
108108
}
109109
}
110110

111111
// TODO: Add support for tools and tool config, to support code generation.
112112

113-
if ( isset( $model_params['system_instruction'] ) ) {
114-
$this->system_instruction = Formatter::format_system_instruction( $model_params['system_instruction'] );
113+
if ( isset( $model_params['systemInstruction'] ) ) {
114+
$this->system_instruction = Formatter::format_system_instruction( $model_params['systemInstruction'] );
115115
}
116116

117-
if ( isset( $model_params['safety_settings'] ) ) {
118-
foreach ( $model_params['safety_settings'] as $index => $safety_setting ) {
117+
if ( isset( $model_params['safetySettings'] ) ) {
118+
foreach ( $model_params['safetySettings'] as $index => $safety_setting ) {
119119
if ( is_array( $safety_setting ) ) {
120-
$model_params['safety_settings'][ $index ] = Safety_Setting::from_array( $safety_setting );
120+
$model_params['safetySettings'][ $index ] = Safety_Setting::from_array( $safety_setting );
121121
} elseif ( ! $safety_setting instanceof Safety_Setting ) {
122122
throw new InvalidArgumentException(
123-
esc_html__( 'The safety_settings parameter must contain Safety_Setting instances.', 'ai-services' )
123+
esc_html__( 'The safetySettings parameter must contain Safety_Setting instances.', 'ai-services' )
124124
);
125125
}
126126
}
127-
$this->safety_settings = $model_params['safety_settings'];
127+
$this->safety_settings = $model_params['safetySettings'];
128128
} else {
129129
$this->safety_settings = array();
130130
}

‎includes/Google/Google_AI_Service.php

+17-18
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
use Felix_Arntz\AI_Services\Services\Contracts\With_API_Client;
1616
use Felix_Arntz\AI_Services\Services\Exception\Generative_AI_Exception;
1717
use Felix_Arntz\AI_Services\Services\Types\Content;
18-
use Felix_Arntz\AI_Services\Services\Types\Generation_Config;
1918
use Felix_Arntz\AI_Services\Services\Types\Parts;
2019
use Felix_Arntz\AI_Services\Services\Util\AI_Capabilities;
2120
use Felix_Arntz\AI_Services_Dependencies\Felix_Arntz\WP_OOP_Plugin_Lib\HTTP\HTTP;
@@ -143,23 +142,23 @@ static function ( array $models, array $model ) {
143142
* @param array<string, mixed> $model_params {
144143
* Optional. Model parameters. Default empty array.
145144
*
146-
* @type string $feature Required. Unique identifier of the feature
147-
* that the model will be used for. Must only
148-
* contain lowercase letters, numbers,
149-
* hyphens.
150-
* @type string $model The model slug. By default, the model will
151-
* be determined based on heuristics such as
152-
* the requested capabilities.
153-
* @type string[] $capabilities Capabilities requested for the model to
154-
* support. It is recommended to specify this
155-
* if you do not explicitly specify a model
156-
* slug.
157-
* @type Generation_Config? $generation_config Model generation configuration options.
158-
* Default none.
159-
* @type string|Parts|Content $system_instruction The system instruction for the model.
160-
* Default none.
161-
* @type Safety_Setting[]|array<string, mixed>[] $safety_settings Optional. The safety settings for the
162-
* model. Default empty array.
145+
* @type string $feature Required. Unique identifier of the feature
146+
* that the model will be used for. Must only
147+
* contain lowercase letters, numbers,
148+
* hyphens.
149+
* @type string $model The model slug. By default, the model will
150+
* be determined based on heuristics such as
151+
* the requested capabilities.
152+
* @type string[] $capabilities Capabilities requested for the model to
153+
* support. It is recommended to specify this
154+
* if you do not explicitly specify a model
155+
* slug.
156+
* @type Generation_Config? $generationConfig Model generation configuration options.
157+
* Default none.
158+
* @type string|Parts|Content $systemInstruction The system instruction for the model.
159+
* Default none.
160+
* @type Safety_Setting[]|array<string, mixed>[] $safetySettings Optional. The safety settings for the
161+
* model. Default empty array.
163162
* }
164163
* @param array<string, mixed> $request_options Optional. The request options. Default empty array.
165164
* @return Generative_AI_Model The generative model.

‎includes/OpenAI/OpenAI_AI_Model.php

+6-6
Original file line numberDiff line numberDiff line change
@@ -91,16 +91,16 @@ public function __construct( OpenAI_AI_API_Client $api, string $model, array $mo
9191

9292
$this->model = $model;
9393

94-
if ( isset( $model_params['generation_config'] ) ) {
95-
if ( $model_params['generation_config'] instanceof Generation_Config ) {
96-
$this->generation_config = $model_params['generation_config'];
94+
if ( isset( $model_params['generationConfig'] ) ) {
95+
if ( $model_params['generationConfig'] instanceof Generation_Config ) {
96+
$this->generation_config = $model_params['generationConfig'];
9797
} else {
98-
$this->generation_config = Generation_Config::from_array( $model_params['generation_config'] );
98+
$this->generation_config = Generation_Config::from_array( $model_params['generationConfig'] );
9999
}
100100
}
101101

102-
if ( isset( $model_params['system_instruction'] ) ) {
103-
$this->system_instruction = Formatter::format_system_instruction( $model_params['system_instruction'] );
102+
if ( isset( $model_params['systemInstruction'] ) ) {
103+
$this->system_instruction = Formatter::format_system_instruction( $model_params['systemInstruction'] );
104104
}
105105
}
106106

‎includes/OpenAI/OpenAI_AI_Service.php

+10-11
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
use Felix_Arntz\AI_Services\Services\Contracts\With_API_Client;
1616
use Felix_Arntz\AI_Services\Services\Exception\Generative_AI_Exception;
1717
use Felix_Arntz\AI_Services\Services\Types\Content;
18-
use Felix_Arntz\AI_Services\Services\Types\Generation_Config;
1918
use Felix_Arntz\AI_Services\Services\Types\Parts;
2019
use Felix_Arntz\AI_Services\Services\Util\AI_Capabilities;
2120
use Felix_Arntz\AI_Services_Dependencies\Felix_Arntz\WP_OOP_Plugin_Lib\HTTP\HTTP;
@@ -152,16 +151,16 @@ static function ( array $model_caps, string $model_slug ) use ( $gpt_capabilitie
152151
* @param array<string, mixed> $model_params {
153152
* Optional. Model parameters. Default empty array.
154153
*
155-
* @type string $feature Required. Unique identifier of the feature that the model
156-
* will be used for. Must only contain lowercase letters,
157-
* numbers, hyphens.
158-
* @type string $model The model slug. By default, the model will be determined
159-
* based on heuristics such as the requested capabilities.
160-
* @type string[] $capabilities Capabilities requested for the model to support. It is
161-
* recommended to specify this if you do not explicitly specify
162-
* a model slug.
163-
* @type Generation_Config? $generation_config Model generation configuration options. Default none.
164-
* @type string|Parts|Content $system_instruction The system instruction for the model. Default none.
154+
* @type string $feature Required. Unique identifier of the feature that the model
155+
* will be used for. Must only contain lowercase letters,
156+
* numbers, hyphens.
157+
* @type string $model The model slug. By default, the model will be determined
158+
* based on heuristics such as the requested capabilities.
159+
* @type string[] $capabilities Capabilities requested for the model to support. It is
160+
* recommended to specify this if you do not explicitly specify a
161+
* model slug.
162+
* @type Generation_Config? $generationConfig Model generation configuration options. Default none.
163+
* @type string|Parts|Content $systemInstruction The system instruction for the model. Default none.
165164
* }
166165
* @param array<string, mixed> $request_options Optional. The request options. Default empty array.
167166
* @return Generative_AI_Model The generative model.

‎includes/Services/Contracts/Generative_AI_Service.php

+10-11
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
use Felix_Arntz\AI_Services\Services\Exception\Generative_AI_Exception;
1212
use Felix_Arntz\AI_Services\Services\Types\Content;
13-
use Felix_Arntz\AI_Services\Services\Types\Generation_Config;
1413
use Felix_Arntz\AI_Services\Services\Types\Parts;
1514
use Felix_Arntz\AI_Services\Services\Util\AI_Capabilities;
1615
use InvalidArgumentException;
@@ -61,16 +60,16 @@ public function list_models( array $request_options = array() ): array;
6160
* @param array<string, mixed> $model_params {
6261
* Optional. Model parameters. Default empty array.
6362
*
64-
* @type string $feature Required. Unique identifier of the feature that the model
65-
* will be used for. Must only contain lowercase letters,
66-
* numbers, hyphens.
67-
* @type string $model The model slug. By default, the model will be determined
68-
* based on heuristics such as the requested capabilities.
69-
* @type string[] $capabilities Capabilities requested for the model to support. It is
70-
* recommended to specify this if you do not explicitly specify
71-
* a model slug.
72-
* @type Generation_Config? $generation_config Model generation configuration options. Default none.
73-
* @type string|Parts|Content $system_instruction The system instruction for the model. Default none.
63+
* @type string $feature Required. Unique identifier of the feature that the model
64+
* will be used for. Must only contain lowercase letters,
65+
* numbers, hyphens.
66+
* @type string $model The model slug. By default, the model will be determined
67+
* based on heuristics such as the requested capabilities.
68+
* @type string[] $capabilities Capabilities requested for the model to support. It is
69+
* recommended to specify this if you do not explicitly specify a
70+
* model slug.
71+
* @type Generation_Config? $generationConfig Model generation configuration options. Default none.
72+
* @type string|Parts|Content $systemInstruction The system instruction for the model. Default none.
7473
* }
7574
* @param array<string, mixed> $request_options Optional. The request options. Default empty array.
7675
* @return Generative_AI_Model The generative model.

0 commit comments

Comments
 (0)