Skip to content

Commit 967e54b

Browse files
committed
fix: formatting and linter errors
1 parent d21c9d4 commit 967e54b

File tree

3 files changed

+53
-48
lines changed

3 files changed

+53
-48
lines changed

src/substrait/builders/type.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,7 @@ def precision_timestamp_tz(precision: int, nullable=True) -> stt.Type:
221221
)
222222
)
223223

224+
224225
def timestamp(nullable=True) -> stt.Type:
225226
return stt.Type(
226227
timestamp=stt.Type.Timestamp(
@@ -230,6 +231,7 @@ def timestamp(nullable=True) -> stt.Type:
230231
)
231232
)
232233

234+
233235
def struct(types: Iterable[stt.Type], nullable=True) -> stt.Type:
234236
return stt.Type(
235237
struct=stt.Type.Struct(

src/substrait/derivation_expression.py

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
from typing import Optional
2-
from antlr4 import InputStream, CommonTokenStream
2+
3+
from antlr4 import CommonTokenStream, InputStream
4+
35
from substrait.gen.antlr.SubstraitTypeLexer import SubstraitTypeLexer
46
from substrait.gen.antlr.SubstraitTypeParser import SubstraitTypeParser
57
from substrait.gen.proto.type_pb2 import Type
@@ -121,15 +123,19 @@ def _evaluate(x, values: dict):
121123
nullability=nullability,
122124
)
123125
)
124-
elif isinstance(parametrized_type, SubstraitTypeParser.PrecisionTimestampContext):
126+
elif isinstance(
127+
parametrized_type, SubstraitTypeParser.PrecisionTimestampContext
128+
):
125129
precision = _evaluate(parametrized_type.precision, values)
126130
return Type(
127131
precision_timestamp=Type.PrecisionTimestamp(
128132
precision=precision,
129133
nullability=nullability,
130134
)
131135
)
132-
elif isinstance(parametrized_type, SubstraitTypeParser.PrecisionTimestampTZContext):
136+
elif isinstance(
137+
parametrized_type, SubstraitTypeParser.PrecisionTimestampTZContext
138+
):
133139
precision = _evaluate(parametrized_type.precision, values)
134140
return Type(
135141
precision_timestamp_tz=Type.PrecisionTimestampTZ(
@@ -144,27 +150,29 @@ def _evaluate(x, values: dict):
144150
)
145151
)
146152
elif isinstance(parametrized_type, SubstraitTypeParser.StructContext):
147-
types = list(map(lambda x: _evaluate(x,values),parametrized_type.expr()))
153+
types = list(
154+
map(lambda x: _evaluate(x, values), parametrized_type.expr())
155+
)
148156
return Type(
149157
struct=Type.Struct(
150158
types=types,
151159
nullability=nullability,
152160
)
153161
)
154162
elif isinstance(parametrized_type, SubstraitTypeParser.ListContext):
155-
type = _evaluate(parametrized_type.expr(),values)
163+
list_type = _evaluate(parametrized_type.expr(), values)
156164
return Type(
157165
list=Type.List(
158-
type=type,
166+
type=list_type,
159167
nullability=nullability,
160168
)
161169
)
162170

163171
elif isinstance(parametrized_type, SubstraitTypeParser.MapContext):
164172
return Type(
165173
map=Type.Map(
166-
key=_evaluate(parametrized_type.key,values),
167-
value=_evaluate(parametrized_type.value,values),
174+
key=_evaluate(parametrized_type.key, values),
175+
value=_evaluate(parametrized_type.value, values),
168176
nullability=nullability,
169177
)
170178
)

tests/test_extension_registry.py

Lines changed: 35 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -129,11 +129,12 @@
129129
)
130130

131131

132-
133132
def test_non_existing_urn():
134133
assert (
135134
registry.lookup_function(
136-
urn="non_existent", function_name="add", signature=[i8(nullable=False), i8(nullable=False)]
135+
urn="non_existent",
136+
function_name="add",
137+
signature=[i8(nullable=False), i8(nullable=False)],
137138
)
138139
is None
139140
)
@@ -142,8 +143,9 @@ def test_non_existing_urn():
142143
def test_non_existing_function():
143144
assert (
144145
registry.lookup_function(
145-
146-
urn="extension:test:functions", function_name="sub", signature=[i8(nullable=False), i8(nullable=False)]
146+
urn="extension:test:functions",
147+
function_name="sub",
148+
signature=[i8(nullable=False), i8(nullable=False)],
147149
)
148150
is None
149151
)
@@ -152,15 +154,19 @@ def test_non_existing_function():
152154
def test_non_existing_function_signature():
153155
assert (
154156
registry.lookup_function(
155-
urn="extension:test:functions", function_name="add", signature=[i8(nullable=False)]
157+
urn="extension:test:functions",
158+
function_name="add",
159+
signature=[i8(nullable=False)],
156160
)
157161
is None
158162
)
159163

160164

161165
def test_exact_match():
162166
assert registry.lookup_function(
163-
urn="extension:test:functions", function_name="add", signature=[i8(nullable=False), i8(nullable=False)]
167+
urn="extension:test:functions",
168+
function_name="add",
169+
signature=[i8(nullable=False), i8(nullable=False)],
164170
)[1] == Type(i8=Type.I8(nullability=Type.NULLABILITY_REQUIRED))
165171

166172

@@ -184,43 +190,35 @@ def test_wildcard_match_fails_with_constraits():
184190

185191

186192
def test_wildcard_match_with_constraits():
187-
assert (
188-
registry.lookup_function(
189-
urn="extension:test:functions",
190-
function_name="add",
191-
signature=[i16(nullable=False), i16(nullable=False), i8(nullable=False)],
192-
)[1]
193-
== i8(nullable=False)
194-
)
193+
assert registry.lookup_function(
194+
urn="extension:test:functions",
195+
function_name="add",
196+
signature=[i16(nullable=False), i16(nullable=False), i8(nullable=False)],
197+
)[1] == i8(nullable=False)
195198

196199

197200
def test_variadic():
198-
assert (
199-
registry.lookup_function(
200-
urn="extension:test:functions",
201-
function_name="test_fn",
202-
signature=[i8(nullable=False), i8(nullable=False), i8(nullable=False)],
203-
)[1]
204-
== i8(nullable=False)
205-
)
201+
assert registry.lookup_function(
202+
urn="extension:test:functions",
203+
function_name="test_fn",
204+
signature=[i8(nullable=False), i8(nullable=False), i8(nullable=False)],
205+
)[1] == i8(nullable=False)
206206

207207

208208
def test_variadic_any():
209-
assert (
210-
registry.lookup_function(
211-
urn="extension:test:functions",
212-
function_name="test_fn_variadic_any",
213-
signature=[i16(nullable=False), i16(nullable=False), i16(nullable=False)],
214-
)[1]
215-
== i16(nullable=False)
216-
)
209+
assert registry.lookup_function(
210+
urn="extension:test:functions",
211+
function_name="test_fn_variadic_any",
212+
signature=[i16(nullable=False), i16(nullable=False), i16(nullable=False)],
213+
)[1] == i16(nullable=False)
217214

218215

219216
def test_variadic_fails_min_constraint():
220217
assert (
221218
registry.lookup_function(
222-
223-
urn="extension:test:functions", function_name="test_fn", signature=[i8(nullable=False)]
219+
urn="extension:test:functions",
220+
function_name="test_fn",
221+
signature=[i8(nullable=False)],
224222
)
225223
is None
226224
)
@@ -254,14 +252,11 @@ def test_decimal_happy_path_discrete():
254252

255253

256254
def test_enum_with_valid_option():
257-
assert (
258-
registry.lookup_function(
259-
urn="extension:test:functions",
260-
function_name="test_enum",
261-
signature=["FLIP", i8(nullable=False)],
262-
)[1]
263-
== i8(nullable=False)
264-
)
255+
assert registry.lookup_function(
256+
urn="extension:test:functions",
257+
function_name="test_enum",
258+
signature=["FLIP", i8(nullable=False)],
259+
)[1] == i8(nullable=False)
265260

266261

267262
def test_enum_with_nonexistent_option():

0 commit comments

Comments
 (0)