Skip to content

Commit 7705d9f

Browse files
taeoldtaeold
committed
Run formatter.
1 parent 98ad247 commit 7705d9f

File tree

4 files changed

+68
-80
lines changed

4 files changed

+68
-80
lines changed

‎samples/https_flask/functions/main.py

+2
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,12 @@ def world():
2424
def httpsflaskexample(request):
2525
return entrypoint(app, request)
2626

27+
2728
@https_fn.on_call()
2829
def callableexample(request: https_fn.CallableRequest):
2930
return request.data
3031

32+
3133
@https_fn.on_call()
3234
def streamingcallable(request: https_fn.CallableRequest):
3335
yield "Hello,"

‎src/firebase_functions/firestore_fn.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ def _firestore_endpoint_handler(
219219
func(database_event_with_auth_context)
220220
else:
221221
# mypy cannot infer that the event type is correct, hence the cast
222-
_typing.cast(_C1 | _C2, func)(database_event) # type: ignore
222+
_typing.cast(_C1 | _C2, func)(database_event) # type: ignore
223223

224224

225225
@_util.copy_func_kwargs(FirestoreOptions)

‎src/firebase_functions/https_fn.py

+6-2
Original file line numberDiff line numberDiff line change
@@ -352,8 +352,10 @@ class CallableRequest(_typing.Generic[_core.T]):
352352
_C1 = _typing.Callable[[Request], Response]
353353
_C2 = _typing.Callable[[CallableRequest[_typing.Any]], _typing.Any]
354354

355+
355356
class _IterWithReturn:
356357
""" Utility class to capture return statements from a generator """
358+
357359
def __init__(self, iterable):
358360
self.iterable = iterable
359361

@@ -366,6 +368,7 @@ def __iter__(self):
366368
else:
367369
raise
368370

371+
369372
def _on_call_handler(func: _C2, request: Request,
370373
enforce_app_check: bool) -> Response:
371374
try:
@@ -425,8 +428,8 @@ def _on_call_handler(func: _C2, request: Request,
425428
return _jsonify(result=vals.value)
426429

427430
else:
428-
return Response(_sse_encode_generator(result), content_type="text/event-stream")
429-
431+
return Response(_sse_encode_generator(result),
432+
content_type="text/event-stream")
430433

431434
# Disable broad exceptions lint since we want to handle all exceptions here
432435
# and wrap as an HttpsError.
@@ -456,6 +459,7 @@ def _sse_encode_generator(gen: _typing.Generator):
456459
yield f"error: {json}\n\n"
457460
yield "END"
458461

462+
459463
@_util.copy_func_kwargs(HttpsOptions)
460464
def on_request(**kwargs) -> _typing.Callable[[_C1], _C1]:
461465
"""

‎tests/test_https_fn.py

+59-77
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ def func(_):
7171

7272
self.assertEqual("world", hello)
7373

74-
7574
def test_callable_encoding(self):
7675
app = Flask(__name__)
7776

@@ -80,18 +79,14 @@ def add(req: https_fn.CallableRequest[int]):
8079
return req.data + 1
8180

8281
with app.test_request_context("/"):
83-
environ = EnvironBuilder(
84-
method="POST",
85-
json={
86-
"data": 1
87-
}
88-
).get_environ()
82+
environ = EnvironBuilder(method="POST", json={
83+
"data": 1
84+
}).get_environ()
8985
request = Request(environ)
9086

9187
response = add(request)
9288
self.assertEqual(response.status_code, 200)
93-
self.assertEqual(response.get_json(), { "result": 2 })
94-
89+
self.assertEqual(response.get_json(), {"result": 2})
9590

9691
def test_callable_errors(self):
9792
app = Flask(__name__)
@@ -105,32 +100,32 @@ def throw_generic_error(req):
105100
def throw_access_denied(req):
106101
raise https_fn.HttpsError(
107102
https_fn.FunctionsErrorCode.PERMISSION_DENIED,
108-
"Permission is denied"
109-
)
103+
"Permission is denied")
110104

111105
with app.test_request_context("/"):
112-
environ = EnvironBuilder(
113-
method="POST",
114-
json={
115-
"data": None
116-
}
117-
).get_environ()
106+
environ = EnvironBuilder(method="POST", json={
107+
"data": None
108+
}).get_environ()
118109
request = Request(environ)
119110

120111
response = throw_generic_error(request)
121112
self.assertEqual(response.status_code, 500)
122-
self.assertEqual(response.get_json(), {
123-
"error": { "message": "INTERNAL", "status": "INTERNAL" }
124-
})
113+
self.assertEqual(
114+
response.get_json(),
115+
{"error": {
116+
"message": "INTERNAL",
117+
"status": "INTERNAL"
118+
}})
125119

126120
response = throw_access_denied(request)
127121
self.assertEqual(response.status_code, 403)
128-
self.assertEqual(response.get_json(), {
129-
"error": {
130-
"message": "Permission is denied",
131-
"status": "PERMISSION_DENIED"
132-
}
133-
})
122+
self.assertEqual(
123+
response.get_json(), {
124+
"error": {
125+
"message": "Permission is denied",
126+
"status": "PERMISSION_DENIED"
127+
}
128+
})
134129

135130
def test_yielding_without_streaming(self):
136131
app = Flask(__name__)
@@ -145,8 +140,7 @@ def yield_thrower(req: https_fn.CallableRequest[int]):
145140
yield from range(req.data)
146141
raise https_fn.HttpsError(
147142
https_fn.FunctionsErrorCode.PERMISSION_DENIED,
148-
"Can't read anymore"
149-
)
143+
"Can't read anymore")
150144

151145
@https_fn.on_call()
152146
def legacy_yielder(req: https_fn.CallableRequest[int]):
@@ -158,49 +152,43 @@ def legacy_yielder(req: https_fn.CallableRequest[int]):
158152
raise StopIteration("OK")
159153

160154
with app.test_request_context("/"):
161-
environ = EnvironBuilder(
162-
method="POST",
163-
json={
164-
"data": 5
165-
}
166-
).get_environ()
155+
environ = EnvironBuilder(method="POST", json={
156+
"data": 5
157+
}).get_environ()
167158

168159
request = Request(environ)
169160
response = yielder(request)
170161

171162
self.assertEqual(response.status_code, 200)
172-
self.assertEqual(response.get_json(), { "result": "OK" })
163+
self.assertEqual(response.get_json(), {"result": "OK"})
173164

174165
with app.test_request_context("/"):
175-
environ = EnvironBuilder(
176-
method="POST",
177-
json={
178-
"data": 5
179-
}
180-
).get_environ()
166+
environ = EnvironBuilder(method="POST", json={
167+
"data": 5
168+
}).get_environ()
181169

182170
request = Request(environ)
183171
response = legacy_yielder(request)
184172

185173
self.assertEqual(response.status_code, 200)
186-
self.assertEqual(response.get_json(), { "result": "OK" })
174+
self.assertEqual(response.get_json(), {"result": "OK"})
187175

188176
with app.test_request_context("/"):
189-
environ = EnvironBuilder(
190-
method="POST",
191-
json={
192-
"data": 3
193-
}
194-
).get_environ()
177+
environ = EnvironBuilder(method="POST", json={
178+
"data": 3
179+
}).get_environ()
195180

196181
request = Request(environ)
197182
response = yield_thrower(request)
198183

199184
self.assertEqual(response.status_code, 403)
200-
self.assertEqual(response.get_json(), {
201-
"error": { "message": "Can't read anymore", "status": "PERMISSION_DENIED" }
202-
})
203-
185+
self.assertEqual(
186+
response.get_json(), {
187+
"error": {
188+
"message": "Can't read anymore",
189+
"status": "PERMISSION_DENIED"
190+
}
191+
})
204192

205193
def test_yielding_with_streaming(self):
206194
app = Flask(__name__)
@@ -213,50 +201,44 @@ def yielder(req: https_fn.CallableRequest[int]):
213201
@https_fn.on_call()
214202
def yield_thrower(req: https_fn.CallableRequest[int]):
215203
yield from range(req.data)
216-
raise https_fn.HttpsError(https_fn.FunctionsErrorCode.INTERNAL, "Throwing")
204+
raise https_fn.HttpsError(https_fn.FunctionsErrorCode.INTERNAL,
205+
"Throwing")
217206

218207
with app.test_request_context("/"):
219-
environ = EnvironBuilder(
220-
method="POST",
221-
json={
222-
"data": 2
223-
},
224-
headers={
225-
"accept": "text/event-stream"
226-
}
227-
).get_environ()
208+
environ = EnvironBuilder(method="POST",
209+
json={
210+
"data": 2
211+
},
212+
headers={
213+
"accept": "text/event-stream"
214+
}).get_environ()
228215

229216
request = Request(environ)
230217
response = yielder(request)
231218

232219
self.assertEqual(response.status_code, 200)
233220
chunks = list(response.response)
234221
self.assertEqual(chunks, [
235-
'data: {"message": 0}\n\n',
236-
'data: {"message": 1}\n\n',
237-
'data: {"result": "OK"}\n\n',
238-
"END"
222+
'data: {"message": 0}\n\n', 'data: {"message": 1}\n\n',
223+
'data: {"result": "OK"}\n\n', "END"
239224
])
240225

241226
with app.test_request_context("/"):
242-
environ = EnvironBuilder(
243-
method="POST",
244-
json={
245-
"data": 2
246-
},
247-
headers={
248-
"accept": "text/event-stream"
249-
}
250-
).get_environ()
227+
environ = EnvironBuilder(method="POST",
228+
json={
229+
"data": 2
230+
},
231+
headers={
232+
"accept": "text/event-stream"
233+
}).get_environ()
251234

252235
request = Request(environ)
253236
response = yield_thrower(request)
254237

255238
self.assertEqual(response.status_code, 200)
256239
chunks = list(response.response)
257240
self.assertEqual(chunks, [
258-
'data: {"message": 0}\n\n',
259-
'data: {"message": 1}\n\n',
241+
'data: {"message": 0}\n\n', 'data: {"message": 1}\n\n',
260242
'error: {"error": {"status": "INTERNAL", "message": "Throwing"}}\n\n',
261243
"END"
262244
])

0 commit comments

Comments
 (0)