Skip to content

Commit 03e9524

Browse files
committed
Add ruff config and format all files
1 parent b474020 commit 03e9524

File tree

9 files changed

+97
-17
lines changed

9 files changed

+97
-17
lines changed

sdk/python/pyproject.toml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,3 +83,24 @@ commit_args = ""
8383
setup_hooks = []
8484
pre_commit_hooks = []
8585
post_commit_hooks = []
86+
87+
[tool.ruff]
88+
exclude = [
89+
"src/datastar_py/consts.py",
90+
]
91+
[tool.ruff.lint]
92+
select = [
93+
# pycodestyle
94+
"E",
95+
# Pyflakes
96+
"F",
97+
# pyupgrade
98+
"UP",
99+
# flake8-bugbear
100+
"B",
101+
# flake8-simplify
102+
"SIM",
103+
# isort
104+
"I",
105+
]
106+
fixable = ["ALL"]
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
from .sse import SSE_HEADERS, ServerSentEventGenerator
22

3-
__all__ = ["ServerSentEventGenerator", "SSE_HEADERS"]
3+
__all__ = ["SSE_HEADERS", "ServerSentEventGenerator"]

sdk/python/src/datastar_py/django.py

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,28 @@
22
from functools import wraps
33
from typing import Any
44

5-
from django.http import StreamingHttpResponse as _StreamingHttpResponse, HttpRequest
5+
from django.http import HttpRequest
6+
from django.http import StreamingHttpResponse as _StreamingHttpResponse
67

78
from .sse import SSE_HEADERS, ServerSentEventGenerator
89

10+
__all__ = [
11+
"SSE_HEADERS",
12+
"DatastarStreamingHttpResponse",
13+
"ServerSentEventGenerator",
14+
"read_signals",
15+
]
16+
917

1018
class DatastarStreamingHttpResponse(_StreamingHttpResponse, ServerSentEventGenerator):
1119
@wraps(_StreamingHttpResponse.__init__)
1220
def __init__(self, *args, **kwargs):
1321
kwargs["headers"] = {**SSE_HEADERS, **kwargs.get("headers", {})}
1422
super().__init__(*args, **kwargs)
1523

24+
1625
def read_signals(request: HttpRequest) -> dict[str, Any]:
1726
if request.method == "GET":
18-
return json.loads(request.GET.get("datastar"))
27+
return json.loads(request.GET["datastar"])
1928
else:
20-
return json.loads(request.body)
29+
return json.loads(request.body)

sdk/python/src/datastar_py/fastapi.py

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,17 @@
11
from typing import Annotated, Any
22

33
from fastapi import Depends
4-
from .starlette import DatastarStreamingResponse, ServerSentEventGenerator, read_signals
4+
5+
from .sse import SSE_HEADERS, ServerSentEventGenerator
6+
from .starlette import DatastarStreamingResponse, read_signals
7+
8+
__all__ = [
9+
"SSE_HEADERS",
10+
"ServerSentEventGenerator",
11+
"SignalsDep",
12+
"read_signals",
13+
"DatastarStreamingResponse",
14+
]
515

616

717
SignalsDep = Annotated[dict[str, Any], Depends(read_signals)]
Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,9 @@
1-
from .sse import ServerSentEventGenerator
1+
from .sse import SSE_HEADERS, ServerSentEventGenerator
22
from .starlette import DatastarStreamingResponse, read_signals
3+
4+
__all__ = [
5+
"SSE_HEADERS",
6+
"DatastarStreamingResponse",
7+
"ServerSentEventGenerator",
8+
"read_signals",
9+
]

sdk/python/src/datastar_py/quart.py

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,17 @@
11
import json
22
from typing import Any
33

4-
from quart import make_response as _make_response, request
4+
from quart import make_response as _make_response
5+
from quart import request
56

6-
from .sse import ServerSentEventGenerator, SSE_HEADERS
7+
from .sse import SSE_HEADERS, ServerSentEventGenerator
8+
9+
__all__ = [
10+
"SSE_HEADERS",
11+
"ServerSentEventGenerator",
12+
"make_datastar_response",
13+
"read_signals",
14+
]
715

816

917
async def make_datastar_response(async_generator):
@@ -14,6 +22,6 @@ async def make_datastar_response(async_generator):
1422

1523
async def read_signals() -> dict[str, Any]:
1624
if request.method == "GET":
17-
return json.loads(request.args.get("datastar"))
25+
return json.loads(request.args["datastar"])
1826
else:
1927
return await request.get_json()

sdk/python/src/datastar_py/sanic.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,23 @@
44
from .sse import SSE_HEADERS, ServerSentEventGenerator
55

66
if TYPE_CHECKING:
7-
from sanic import Request, HTTPResponse
7+
from sanic import HTTPResponse, Request
8+
9+
__all__ = [
10+
"SSE_HEADERS",
11+
"ServerSentEventGenerator",
12+
"datastar_respond",
13+
"read_signals",
14+
]
815

916

1017
async def datastar_respond(request: "Request") -> "HTTPResponse":
1118
response = await request.respond(headers=SSE_HEADERS)
1219
return response
1320

21+
1422
async def read_signals(request: "Request") -> dict[str, Any]:
1523
if request.method == "GET":
16-
return json.loads(request.args.get("datastar"))
24+
return json.loads(request.args["datastar"])
1725
else:
1826
return await request.json()

sdk/python/src/datastar_py/sse.py

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,19 @@ def merge_fragments(
6060
fragments = fragments.__html__()
6161
data_lines = []
6262
if merge_mode:
63-
data_lines.append(f"data: {consts.MERGE_MODE_DATALINE_LITERAL} {merge_mode}")
63+
data_lines.append(
64+
f"data: {consts.MERGE_MODE_DATALINE_LITERAL} {merge_mode}"
65+
)
6466
if selector:
6567
data_lines.append(f"data: {consts.SELECTOR_DATALINE_LITERAL} {selector}")
6668
if use_view_transition:
67-
data_lines.append(f"data: {consts.USE_VIEW_TRANSITION_DATALINE_LITERAL} true")
69+
data_lines.append(
70+
f"data: {consts.USE_VIEW_TRANSITION_DATALINE_LITERAL} true"
71+
)
6872
else:
69-
data_lines.append(f"data: {consts.USE_VIEW_TRANSITION_DATALINE_LITERAL} false")
73+
data_lines.append(
74+
f"data: {consts.USE_VIEW_TRANSITION_DATALINE_LITERAL} false"
75+
)
7076

7177
data_lines.extend(
7278
f"data: {consts.FRAGMENTS_DATALINE_LITERAL} {x}"
@@ -92,9 +98,13 @@ def remove_fragments(
9298
if selector:
9399
data_lines.append(f"data: {consts.SELECTOR_DATALINE_LITERAL} {selector}")
94100
if use_view_transition:
95-
data_lines.append(f"data: {consts.USE_VIEW_TRANSITION_DATALINE_LITERAL} true")
101+
data_lines.append(
102+
f"data: {consts.USE_VIEW_TRANSITION_DATALINE_LITERAL} true"
103+
)
96104
else:
97-
data_lines.append(f"data: {consts.USE_VIEW_TRANSITION_DATALINE_LITERAL} false")
105+
data_lines.append(
106+
f"data: {consts.USE_VIEW_TRANSITION_DATALINE_LITERAL} false"
107+
)
98108

99109
return ServerSentEventGenerator._send(
100110
consts.EventType.REMOVE_FRAGMENTS,

sdk/python/src/datastar_py/starlette.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,13 @@
77

88
from .sse import SSE_HEADERS, ServerSentEventGenerator
99

10+
__all__ = [
11+
"SSE_HEADERS",
12+
"DatastarStreamingResponse",
13+
"ServerSentEventGenerator",
14+
"read_signals",
15+
]
16+
1017

1118
class DatastarStreamingResponse(_StreamingResponse, ServerSentEventGenerator):
1219
@wraps(_StreamingResponse.__init__)
@@ -17,6 +24,6 @@ def __init__(self, *args, **kwargs):
1724

1825
async def read_signals(request: Request) -> dict[str, Any]:
1926
if request.method == "GET":
20-
return json.loads(request.query_params.get("datastar"))
27+
return json.loads(request.query_params["datastar"])
2128
else:
2229
return await request.json()

0 commit comments

Comments
 (0)