Skip to content

Commit 247de3b

Browse files
applies lint
1 parent 50b8010 commit 247de3b

File tree

2 files changed

+45
-31
lines changed

2 files changed

+45
-31
lines changed

src/sagemaker/feature_store/dataset_builder.py

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ def construct_feature_group_to_be_merged(
124124
target_feature_name_in_base: str = None,
125125
feature_name_in_target: str = None,
126126
join_comparator: JoinComparatorEnum = None,
127-
join_type: JoinTypeEnum = None
127+
join_type: JoinTypeEnum = None,
128128
) -> FeatureGroupToBeMerged:
129129
"""Construct a FeatureGroupToBeMerged object by provided parameters.
130130
@@ -145,7 +145,9 @@ def construct_feature_group_to_be_merged(
145145
"DataCatalogConfig", None
146146
)
147147
if not data_catalog_config:
148-
raise RuntimeError(f"No metastore is configured with FeatureGroup {target_feature_group.name}.")
148+
raise RuntimeError(
149+
f"No metastore is configured with FeatureGroup {target_feature_group.name}."
150+
)
149151

150152
record_identifier_feature_name = feature_group_metadata.get("RecordIdentifierFeatureName", None)
151153
feature_definitions = feature_group_metadata.get("FeatureDefinitions", [])
@@ -165,7 +167,7 @@ def construct_feature_group_to_be_merged(
165167
catalog = data_catalog_config.get("Catalog", None) if disable_glue else _DEFAULT_CATALOG
166168
features = [feature.get("FeatureName", None) for feature in feature_definitions]
167169

168-
if (feature_name_in_target is not None and feature_name_in_target not in features):
170+
if feature_name_in_target is not None and feature_name_in_target not in features:
169171
raise ValueError(
170172
f"Feature {feature_name_in_target} not found in FeatureGroup {target_feature_group.name}"
171173
)
@@ -197,7 +199,7 @@ def construct_feature_group_to_be_merged(
197199
TableType.FEATURE_GROUP,
198200
feature_name_in_target,
199201
join_comparator,
200-
join_type
202+
join_type,
201203
)
202204

203205

@@ -276,7 +278,7 @@ def with_feature_group(
276278
included_feature_names: List[str] = None,
277279
feature_name_in_target: str = None,
278280
join_comparator: JoinComparatorEnum = None,
279-
join_type: JoinTypeEnum = None
281+
join_type: JoinTypeEnum = None,
280282
):
281283
"""Join FeatureGroup with base.
282284
@@ -291,11 +293,12 @@ def with_feature_group(
291293
"""
292294
self._feature_groups_to_be_merged.append(
293295
construct_feature_group_to_be_merged(
294-
feature_group, included_feature_names,
296+
feature_group,
297+
included_feature_names,
295298
target_feature_name_in_base,
296299
feature_name_in_target,
297300
join_comparator,
298-
join_type
301+
join_type,
299302
)
300303
)
301304
return self
@@ -960,16 +963,23 @@ def _construct_join_condition(self, feature_group: FeatureGroupToBeMerged, suffi
960963
The JOIN query string.
961964
"""
962965

963-
join_type = (feature_group.join_type if feature_group.join_type is not None
964-
else JoinTypeEnum.INNER_JOIN)
966+
join_type = (
967+
feature_group.join_type
968+
if feature_group.join_type is not None
969+
else JoinTypeEnum.INNER_JOIN
970+
)
965971

966-
join_comparator = (feature_group.join_comparator
967-
if feature_group.join_comparator is not None
968-
else JoinComparatorEnum.EQUALS)
972+
join_comparator = (
973+
feature_group.join_comparator
974+
if feature_group.join_comparator is not None
975+
else JoinComparatorEnum.EQUALS
976+
)
969977

970-
feature_name_in_target = (feature_group.feature_name_in_target
971-
if feature_group.feature_name_in_target is not None
972-
else feature_group.record_identifier_feature_name)
978+
feature_name_in_target = (
979+
feature_group.feature_name_in_target
980+
if feature_group.feature_name_in_target is not None
981+
else feature_group.record_identifier_feature_name
982+
)
973983

974984
join_condition_string = (
975985
f"\n{join_type.value} fg_{suffix}\n"

tests/unit/sagemaker/feature_store/test_dataset_builder.py

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,9 @@
2424
FeatureGroupToBeMerged,
2525
TableType,
2626
JoinComparatorEnum,
27-
JoinTypeEnum
28-
)
29-
from sagemaker.feature_store.feature_group import (
30-
FeatureDefinition,
31-
FeatureGroup,
32-
FeatureTypeEnum
27+
JoinTypeEnum,
3328
)
29+
from sagemaker.feature_store.feature_group import FeatureDefinition, FeatureGroup, FeatureTypeEnum
3430

3531

3632
@pytest.fixture
@@ -530,10 +526,15 @@ def test_construct_query_string(sagemaker_session_mock):
530526
+ ")\n"
531527
)
532528

529+
533530
# Tests the optional feature_name_in_target, join_comparator and join_type parameters
534531
def test_with_feature_group_with_optional_params_query_string(sagemaker_session_mock):
535-
base_feature_group = FeatureGroup(name="base_feature_group", sagemaker_session=sagemaker_session_mock)
536-
target_feature_group = FeatureGroup(name="target_feature_group", sagemaker_session=sagemaker_session_mock)
532+
base_feature_group = FeatureGroup(
533+
name="base_feature_group", sagemaker_session=sagemaker_session_mock
534+
)
535+
target_feature_group = FeatureGroup(
536+
name="target_feature_group", sagemaker_session=sagemaker_session_mock
537+
)
537538

538539
dataset_builder = DatasetBuilder(
539540
sagemaker_session=sagemaker_session_mock,
@@ -545,7 +546,9 @@ def test_with_feature_group_with_optional_params_query_string(sagemaker_session_
545546
dataset_builder._event_time_identifier_feature_name = "target-feature"
546547

547548
sagemaker_session_mock.describe_feature_group.return_value = {
548-
"OfflineStoreConfig": {"DataCatalogConfig": {"TableName": "table-name", "Database": "database"}},
549+
"OfflineStoreConfig": {
550+
"DataCatalogConfig": {"TableName": "table-name", "Database": "database"}
551+
},
549552
"RecordIdentifierFeatureName": "feature-1",
550553
"EventTimeFeatureName": "feature-2",
551554
"FeatureDefinitions": [
@@ -554,12 +557,14 @@ def test_with_feature_group_with_optional_params_query_string(sagemaker_session_
554557
],
555558
}
556559

557-
dataset_builder.with_feature_group(target_feature_group,
558-
"target-feature",
559-
["feature-1", "feature-2"],
560-
"feature-2",
561-
JoinComparatorEnum.GREATER_THAN,
562-
JoinTypeEnum.FULL_JOIN)
560+
dataset_builder.with_feature_group(
561+
target_feature_group,
562+
"target-feature",
563+
["feature-1", "feature-2"],
564+
"feature-2",
565+
JoinComparatorEnum.GREATER_THAN,
566+
JoinTypeEnum.FULL_JOIN,
567+
)
563568

564569
query_string = dataset_builder._construct_query_string(BASE)
565570

@@ -673,7 +678,6 @@ def test_with_feature_group_with_optional_params_query_string(sagemaker_session_
673678
)
674679

675680

676-
677681
def test_create_temp_table(sagemaker_session_mock):
678682
dataframe = pd.DataFrame({"feature-1": [420, 380, 390], "feature-2": [50, 40, 45]})
679683
dataset_builder = DatasetBuilder(

0 commit comments

Comments
 (0)