Refactor APIClient to improve request handling and add support for custom headers; enhance api_call function to accept header key-value pairs.

.vscode/mcp.json

@@ -0,0 +1,7 @@
+{
+    "servers": {
+        "my-mcp-server-6195b585": {
+            "url": " http://127.0.0.1:7860/gradio_api/mcp/sse"
+        }
+    }
+}

apiCall.py

@@ -3,48 +3,62 @@ import json
 
 
 class APIClient:
-    def __init__(self, base_url="https://v2.xivapi.com/api", auth_token=None):
-        self.base_url = base_url if base_url else "https://v2.xivapi.com/api"
+    def __init__(self, base_url, auth_token=None):
+        """
+        Initialize the API client with a base URL and optional auth token.
+
+        Parameters:
+        - base_url: The base URL of the API
+        - auth_token: Optional authentication token
+        """
+        self.base_url = base_url.rstrip("/")
         self.auth_token = auth_token
 
-    def make_request(
-        self, endpoint=None, params=None, method="GET", data=None, json_data=None
-    ):
+    def make_request(self, endpoint="", params=None, headers=None, method="GET"):
         """
-        Make an API request with flexible parameters.
+        Make an HTTP request to the API endpoint.
+
+        Parameters:
+        - endpoint: API endpoint (without leading slash)
+        - params: Dictionary of parameters to include in the request
+        - headers: Dictionary of headers to include in the request
+        - method: HTTP method (GET, POST, PUT, DELETE)
+
+        Returns:
+        - String representation of the API response
         """
-        url = f"{self.base_url}/{endpoint}" if endpoint else self.base_url
+        url = f"{self.base_url}/{endpoint.lstrip('/')}" if endpoint else self.base_url
 
-        # Remove trailing slash if endpoint is empty
-        if endpoint == "":
-            url = self.base_url.rstrip("/")
+        # Initialize headers dictionary if None
+        if headers is None:
+            headers = {}
 
-        headers = {}
+        # Add authorization if token is provided
         if self.auth_token:
             headers["Authorization"] = f"Bearer {self.auth_token}"
 
-        kwargs = {"headers": headers}
-
-        if params:
-            kwargs["params"] = params
-        if data:
-            kwargs["data"] = data
-        if json_data:
-            kwargs["json"] = json_data
-
         try:
-            print(f"Making {method} request to {url}")
-            print(f"Parameters: {params}")
+            if method.upper() == "GET":
+                response = requests.get(url, params=params, headers=headers)
+            elif method.upper() == "POST":
+                response = requests.post(url, json=params, headers=headers)
+            elif method.upper() == "PUT":
+                response = requests.put(url, json=params, headers=headers)
+            elif method.upper() == "DELETE":
+                response = requests.delete(url, json=params, headers=headers)
+            else:
+                return f"Unsupported method: {method}"
 
-            response = requests.request(method, url, **kwargs)
+            # Check if the response is successful
+            response.raise_for_status()
 
-            # Try to parse response as JSON
-            if response.status_code == 200:
-                try:
-                    return response.json()
-                except json.JSONDecodeError:
-                    return response.text
+            # Try to parse JSON response
+            try:
+                result = response.json()
+                return json.dumps(result, indent=2)
+            except ValueError:
+                # Return raw text if not JSON
+                return response.text
 
-            return f"Error {response.status_code}: {response.text}"
         except requests.exceptions.RequestException as e:
-            return f"Request Error: {str(e)}"
+            return f"Request error: {str(e)}"

main.py

@@ -8,6 +8,7 @@ def api_call(
     auth_token=None,
     endpoint=None,
     param_keys_values=None,
+    header_keys_values=None,
     additional_params=None,
     method="GET",
 ):
@@ -19,17 +20,19 @@ def api_call(
     - auth_token: Optional authentication token for APIs requiring authorization
     - endpoint: The specific API endpoint to call (e.g., "search", "users/profile")
     - param_keys_values: String containing parameter key-value pairs, one per line in format "key: value"
+    - header_keys_values: String containing header key-value pairs, one per line in format "key: value"
     - additional_params: Optional JSON string for complex parameters
     - method: HTTP method to use (GET, POST, PUT, DELETE)
 
     Instructions:
-    - Format param_keys_values as a multi-line string with each parameter on a new line
+    - Format param_keys_values and header_keys_values as a multi-line string with each pair on a new line
     - For numeric values, simply use numbers without quotes
     - For boolean values, use "true" or "false" (lowercase)
     - For string values, just provide the string without additional quotes
     """
     # Build params dictionary from key-value pairs
     params = {}
+    headers = {}
 
     # Process param_keys_values
     if param_keys_values:
@@ -51,6 +54,18 @@ def api_call(
                     else:
                         params[key] = value
 
+    # Process header_keys_values
+    if header_keys_values:
+        lines = header_keys_values.strip().split("\n")
+        for line in lines:
+            if ":" in line:
+                key, value = line.split(":", 1)
+                key = key.strip()
+                value = value.strip()
+
+                if key:  # Only add non-empty keys
+                    headers[key] = value
+
     # Handle additional parameters
     if additional_params and additional_params.strip():
         try:
@@ -68,6 +83,7 @@ def api_call(
         result = client.make_request(
             endpoint=endpoint,
             params=params,
+            headers=headers,
             method=method,
         )
         return result
@@ -91,6 +107,12 @@ demo = gr.Interface(
             value='query: Name~"popoto"\nsheets: Item\nfields: Name,Description\nlanguage: en\nlimit: 1',
             lines=5,
         ),
+        gr.Textbox(
+            label="Header Key-Value Pairs",
+            placeholder="Enter one header per line in format 'key: value'",
+            value="",
+            lines=3,
+        ),
         gr.Textbox(
             label="Additional Parameters (JSON)",
             placeholder="Enter any additional parameters as JSON",
@@ -107,6 +129,8 @@ demo = gr.Interface(
     + "- **Endpoint**: The specific endpoint to call (without leading slash) \n"
     + "- **Parameter Key-Value Pairs**: Format as 'key: value' with each pair on a new line \n"
     + "  Example: \n```\nquery: search term\nlimit: 10\nfilter: active\n``` \n"
+    + "- **Header Key-Value Pairs**: Format as 'key: value' with each pair on a new line \n"
+    + "  Example: \n```\nx-api-key: your_api_key\ncontent-type: application/json\n``` \n"
     + "- **Additional Parameters**: Use valid JSON format for nested or complex parameters \n"
     + "- **Method**: Choose the appropriate HTTP method for your request",
     examples=[
@@ -115,6 +139,7 @@ demo = gr.Interface(
             "",
             "search",
             'query: Name~"popoto"\nsheets: Item\nfields: Name,Description\nlanguage: en\nlimit: 1',
+            "",
             "{}",
             "GET",
         ],
@@ -123,9 +148,19 @@ demo = gr.Interface(
             "",
             "repos/microsoft/TypeScript/issues",
             "state: open\nper_page: 5",
+            "Accept: application/vnd.github.v3+json",
             "{}",
             "GET",
         ],
+        [
+            "https://api.anthropic.com/v1/messages",
+            "",
+            "",
+            "",
+            "x-api-key: YOUR_API_KEY\nanthropic-version: 2023-06-01\ncontent-type: application/json",
+            '{"model":"claude-opus-4-20250514","max_tokens":1024,"messages":[{"role":"user","content":"Hello, world"}]}',
+            "POST",
+        ],
     ],
     flagging_mode="manual",
     flagging_options=["Invalid Request", "API Error", "Other"],