Improved requests so that it can use different methods

app.py

@@ -11,7 +11,7 @@ from tdagent.tools.get_domain_information import (
     geo_location_tool,
     scrap_subdomains_tool,
 )
-from tdagent.tools.get_url_content import gr_get_url_http_content
+from tdagent.tools.get_url_content import gr_get_url_http_content, gr_make_http_request
 from tdagent.tools.internal_company_user_search import gr_internal_company
 from tdagent.tools.lookup_company_cloud_account_information import (
     gr_lookup_company_cloud_account_information,
@@ -37,7 +37,7 @@ def _read_markdown_body_as_html(path: str = "README.md") -> str:
     if lines and lines[0].strip() == "---":
         for i in range(1, len(lines)):
             if lines[i].strip() == "---":
-                lines = lines[i + 1 :]  # skip metadata block
+                lines = lines[i + 1:]  # skip metadata block
                 break
 
     markdown_body = "".join(lines).strip()
@@ -52,7 +52,7 @@ class ToolInfo(NamedTuple):
 
 
 TOOLS = (
-    ToolInfo("Get URL Content", gr_get_url_http_content),
+    ToolInfo("Make an HTTP request to a URL with specified method and parameters", gr_make_http_request),
     ToolInfo("Query AbuseIPDB", gr_query_abuseipdb),
     # Whois does not work from Spaces (port 43 blocked)
     # ToolInfo("Query WHOIS", gr_query_whois),
@@ -125,7 +125,8 @@ with (
             """,
             )
             gr.HTML(
-                """<iframe width="560" height="315" src="https://youtube.com/embed/c7Yg_jOD6J0" frameborder="0" allowfullscreen></iframe>""",  # noqa: E501
+                """<iframe width="560" height="315" src="https://youtube.com/embed/c7Yg_jOD6J0" frameborder="0" allowfullscreen></iframe>""",
+                # noqa: E501
             )
 
 if __name__ == "__main__":

tdagent/tools/get_url_content.py

@@ -1,66 +1,106 @@
 from collections.abc import Sequence
+from typing import Literal, Optional, Dict, Any
 
 import gradio as gr
 import requests
 
 from tdagent.constants import HttpContentType
 
+# Define valid HTTP methods
+HttpMethod = Literal["GET", "POST", "PUT", "DELETE", "PATCH", "HEAD"]
 
-def get_url_http_content(
+
+def make_http_request(
     url: str,
+    method: HttpMethod = "GET",
     content_type: Sequence[HttpContentType] | None = None,
+    body: Optional[str] = None,
     timeout: int = 30,
+    custom_headers: Optional[Dict[str, str]] = None
 ) -> tuple[str, str]:
-    """Get the content of a URL using an HTTP GET request.
+    """Make an HTTP request to a URL with specified method and parameters.
 
     Args:
-        url: The URL to fetch the content from.
+        url: The URL to make the request to.
+        method: HTTP method to use (GET, POST, PUT, DELETE, PATCH, HEAD).
         content_type: If given it should contain the expected
-            content types in the response body. The server may
-            not honor the requested content types.
+            content types in the response body.
+        body: Request body for methods that support it (POST, PUT, PATCH).
         timeout: Request timeout in seconds. Defaults to 30.
+        custom_headers: Additional headers to include in the request.
 
     Returns:
         A pair of strings (content, error_message). If there is an
-        error getting content from the URL the `content` will be
-        empty and `error_message` will, usually, contain the error
-        cause. Otherwise, `error_message` will be empty and the
-        content will be filled with data fetched from the URL.
+        error making the request, the `content` will be empty and
+        `error_message` will contain the error cause. Otherwise,
+        `error_message` will be empty and the content will be filled
+        with data fetched from the URL.
     """
-    headers = {}
+    headers = custom_headers or {}
 
     if content_type:
         headers["Accept"] = ",".join(content_type)
 
+    # Prepare request parameters
+    request_params: Dict[str, Any] = {
+        "url": url,
+        "headers": headers,
+        "timeout": timeout,
+    }
+
+    # Add body for methods that support it
+    if method in ["POST", "PUT", "PATCH"] and body:
+        request_params["data"] = body
+
     try:
-        response = requests.get(
-            url,
-            headers=headers,
-            timeout=timeout,
-        )
+        response = requests.request(method, **request_params)
     except requests.exceptions.MissingSchema as err:
         return "", str(err)
+    except requests.exceptions.RequestException as err:
+        return "", str(err)
 
     try:
         response.raise_for_status()
     except requests.HTTPError as err:
         return "", str(err)
 
+    # For HEAD requests, return headers as content
+    if method == "HEAD":
+        return str(dict(response.headers)), ""
+
     return response.text, ""
 
 
-gr_get_url_http_content = gr.Interface(
-    fn=get_url_http_content,
-    inputs=[gr.Textbox(label="url"), gr.Textbox(label="content type")],
-    outputs=gr.Text(label="content"),
-    title="Get the content of a URL using an HTTP GET request.",
+# Create the Gradio interface
+gr_make_http_request = gr.Interface(
+    fn=make_http_request,
+    inputs=[
+        gr.Textbox(label="URL"),
+        gr.Dropdown(
+            choices=["GET", "POST", "PUT", "DELETE", "PATCH", "HEAD"],
+            label="HTTP Method",
+            value="GET"
+        ),
+        gr.Textbox(label="Content Type (comma-separated)"),
+        gr.Textbox(label="Request Body (for POST/PUT/PATCH)", lines=3),
+        gr.Number(label="Timeout (seconds)", value=30),
+        gr.Textbox(
+            label="Custom Headers (JSON format)",
+            placeholder='{"Authorization": "Bearer token"}'
+        )
+    ],
+    outputs=gr.Text(label="Response"),
+    title="Make HTTP Requests",
     description=(
-        "Get the content of a URL in one of the specified content types."
-        " The server may not honor the content type and if it fails the"
-        " reason should also be returned with the corresponding HTTP"
-        " error code. Be wary of retrieving the content of malicious urls."
+        "Make HTTP requests with different methods and parameters. "
+        "Supports GET, POST, PUT, DELETE, PATCH, and HEAD methods. "
+        "For POST, PUT, and PATCH requests, you can include a request body. "
+        "Custom headers can be added in JSON format. "
+        "Be cautious when accessing unknown URLs."
     ),
     examples=[
-        ["https://google.com", "html"],
+        ["https://google.com", "GET", "text/html", "", 30, ""],
+        ["https://api.example.com/data", "POST", "application/json", '{"key": "value"}', 30,
+         '{"Authorization": "Bearer token"}'],
     ],
 )