Add tests, small refactor (#21)

Author: oxy-rostyslav

.gitignore

@@ -70,7 +70,8 @@ ipython_config.py
 __pypackages__/
 
 # Environments
-*/.env
+.env
+tests/e2e/.env
 .venv
 env/
 venv/

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## [0.2.1] - 2025-05-23
+
+### Added
+
+- More tests
+
+### Changed
+
+- README.md
+
 ## [0.2.0] - 2025-05-13
 
 ### Added

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "oxylabs-mcp"
-version = "0.2.0"
+version = "0.2.1"
 description = "Oxylabs MCP server"
 authors = [
     {name="Augis Braziunas", email="[email protected]"},

src/oxylabs_mcp/__init__.py

@@ -1,9 +1,9 @@
-from . import server
+from oxylabs_mcp.server import mcp
 
 
 def main() -> None:
     """Start the MCP server."""
-    server.main()
+    mcp.run()
 
 
 # Optionally expose other important items at package level

src/oxylabs_mcp/server.py

@@ -222,10 +222,5 @@ async def amazon_product_scraper(
         return e.stringify()
 
 
-def main() -> None:
-    """Run the MCP server."""
-    mcp.run()
-
-
 if __name__ == "__main__":
-    main()
+    mcp.run()

src/oxylabs_mcp/utils.py

@@ -218,8 +218,6 @@ def get_content(response: Response, *, output_format: str, parse: bool = False)
     if output_format == "links":
         links = extract_links_with_text(str(content))
         return "\n".join(links)
-    if output_format in ("md", ""):
-        striped_html = strip_html(str(content))
-        return markdownify(striped_html)  # type: ignore[no-any-return]
 
-    return str(content)
+    stripped_html = strip_html(str(content))
+    return markdownify(stripped_html)  # type: ignore[no-any-return]

tests/integration/test_server.py

@@ -4,7 +4,7 @@
 from unittest.mock import AsyncMock, MagicMock, patch
 
 import pytest
-from httpx import Request, Response
+from httpx import HTTPStatusError, Request, RequestError, Response
 from mcp.server.fastmcp import FastMCP
 from mcp.types import TextContent
 
@@ -282,3 +282,74 @@ async def test_default_headers_are_set(
 
     client_info_pattern = re.compile(r"oxylabs-mcp-fake_cursor/(\d+)\.(\d+)\.(\d+)$")
     assert re.match(client_info_pattern, client_info)
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    ("tool", "arguments"),
+    [
+        pytest.param(
+            "universal_scraper",
+            {"url": "test_url"},
+            id="universal_scraper",
+        ),
+        pytest.param(
+            "google_search_scraper",
+            {"query": "Generic query"},
+            id="google_search_scraper",
+        ),
+        pytest.param(
+            "amazon_search_scraper",
+            {"query": "Generic query"},
+            id="amazon_search_scraper",
+        ),
+        pytest.param(
+            "amazon_product_scraper",
+            {"query": "Generic query"},
+            id="amazon_product_scraper",
+        ),
+    ],
+)
+@pytest.mark.parametrize(
+    ("exception", "expected_text"),
+    [
+        pytest.param(
+            HTTPStatusError(
+                "HTTP status error",
+                request=MagicMock(),
+                response=MagicMock(status_code=500, text="Internal Server Error"),
+            ),
+            "HTTP error during POST request: 500 - Internal Server Error",
+            id="https_status_error",
+        ),
+        pytest.param(
+            RequestError("Request error"),
+            "Request error during POST request: Request error",
+            id="request_error",
+        ),
+        pytest.param(
+            Exception("Unexpected exception"),
+            "Error: Unexpected exception",
+            id="unhandled_exception",
+        ),
+    ],
+)
+async def test_request_client_error_handling(
+    mcp: FastMCP,
+    request_data: Request,
+    oxylabs_client: AsyncMock,
+    request_session: MagicMock,
+    tool: str,
+    arguments: dict,
+    exception: Exception,
+    expected_text: str,
+):
+    request_session.client_params.clientInfo.name = "fake_cursor"
+
+    oxylabs_client.post.side_effect = [exception]
+    oxylabs_client.get.side_effect = [exception]
+
+    with patch("os.environ", new=ENV_VARIABLES):
+        result = await mcp.call_tool(tool, arguments=arguments)
+
+    assert result[0].text == expected_text