Skip to content

Commit 4ad3c21

Browse files
committed
make formatter happy.
1 parent 2d5be31 commit 4ad3c21

File tree

4 files changed

+73
-28
lines changed

4 files changed

+73
-28
lines changed

src/firebase_functions/dataconnect_fn.py

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,9 @@ def _dataconnect_endpoint_handler(
208208
) -> None:
209209
# Currently, only mutationExecuted is supported
210210
if event_type != _event_type_mutation_executed:
211-
raise NotImplementedError(f"Unsupported event type: {event_type}. Only {_event_type_mutation_executed} is currently supported.")
211+
raise NotImplementedError(
212+
f"Unsupported event type: {event_type}. Only {_event_type_mutation_executed} is currently supported."
213+
)
212214

213215
event_attributes = raw._get_attributes()
214216
event_data: _typing.Any = raw.get_data()
@@ -223,15 +225,9 @@ def _dataconnect_endpoint_handler(
223225
if service_pattern:
224226
params = {**params, **service_pattern.extract_matches(event_service)}
225227
if connector_pattern:
226-
params = {
227-
**params,
228-
**connector_pattern.extract_matches(event_connector)
229-
}
228+
params = {**params, **connector_pattern.extract_matches(event_connector)}
230229
if operation_pattern:
231-
params = {
232-
**params,
233-
**operation_pattern.extract_matches(event_operation)
234-
}
230+
params = {**params, **operation_pattern.extract_matches(event_operation)}
235231

236232
event_auth_type = event_attributes["authtype"]
237233
event_auth_id = event_attributes["authid"]
@@ -281,12 +277,13 @@ def mutation_executed_handler(event: Event[MutationEventData]):
281277
options = DataConnectOptions(**kwargs)
282278

283279
def on_mutation_executed_inner_decorator(func: _C1):
284-
service_pattern = _path_pattern.PathPattern(
285-
options.service) if options.service else None
286-
connector_pattern = _path_pattern.PathPattern(
287-
options.connector) if options.connector else None
288-
operation_pattern = _path_pattern.PathPattern(
289-
options.operation) if options.operation else None
280+
service_pattern = _path_pattern.PathPattern(options.service) if options.service else None
281+
connector_pattern = (
282+
_path_pattern.PathPattern(options.connector) if options.connector else None
283+
)
284+
operation_pattern = (
285+
_path_pattern.PathPattern(options.operation) if options.operation else None
286+
)
290287

291288
@_functools.wraps(func)
292289
def on_mutation_executed_wrapped(raw: _ce.CloudEvent):

src/firebase_functions/options.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1188,22 +1188,22 @@ def _endpoint(
11881188
event_filters_path_patterns: _typing.Any = {}
11891189

11901190
if self.service:
1191-
if service_pattern.has_wildcards:
1192-
event_filters_path_patterns["service"] = service_pattern.value
1193-
else:
1194-
event_filters["service"] = service_pattern.value
1191+
if service_pattern.has_wildcards:
1192+
event_filters_path_patterns["service"] = service_pattern.value
1193+
else:
1194+
event_filters["service"] = service_pattern.value
11951195

11961196
if self.connector:
1197-
if connector_pattern.has_wildcards:
1198-
event_filters_path_patterns["connector"] = connector_pattern.value
1199-
else:
1200-
event_filters["connector"] = connector_pattern.value
1197+
if connector_pattern.has_wildcards:
1198+
event_filters_path_patterns["connector"] = connector_pattern.value
1199+
else:
1200+
event_filters["connector"] = connector_pattern.value
12011201

12021202
if self.operation:
1203-
if operation_pattern.has_wildcards:
1204-
event_filters_path_patterns["operation"] = operation_pattern.value
1205-
else:
1206-
event_filters["operation"] = operation_pattern.value
1203+
if operation_pattern.has_wildcards:
1204+
event_filters_path_patterns["operation"] = operation_pattern.value
1205+
else:
1206+
event_filters["operation"] = operation_pattern.value
12071207

12081208
event_trigger = _manifest.EventTrigger(
12091209
eventType=kwargs["event_type"],

tests/repro_async_error.py

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
import json
2+
3+
import pytest
4+
from flask import Request, Response
5+
6+
from firebase_functions import https_fn
7+
8+
9+
# Mock request object
10+
class MockRequest:
11+
def __init__(self, data=None, headers=None, method="POST"):
12+
self.data = json.dumps(data).encode("utf-8") if data else b""
13+
self.headers = headers or {"Content-Type": "application/json"}
14+
self.method = method
15+
self.json = data
16+
17+
18+
# Async function with error
19+
@https_fn.on_request()
20+
async def async_error_func(req: Request) -> Response:
21+
raise ValueError("Async error")
22+
23+
24+
# Sync function with error
25+
@https_fn.on_request()
26+
def sync_error_func(req: Request) -> Response:
27+
raise ValueError("Sync error")
28+
29+
30+
@pytest.mark.asyncio
31+
async def test_async_error_handling():
32+
req = MockRequest()
33+
try:
34+
await async_error_func(req)
35+
except ValueError as e:
36+
assert str(e) == "Async error"
37+
except Exception as e:
38+
pytest.fail(f"Unexpected exception: {type(e).__name__}: {e}")
39+
40+
41+
def test_sync_error_handling():
42+
req = MockRequest()
43+
try:
44+
sync_error_func(req)
45+
except ValueError as e:
46+
assert str(e) == "Sync error"
47+
except Exception as e:
48+
pytest.fail(f"Unexpected exception: {type(e).__name__}: {e}")

tests/test_dataconnect_fn.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ def init():
132132
"connector": "connector-id",
133133
"operation": "mutation-name",
134134
"authtype": "app_user",
135-
"authid": "auth-id"
135+
"authid": "auth-id",
136136
},
137137
data=json.dumps({}),
138138
)

0 commit comments

Comments
 (0)