Skip to content

Commit 44e305e

Browse files
committed
style: formatting and linting
1 parent d3678f2 commit 44e305e

15 files changed

Lines changed: 61 additions & 53 deletions

File tree

src/dve/core_engine/backends/base/reader.py

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -119,10 +119,7 @@ def read_to_entity_type(
119119
"""
120120
if entity_name == Iterator[dict[str, Any]]:
121121
return self.read_to_py_iterator(
122-
resource,
123-
entity_name,
124-
schema, # type: ignore
125-
all_model_fields
122+
resource, entity_name, schema, all_model_fields # type: ignore
126123
)
127124

128125
self.raise_if_not_sensible_file(resource, entity_name)
@@ -133,11 +130,7 @@ def read_to_entity_type(
133130
raise ReaderLacksEntityTypeSupport(entity_type=entity_type) from err
134131

135132
return reader_func(
136-
self,
137-
resource,
138-
entity_name,
139-
schema,
140-
all_model_fields=all_model_fields # type: ignore
133+
self, resource, entity_name, schema, all_model_fields=all_model_fields # type: ignore
141134
)
142135

143136
def add_record_index(self, entity: EntityType, **kwargs) -> EntityType:

src/dve/core_engine/backends/exceptions.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,7 @@ class UnableToParseCSVError(MessageBearingError):
3737
"""An error raised when unable to parse a CSV file"""
3838

3939
def __init__(
40-
self,
41-
entity_name: str,
42-
field_check_error_message: str,
43-
field_check_error_code: str
40+
self, entity_name: str, field_check_error_message: str, field_check_error_code: str
4441
):
4542
super().__init__(
4643
messages=[

src/dve/core_engine/backends/implementations/duckdb/duckdb_helpers.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,9 @@ def _ddb_filter_contract_errors(
276276
"Entity": "STRING",
277277
},
278278
)
279-
.filter(f"FailureType == 'record' AND Status != 'informational' AND Entity = '{entity_name}'") # pylint: disable=C0301
279+
.filter(
280+
f"FailureType == 'record' AND Status != 'informational' AND Entity = '{entity_name}'"
281+
) # pylint: disable=C0301
280282
.select("RecordIndex")
281283
.distinct()
282284
.order("RecordIndex asc")
@@ -286,9 +288,7 @@ def _ddb_filter_contract_errors(
286288
return entity
287289

288290
filtered_entity = entity.join(
289-
relevant_record_rejection_codes_rel,
290-
condition="__record_index__ == RecordIndex",
291-
how="anti"
291+
relevant_record_rejection_codes_rel, condition="__record_index__ == RecordIndex", how="anti"
292292
)
293293
return filtered_entity
294294

src/dve/core_engine/backends/implementations/duckdb/readers/csv.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ def __init__(
7171
quote_char=quotechar,
7272
field_check=field_check,
7373
field_check_error_code=field_check_error_code,
74-
field_check_error_message=field_check_error_message
74+
field_check_error_message=field_check_error_message,
7575
)
7676

7777
def read_to_py_iterator(
@@ -254,7 +254,7 @@ def read_to_relation( # pylint: disable=unused-argument
254254
resource=resource,
255255
entity_name=entity_name,
256256
schema=schema,
257-
all_model_fields=all_model_fields
257+
all_model_fields=all_model_fields,
258258
)
259259
entity = entity.select(StarExpression(exclude=[RECORD_INDEX_COLUMN_NAME])).distinct()
260260
no_records = entity.shape[0]

src/dve/core_engine/backends/implementations/spark/readers/csv.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
from pyspark.sql.types import StructType
1010

1111
from dve.core_engine.backends.base.reader import read_function
12-
from dve.core_engine.backends.readers.csv import CSVFileReader
1312
from dve.core_engine.backends.exceptions import EmptyFileError
1413
from dve.core_engine.backends.implementations.spark.spark_helpers import (
1514
get_type_from_annotation,
1615
spark_record_index,
1716
spark_write_parquet,
1817
)
18+
from dve.core_engine.backends.readers.csv import CSVFileReader
1919
from dve.core_engine.type_hints import URI, EntityName
2020
from dve.parser.file_handling import get_content_length
2121

src/dve/core_engine/backends/implementations/spark/rules.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
create_udf,
1515
get_all_registered_udfs,
1616
object_to_spark_literal,
17+
spark_filter_contract_errors,
1718
spark_read_parquet,
1819
spark_record_index,
1920
spark_write_parquet,
20-
spark_filter_contract_errors,
2121
)
2222
from dve.core_engine.backends.implementations.spark.types import (
2323
Joined,

src/dve/core_engine/backends/implementations/spark/spark_helpers.py

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
from pyspark.sql.types import LongType, StructField, StructType
2727
from typing_extensions import Annotated, Protocol, TypedDict, get_args, get_origin, get_type_hints
2828

29-
from dve.core_engine.backends.base.utilities import _get_non_heterogenous_type
3029
from dve.common.error_utils import get_feedback_errors_uri
30+
from dve.core_engine.backends.base.utilities import _get_non_heterogenous_type
3131
from dve.core_engine.constants import RECORD_INDEX_COLUMN_NAME
3232
from dve.core_engine.type_hints import URI, EntityName
3333

@@ -380,12 +380,14 @@ def _spark_filter_contract_errors(
380380
relevant_record_rejections_codes_df = (
381381
self.spark_session.read.json(
382382
path=contract_error_location,
383-
schema=st.StructType([
384-
st.StructField("RecordIndex", st.IntegerType()),
385-
st.StructField("FailureType", st.StringType()),
386-
st.StructField("Status", st.StringType()),
387-
st.StructField("Entity", st.StringType()),
388-
]),
383+
schema=st.StructType(
384+
[
385+
st.StructField("RecordIndex", st.IntegerType()),
386+
st.StructField("FailureType", st.StringType()),
387+
st.StructField("Status", st.StringType()),
388+
st.StructField("Entity", st.StringType()),
389+
]
390+
),
389391
)
390392
.filter(
391393
(sf.col("FailureType") == sf.lit("record"))

src/dve/core_engine/backends/metadata/contract.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ def schemas(self) -> dict[EntityName, type[BaseModel]]:
4444
"""The per-entity schemas, as pydantic models."""
4545
if not self._schemas:
4646
for entity_name, validator in self.validators.items():
47-
self._schemas[entity_name] = validator.model # type: ignore # pylint: disable=E1137
47+
self._schemas[entity_name] = validator.model # type: ignore # pylint: disable=E1137
4848
return self._schemas.copy() # pylint: disable=E1101
4949

5050
@root_validator(allow_reuse=True)

src/dve/core_engine/backends/readers/csv.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
MissingHeaderError,
1717
)
1818
from dve.core_engine.backends.readers.utilities import (
19-
raise_message_bearing_error_on_header_differences
19+
get_all_model_fields,
20+
raise_message_bearing_error_on_header_differences,
2021
)
2122
from dve.core_engine.backends.utilities import get_polars_type_from_annotation, stringify_model
2223
from dve.core_engine.constants import RECORD_INDEX_COLUMN_NAME
23-
from dve.core_engine.backends.readers.utilities import get_all_model_fields
2424
from dve.core_engine.type_hints import EntityName
2525
from dve.parser.file_handling import get_content_length, open_stream
2626
from dve.parser.file_handling.implementations.file import file_uri_to_local_path

src/dve/core_engine/backends/readers/utilities.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,16 @@ def raise_message_bearing_error_on_header_differences(
4444
header or vice versa.
4545
"""
4646
missing, additional = check_csv_header_expected(
47-
resource,
48-
expected_schema,
49-
all_model_fields,
50-
delimiter,
51-
quote_char
47+
resource, expected_schema, all_model_fields, delimiter, quote_char
5248
)
5349

5450
if missing or additional:
55-
record_details_missing = f"missing fields: {', '.join(sorted(missing))};" if missing else "" # pylint: disable=C0301
56-
record_details_additional = f"additional fields: {', '.join(sorted(additional))};" if additional else "" # pylint: disable=C0301
51+
record_details_missing = (
52+
f"missing fields: {', '.join(sorted(missing))};" if missing else ""
53+
) # pylint: disable=C0301
54+
record_details_additional = (
55+
f"additional fields: {', '.join(sorted(additional))};" if additional else ""
56+
) # pylint: disable=C0301
5757
raise MessageBearingError(
5858
"The CSV header doesn't match what is expected",
5959
messages=[

0 commit comments

Comments
 (0)