diff --git a/src/agentcore/templates/presenters/documents/basic_metadata.jinja b/src/agentcore/templates/presenters/documents/basic_metadata.jinja index a1ba652..824c899 100644 --- a/src/agentcore/templates/presenters/documents/basic_metadata.jinja +++ b/src/agentcore/templates/presenters/documents/basic_metadata.jinja @@ -1,6 +1,6 @@ {%- import 'macros.jinja' as utils %} {%- for document in documents %} -<{{ doc_tag }} {{ utils.show_field('name', document.metadata, "name", 'Unknown') }} {{ utils.show_field('url', document.metadata, 'url', 'no-url', index=0) }}> +<{{ doc_tag }} {{ utils.show_field('name', document.metadata, "name", 'Unknown') }} {{ utils.show_field('source', document.metadata, 'source', 'Unknown', index=0) }}> {{ document.text }} {%- endfor %} diff --git a/src/agentcore/templates/presenters/documents/full_metadata.jinja b/src/agentcore/templates/presenters/documents/full_metadata.jinja index de8d556..21bcc07 100644 --- a/src/agentcore/templates/presenters/documents/full_metadata.jinja +++ b/src/agentcore/templates/presenters/documents/full_metadata.jinja @@ -1,6 +1,6 @@ {%- import 'macros.jinja' as utils %} {%- for document in documents %} -<{{ doc_tag }} {{ utils.show_field('name', document.metadata, 'name', 'Unknown') }} {{ utils.show_field('source', document.metadata, 'source', 'Unknown') }} {{ utils.show_field('path', document.metadata, 'path', 'no path') }} {{ utils.show_field('uuid', document.metadata, 'uuid', 'Unknown') }} {{ utils.show_field('description', document.metadata, 'description', 'Unknown') }} {{ utils.show_field('url', document.metadata, 'url', 'no-url', index=0) }}> +<{{ doc_tag }} {{ utils.show_field('name', document.metadata, 'name', 'Unknown') }} {{ utils.show_field('source', document.metadata, 'source', 'Unknown') }} {{ utils.show_field('path', document.metadata, 'path', 'no path') }} {{ utils.show_field('uuid', document.metadata, 'uuid', 'Unknown') }} {{ utils.show_field('description', document.metadata, 'description', 'Unknown') }}> {{ document.text }} {%- endfor %} diff --git a/src/agentcore/toolset/definitions/web_request.py b/src/agentcore/toolset/definitions/web_request.py index 563c9af..f0b835c 100644 --- a/src/agentcore/toolset/definitions/web_request.py +++ b/src/agentcore/toolset/definitions/web_request.py @@ -3,7 +3,7 @@ import requests from pydantic import HttpUrl, JsonValue -from agentcore.models import ToolParam +from agentcore.models import ActionResult, Document, Metadata, ToolParam from agentcore.toolset.library import tools from agentcore.utils import convert_output_to_action_result @@ -23,8 +23,8 @@ ), }, ) -@convert_output_to_action_result -def web_request(url: HttpUrl, method: str, payload: JsonValue | None = None) -> str: + +def web_request(url: HttpUrl, method: str, payload: JsonValue | None = None) -> ActionResult: match method: case "GET": response = requests.get(str(url)) @@ -32,4 +32,4 @@ def web_request(url: HttpUrl, method: str, payload: JsonValue | None = None) -> response = requests.post(str(url), json=payload) case _: raise ValueError(f"Unsupported method: {method}") - return response.text + return [Document(text=response.text, metadata=Metadata(source=str(url)))]