hyperbrowser 0.1.0__tar.gz → 0.2.0__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {hyperbrowser-0.1.0 → hyperbrowser-0.2.0}/PKG-INFO +18 -18
- {hyperbrowser-0.1.0 → hyperbrowser-0.2.0}/README.md +17 -17
- {hyperbrowser-0.1.0 → hyperbrowser-0.2.0}/hyperbrowser/__init__.py +1 -1
- {hyperbrowser-0.1.0 → hyperbrowser-0.2.0}/hyperbrowser/client/async_client.py +20 -6
- {hyperbrowser-0.1.0 → hyperbrowser-0.2.0}/hyperbrowser/client/base.py +19 -5
- {hyperbrowser-0.1.0 → hyperbrowser-0.2.0}/hyperbrowser/client/sync.py +12 -6
- {hyperbrowser-0.1.0 → hyperbrowser-0.2.0}/hyperbrowser/config.py +8 -4
- hyperbrowser-0.2.0/hyperbrowser/exceptions.py +38 -0
- {hyperbrowser-0.1.0 → hyperbrowser-0.2.0}/hyperbrowser/models/session.py +19 -4
- hyperbrowser-0.2.0/hyperbrowser/transport/async_transport.py +97 -0
- {hyperbrowser-0.1.0 → hyperbrowser-0.2.0}/hyperbrowser/transport/base.py +15 -14
- hyperbrowser-0.2.0/hyperbrowser/transport/sync.py +76 -0
- {hyperbrowser-0.1.0 → hyperbrowser-0.2.0}/pyproject.toml +4 -1
- hyperbrowser-0.1.0/hyperbrowser/transport/async_transport.py +0 -41
- hyperbrowser-0.1.0/hyperbrowser/transport/sync.py +0 -36
- {hyperbrowser-0.1.0 → hyperbrowser-0.2.0}/LICENSE +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.1
|
|
2
2
|
Name: hyperbrowser
|
|
3
|
-
Version: 0.
|
|
3
|
+
Version: 0.2.0
|
|
4
4
|
Summary: Python SDK for hyperbrowser
|
|
5
5
|
Home-page: https://github.com/hyperbrowserai/python-sdk
|
|
6
6
|
License: MIT
|
|
@@ -52,28 +52,28 @@ from hyperbrowser.client.async_client import AsyncHyperbrowser as Hyperbrowser
|
|
|
52
52
|
HYPERBROWSER_API_KEY = "test-key"
|
|
53
53
|
|
|
54
54
|
async def main():
|
|
55
|
-
|
|
56
|
-
|
|
55
|
+
async with Hyperbrowser(api_key=HYPERBROWSER_API_KEY) as client:
|
|
56
|
+
session = await client.create_session()
|
|
57
57
|
|
|
58
|
-
|
|
59
|
-
|
|
58
|
+
ws_endpoint = f"{session.websocket_url}&apiKey={HYPERBROWSER_API_KEY}"
|
|
59
|
+
browser = await connect(browserWSEndpoint=ws_endpoint, defaultViewport=None)
|
|
60
60
|
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
61
|
+
# Get pages
|
|
62
|
+
pages = await browser.pages()
|
|
63
|
+
if not pages:
|
|
64
|
+
raise Exception("No pages available")
|
|
65
65
|
|
|
66
|
-
|
|
66
|
+
page = pages[0]
|
|
67
67
|
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
68
|
+
# Navigate to a website
|
|
69
|
+
print("Navigating to Hacker News...")
|
|
70
|
+
await page.goto("https://news.ycombinator.com/")
|
|
71
|
+
page_title = await page.title()
|
|
72
|
+
print("Page title:", page_title)
|
|
73
73
|
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
74
|
+
await page.close()
|
|
75
|
+
await browser.disconnect()
|
|
76
|
+
print("Session completed!")
|
|
77
77
|
|
|
78
78
|
# Run the asyncio event loop
|
|
79
79
|
asyncio.get_event_loop().run_until_complete(main())
|
|
@@ -30,28 +30,28 @@ from hyperbrowser.client.async_client import AsyncHyperbrowser as Hyperbrowser
|
|
|
30
30
|
HYPERBROWSER_API_KEY = "test-key"
|
|
31
31
|
|
|
32
32
|
async def main():
|
|
33
|
-
|
|
34
|
-
|
|
33
|
+
async with Hyperbrowser(api_key=HYPERBROWSER_API_KEY) as client:
|
|
34
|
+
session = await client.create_session()
|
|
35
35
|
|
|
36
|
-
|
|
37
|
-
|
|
36
|
+
ws_endpoint = f"{session.websocket_url}&apiKey={HYPERBROWSER_API_KEY}"
|
|
37
|
+
browser = await connect(browserWSEndpoint=ws_endpoint, defaultViewport=None)
|
|
38
38
|
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
39
|
+
# Get pages
|
|
40
|
+
pages = await browser.pages()
|
|
41
|
+
if not pages:
|
|
42
|
+
raise Exception("No pages available")
|
|
43
43
|
|
|
44
|
-
|
|
44
|
+
page = pages[0]
|
|
45
45
|
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
46
|
+
# Navigate to a website
|
|
47
|
+
print("Navigating to Hacker News...")
|
|
48
|
+
await page.goto("https://news.ycombinator.com/")
|
|
49
|
+
page_title = await page.title()
|
|
50
|
+
print("Page title:", page_title)
|
|
51
51
|
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
52
|
+
await page.close()
|
|
53
|
+
await browser.disconnect()
|
|
54
|
+
print("Session completed!")
|
|
55
55
|
|
|
56
56
|
# Run the asyncio event loop
|
|
57
57
|
asyncio.get_event_loop().run_until_complete(main())
|
|
@@ -1,11 +1,18 @@
|
|
|
1
1
|
from typing import Optional
|
|
2
2
|
from ..transport.async_transport import AsyncTransport
|
|
3
3
|
from .base import HyperbrowserBase
|
|
4
|
-
from ..models.session import
|
|
4
|
+
from ..models.session import (
|
|
5
|
+
BasicResponse,
|
|
6
|
+
SessionDetail,
|
|
7
|
+
SessionListParams,
|
|
8
|
+
SessionListResponse,
|
|
9
|
+
)
|
|
5
10
|
from ..config import ClientConfig
|
|
6
11
|
|
|
12
|
+
|
|
7
13
|
class AsyncHyperbrowser(HyperbrowserBase):
|
|
8
14
|
"""Asynchronous Hyperbrowser client"""
|
|
15
|
+
|
|
9
16
|
def __init__(
|
|
10
17
|
self,
|
|
11
18
|
config: Optional[ClientConfig] = None,
|
|
@@ -22,16 +29,23 @@ class AsyncHyperbrowser(HyperbrowserBase):
|
|
|
22
29
|
response = await self.transport.get(self._build_url(f"/session/{id}"))
|
|
23
30
|
return SessionDetail(**response.data)
|
|
24
31
|
|
|
25
|
-
async def stop_session(self, id: str) ->
|
|
32
|
+
async def stop_session(self, id: str) -> BasicResponse:
|
|
26
33
|
response = await self.transport.put(self._build_url(f"/session/{id}/stop"))
|
|
27
|
-
return response.
|
|
34
|
+
return BasicResponse(**response.data)
|
|
28
35
|
|
|
29
|
-
async def get_session_list(
|
|
36
|
+
async def get_session_list(
|
|
37
|
+
self, params: SessionListParams = SessionListParams()
|
|
38
|
+
) -> SessionListResponse:
|
|
30
39
|
response = await self.transport.get(
|
|
31
|
-
self._build_url("/sessions"),
|
|
32
|
-
params=params.__dict__
|
|
40
|
+
self._build_url("/sessions"), params=params.__dict__
|
|
33
41
|
)
|
|
34
42
|
return SessionListResponse(**response.data)
|
|
35
43
|
|
|
36
44
|
async def close(self) -> None:
|
|
37
45
|
await self.transport.close()
|
|
46
|
+
|
|
47
|
+
async def __aenter__(self):
|
|
48
|
+
return self
|
|
49
|
+
|
|
50
|
+
async def __aexit__(self, exc_type, exc_val, exc_tb):
|
|
51
|
+
await self.close()
|
|
@@ -1,10 +1,14 @@
|
|
|
1
1
|
from typing import Optional
|
|
2
|
+
|
|
3
|
+
from hyperbrowser.exceptions import HyperbrowserError
|
|
2
4
|
from ..config import ClientConfig
|
|
3
5
|
from ..transport.base import TransportStrategy
|
|
4
6
|
import os
|
|
5
7
|
|
|
8
|
+
|
|
6
9
|
class HyperbrowserBase:
|
|
7
10
|
"""Base class with shared functionality for sync/async clients"""
|
|
11
|
+
|
|
8
12
|
def __init__(
|
|
9
13
|
self,
|
|
10
14
|
transport: TransportStrategy,
|
|
@@ -14,15 +18,25 @@ class HyperbrowserBase:
|
|
|
14
18
|
):
|
|
15
19
|
if config is None:
|
|
16
20
|
config = ClientConfig(
|
|
17
|
-
api_key=
|
|
18
|
-
|
|
21
|
+
api_key=(
|
|
22
|
+
api_key
|
|
23
|
+
if api_key is not None
|
|
24
|
+
else os.environ.get("HYPERBROWSER_API_KEY", "")
|
|
25
|
+
),
|
|
26
|
+
base_url=(
|
|
27
|
+
base_url
|
|
28
|
+
if base_url is not None
|
|
29
|
+
else os.environ.get(
|
|
30
|
+
"HYPERBROWSER_BASE_URL", "https://app.hyperbrowser.ai"
|
|
31
|
+
)
|
|
32
|
+
),
|
|
19
33
|
)
|
|
20
|
-
|
|
34
|
+
|
|
21
35
|
if not config.api_key:
|
|
22
|
-
raise
|
|
36
|
+
raise HyperbrowserError("API key must be provided")
|
|
23
37
|
|
|
24
38
|
self.config = config
|
|
25
39
|
self.transport = transport(config.api_key)
|
|
26
40
|
|
|
27
41
|
def _build_url(self, path: str) -> str:
|
|
28
|
-
return f"{self.config.base_url}/api{path}"
|
|
42
|
+
return f"{self.config.base_url}/api{path}"
|
|
@@ -1,11 +1,18 @@
|
|
|
1
1
|
from typing import Optional
|
|
2
2
|
from ..transport.sync import SyncTransport
|
|
3
3
|
from .base import HyperbrowserBase
|
|
4
|
-
from ..models.session import
|
|
4
|
+
from ..models.session import (
|
|
5
|
+
BasicResponse,
|
|
6
|
+
SessionDetail,
|
|
7
|
+
SessionListParams,
|
|
8
|
+
SessionListResponse,
|
|
9
|
+
)
|
|
5
10
|
from ..config import ClientConfig
|
|
6
11
|
|
|
12
|
+
|
|
7
13
|
class Hyperbrowser(HyperbrowserBase):
|
|
8
14
|
"""Synchronous Hyperbrowser client"""
|
|
15
|
+
|
|
9
16
|
def __init__(
|
|
10
17
|
self,
|
|
11
18
|
config: Optional[ClientConfig] = None,
|
|
@@ -22,16 +29,15 @@ class Hyperbrowser(HyperbrowserBase):
|
|
|
22
29
|
response = self.transport.get(self._build_url(f"/session/{id}"))
|
|
23
30
|
return SessionDetail(**response.data)
|
|
24
31
|
|
|
25
|
-
def stop_session(self, id: str) ->
|
|
32
|
+
def stop_session(self, id: str) -> BasicResponse:
|
|
26
33
|
response = self.transport.put(self._build_url(f"/session/{id}/stop"))
|
|
27
|
-
return response.
|
|
34
|
+
return BasicResponse(**response.data)
|
|
28
35
|
|
|
29
36
|
def get_session_list(self, params: SessionListParams) -> SessionListResponse:
|
|
30
37
|
response = self.transport.get(
|
|
31
|
-
self._build_url("/sessions"),
|
|
32
|
-
params=params.__dict__
|
|
38
|
+
self._build_url("/sessions"), params=params.__dict__
|
|
33
39
|
)
|
|
34
40
|
return SessionListResponse(**response.data)
|
|
35
41
|
|
|
36
42
|
def close(self) -> None:
|
|
37
|
-
self.transport.close()
|
|
43
|
+
self.transport.close()
|
|
@@ -2,17 +2,21 @@ from dataclasses import dataclass
|
|
|
2
2
|
from typing import Optional
|
|
3
3
|
import os
|
|
4
4
|
|
|
5
|
+
|
|
5
6
|
@dataclass
|
|
6
7
|
class ClientConfig:
|
|
7
8
|
"""Configuration for the Hyperbrowser client"""
|
|
9
|
+
|
|
8
10
|
api_key: str
|
|
9
11
|
base_url: str = "https://api.hyperbrowser.com"
|
|
10
12
|
|
|
11
13
|
@classmethod
|
|
12
|
-
def from_env(cls) ->
|
|
14
|
+
def from_env(cls) -> "ClientConfig":
|
|
13
15
|
api_key = os.environ.get("HYPERBROWSER_API_KEY")
|
|
14
16
|
if api_key is None:
|
|
15
17
|
raise ValueError("HYPERBROWSER_API_KEY environment variable is required")
|
|
16
|
-
|
|
17
|
-
base_url = os.environ.get(
|
|
18
|
-
|
|
18
|
+
|
|
19
|
+
base_url = os.environ.get(
|
|
20
|
+
"HYPERBROWSER_BASE_URL", "https://api.hyperbrowser.com"
|
|
21
|
+
)
|
|
22
|
+
return cls(api_key=api_key, base_url=base_url)
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
# exceptions.py
|
|
2
|
+
from typing import Optional, Any
|
|
3
|
+
|
|
4
|
+
|
|
5
|
+
class HyperbrowserError(Exception):
|
|
6
|
+
"""Base exception class for Hyperbrowser SDK errors"""
|
|
7
|
+
|
|
8
|
+
def __init__(
|
|
9
|
+
self,
|
|
10
|
+
message: str,
|
|
11
|
+
status_code: Optional[int] = None,
|
|
12
|
+
response: Optional[Any] = None,
|
|
13
|
+
original_error: Optional[Exception] = None,
|
|
14
|
+
):
|
|
15
|
+
super().__init__(message)
|
|
16
|
+
self.status_code = status_code
|
|
17
|
+
self.response = response
|
|
18
|
+
self.original_error = original_error
|
|
19
|
+
|
|
20
|
+
def __str__(self) -> str:
|
|
21
|
+
"""Custom string representation to show a cleaner error message"""
|
|
22
|
+
parts = [f"{self.args[0]}"]
|
|
23
|
+
|
|
24
|
+
if self.status_code:
|
|
25
|
+
parts.append(f"Status: {self.status_code}")
|
|
26
|
+
|
|
27
|
+
if self.original_error and not isinstance(
|
|
28
|
+
self.original_error, HyperbrowserError
|
|
29
|
+
):
|
|
30
|
+
error_type = type(self.original_error).__name__
|
|
31
|
+
error_msg = str(self.original_error)
|
|
32
|
+
if error_msg and error_msg != str(self.args[0]):
|
|
33
|
+
parts.append(f"Caused by {error_type}: {error_msg}")
|
|
34
|
+
|
|
35
|
+
return " - ".join(parts)
|
|
36
|
+
|
|
37
|
+
def __repr__(self) -> str:
|
|
38
|
+
return self.__str__()
|
|
@@ -4,10 +4,20 @@ from pydantic import BaseModel, Field, ConfigDict, field_validator
|
|
|
4
4
|
|
|
5
5
|
SessionStatus = Literal["active", "closed", "error"]
|
|
6
6
|
|
|
7
|
+
|
|
8
|
+
class BasicResponse(BaseModel):
|
|
9
|
+
"""
|
|
10
|
+
Represents a basic Hyperbrowser response.
|
|
11
|
+
"""
|
|
12
|
+
|
|
13
|
+
success: bool
|
|
14
|
+
|
|
15
|
+
|
|
7
16
|
class Session(BaseModel):
|
|
8
17
|
"""
|
|
9
18
|
Represents a basic session in the Hyperbrowser system.
|
|
10
19
|
"""
|
|
20
|
+
|
|
11
21
|
model_config = ConfigDict(
|
|
12
22
|
populate_by_alias=True,
|
|
13
23
|
)
|
|
@@ -22,7 +32,7 @@ class Session(BaseModel):
|
|
|
22
32
|
duration: Optional[int] = None
|
|
23
33
|
session_url: str = Field(alias="sessionUrl")
|
|
24
34
|
|
|
25
|
-
@field_validator(
|
|
35
|
+
@field_validator("start_time", "end_time", mode="before")
|
|
26
36
|
@classmethod
|
|
27
37
|
def parse_timestamp(cls, value: Optional[Union[str, int]]) -> Optional[int]:
|
|
28
38
|
"""Convert string timestamps to integers."""
|
|
@@ -32,28 +42,33 @@ class Session(BaseModel):
|
|
|
32
42
|
return int(value)
|
|
33
43
|
return value
|
|
34
44
|
|
|
45
|
+
|
|
35
46
|
class SessionDetail(Session):
|
|
36
47
|
"""
|
|
37
48
|
Detailed session information including websocket endpoint.
|
|
38
49
|
"""
|
|
50
|
+
|
|
39
51
|
websocket_url: Optional[str] = Field(alias="wsEndpoint", default=None)
|
|
40
52
|
|
|
53
|
+
|
|
41
54
|
class SessionListParams(BaseModel):
|
|
42
55
|
"""
|
|
43
56
|
Parameters for listing sessions.
|
|
44
57
|
"""
|
|
58
|
+
|
|
45
59
|
model_config = ConfigDict(
|
|
46
60
|
populate_by_alias=True,
|
|
47
61
|
)
|
|
48
62
|
|
|
49
|
-
status: Optional[SessionStatus] = None
|
|
63
|
+
status: Optional[SessionStatus] = Field(default=None, exclude=None)
|
|
50
64
|
page: int = Field(default=1, ge=1)
|
|
51
|
-
|
|
65
|
+
|
|
52
66
|
|
|
53
67
|
class SessionListResponse(BaseModel):
|
|
54
68
|
"""
|
|
55
69
|
Response containing a list of sessions with pagination information.
|
|
56
70
|
"""
|
|
71
|
+
|
|
57
72
|
model_config = ConfigDict(
|
|
58
73
|
populate_by_alias=True,
|
|
59
74
|
)
|
|
@@ -71,4 +86,4 @@ class SessionListResponse(BaseModel):
|
|
|
71
86
|
@property
|
|
72
87
|
def total_pages(self) -> int:
|
|
73
88
|
"""Calculate the total number of pages."""
|
|
74
|
-
return -(-self.total_count // self.per_page)
|
|
89
|
+
return -(-self.total_count // self.per_page)
|
|
@@ -0,0 +1,97 @@
|
|
|
1
|
+
import asyncio
|
|
2
|
+
import aiohttp
|
|
3
|
+
from typing import Optional
|
|
4
|
+
|
|
5
|
+
from hyperbrowser.exceptions import HyperbrowserError
|
|
6
|
+
from .base import TransportStrategy, APIResponse
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
class AsyncTransport(TransportStrategy):
|
|
10
|
+
"""Asynchronous transport implementation using aiohttp"""
|
|
11
|
+
|
|
12
|
+
def __init__(self, api_key: str):
|
|
13
|
+
self.session = aiohttp.ClientSession(headers={"x-api-key": api_key})
|
|
14
|
+
self._closed = False
|
|
15
|
+
|
|
16
|
+
async def close(self) -> None:
|
|
17
|
+
if not self._closed and not self.session.closed:
|
|
18
|
+
self._closed = True
|
|
19
|
+
await self.session.close()
|
|
20
|
+
|
|
21
|
+
async def __aenter__(self):
|
|
22
|
+
return self
|
|
23
|
+
|
|
24
|
+
async def __aexit__(self, exc_type, exc_val, exc_tb):
|
|
25
|
+
await self.close()
|
|
26
|
+
|
|
27
|
+
def __del__(self):
|
|
28
|
+
if not self._closed and not self.session.closed:
|
|
29
|
+
try:
|
|
30
|
+
loop = asyncio.get_event_loop()
|
|
31
|
+
if loop.is_running():
|
|
32
|
+
loop.create_task(self.session.close())
|
|
33
|
+
else:
|
|
34
|
+
loop.run_until_complete(self.session.close())
|
|
35
|
+
except Exception:
|
|
36
|
+
pass
|
|
37
|
+
|
|
38
|
+
async def _handle_response(self, response: aiohttp.ClientResponse) -> APIResponse:
|
|
39
|
+
try:
|
|
40
|
+
response.raise_for_status()
|
|
41
|
+
try:
|
|
42
|
+
if response.content_length is None or response.content_length == 0:
|
|
43
|
+
return APIResponse.from_status(response.status)
|
|
44
|
+
return APIResponse(await response.json())
|
|
45
|
+
except aiohttp.ContentTypeError as e:
|
|
46
|
+
if response.status >= 400:
|
|
47
|
+
text = await response.text()
|
|
48
|
+
raise HyperbrowserError(
|
|
49
|
+
text or "Unknown error occurred",
|
|
50
|
+
status_code=response.status,
|
|
51
|
+
response=response,
|
|
52
|
+
original_error=e,
|
|
53
|
+
)
|
|
54
|
+
return APIResponse.from_status(response.status)
|
|
55
|
+
except aiohttp.ClientResponseError as e:
|
|
56
|
+
try:
|
|
57
|
+
error_data = await response.json()
|
|
58
|
+
message = error_data.get("message") or error_data.get("error") or str(e)
|
|
59
|
+
except:
|
|
60
|
+
message = str(e)
|
|
61
|
+
raise HyperbrowserError(
|
|
62
|
+
message,
|
|
63
|
+
status_code=response.status,
|
|
64
|
+
response=response,
|
|
65
|
+
original_error=e,
|
|
66
|
+
)
|
|
67
|
+
except aiohttp.ClientError as e:
|
|
68
|
+
raise HyperbrowserError("Request failed", original_error=e)
|
|
69
|
+
|
|
70
|
+
async def post(self, url: str) -> APIResponse:
|
|
71
|
+
try:
|
|
72
|
+
async with self.session.post(url) as response:
|
|
73
|
+
return await self._handle_response(response)
|
|
74
|
+
except HyperbrowserError:
|
|
75
|
+
raise
|
|
76
|
+
except Exception as e:
|
|
77
|
+
raise HyperbrowserError("Post request failed", original_error=e)
|
|
78
|
+
|
|
79
|
+
async def get(self, url: str, params: Optional[dict] = None) -> APIResponse:
|
|
80
|
+
if params:
|
|
81
|
+
params = {k: v for k, v in params.items() if v is not None}
|
|
82
|
+
try:
|
|
83
|
+
async with self.session.get(url, params=params) as response:
|
|
84
|
+
return await self._handle_response(response)
|
|
85
|
+
except HyperbrowserError:
|
|
86
|
+
raise
|
|
87
|
+
except Exception as e:
|
|
88
|
+
raise HyperbrowserError("Get request failed", original_error=e)
|
|
89
|
+
|
|
90
|
+
async def put(self, url: str) -> APIResponse:
|
|
91
|
+
try:
|
|
92
|
+
async with self.session.put(url) as response:
|
|
93
|
+
return await self._handle_response(response)
|
|
94
|
+
except HyperbrowserError:
|
|
95
|
+
raise
|
|
96
|
+
except Exception as e:
|
|
97
|
+
raise HyperbrowserError("Put request failed", original_error=e)
|
|
@@ -1,31 +1,30 @@
|
|
|
1
1
|
from abc import ABC, abstractmethod
|
|
2
2
|
from typing import Optional, TypeVar, Generic, Type, Union
|
|
3
3
|
|
|
4
|
-
|
|
4
|
+
from hyperbrowser.exceptions import HyperbrowserError
|
|
5
|
+
|
|
6
|
+
T = TypeVar("T")
|
|
7
|
+
|
|
5
8
|
|
|
6
9
|
class APIResponse(Generic[T]):
|
|
7
10
|
"""
|
|
8
11
|
Wrapper for API responses to standardize sync/async handling.
|
|
9
|
-
|
|
10
|
-
Attributes:
|
|
11
|
-
data: The parsed response data, if any
|
|
12
|
-
status_code: HTTP status code of the response
|
|
13
12
|
"""
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
data: Optional[Union[dict, T]] = None,
|
|
17
|
-
status_code: int = 200
|
|
18
|
-
):
|
|
13
|
+
|
|
14
|
+
def __init__(self, data: Optional[Union[dict, T]] = None, status_code: int = 200):
|
|
19
15
|
self.data = data
|
|
20
16
|
self.status_code = status_code
|
|
21
17
|
|
|
22
18
|
@classmethod
|
|
23
|
-
def from_json(cls, json_data: dict, model: Type[T]) ->
|
|
19
|
+
def from_json(cls, json_data: dict, model: Type[T]) -> "APIResponse[T]":
|
|
24
20
|
"""Create an APIResponse from JSON data with a specific model."""
|
|
25
|
-
|
|
21
|
+
try:
|
|
22
|
+
return cls(data=model(**json_data))
|
|
23
|
+
except Exception as e:
|
|
24
|
+
raise HyperbrowserError("Failed to parse response data", original_error=e)
|
|
26
25
|
|
|
27
26
|
@classmethod
|
|
28
|
-
def from_status(cls, status_code: int) ->
|
|
27
|
+
def from_status(cls, status_code: int) -> "APIResponse[None]":
|
|
29
28
|
"""Create an APIResponse from just a status code."""
|
|
30
29
|
return cls(data=None, status_code=status_code)
|
|
31
30
|
|
|
@@ -33,8 +32,10 @@ class APIResponse(Generic[T]):
|
|
|
33
32
|
"""Check if the response indicates success."""
|
|
34
33
|
return 200 <= self.status_code < 300
|
|
35
34
|
|
|
35
|
+
|
|
36
36
|
class TransportStrategy(ABC):
|
|
37
37
|
"""Abstract base class for different transport implementations"""
|
|
38
|
+
|
|
38
39
|
@abstractmethod
|
|
39
40
|
def __init__(self, api_key: str):
|
|
40
41
|
pass
|
|
@@ -53,4 +54,4 @@ class TransportStrategy(ABC):
|
|
|
53
54
|
|
|
54
55
|
@abstractmethod
|
|
55
56
|
def put(self, url: str) -> APIResponse:
|
|
56
|
-
pass
|
|
57
|
+
pass
|
|
@@ -0,0 +1,76 @@
|
|
|
1
|
+
import requests
|
|
2
|
+
from typing import Optional
|
|
3
|
+
|
|
4
|
+
from hyperbrowser.exceptions import HyperbrowserError
|
|
5
|
+
from .base import TransportStrategy, APIResponse
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
class SyncTransport(TransportStrategy):
|
|
9
|
+
"""Synchronous transport implementation using requests"""
|
|
10
|
+
|
|
11
|
+
def __init__(self, api_key: str):
|
|
12
|
+
self.session = requests.Session()
|
|
13
|
+
self.session.headers.update({"x-api-key": api_key})
|
|
14
|
+
|
|
15
|
+
def _handle_response(self, response: requests.Response) -> APIResponse:
|
|
16
|
+
try:
|
|
17
|
+
response.raise_for_status()
|
|
18
|
+
try:
|
|
19
|
+
if not response.content:
|
|
20
|
+
return APIResponse.from_status(response.status_code)
|
|
21
|
+
return APIResponse(response.json())
|
|
22
|
+
except requests.exceptions.JSONDecodeError as e:
|
|
23
|
+
if response.status_code >= 400:
|
|
24
|
+
raise HyperbrowserError(
|
|
25
|
+
response.text or "Unknown error occurred",
|
|
26
|
+
status_code=response.status_code,
|
|
27
|
+
response=response,
|
|
28
|
+
original_error=e,
|
|
29
|
+
)
|
|
30
|
+
return APIResponse.from_status(response.status_code)
|
|
31
|
+
except requests.exceptions.HTTPError as e:
|
|
32
|
+
try:
|
|
33
|
+
error_data = response.json()
|
|
34
|
+
message = error_data.get("message") or error_data.get("error") or str(e)
|
|
35
|
+
except:
|
|
36
|
+
message = str(e)
|
|
37
|
+
raise HyperbrowserError(
|
|
38
|
+
message,
|
|
39
|
+
status_code=response.status_code,
|
|
40
|
+
response=response,
|
|
41
|
+
original_error=e,
|
|
42
|
+
)
|
|
43
|
+
except requests.RequestException as e:
|
|
44
|
+
raise HyperbrowserError("Request failed", original_error=e)
|
|
45
|
+
|
|
46
|
+
def close(self) -> None:
|
|
47
|
+
self.session.close()
|
|
48
|
+
|
|
49
|
+
def post(self, url: str) -> APIResponse:
|
|
50
|
+
try:
|
|
51
|
+
response = self.session.post(url)
|
|
52
|
+
return self._handle_response(response)
|
|
53
|
+
except HyperbrowserError:
|
|
54
|
+
raise
|
|
55
|
+
except Exception as e:
|
|
56
|
+
raise HyperbrowserError("Post request failed", original_error=e)
|
|
57
|
+
|
|
58
|
+
def get(self, url: str, params: Optional[dict] = None) -> APIResponse:
|
|
59
|
+
if params:
|
|
60
|
+
params = {k: v for k, v in params.items() if v is not None}
|
|
61
|
+
try:
|
|
62
|
+
response = self.session.get(url, params=params)
|
|
63
|
+
return self._handle_response(response)
|
|
64
|
+
except HyperbrowserError:
|
|
65
|
+
raise
|
|
66
|
+
except Exception as e:
|
|
67
|
+
raise HyperbrowserError("Get request failed", original_error=e)
|
|
68
|
+
|
|
69
|
+
def put(self, url: str) -> APIResponse:
|
|
70
|
+
try:
|
|
71
|
+
response = self.session.put(url)
|
|
72
|
+
return self._handle_response(response)
|
|
73
|
+
except HyperbrowserError:
|
|
74
|
+
raise
|
|
75
|
+
except Exception as e:
|
|
76
|
+
raise HyperbrowserError("Put request failed", original_error=e)
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
[tool.poetry]
|
|
2
2
|
name = "hyperbrowser"
|
|
3
|
-
version = "0.
|
|
3
|
+
version = "0.2.0"
|
|
4
4
|
description = "Python SDK for hyperbrowser"
|
|
5
5
|
authors = ["Nikhil Shahi <nshahi1998@gmail.com>"]
|
|
6
6
|
license = "MIT"
|
|
@@ -16,6 +16,9 @@ pydantic = "^2.10.0"
|
|
|
16
16
|
aiohttp = "^3.11.7"
|
|
17
17
|
|
|
18
18
|
|
|
19
|
+
[tool.poetry.group.dev.dependencies]
|
|
20
|
+
black = "^24.10.0"
|
|
21
|
+
|
|
19
22
|
[build-system]
|
|
20
23
|
requires = ["poetry-core"]
|
|
21
24
|
build-backend = "poetry.core.masonry.api"
|
|
@@ -1,41 +0,0 @@
|
|
|
1
|
-
import aiohttp
|
|
2
|
-
from typing import Optional
|
|
3
|
-
from .base import TransportStrategy, APIResponse
|
|
4
|
-
|
|
5
|
-
class AsyncTransport(TransportStrategy):
|
|
6
|
-
"""Asynchronous transport implementation using aiohttp"""
|
|
7
|
-
def __init__(self, api_key: str):
|
|
8
|
-
self.session = aiohttp.ClientSession(headers={"x-api-key": api_key})
|
|
9
|
-
|
|
10
|
-
async def close(self) -> None:
|
|
11
|
-
await self.session.close()
|
|
12
|
-
|
|
13
|
-
async def post(self, url: str) -> APIResponse:
|
|
14
|
-
async with self.session.post(url) as response:
|
|
15
|
-
response.raise_for_status()
|
|
16
|
-
try:
|
|
17
|
-
if response.content_length is None or response.content_length == 0:
|
|
18
|
-
return APIResponse.from_status(response.status)
|
|
19
|
-
return APIResponse(await response.json())
|
|
20
|
-
except aiohttp.ContentTypeError:
|
|
21
|
-
return APIResponse.from_status(response.status)
|
|
22
|
-
|
|
23
|
-
async def get(self, url: str, params: Optional[dict] = None) -> APIResponse:
|
|
24
|
-
async with self.session.get(url, params=params) as response:
|
|
25
|
-
response.raise_for_status()
|
|
26
|
-
try:
|
|
27
|
-
if response.content_length is None or response.content_length == 0:
|
|
28
|
-
return APIResponse.from_status(response.status)
|
|
29
|
-
return APIResponse(await response.json())
|
|
30
|
-
except aiohttp.ContentTypeError:
|
|
31
|
-
return APIResponse.from_status(response.status)
|
|
32
|
-
|
|
33
|
-
async def put(self, url: str) -> APIResponse:
|
|
34
|
-
async with self.session.put(url) as response:
|
|
35
|
-
response.raise_for_status()
|
|
36
|
-
try:
|
|
37
|
-
if response.content_length is None or response.content_length == 0:
|
|
38
|
-
return APIResponse.from_status(response.status)
|
|
39
|
-
return APIResponse(await response.json())
|
|
40
|
-
except aiohttp.ContentTypeError:
|
|
41
|
-
return APIResponse.from_status(response.status)
|
|
@@ -1,36 +0,0 @@
|
|
|
1
|
-
import requests
|
|
2
|
-
from typing import Optional
|
|
3
|
-
from .base import TransportStrategy, APIResponse
|
|
4
|
-
|
|
5
|
-
class SyncTransport(TransportStrategy):
|
|
6
|
-
"""Synchronous transport implementation using requests"""
|
|
7
|
-
def __init__(self, api_key: str):
|
|
8
|
-
self.session = requests.Session()
|
|
9
|
-
self.session.headers.update({"x-api-key": api_key})
|
|
10
|
-
|
|
11
|
-
def close(self) -> None:
|
|
12
|
-
self.session.close()
|
|
13
|
-
|
|
14
|
-
def post(self, url: str) -> APIResponse:
|
|
15
|
-
response = self.session.post(url)
|
|
16
|
-
response.raise_for_status()
|
|
17
|
-
try:
|
|
18
|
-
return APIResponse(response.json()) if response.content else APIResponse.from_status(response.status_code)
|
|
19
|
-
except requests.exceptions.JSONDecodeError:
|
|
20
|
-
return APIResponse.from_status(response.status_code)
|
|
21
|
-
|
|
22
|
-
def get(self, url: str, params: Optional[dict] = None) -> APIResponse:
|
|
23
|
-
response = self.session.get(url, params=params)
|
|
24
|
-
response.raise_for_status()
|
|
25
|
-
try:
|
|
26
|
-
return APIResponse(response.json()) if response.content else APIResponse.from_status(response.status_code)
|
|
27
|
-
except requests.exceptions.JSONDecodeError:
|
|
28
|
-
return APIResponse.from_status(response.status_code)
|
|
29
|
-
|
|
30
|
-
def put(self, url: str) -> APIResponse:
|
|
31
|
-
response = self.session.put(url)
|
|
32
|
-
response.raise_for_status()
|
|
33
|
-
try:
|
|
34
|
-
return APIResponse(response.json()) if response.content else APIResponse.from_status(response.status_code)
|
|
35
|
-
except requests.exceptions.JSONDecodeError:
|
|
36
|
-
return APIResponse.from_status(response.status_code)
|
|
File without changes
|