Added basic StructuredContent

Author: ineersa

src/Capability/Tool/ToolCaller.php

@@ -77,7 +77,7 @@ public function call(CallToolRequest $request): CallToolResult
                 'result_type' => \gettype($result),
             ]);
 
-            return new CallToolResult($formattedResult);
+            return CallToolResult::fromArray($formattedResult);
         } catch (\Throwable $e) {
             $this->logger->error('Tool execution failed', [
                 'name' => $toolName,

src/Schema/Result/CallToolResult.php

@@ -45,11 +45,12 @@ class CallToolResult implements ResultInterface
     /**
      * Create a new CallToolResult.
      *
-     * @param array<TextContent|ImageContent|AudioContent|EmbeddedResource|StructuredContent> $content The content of the tool result
+     * @param array<TextContent|ImageContent|AudioContent|EmbeddedResource> $content The content of the tool result
      * @param bool                                                          $isError Whether the tool execution resulted in an error.  If not set, this is assumed to be false (the call was successful).
      */
     public function __construct(
         public readonly array $content,
+        public readonly ?StructuredContent $structuredContent = null,
         public readonly bool $isError = false,
     ) {
         foreach ($this->content as $item) {
@@ -64,36 +65,37 @@ public function __construct(
      *
      * @param array<TextContent|ImageContent|AudioContent|EmbeddedResource> $content The content of the tool result
      */
-    public static function success(array $content): self
+    public static function success(array $content, ?StructuredContent $structuredContent = null): self
     {
-        return new self($content, false);
+        return new self($content, $structuredContent, false);
     }
 
     /**
      * Create a new CallToolResult with error status.
      *
      * @param array<TextContent|ImageContent|AudioContent|EmbeddedResource> $content The content of the tool result
      */
-    public static function error(array $content): self
+    public static function error(array $content, ?StructuredContent $structuredContent = null): self
     {
-        return new self($content, true);
+        return new self($content, $structuredContent, true);
     }
 
     /**
-     * @param array{
-     *     content: array<TextContentData|ImageContentData|AudioContentData|EmbeddedResourceData>,
-     *     isError?: bool,
-     * } $data
+     * @param array<int, TextContentData|ImageContentData|AudioContentData|EmbeddedResourceData|StructuredContent> $data
      */
     public static function fromArray(array $data): self
     {
-        if (!isset($data['content']) || !\is_array($data['content'])) {
-            throw new InvalidArgumentException('Missing or invalid "content" array in CallToolResult data.');
-        }
-
         $contents = [];
+        $structuredContent = null;
 
-        foreach ($data['content'] as $item) {
+        foreach ($data as $item) {
+            if (!$item instanceof Content) {
+                throw new InvalidArgumentException('Provided array must be an array of Content objects.');
+            }
+            if ('structured' === $item->type) {
+                $structuredContent = $item['structured'];
+                continue;
+            }
             $contents[] = match ($item['type'] ?? null) {
                 'text' => TextContent::fromArray($item),
                 'image' => ImageContent::fromArray($item),
@@ -103,20 +105,27 @@ public static function fromArray(array $data): self
             };
         }
 
-        return new self($contents, $data['isError'] ?? false);
+        return new self($contents, $structuredContent);
     }
 
     /**
      * @return array{
-     *     content: array<TextContent|ImageContent|AudioContent|EmbeddedResource|StructuredContent>,
+     *     content: array<TextContent|ImageContent|AudioContent|EmbeddedResource>,
+     *     structuredContent?: StructuredContent,
      *     isError: bool,
      * }
      */
     public function jsonSerialize(): array
     {
-        return [
+        $result = [
             'content' => $this->content,
             'isError' => $this->isError,
         ];
+
+        if ($this->structuredContent) {
+            $result['structuredContent'] = $this->structuredContent->jsonSerialize();
+        }
+
+        return $result;
     }
 }