Skip to content

Commit 89ae723

Browse files
felixarntzfelixarntz
committed
Enhance content part classes by providing dedicated getter functions.
1 parent 4ce7026 commit 89ae723

File tree

7 files changed

+82
-30
lines changed

7 files changed

+82
-30
lines changed

‎includes/Anthropic/Anthropic_AI_Model.php

+5-6
Original file line numberDiff line numberDiff line change
@@ -240,14 +240,13 @@ private static function get_content_transformers(): array {
240240
$parts = array();
241241
foreach ( $content->get_parts() as $part ) {
242242
if ( $part instanceof Text_Part ) {
243-
$data = $part->to_array();
244243
$parts[] = array(
245244
'type' => 'text',
246-
'text' => $data['text'],
245+
'text' => $part->get_text(),
247246
);
248247
} elseif ( $part instanceof Inline_Data_Part ) {
249-
$data = $part->to_array();
250-
if ( ! str_starts_with( $data['inlineData']['mimeType'], 'image/' ) ) {
248+
$mime_type = $part->get_mime_type();
249+
if ( ! str_starts_with( $mime_type, 'image/' ) ) {
251250
throw new InvalidArgumentException(
252251
esc_html__( 'Invalid content part: The Anthropic API only supports text and inline image parts.', 'ai-services' )
253252
);
@@ -256,8 +255,8 @@ private static function get_content_transformers(): array {
256255
'type' => 'image',
257256
'source' => array(
258257
'type' => 'base64',
259-
'media_type' => $data['inlineData']['mimeType'],
260-
'data' => $data['inlineData']['data'],
258+
'media_type' => $mime_type,
259+
'data' => $part->get_base64_data(),
261260
),
262261
);
263262
} else {

‎includes/Google/Google_AI_Model.php

+11-12
Original file line numberDiff line numberDiff line change
@@ -276,22 +276,21 @@ private static function get_content_transformers(): array {
276276
$parts = array();
277277
foreach ( $content->get_parts() as $part ) {
278278
if ( $part instanceof Text_Part ) {
279-
$data = $part->to_array();
280-
$parts[] = array( 'text' => $data['text'] );
279+
$parts[] = array( 'text' => $part->get_text() );
281280
} elseif ( $part instanceof Inline_Data_Part ) {
282-
$data = $part->to_array();
281+
$mime_type = $part->get_mime_type();
283282
if (
284-
str_starts_with( $data['inlineData']['mimeType'], 'image/' )
285-
|| str_starts_with( $data['inlineData']['mimeType'], 'audio/' )
283+
str_starts_with( $mime_type, 'image/' )
284+
|| str_starts_with( $mime_type, 'audio/' )
286285
) {
287286
$parts[] = array(
288287
'inlineData' => array(
289-
'mimeType' => $data['inlineData']['mimeType'],
288+
'mimeType' => $mime_type,
290289
// The Google AI API expects inlineData blobs to be without the prefix.
291290
'data' => preg_replace(
292291
'/^data:[a-z]+\/[a-z]+;base64,/',
293292
'',
294-
$data['inlineData']['data']
293+
$part->get_base64_data()
295294
),
296295
),
297296
);
@@ -301,15 +300,15 @@ private static function get_content_transformers(): array {
301300
);
302301
}
303302
} elseif ( $part instanceof File_Data_Part ) {
304-
$data = $part->to_array();
303+
$mime_type = $part->get_mime_type();
305304
if (
306-
str_starts_with( $data['fileData']['mimeType'], 'image/' )
307-
|| str_starts_with( $data['fileData']['mimeType'], 'audio/' )
305+
str_starts_with( $mime_type, 'image/' )
306+
|| str_starts_with( $mime_type, 'audio/' )
308307
) {
309308
$parts[] = array(
310309
'fileData' => array(
311-
'mimeType' => $data['fileData']['mimeType'],
312-
'fileUri' => $data['fileData']['fileUri'],
310+
'mimeType' => $mime_type,
311+
'fileUri' => $part->get_file_uri(),
313312
),
314313
);
315314
} else {

‎includes/OpenAI/OpenAI_AI_Model.php

+10-11
Original file line numberDiff line numberDiff line change
@@ -296,26 +296,25 @@ private static function get_content_transformers(): array {
296296
$parts = array();
297297
foreach ( $content->get_parts() as $part ) {
298298
if ( $part instanceof Text_Part ) {
299-
$data = $part->to_array();
300299
$parts[] = array(
301300
'type' => 'text',
302-
'text' => $data['text'],
301+
'text' => $part->get_text(),
303302
);
304303
} elseif ( $part instanceof Inline_Data_Part ) {
305-
$data = $part->to_array();
306-
if ( str_starts_with( $data['inlineData']['mimeType'], 'image/' ) ) {
304+
$mime_type = $part->get_mime_type();
305+
if ( str_starts_with( $mime_type, 'image/' ) ) {
307306
$parts[] = array(
308307
'type' => 'image_url',
309308
'image_url' => array(
310-
'url' => $data['inlineData']['data'],
309+
'url' => $part->get_base64_data(),
311310
),
312311
);
313-
} elseif ( str_starts_with( $data['inlineData']['mimeType'], 'audio/' ) ) {
312+
} elseif ( str_starts_with( $mime_type, 'audio/' ) ) {
314313
$parts[] = array(
315314
'type' => 'input_audio',
316315
'input_audio' => array(
317-
'data' => $data['inlineData']['data'],
318-
'format' => wp_get_default_extension_for_mime_type( $data['inlineData']['mimeType'] ),
316+
'data' => $part->get_base64_data(),
317+
'format' => wp_get_default_extension_for_mime_type( $mime_type ),
319318
),
320319
);
321320
} else {
@@ -324,16 +323,16 @@ private static function get_content_transformers(): array {
324323
);
325324
}
326325
} elseif ( $part instanceof File_Data_Part ) {
327-
$data = $part->to_array();
328-
if ( ! str_starts_with( $data['fileData']['mimeType'], 'image/' ) ) {
326+
$mime_type = $part->get_mime_type();
327+
if ( ! str_starts_with( $mime_type, 'image/' ) ) {
329328
throw new InvalidArgumentException(
330329
esc_html__( 'Invalid content part: The OpenAI API only supports text, image, and audio parts.', 'ai-services' )
331330
);
332331
}
333332
$parts[] = array(
334333
'type' => 'image_url',
335334
'image_url' => array(
336-
'url' => $data['fileData']['fileUri'],
335+
'url' => $part->get_file_uri(),
337336
),
338337
);
339338
} else {

‎includes/Services/Types/Candidates.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ public function get( int $index ): Candidate {
126126
*
127127
* @since 0.1.0
128128
*
129-
* @return mixed[] Array representation.
129+
* @return array<string, mixed>[] Array representation.
130130
*/
131131
public function to_array(): array {
132132
return array_map(

‎includes/Services/Types/Parts/File_Data_Part.php

+22
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,28 @@
1717
*/
1818
final class File_Data_Part extends Abstract_Part {
1919

20+
/**
21+
* Gets the MIME type from the part.
22+
*
23+
* @since n.e.x.t
24+
*
25+
* @return string The MIME type.
26+
*/
27+
public function get_mime_type(): string {
28+
return $this->to_array()['fileData']['mimeType'];
29+
}
30+
31+
/**
32+
* Gets the file URI from the part.
33+
*
34+
* @since n.e.x.t
35+
*
36+
* @return string The file URI.
37+
*/
38+
public function get_file_uri(): string {
39+
return $this->to_array()['fileData']['fileUri'];
40+
}
41+
2042
/**
2143
* Formats the data for the part.
2244
*

‎includes/Services/Types/Parts/Inline_Data_Part.php

+22
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,28 @@
1717
*/
1818
final class Inline_Data_Part extends Abstract_Part {
1919

20+
/**
21+
* Gets the MIME type from the part.
22+
*
23+
* @since n.e.x.t
24+
*
25+
* @return string The MIME type.
26+
*/
27+
public function get_mime_type(): string {
28+
return $this->to_array()['inlineData']['mimeType'];
29+
}
30+
31+
/**
32+
* Gets the file as base64 data from the part.
33+
*
34+
* @since n.e.x.t
35+
*
36+
* @return string The file as base64 data.
37+
*/
38+
public function get_base64_data(): string {
39+
return $this->to_array()['inlineData']['data'];
40+
}
41+
2042
/**
2143
* Formats the data for the part.
2244
*

‎includes/Services/Types/Parts/Text_Part.php

+11
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,17 @@
1717
*/
1818
final class Text_Part extends Abstract_Part {
1919

20+
/**
21+
* Gets the text from the part.
22+
*
23+
* @since n.e.x.t
24+
*
25+
* @return string The text.
26+
*/
27+
public function get_text(): string {
28+
return $this->to_array()['text'];
29+
}
30+
2031
/**
2132
* Formats the data for the part.
2233
*

0 commit comments

Comments
 (0)