Fixed errors

tdagent/tools/get_url_content.py

@@ -1,5 +1,6 @@
 from collections.abc import Sequence
 from typing import Literal, Optional, Dict, Any
+import json
 
 import gradio as gr
 import requests
@@ -9,37 +10,41 @@ from tdagent.constants import HttpContentType
 # Define valid HTTP methods
 HttpMethod = Literal["GET", "POST", "PUT", "DELETE", "PATCH", "HEAD"]
 
-
 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
+    content_type: str = "",
+    body: str = "",
+    timeout: float = 30,
+    custom_headers: str = ""
 ) -> tuple[str, str]:
     """Make an HTTP request to a URL with specified method and parameters.
 
     Args:
         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.
+        content_type: Comma-separated string of content types.
         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.
+        custom_headers: JSON string of additional headers.
 
     Returns:
-        A pair of strings (content, error_message). If there is an
-        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.
+        A pair of strings (content, error_message).
     """
-    headers = custom_headers or {}
+    # Initialize headers dictionary
+    headers = {}
 
+    # Parse content type
     if content_type:
-        headers["Accept"] = ",".join(content_type)
+        headers["Accept"] = content_type
+
+    # Parse custom headers
+    if custom_headers:
+        try:
+            custom_headers_dict = json.loads(custom_headers)
+            headers.update(custom_headers_dict)
+        except json.JSONDecodeError:
+            return "", "Invalid JSON format in custom headers"
 
     # Prepare request parameters
     request_params: Dict[str, Any] = {
@@ -70,7 +75,6 @@ def make_http_request(
 
     return response.text, ""
 
-
 # Create the Gradio interface
 gr_make_http_request = gr.Interface(
     fn=make_http_request,
@@ -81,9 +85,21 @@ gr_make_http_request = gr.Interface(
             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="Content Type",
+            placeholder="text/html,application/json"
+        ),
+        gr.Textbox(
+            label="Request Body (for POST/PUT/PATCH)",
+            lines=3,
+            placeholder='{"key": "value"}'
+        ),
+        gr.Number(
+            label="Timeout (seconds)",
+            value=30,
+            minimum=1,
+            maximum=300
+        ),
         gr.Textbox(
             label="Custom Headers (JSON format)",
             placeholder='{"Authorization": "Bearer token"}'
@@ -100,7 +116,9 @@ gr_make_http_request = gr.Interface(
     ),
     examples=[
         ["https://google.com", "GET", "text/html", "", 30, ""],
-        ["https://api.example.com/data", "POST", "application/json", '{"key": "value"}', 30,
-         '{"Authorization": "Bearer token"}'],
+        ["https://api.example.com/data", "POST", "application/json", '{"key": "value"}', 30, '{"Authorization": "Bearer token"}'],
     ],
 )
+
+if __name__ == "__main__":
+    gr_make_http_request.launch()