fix: Allow online store only FeatureGroups#2015

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
metrizable merged 4 commits into from
Dec 24, 2020
Merged

fix: Allow online store only FeatureGroups #2015

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f71b8e0
fix: Allow online store only FeatureGroups
Dec 4, 2020
e961fff
Merge branch 'master' into master
metrizable Dec 18, 2020
414de39
Merge branch 'master' into master
metrizable Dec 21, 2020
93f7f1f
Merge branch 'master' into master
metrizable Dec 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 18 additions & 12 deletions src/sagemaker/feature_store/feature_group.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -290,7 +290,7 @@ class FeatureGroup:

def create(
self,
s3_uri: str,
s3_uri: Union[str, bool],
record_identifier_name: str,
event_time_feature_name: str,
role_arn: str,
Expand All@@ -305,7 +305,8 @@ def create(
"""Create a SageMaker FeatureStore FeatureGroup.

Args:
s3_uri (str): S3 URI of the offline store.
s3_uri (Union[str, bool]): S3 URI of the offline store, set to

@metrizablemetrizableDec 22, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

would it be better if it were set to None or ""?

``False`` to disable offline store.
record_identifier_name (str): name of the record identifier feature.
event_time_feature_name (str): name of the event time feature.
role_arn (str): ARN of the role used to call CreateFeatureGroup.
Expand DownExpand Up@@ -342,15 +343,18 @@ def create(
create_feature_store_args.update({"online_store_config": online_store_config.to_dict()})

# offline store configuration
s3_storage_config = S3StorageConfig(s3_uri=s3_uri)
if offline_store_kms_key_id:
s3_storage_config.kms_key_id = offline_store_kms_key_id
offline_store_config = OfflineStoreConfig(
s3_storage_config=s3_storage_config,
disable_glue_table_creation=disable_glue_table_creation,
data_catalog_config=data_catalog_config,
)
create_feature_store_args.update({"offline_store_config": offline_store_config.to_dict()})
if s3_uri:

@metrizablemetrizableDec 22, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the type differences are a bit odd, since s3_uri is expected to be bool in some cases.

s3_storage_config = S3StorageConfig(s3_uri=s3_uri)
if offline_store_kms_key_id:
s3_storage_config.kms_key_id = offline_store_kms_key_id
offline_store_config = OfflineStoreConfig(
s3_storage_config=s3_storage_config,
disable_glue_table_creation=disable_glue_table_creation,
data_catalog_config=data_catalog_config,
)
create_feature_store_args.update(
{"offline_store_config": offline_store_config.to_dict()}
)

return self.sagemaker_session.create_feature_group(**create_feature_store_args)

Expand All@@ -367,7 +371,9 @@ def describe(self, next_token: str = None) -> Dict[str, Any]:
Returns:
Response dict from the service.
"""
return self.sagemaker_session.describe_feature_group(self.name, next_token)
return self.sagemaker_session.describe_feature_group(
feature_group_name=self.name, next_token=next_token
)

def load_feature_definitions(
self,
Expand Down
22 changes: 22 additions & 0 deletions tests/integ/test_feature_store.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -141,6 +141,28 @@ def create_table_ddl():
)


def test_create_feature_store_online_only(
feature_store_session,
role,
feature_group_name,
pandas_data_frame,
):
feature_group = FeatureGroup(name=feature_group_name, sagemaker_session=feature_store_session)
feature_group.load_feature_definitions(data_frame=pandas_data_frame)

with cleanup_feature_group(feature_group):
output = feature_group.create(
s3_uri=False,
record_identifier_name="feature1",
event_time_feature_name="feature3",
role_arn=role,
enable_online_store=True,
)
_wait_for_feature_group_create(feature_group)

assert output["FeatureGroupArn"].endswith(f"feature-group/{feature_group_name}")


def test_create_feature_store(
feature_store_session,
role,
Expand Down
50 changes: 40 additions & 10 deletions tests/unit/sagemaker/feature_store/test_feature_store.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -79,36 +79,66 @@ def test_feature_store_create(
role_arn=role_arn,
enable_online_store=True,
)
assert sagemaker_session_mock.create_feature_group.called_with(
sagemaker_session_mock.create_feature_group.assert_called_with(
feature_group_name="MyFeatureGroup",
record_identifier_name="feature1",
event_time_feature_name="feature2",
feature_definitions=[fd.to_dict() for fd in feature_group_dummy_definitions],
role_arn=role_arn,
description=None,
tags=None,
online_store_config={"EnableOnlineStore": True},
offline_store_config={
"DisableGlueTableCreation": False,
"S3StorageConfig": {"S3Uri": s3_uri},
},
)


def test_feature_store_create_online_only(
sagemaker_session_mock, role_arn, feature_group_dummy_definitions
):
feature_group = FeatureGroup(name="MyFeatureGroup", sagemaker_session=sagemaker_session_mock)
feature_group.feature_definitions = feature_group_dummy_definitions
feature_group.create(
s3_uri=False,
record_identifier_name="feature1",
event_time_feature_name="feature2",
role_arn=role_arn,
enable_online_store=True,
)
sagemaker_session_mock.create_feature_group.assert_called_with(
feature_group_name="MyFeatureGroup",
record_identifier_name="feature1",
event_time_feature_name="feature2",
feature_definitions=[fd.to_dict() for fd in feature_group_dummy_definitions],
role_arn=role_arn,
description=None,
tags=None,
online_store_config={"EnableOnlineStore": True},
)


def test_feature_store_delete(sagemaker_session_mock):
feature_group = FeatureGroup(name="MyFeatureGroup", sagemaker_session=sagemaker_session_mock)
feature_group.delete()
assert sagemaker_session_mock.delete_feature_group.called_with(
sagemaker_session_mock.delete_feature_group.assert_called_with(
feature_group_name="MyFeatureGroup"
)


def test_feature_store_describe(sagemaker_session_mock):
feature_group = FeatureGroup(name="MyFeatureGroup", sagemaker_session=sagemaker_session_mock)
feature_group.describe()
assert sagemaker_session_mock.describe_feature_group.called_with(
feature_group_name="MyFeatureGroup"
sagemaker_session_mock.describe_feature_group.assert_called_with(
feature_group_name="MyFeatureGroup", next_token=None
)


def test_put_record(sagemaker_session_mock):
feature_group = FeatureGroup(name="MyFeatureGroup", sagemaker_session=sagemaker_session_mock)
feature_group.put_record(record=[])
assert sagemaker_session_mock.put_record.called_with(
sagemaker_session_mock.put_record.assert_called_with(
feature_group_name="MyFeatureGroup", record=[]
)

Expand DownExpand Up@@ -268,7 +298,7 @@ def query(sagemaker_session_mock):
def test_athena_query_run(sagemaker_session_mock, query):
sagemaker_session_mock.start_query_execution.return_value = {"QueryExecutionId": "query_id"}
query.run(query_string="query", output_location="s3://some-bucket/some-path")
assert sagemaker_session_mock.start_query_execution.called_with(
sagemaker_session_mock.start_query_execution.assert_called_with(
catalog="catalog",
database="database",
query_string="query",
Expand All@@ -283,13 +313,13 @@ def test_athena_query_run(sagemaker_session_mock, query):
def test_athena_query_wait(sagemaker_session_mock, query):
query._current_query_execution_id = "query_id"
query.wait()
assert sagemaker_session_mock.wait_for_athena_query.called_with(query_execution_id="query_id")
sagemaker_session_mock.wait_for_athena_query.assert_called_with(query_execution_id="query_id")


def test_athena_query_get_query_execution(sagemaker_session_mock, query):
query._current_query_execution_id = "query_id"
query.get_query_execution()
assert sagemaker_session_mock.wait_for_athena_query.called_with(query_execution_id="query_id")
sagemaker_session_mock.get_query_execution.assert_called_with(query_execution_id="query_id")


@patch("tempfile.gettempdir", Mock(return_value="tmp"))
Expand All@@ -302,13 +332,13 @@ def test_athena_query_as_dataframe(read_csv, sagemaker_session_mock, query):
query._result_bucket = "bucket"
query._result_file_prefix = "prefix"
query.as_dataframe()
assert sagemaker_session_mock.download_athena_query_result.called_with(
sagemaker_session_mock.download_athena_query_result.assert_called_with(
bucket="bucket",
prefix="prefix",
query_execution_id="query_id",
filename="tmp/query_id.csv",
)
assert read_csv.called_with("tmp/query_id.csv", delimiter=",")
read_csv.assert_called_with("tmp/query_id.csv", delimiter=",")


@patch("tempfile.gettempdir", Mock(return_value="tmp"))
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
fix: Allow online store only FeatureGroups#2015

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

metrizable
merged 4 commits into

from

Dec 24, 2020
 Merged


fix: Allow online store only FeatureGroups
#2015
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
f71b8e0

fix: Allow online store only FeatureGroups

Dec 4, 2020
e961fff

Merge branch 'master' into master


metrizable Dec 18, 2020
414de39

Merge branch 'master' into master


metrizable Dec 21, 2020
93f7f1f

Merge branch 'master' into master


metrizable Dec 24, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


30 changes: 18 additions & 12 deletions
src/sagemaker/feature_store/feature_group.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -290,7 +290,7 @@ class FeatureGroup:

 def create(
 self,
 s3_uri: str,
 s3_uri: Union[str, bool],
 record_identifier_name: str,
 event_time_feature_name: str,
 role_arn: str,
Expand All@@ -305,7 +305,8 @@ def create(
 """Create a SageMaker FeatureStore FeatureGroup.

 Args:
 s3_uri (str): S3 URI of the offline store.
 s3_uri (Union[str, bool]): S3 URI of the offline store, set to
@metrizablemetrizableDec 22, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

would it be better if it were set to None or ""?
 ``False`` to disable offline store.
 record_identifier_name (str): name of the record identifier feature.
 event_time_feature_name (str): name of the event time feature.
 role_arn (str): ARN of the role used to call CreateFeatureGroup.
Expand DownExpand Up@@ -342,15 +343,18 @@ def create(
 create_feature_store_args.update({"online_store_config": online_store_config.to_dict()})

 # offline store configuration
 s3_storage_config = S3StorageConfig(s3_uri=s3_uri)
 if offline_store_kms_key_id:
 s3_storage_config.kms_key_id = offline_store_kms_key_id
 offline_store_config = OfflineStoreConfig(
 s3_storage_config=s3_storage_config,
 disable_glue_table_creation=disable_glue_table_creation,
 data_catalog_config=data_catalog_config,
 )
 create_feature_store_args.update({"offline_store_config": offline_store_config.to_dict()})
 if s3_uri:
@metrizablemetrizableDec 22, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the type differences are a bit odd, since s3_uri is expected to be bool in some cases.
 s3_storage_config = S3StorageConfig(s3_uri=s3_uri)
 if offline_store_kms_key_id:
 s3_storage_config.kms_key_id = offline_store_kms_key_id
 offline_store_config = OfflineStoreConfig(
 s3_storage_config=s3_storage_config,
 disable_glue_table_creation=disable_glue_table_creation,
 data_catalog_config=data_catalog_config,
 )
 create_feature_store_args.update(
 {"offline_store_config": offline_store_config.to_dict()}
 )

 return self.sagemaker_session.create_feature_group(**create_feature_store_args)

Expand All@@ -367,7 +371,9 @@ def describe(self, next_token: str = None) -> Dict[str, Any]:
 Returns:
 Response dict from the service.
 """
 return self.sagemaker_session.describe_feature_group(self.name, next_token)
 return self.sagemaker_session.describe_feature_group(
 feature_group_name=self.name, next_token=next_token
 )

 def load_feature_definitions(
 self,
Expand Down

22 changes: 22 additions & 0 deletions
tests/integ/test_feature_store.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -141,6 +141,28 @@ def create_table_ddl():
 )


def test_create_feature_store_online_only(
 feature_store_session,
 role,
 feature_group_name,
 pandas_data_frame,
):
 feature_group = FeatureGroup(name=feature_group_name, sagemaker_session=feature_store_session)
 feature_group.load_feature_definitions(data_frame=pandas_data_frame)

 with cleanup_feature_group(feature_group):
 output = feature_group.create(
 s3_uri=False,
 record_identifier_name="feature1",
 event_time_feature_name="feature3",
 role_arn=role,
 enable_online_store=True,
 )
 _wait_for_feature_group_create(feature_group)

 assert output["FeatureGroupArn"].endswith(f"feature-group/{feature_group_name}")


def test_create_feature_store(
 feature_store_session,
 role,
Expand Down

50 changes: 40 additions & 10 deletions
tests/unit/sagemaker/feature_store/test_feature_store.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,36 +79,66 @@ def test_feature_store_create(
 role_arn=role_arn,
 enable_online_store=True,
 )
assert sagemaker_session_mock.create_feature_group.called_with(
 sagemaker_session_mock.create_feature_group.assert_called_with(
 feature_group_name="MyFeatureGroup",
 record_identifier_name="feature1",
 event_time_feature_name="feature2",
 feature_definitions=[fd.to_dict() for fd in feature_group_dummy_definitions],
 role_arn=role_arn,
 description=None,
 tags=None,
 online_store_config={"EnableOnlineStore": True},
 offline_store_config={
 "DisableGlueTableCreation": False,
 "S3StorageConfig": {"S3Uri": s3_uri},
 },
 )


def test_feature_store_create_online_only(
 sagemaker_session_mock, role_arn, feature_group_dummy_definitions
):
 feature_group = FeatureGroup(name="MyFeatureGroup", sagemaker_session=sagemaker_session_mock)
 feature_group.feature_definitions = feature_group_dummy_definitions
 feature_group.create(
 s3_uri=False,
 record_identifier_name="feature1",
 event_time_feature_name="feature2",
 role_arn=role_arn,
 enable_online_store=True,
 )
 sagemaker_session_mock.create_feature_group.assert_called_with(
 feature_group_name="MyFeatureGroup",
 record_identifier_name="feature1",
 event_time_feature_name="feature2",
 feature_definitions=[fd.to_dict() for fd in feature_group_dummy_definitions],
 role_arn=role_arn,
 description=None,
 tags=None,
 online_store_config={"EnableOnlineStore": True},
 )


def test_feature_store_delete(sagemaker_session_mock):
 feature_group = FeatureGroup(name="MyFeatureGroup", sagemaker_session=sagemaker_session_mock)
 feature_group.delete()
assert sagemaker_session_mock.delete_feature_group.called_with(
 sagemaker_session_mock.delete_feature_group.assert_called_with(
 feature_group_name="MyFeatureGroup"
 )


def test_feature_store_describe(sagemaker_session_mock):
 feature_group = FeatureGroup(name="MyFeatureGroup", sagemaker_session=sagemaker_session_mock)
 feature_group.describe()
assert sagemaker_session_mock.describe_feature_group.called_with(
 feature_group_name="MyFeatureGroup"
 sagemaker_session_mock.describe_feature_group.assert_called_with(
 feature_group_name="MyFeatureGroup", next_token=None
 )


def test_put_record(sagemaker_session_mock):
 feature_group = FeatureGroup(name="MyFeatureGroup", sagemaker_session=sagemaker_session_mock)
 feature_group.put_record(record=[])
assert sagemaker_session_mock.put_record.called_with(
 sagemaker_session_mock.put_record.assert_called_with(
 feature_group_name="MyFeatureGroup", record=[]
 )

Expand DownExpand Up@@ -268,7 +298,7 @@ def query(sagemaker_session_mock):
def test_athena_query_run(sagemaker_session_mock, query):
 sagemaker_session_mock.start_query_execution.return_value = {"QueryExecutionId": "query_id"}
 query.run(query_string="query", output_location="s3://some-bucket/some-path")
assert sagemaker_session_mock.start_query_execution.called_with(
 sagemaker_session_mock.start_query_execution.assert_called_with(
 catalog="catalog",
 database="database",
 query_string="query",
Expand All@@ -283,13 +313,13 @@ def test_athena_query_run(sagemaker_session_mock, query):
def test_athena_query_wait(sagemaker_session_mock, query):
 query._current_query_execution_id = "query_id"
 query.wait()
assert sagemaker_session_mock.wait_for_athena_query.called_with(query_execution_id="query_id")
 sagemaker_session_mock.wait_for_athena_query.assert_called_with(query_execution_id="query_id")


def test_athena_query_get_query_execution(sagemaker_session_mock, query):
 query._current_query_execution_id = "query_id"
 query.get_query_execution()
assert sagemaker_session_mock.wait_for_athena_query.called_with(query_execution_id="query_id")
 sagemaker_session_mock.get_query_execution.assert_called_with(query_execution_id="query_id")


@patch("tempfile.gettempdir", Mock(return_value="tmp"))
Expand All@@ -302,13 +332,13 @@ def test_athena_query_as_dataframe(read_csv, sagemaker_session_mock, query):
 query._result_bucket = "bucket"
 query._result_file_prefix = "prefix"
 query.as_dataframe()
assert sagemaker_session_mock.download_athena_query_result.called_with(
 sagemaker_session_mock.download_athena_query_result.assert_called_with(
 bucket="bucket",
 prefix="prefix",
 query_execution_id="query_id",
 filename="tmp/query_id.csv",
 )
assert read_csv.called_with("tmp/query_id.csv", delimiter=",")
 read_csv.assert_called_with("tmp/query_id.csv", delimiter=",")


@patch("tempfile.gettempdir", Mock(return_value="tmp"))
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: Allow online store only FeatureGroups#2015

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

metrizable
merged 4 commits into

from

Dec 24, 2020
 Merged


fix: Allow online store only FeatureGroups
#2015
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
f71b8e0

fix: Allow online store only FeatureGroups

Dec 4, 2020
e961fff

Merge branch 'master' into master


metrizable Dec 18, 2020
414de39

Merge branch 'master' into master


metrizable Dec 21, 2020
93f7f1f

Merge branch 'master' into master


metrizable Dec 24, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


30 changes: 18 additions & 12 deletions
src/sagemaker/feature_store/feature_group.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -290,7 +290,7 @@ class FeatureGroup:

 def create(
 self,
 s3_uri: str,
 s3_uri: Union[str, bool],
 record_identifier_name: str,
 event_time_feature_name: str,
 role_arn: str,
Expand All@@ -305,7 +305,8 @@ def create(
 """Create a SageMaker FeatureStore FeatureGroup.

 Args:
 s3_uri (str): S3 URI of the offline store.
 s3_uri (Union[str, bool]): S3 URI of the offline store, set to
@metrizablemetrizableDec 22, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

would it be better if it were set to None or ""?
 ``False`` to disable offline store.
 record_identifier_name (str): name of the record identifier feature.
 event_time_feature_name (str): name of the event time feature.
 role_arn (str): ARN of the role used to call CreateFeatureGroup.
Expand DownExpand Up@@ -342,15 +343,18 @@ def create(
 create_feature_store_args.update({"online_store_config": online_store_config.to_dict()})

 # offline store configuration
 s3_storage_config = S3StorageConfig(s3_uri=s3_uri)
 if offline_store_kms_key_id:
 s3_storage_config.kms_key_id = offline_store_kms_key_id
 offline_store_config = OfflineStoreConfig(
 s3_storage_config=s3_storage_config,
 disable_glue_table_creation=disable_glue_table_creation,
 data_catalog_config=data_catalog_config,
 )
 create_feature_store_args.update({"offline_store_config": offline_store_config.to_dict()})
 if s3_uri:
@metrizablemetrizableDec 22, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the type differences are a bit odd, since s3_uri is expected to be bool in some cases.
 s3_storage_config = S3StorageConfig(s3_uri=s3_uri)
 if offline_store_kms_key_id:
 s3_storage_config.kms_key_id = offline_store_kms_key_id
 offline_store_config = OfflineStoreConfig(
 s3_storage_config=s3_storage_config,
 disable_glue_table_creation=disable_glue_table_creation,
 data_catalog_config=data_catalog_config,
 )
 create_feature_store_args.update(
 {"offline_store_config": offline_store_config.to_dict()}
 )

 return self.sagemaker_session.create_feature_group(**create_feature_store_args)

Expand All@@ -367,7 +371,9 @@ def describe(self, next_token: str = None) -> Dict[str, Any]:
 Returns:
 Response dict from the service.
 """
 return self.sagemaker_session.describe_feature_group(self.name, next_token)
 return self.sagemaker_session.describe_feature_group(
 feature_group_name=self.name, next_token=next_token
 )

 def load_feature_definitions(
 self,
Expand Down

22 changes: 22 additions & 0 deletions
tests/integ/test_feature_store.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -141,6 +141,28 @@ def create_table_ddl():
 )


def test_create_feature_store_online_only(
 feature_store_session,
 role,
 feature_group_name,
 pandas_data_frame,
):
 feature_group = FeatureGroup(name=feature_group_name, sagemaker_session=feature_store_session)
 feature_group.load_feature_definitions(data_frame=pandas_data_frame)

 with cleanup_feature_group(feature_group):
 output = feature_group.create(
 s3_uri=False,
 record_identifier_name="feature1",
 event_time_feature_name="feature3",
 role_arn=role,
 enable_online_store=True,
 )
 _wait_for_feature_group_create(feature_group)

 assert output["FeatureGroupArn"].endswith(f"feature-group/{feature_group_name}")


def test_create_feature_store(
 feature_store_session,
 role,
Expand Down

50 changes: 40 additions & 10 deletions
tests/unit/sagemaker/feature_store/test_feature_store.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,36 +79,66 @@ def test_feature_store_create(
 role_arn=role_arn,
 enable_online_store=True,
 )
assert sagemaker_session_mock.create_feature_group.called_with(
 sagemaker_session_mock.create_feature_group.assert_called_with(
 feature_group_name="MyFeatureGroup",
 record_identifier_name="feature1",
 event_time_feature_name="feature2",
 feature_definitions=[fd.to_dict() for fd in feature_group_dummy_definitions],
 role_arn=role_arn,
 description=None,
 tags=None,
 online_store_config={"EnableOnlineStore": True},
 offline_store_config={
 "DisableGlueTableCreation": False,
 "S3StorageConfig": {"S3Uri": s3_uri},
 },
 )


def test_feature_store_create_online_only(
 sagemaker_session_mock, role_arn, feature_group_dummy_definitions
):
 feature_group = FeatureGroup(name="MyFeatureGroup", sagemaker_session=sagemaker_session_mock)
 feature_group.feature_definitions = feature_group_dummy_definitions
 feature_group.create(
 s3_uri=False,
 record_identifier_name="feature1",
 event_time_feature_name="feature2",
 role_arn=role_arn,
 enable_online_store=True,
 )
 sagemaker_session_mock.create_feature_group.assert_called_with(
 feature_group_name="MyFeatureGroup",
 record_identifier_name="feature1",
 event_time_feature_name="feature2",
 feature_definitions=[fd.to_dict() for fd in feature_group_dummy_definitions],
 role_arn=role_arn,
 description=None,
 tags=None,
 online_store_config={"EnableOnlineStore": True},
 )


def test_feature_store_delete(sagemaker_session_mock):
 feature_group = FeatureGroup(name="MyFeatureGroup", sagemaker_session=sagemaker_session_mock)
 feature_group.delete()
assert sagemaker_session_mock.delete_feature_group.called_with(
 sagemaker_session_mock.delete_feature_group.assert_called_with(
 feature_group_name="MyFeatureGroup"
 )


def test_feature_store_describe(sagemaker_session_mock):
 feature_group = FeatureGroup(name="MyFeatureGroup", sagemaker_session=sagemaker_session_mock)
 feature_group.describe()
assert sagemaker_session_mock.describe_feature_group.called_with(
 feature_group_name="MyFeatureGroup"
 sagemaker_session_mock.describe_feature_group.assert_called_with(
 feature_group_name="MyFeatureGroup", next_token=None
 )


def test_put_record(sagemaker_session_mock):
 feature_group = FeatureGroup(name="MyFeatureGroup", sagemaker_session=sagemaker_session_mock)
 feature_group.put_record(record=[])
assert sagemaker_session_mock.put_record.called_with(
 sagemaker_session_mock.put_record.assert_called_with(
 feature_group_name="MyFeatureGroup", record=[]
 )

Expand DownExpand Up@@ -268,7 +298,7 @@ def query(sagemaker_session_mock):
def test_athena_query_run(sagemaker_session_mock, query):
 sagemaker_session_mock.start_query_execution.return_value = {"QueryExecutionId": "query_id"}
 query.run(query_string="query", output_location="s3://some-bucket/some-path")
assert sagemaker_session_mock.start_query_execution.called_with(
 sagemaker_session_mock.start_query_execution.assert_called_with(
 catalog="catalog",
 database="database",
 query_string="query",
Expand All@@ -283,13 +313,13 @@ def test_athena_query_run(sagemaker_session_mock, query):
def test_athena_query_wait(sagemaker_session_mock, query):
 query._current_query_execution_id = "query_id"
 query.wait()
assert sagemaker_session_mock.wait_for_athena_query.called_with(query_execution_id="query_id")
 sagemaker_session_mock.wait_for_athena_query.assert_called_with(query_execution_id="query_id")


def test_athena_query_get_query_execution(sagemaker_session_mock, query):
 query._current_query_execution_id = "query_id"
 query.get_query_execution()
assert sagemaker_session_mock.wait_for_athena_query.called_with(query_execution_id="query_id")
 sagemaker_session_mock.get_query_execution.assert_called_with(query_execution_id="query_id")


@patch("tempfile.gettempdir", Mock(return_value="tmp"))
Expand All@@ -302,13 +332,13 @@ def test_athena_query_as_dataframe(read_csv, sagemaker_session_mock, query):
 query._result_bucket = "bucket"
 query._result_file_prefix = "prefix"
 query.as_dataframe()
assert sagemaker_session_mock.download_athena_query_result.called_with(
 sagemaker_session_mock.download_athena_query_result.assert_called_with(
 bucket="bucket",
 prefix="prefix",
 query_execution_id="query_id",
 filename="tmp/query_id.csv",
 )
assert read_csv.called_with("tmp/query_id.csv", delimiter=",")
 read_csv.assert_called_with("tmp/query_id.csv", delimiter=",")


@patch("tempfile.gettempdir", Mock(return_value="tmp"))
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: Allow online store only FeatureGroups#2015

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

metrizable
merged 4 commits into

from

Dec 24, 2020
 Merged


fix: Allow online store only FeatureGroups
#2015
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
f71b8e0

fix: Allow online store only FeatureGroups

Dec 4, 2020
e961fff

Merge branch 'master' into master


metrizable Dec 18, 2020
414de39

Merge branch 'master' into master


metrizable Dec 21, 2020
93f7f1f

Merge branch 'master' into master


metrizable Dec 24, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


30 changes: 18 additions & 12 deletions
src/sagemaker/feature_store/feature_group.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -290,7 +290,7 @@ class FeatureGroup:

 def create(
 self,
 s3_uri: str,
 s3_uri: Union[str, bool],
 record_identifier_name: str,
 event_time_feature_name: str,
 role_arn: str,
Expand All@@ -305,7 +305,8 @@ def create(
 """Create a SageMaker FeatureStore FeatureGroup.

 Args:
 s3_uri (str): S3 URI of the offline store.
 s3_uri (Union[str, bool]): S3 URI of the offline store, set to
@metrizablemetrizableDec 22, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

would it be better if it were set to None or ""?
 ``False`` to disable offline store.
 record_identifier_name (str): name of the record identifier feature.
 event_time_feature_name (str): name of the event time feature.
 role_arn (str): ARN of the role used to call CreateFeatureGroup.
Expand DownExpand Up@@ -342,15 +343,18 @@ def create(
 create_feature_store_args.update({"online_store_config": online_store_config.to_dict()})

 # offline store configuration
 s3_storage_config = S3StorageConfig(s3_uri=s3_uri)
 if offline_store_kms_key_id:
 s3_storage_config.kms_key_id = offline_store_kms_key_id
 offline_store_config = OfflineStoreConfig(
 s3_storage_config=s3_storage_config,
 disable_glue_table_creation=disable_glue_table_creation,
 data_catalog_config=data_catalog_config,
 )
 create_feature_store_args.update({"offline_store_config": offline_store_config.to_dict()})
 if s3_uri:
@metrizablemetrizableDec 22, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the type differences are a bit odd, since s3_uri is expected to be bool in some cases.
 s3_storage_config = S3StorageConfig(s3_uri=s3_uri)
 if offline_store_kms_key_id:
 s3_storage_config.kms_key_id = offline_store_kms_key_id
 offline_store_config = OfflineStoreConfig(
 s3_storage_config=s3_storage_config,
 disable_glue_table_creation=disable_glue_table_creation,
 data_catalog_config=data_catalog_config,
 )
 create_feature_store_args.update(
 {"offline_store_config": offline_store_config.to_dict()}
 )

 return self.sagemaker_session.create_feature_group(**create_feature_store_args)

Expand All@@ -367,7 +371,9 @@ def describe(self, next_token: str = None) -> Dict[str, Any]:
 Returns:
 Response dict from the service.
 """
 return self.sagemaker_session.describe_feature_group(self.name, next_token)
 return self.sagemaker_session.describe_feature_group(
 feature_group_name=self.name, next_token=next_token
 )

 def load_feature_definitions(
 self,
Expand Down

22 changes: 22 additions & 0 deletions
tests/integ/test_feature_store.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -141,6 +141,28 @@ def create_table_ddl():
 )


def test_create_feature_store_online_only(
 feature_store_session,
 role,
 feature_group_name,
 pandas_data_frame,
):
 feature_group = FeatureGroup(name=feature_group_name, sagemaker_session=feature_store_session)
 feature_group.load_feature_definitions(data_frame=pandas_data_frame)

 with cleanup_feature_group(feature_group):
 output = feature_group.create(
 s3_uri=False,
 record_identifier_name="feature1",
 event_time_feature_name="feature3",
 role_arn=role,
 enable_online_store=True,
 )
 _wait_for_feature_group_create(feature_group)

 assert output["FeatureGroupArn"].endswith(f"feature-group/{feature_group_name}")


def test_create_feature_store(
 feature_store_session,
 role,
Expand Down

50 changes: 40 additions & 10 deletions
tests/unit/sagemaker/feature_store/test_feature_store.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,36 +79,66 @@ def test_feature_store_create(
 role_arn=role_arn,
 enable_online_store=True,
 )
assert sagemaker_session_mock.create_feature_group.called_with(
 sagemaker_session_mock.create_feature_group.assert_called_with(
 feature_group_name="MyFeatureGroup",
 record_identifier_name="feature1",
 event_time_feature_name="feature2",
 feature_definitions=[fd.to_dict() for fd in feature_group_dummy_definitions],
 role_arn=role_arn,
 description=None,
 tags=None,
 online_store_config={"EnableOnlineStore": True},
 offline_store_config={
 "DisableGlueTableCreation": False,
 "S3StorageConfig": {"S3Uri": s3_uri},
 },
 )


def test_feature_store_create_online_only(
 sagemaker_session_mock, role_arn, feature_group_dummy_definitions
):
 feature_group = FeatureGroup(name="MyFeatureGroup", sagemaker_session=sagemaker_session_mock)
 feature_group.feature_definitions = feature_group_dummy_definitions
 feature_group.create(
 s3_uri=False,
 record_identifier_name="feature1",
 event_time_feature_name="feature2",
 role_arn=role_arn,
 enable_online_store=True,
 )
 sagemaker_session_mock.create_feature_group.assert_called_with(
 feature_group_name="MyFeatureGroup",
 record_identifier_name="feature1",
 event_time_feature_name="feature2",
 feature_definitions=[fd.to_dict() for fd in feature_group_dummy_definitions],
 role_arn=role_arn,
 description=None,
 tags=None,
 online_store_config={"EnableOnlineStore": True},
 )


def test_feature_store_delete(sagemaker_session_mock):
 feature_group = FeatureGroup(name="MyFeatureGroup", sagemaker_session=sagemaker_session_mock)
 feature_group.delete()
assert sagemaker_session_mock.delete_feature_group.called_with(
 sagemaker_session_mock.delete_feature_group.assert_called_with(
 feature_group_name="MyFeatureGroup"
 )


def test_feature_store_describe(sagemaker_session_mock):
 feature_group = FeatureGroup(name="MyFeatureGroup", sagemaker_session=sagemaker_session_mock)
 feature_group.describe()
assert sagemaker_session_mock.describe_feature_group.called_with(
 feature_group_name="MyFeatureGroup"
 sagemaker_session_mock.describe_feature_group.assert_called_with(
 feature_group_name="MyFeatureGroup", next_token=None
 )


def test_put_record(sagemaker_session_mock):
 feature_group = FeatureGroup(name="MyFeatureGroup", sagemaker_session=sagemaker_session_mock)
 feature_group.put_record(record=[])
assert sagemaker_session_mock.put_record.called_with(
 sagemaker_session_mock.put_record.assert_called_with(
 feature_group_name="MyFeatureGroup", record=[]
 )

Expand DownExpand Up@@ -268,7 +298,7 @@ def query(sagemaker_session_mock):
def test_athena_query_run(sagemaker_session_mock, query):
 sagemaker_session_mock.start_query_execution.return_value = {"QueryExecutionId": "query_id"}
 query.run(query_string="query", output_location="s3://some-bucket/some-path")
assert sagemaker_session_mock.start_query_execution.called_with(
 sagemaker_session_mock.start_query_execution.assert_called_with(
 catalog="catalog",
 database="database",
 query_string="query",
Expand All@@ -283,13 +313,13 @@ def test_athena_query_run(sagemaker_session_mock, query):
def test_athena_query_wait(sagemaker_session_mock, query):
 query._current_query_execution_id = "query_id"
 query.wait()
assert sagemaker_session_mock.wait_for_athena_query.called_with(query_execution_id="query_id")
 sagemaker_session_mock.wait_for_athena_query.assert_called_with(query_execution_id="query_id")


def test_athena_query_get_query_execution(sagemaker_session_mock, query):
 query._current_query_execution_id = "query_id"
 query.get_query_execution()
assert sagemaker_session_mock.wait_for_athena_query.called_with(query_execution_id="query_id")
 sagemaker_session_mock.get_query_execution.assert_called_with(query_execution_id="query_id")


@patch("tempfile.gettempdir", Mock(return_value="tmp"))
Expand All@@ -302,13 +332,13 @@ def test_athena_query_as_dataframe(read_csv, sagemaker_session_mock, query):
 query._result_bucket = "bucket"
 query._result_file_prefix = "prefix"
 query.as_dataframe()
assert sagemaker_session_mock.download_athena_query_result.called_with(
 sagemaker_session_mock.download_athena_query_result.assert_called_with(
 bucket="bucket",
 prefix="prefix",
 query_execution_id="query_id",
 filename="tmp/query_id.csv",
 )
assert read_csv.called_with("tmp/query_id.csv", delimiter=",")
 read_csv.assert_called_with("tmp/query_id.csv", delimiter=",")


@patch("tempfile.gettempdir", Mock(return_value="tmp"))
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
fix: Allow online store only FeatureGroups#2015

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

metrizable
merged 4 commits into

from

Dec 24, 2020
 Merged


fix: Allow online store only FeatureGroups
#2015
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
f71b8e0

fix: Allow online store only FeatureGroups

Dec 4, 2020
e961fff

Merge branch 'master' into master


metrizable Dec 18, 2020
414de39

Merge branch 'master' into master


metrizable Dec 21, 2020
93f7f1f

Merge branch 'master' into master


metrizable Dec 24, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


30 changes: 18 additions & 12 deletions
src/sagemaker/feature_store/feature_group.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -290,7 +290,7 @@ class FeatureGroup:

 def create(
 self,
 s3_uri: str,
 s3_uri: Union[str, bool],
 record_identifier_name: str,
 event_time_feature_name: str,
 role_arn: str,
Expand All@@ -305,7 +305,8 @@ def create(
 """Create a SageMaker FeatureStore FeatureGroup.

 Args:
 s3_uri (str): S3 URI of the offline store.
 s3_uri (Union[str, bool]): S3 URI of the offline store, set to
@metrizablemetrizableDec 22, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

would it be better if it were set to None or ""?
 ``False`` to disable offline store.
 record_identifier_name (str): name of the record identifier feature.
 event_time_feature_name (str): name of the event time feature.
 role_arn (str): ARN of the role used to call CreateFeatureGroup.
Expand DownExpand Up@@ -342,15 +343,18 @@ def create(
 create_feature_store_args.update({"online_store_config": online_store_config.to_dict()})

 # offline store configuration
 s3_storage_config = S3StorageConfig(s3_uri=s3_uri)
 if offline_store_kms_key_id:
 s3_storage_config.kms_key_id = offline_store_kms_key_id
 offline_store_config = OfflineStoreConfig(
 s3_storage_config=s3_storage_config,
 disable_glue_table_creation=disable_glue_table_creation,
 data_catalog_config=data_catalog_config,
 )
 create_feature_store_args.update({"offline_store_config": offline_store_config.to_dict()})
 if s3_uri:
@metrizablemetrizableDec 22, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the type differences are a bit odd, since s3_uri is expected to be bool in some cases.
 s3_storage_config = S3StorageConfig(s3_uri=s3_uri)
 if offline_store_kms_key_id:
 s3_storage_config.kms_key_id = offline_store_kms_key_id
 offline_store_config = OfflineStoreConfig(
 s3_storage_config=s3_storage_config,
 disable_glue_table_creation=disable_glue_table_creation,
 data_catalog_config=data_catalog_config,
 )
 create_feature_store_args.update(
 {"offline_store_config": offline_store_config.to_dict()}
 )

 return self.sagemaker_session.create_feature_group(**create_feature_store_args)

Expand All@@ -367,7 +371,9 @@ def describe(self, next_token: str = None) -> Dict[str, Any]:
 Returns:
 Response dict from the service.
 """
 return self.sagemaker_session.describe_feature_group(self.name, next_token)
 return self.sagemaker_session.describe_feature_group(
 feature_group_name=self.name, next_token=next_token
 )

 def load_feature_definitions(
 self,
Expand Down

22 changes: 22 additions & 0 deletions
tests/integ/test_feature_store.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -141,6 +141,28 @@ def create_table_ddl():
 )


def test_create_feature_store_online_only(
 feature_store_session,
 role,
 feature_group_name,
 pandas_data_frame,
):
 feature_group = FeatureGroup(name=feature_group_name, sagemaker_session=feature_store_session)
 feature_group.load_feature_definitions(data_frame=pandas_data_frame)

 with cleanup_feature_group(feature_group):
 output = feature_group.create(
 s3_uri=False,
 record_identifier_name="feature1",
 event_time_feature_name="feature3",
 role_arn=role,
 enable_online_store=True,
 )
 _wait_for_feature_group_create(feature_group)

 assert output["FeatureGroupArn"].endswith(f"feature-group/{feature_group_name}")


def test_create_feature_store(
 feature_store_session,
 role,
Expand Down

50 changes: 40 additions & 10 deletions
tests/unit/sagemaker/feature_store/test_feature_store.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,36 +79,66 @@ def test_feature_store_create(
 role_arn=role_arn,
 enable_online_store=True,
 )
assert sagemaker_session_mock.create_feature_group.called_with(
 sagemaker_session_mock.create_feature_group.assert_called_with(
 feature_group_name="MyFeatureGroup",
 record_identifier_name="feature1",
 event_time_feature_name="feature2",
 feature_definitions=[fd.to_dict() for fd in feature_group_dummy_definitions],
 role_arn=role_arn,
 description=None,
 tags=None,
 online_store_config={"EnableOnlineStore": True},
 offline_store_config={
 "DisableGlueTableCreation": False,
 "S3StorageConfig": {"S3Uri": s3_uri},
 },
 )


def test_feature_store_create_online_only(
 sagemaker_session_mock, role_arn, feature_group_dummy_definitions
):
 feature_group = FeatureGroup(name="MyFeatureGroup", sagemaker_session=sagemaker_session_mock)
 feature_group.feature_definitions = feature_group_dummy_definitions
 feature_group.create(
 s3_uri=False,
 record_identifier_name="feature1",
 event_time_feature_name="feature2",
 role_arn=role_arn,
 enable_online_store=True,
 )
 sagemaker_session_mock.create_feature_group.assert_called_with(
 feature_group_name="MyFeatureGroup",
 record_identifier_name="feature1",
 event_time_feature_name="feature2",
 feature_definitions=[fd.to_dict() for fd in feature_group_dummy_definitions],
 role_arn=role_arn,
 description=None,
 tags=None,
 online_store_config={"EnableOnlineStore": True},
 )


def test_feature_store_delete(sagemaker_session_mock):
 feature_group = FeatureGroup(name="MyFeatureGroup", sagemaker_session=sagemaker_session_mock)
 feature_group.delete()
assert sagemaker_session_mock.delete_feature_group.called_with(
 sagemaker_session_mock.delete_feature_group.assert_called_with(
 feature_group_name="MyFeatureGroup"
 )


def test_feature_store_describe(sagemaker_session_mock):
 feature_group = FeatureGroup(name="MyFeatureGroup", sagemaker_session=sagemaker_session_mock)
 feature_group.describe()
assert sagemaker_session_mock.describe_feature_group.called_with(
 feature_group_name="MyFeatureGroup"
 sagemaker_session_mock.describe_feature_group.assert_called_with(
 feature_group_name="MyFeatureGroup", next_token=None
 )


def test_put_record(sagemaker_session_mock):
 feature_group = FeatureGroup(name="MyFeatureGroup", sagemaker_session=sagemaker_session_mock)
 feature_group.put_record(record=[])
assert sagemaker_session_mock.put_record.called_with(
 sagemaker_session_mock.put_record.assert_called_with(
 feature_group_name="MyFeatureGroup", record=[]
 )

Expand DownExpand Up@@ -268,7 +298,7 @@ def query(sagemaker_session_mock):
def test_athena_query_run(sagemaker_session_mock, query):
 sagemaker_session_mock.start_query_execution.return_value = {"QueryExecutionId": "query_id"}
 query.run(query_string="query", output_location="s3://some-bucket/some-path")
assert sagemaker_session_mock.start_query_execution.called_with(
 sagemaker_session_mock.start_query_execution.assert_called_with(
 catalog="catalog",
 database="database",
 query_string="query",
Expand All@@ -283,13 +313,13 @@ def test_athena_query_run(sagemaker_session_mock, query):
def test_athena_query_wait(sagemaker_session_mock, query):
 query._current_query_execution_id = "query_id"
 query.wait()
assert sagemaker_session_mock.wait_for_athena_query.called_with(query_execution_id="query_id")
 sagemaker_session_mock.wait_for_athena_query.assert_called_with(query_execution_id="query_id")


def test_athena_query_get_query_execution(sagemaker_session_mock, query):
 query._current_query_execution_id = "query_id"
 query.get_query_execution()
assert sagemaker_session_mock.wait_for_athena_query.called_with(query_execution_id="query_id")
 sagemaker_session_mock.get_query_execution.assert_called_with(query_execution_id="query_id")


@patch("tempfile.gettempdir", Mock(return_value="tmp"))
Expand All@@ -302,13 +332,13 @@ def test_athena_query_as_dataframe(read_csv, sagemaker_session_mock, query):
 query._result_bucket = "bucket"
 query._result_file_prefix = "prefix"
 query.as_dataframe()
assert sagemaker_session_mock.download_athena_query_result.called_with(
 sagemaker_session_mock.download_athena_query_result.assert_called_with(
 bucket="bucket",
 prefix="prefix",
 query_execution_id="query_id",
 filename="tmp/query_id.csv",
 )
assert read_csv.called_with("tmp/query_id.csv", delimiter=",")
 read_csv.assert_called_with("tmp/query_id.csv", delimiter=",")


@patch("tempfile.gettempdir", Mock(return_value="tmp"))
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: Allow online store only FeatureGroups#2015

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

metrizable
merged 4 commits into

from

Dec 24, 2020
 Merged


fix: Allow online store only FeatureGroups
#2015
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
f71b8e0

fix: Allow online store only FeatureGroups

Dec 4, 2020
e961fff

Merge branch 'master' into master


metrizable Dec 18, 2020
414de39

Merge branch 'master' into master


metrizable Dec 21, 2020
93f7f1f

Merge branch 'master' into master


metrizable Dec 24, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


30 changes: 18 additions & 12 deletions
src/sagemaker/feature_store/feature_group.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -290,7 +290,7 @@ class FeatureGroup:

 def create(
 self,
 s3_uri: str,
 s3_uri: Union[str, bool],
 record_identifier_name: str,
 event_time_feature_name: str,
 role_arn: str,
Expand All@@ -305,7 +305,8 @@ def create(
 """Create a SageMaker FeatureStore FeatureGroup.

 Args:
 s3_uri (str): S3 URI of the offline store.
 s3_uri (Union[str, bool]): S3 URI of the offline store, set to
@metrizablemetrizableDec 22, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

would it be better if it were set to None or ""?
 ``False`` to disable offline store.
 record_identifier_name (str): name of the record identifier feature.
 event_time_feature_name (str): name of the event time feature.
 role_arn (str): ARN of the role used to call CreateFeatureGroup.
Expand DownExpand Up@@ -342,15 +343,18 @@ def create(
 create_feature_store_args.update({"online_store_config": online_store_config.to_dict()})

 # offline store configuration
 s3_storage_config = S3StorageConfig(s3_uri=s3_uri)
 if offline_store_kms_key_id:
 s3_storage_config.kms_key_id = offline_store_kms_key_id
 offline_store_config = OfflineStoreConfig(
 s3_storage_config=s3_storage_config,
 disable_glue_table_creation=disable_glue_table_creation,
 data_catalog_config=data_catalog_config,
 )
 create_feature_store_args.update({"offline_store_config": offline_store_config.to_dict()})
 if s3_uri:
@metrizablemetrizableDec 22, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the type differences are a bit odd, since s3_uri is expected to be bool in some cases.
 s3_storage_config = S3StorageConfig(s3_uri=s3_uri)
 if offline_store_kms_key_id:
 s3_storage_config.kms_key_id = offline_store_kms_key_id
 offline_store_config = OfflineStoreConfig(
 s3_storage_config=s3_storage_config,
 disable_glue_table_creation=disable_glue_table_creation,
 data_catalog_config=data_catalog_config,
 )
 create_feature_store_args.update(
 {"offline_store_config": offline_store_config.to_dict()}
 )

 return self.sagemaker_session.create_feature_group(**create_feature_store_args)

Expand All@@ -367,7 +371,9 @@ def describe(self, next_token: str = None) -> Dict[str, Any]:
 Returns:
 Response dict from the service.
 """
 return self.sagemaker_session.describe_feature_group(self.name, next_token)
 return self.sagemaker_session.describe_feature_group(
 feature_group_name=self.name, next_token=next_token
 )

 def load_feature_definitions(
 self,
Expand Down

22 changes: 22 additions & 0 deletions
tests/integ/test_feature_store.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -141,6 +141,28 @@ def create_table_ddl():
 )


def test_create_feature_store_online_only(
 feature_store_session,
 role,
 feature_group_name,
 pandas_data_frame,
):
 feature_group = FeatureGroup(name=feature_group_name, sagemaker_session=feature_store_session)
 feature_group.load_feature_definitions(data_frame=pandas_data_frame)

 with cleanup_feature_group(feature_group):
 output = feature_group.create(
 s3_uri=False,
 record_identifier_name="feature1",
 event_time_feature_name="feature3",
 role_arn=role,
 enable_online_store=True,
 )
 _wait_for_feature_group_create(feature_group)

 assert output["FeatureGroupArn"].endswith(f"feature-group/{feature_group_name}")


def test_create_feature_store(
 feature_store_session,
 role,
Expand Down

50 changes: 40 additions & 10 deletions
tests/unit/sagemaker/feature_store/test_feature_store.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,36 +79,66 @@ def test_feature_store_create(
 role_arn=role_arn,
 enable_online_store=True,
 )
assert sagemaker_session_mock.create_feature_group.called_with(
 sagemaker_session_mock.create_feature_group.assert_called_with(
 feature_group_name="MyFeatureGroup",
 record_identifier_name="feature1",
 event_time_feature_name="feature2",
 feature_definitions=[fd.to_dict() for fd in feature_group_dummy_definitions],
 role_arn=role_arn,
 description=None,
 tags=None,
 online_store_config={"EnableOnlineStore": True},
 offline_store_config={
 "DisableGlueTableCreation": False,
 "S3StorageConfig": {"S3Uri": s3_uri},
 },
 )


def test_feature_store_create_online_only(
 sagemaker_session_mock, role_arn, feature_group_dummy_definitions
):
 feature_group = FeatureGroup(name="MyFeatureGroup", sagemaker_session=sagemaker_session_mock)
 feature_group.feature_definitions = feature_group_dummy_definitions
 feature_group.create(
 s3_uri=False,
 record_identifier_name="feature1",
 event_time_feature_name="feature2",
 role_arn=role_arn,
 enable_online_store=True,
 )
 sagemaker_session_mock.create_feature_group.assert_called_with(
 feature_group_name="MyFeatureGroup",
 record_identifier_name="feature1",
 event_time_feature_name="feature2",
 feature_definitions=[fd.to_dict() for fd in feature_group_dummy_definitions],
 role_arn=role_arn,
 description=None,
 tags=None,
 online_store_config={"EnableOnlineStore": True},
 )


def test_feature_store_delete(sagemaker_session_mock):
 feature_group = FeatureGroup(name="MyFeatureGroup", sagemaker_session=sagemaker_session_mock)
 feature_group.delete()
assert sagemaker_session_mock.delete_feature_group.called_with(
 sagemaker_session_mock.delete_feature_group.assert_called_with(
 feature_group_name="MyFeatureGroup"
 )


def test_feature_store_describe(sagemaker_session_mock):
 feature_group = FeatureGroup(name="MyFeatureGroup", sagemaker_session=sagemaker_session_mock)
 feature_group.describe()
assert sagemaker_session_mock.describe_feature_group.called_with(
 feature_group_name="MyFeatureGroup"
 sagemaker_session_mock.describe_feature_group.assert_called_with(
 feature_group_name="MyFeatureGroup", next_token=None
 )


def test_put_record(sagemaker_session_mock):
 feature_group = FeatureGroup(name="MyFeatureGroup", sagemaker_session=sagemaker_session_mock)
 feature_group.put_record(record=[])
assert sagemaker_session_mock.put_record.called_with(
 sagemaker_session_mock.put_record.assert_called_with(
 feature_group_name="MyFeatureGroup", record=[]
 )

Expand DownExpand Up@@ -268,7 +298,7 @@ def query(sagemaker_session_mock):
def test_athena_query_run(sagemaker_session_mock, query):
 sagemaker_session_mock.start_query_execution.return_value = {"QueryExecutionId": "query_id"}
 query.run(query_string="query", output_location="s3://some-bucket/some-path")
assert sagemaker_session_mock.start_query_execution.called_with(
 sagemaker_session_mock.start_query_execution.assert_called_with(
 catalog="catalog",
 database="database",
 query_string="query",
Expand All@@ -283,13 +313,13 @@ def test_athena_query_run(sagemaker_session_mock, query):
def test_athena_query_wait(sagemaker_session_mock, query):
 query._current_query_execution_id = "query_id"
 query.wait()
assert sagemaker_session_mock.wait_for_athena_query.called_with(query_execution_id="query_id")
 sagemaker_session_mock.wait_for_athena_query.assert_called_with(query_execution_id="query_id")


def test_athena_query_get_query_execution(sagemaker_session_mock, query):
 query._current_query_execution_id = "query_id"
 query.get_query_execution()
assert sagemaker_session_mock.wait_for_athena_query.called_with(query_execution_id="query_id")
 sagemaker_session_mock.get_query_execution.assert_called_with(query_execution_id="query_id")


@patch("tempfile.gettempdir", Mock(return_value="tmp"))
Expand All@@ -302,13 +332,13 @@ def test_athena_query_as_dataframe(read_csv, sagemaker_session_mock, query):
 query._result_bucket = "bucket"
 query._result_file_prefix = "prefix"
 query.as_dataframe()
assert sagemaker_session_mock.download_athena_query_result.called_with(
 sagemaker_session_mock.download_athena_query_result.assert_called_with(
 bucket="bucket",
 prefix="prefix",
 query_execution_id="query_id",
 filename="tmp/query_id.csv",
 )
assert read_csv.called_with("tmp/query_id.csv", delimiter=",")
 read_csv.assert_called_with("tmp/query_id.csv", delimiter=",")


@patch("tempfile.gettempdir", Mock(return_value="tmp"))
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: Allow online store only FeatureGroups#2015

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

metrizable
merged 4 commits into

from

Dec 24, 2020
 Merged


fix: Allow online store only FeatureGroups
#2015
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
f71b8e0

fix: Allow online store only FeatureGroups

Dec 4, 2020
e961fff

Merge branch 'master' into master


metrizable Dec 18, 2020
414de39

Merge branch 'master' into master


metrizable Dec 21, 2020
93f7f1f

Merge branch 'master' into master


metrizable Dec 24, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


30 changes: 18 additions & 12 deletions
src/sagemaker/feature_store/feature_group.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -290,7 +290,7 @@ class FeatureGroup:

 def create(
 self,
 s3_uri: str,
 s3_uri: Union[str, bool],
 record_identifier_name: str,
 event_time_feature_name: str,
 role_arn: str,
Expand All@@ -305,7 +305,8 @@ def create(
 """Create a SageMaker FeatureStore FeatureGroup.

 Args:
 s3_uri (str): S3 URI of the offline store.
 s3_uri (Union[str, bool]): S3 URI of the offline store, set to
@metrizablemetrizableDec 22, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

would it be better if it were set to None or ""?
 ``False`` to disable offline store.
 record_identifier_name (str): name of the record identifier feature.
 event_time_feature_name (str): name of the event time feature.
 role_arn (str): ARN of the role used to call CreateFeatureGroup.
Expand DownExpand Up@@ -342,15 +343,18 @@ def create(
 create_feature_store_args.update({"online_store_config": online_store_config.to_dict()})

 # offline store configuration
 s3_storage_config = S3StorageConfig(s3_uri=s3_uri)
 if offline_store_kms_key_id:
 s3_storage_config.kms_key_id = offline_store_kms_key_id
 offline_store_config = OfflineStoreConfig(
 s3_storage_config=s3_storage_config,
 disable_glue_table_creation=disable_glue_table_creation,
 data_catalog_config=data_catalog_config,
 )
 create_feature_store_args.update({"offline_store_config": offline_store_config.to_dict()})
 if s3_uri:
@metrizablemetrizableDec 22, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the type differences are a bit odd, since s3_uri is expected to be bool in some cases.
 s3_storage_config = S3StorageConfig(s3_uri=s3_uri)
 if offline_store_kms_key_id:
 s3_storage_config.kms_key_id = offline_store_kms_key_id
 offline_store_config = OfflineStoreConfig(
 s3_storage_config=s3_storage_config,
 disable_glue_table_creation=disable_glue_table_creation,
 data_catalog_config=data_catalog_config,
 )
 create_feature_store_args.update(
 {"offline_store_config": offline_store_config.to_dict()}
 )

 return self.sagemaker_session.create_feature_group(**create_feature_store_args)

Expand All@@ -367,7 +371,9 @@ def describe(self, next_token: str = None) -> Dict[str, Any]:
 Returns:
 Response dict from the service.
 """
 return self.sagemaker_session.describe_feature_group(self.name, next_token)
 return self.sagemaker_session.describe_feature_group(
 feature_group_name=self.name, next_token=next_token
 )

 def load_feature_definitions(
 self,
Expand Down

22 changes: 22 additions & 0 deletions
tests/integ/test_feature_store.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -141,6 +141,28 @@ def create_table_ddl():
 )


def test_create_feature_store_online_only(
 feature_store_session,
 role,
 feature_group_name,
 pandas_data_frame,
):
 feature_group = FeatureGroup(name=feature_group_name, sagemaker_session=feature_store_session)
 feature_group.load_feature_definitions(data_frame=pandas_data_frame)

 with cleanup_feature_group(feature_group):
 output = feature_group.create(
 s3_uri=False,
 record_identifier_name="feature1",
 event_time_feature_name="feature3",
 role_arn=role,
 enable_online_store=True,
 )
 _wait_for_feature_group_create(feature_group)

 assert output["FeatureGroupArn"].endswith(f"feature-group/{feature_group_name}")


def test_create_feature_store(
 feature_store_session,
 role,
Expand Down

50 changes: 40 additions & 10 deletions
tests/unit/sagemaker/feature_store/test_feature_store.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,36 +79,66 @@ def test_feature_store_create(
 role_arn=role_arn,
 enable_online_store=True,
 )
assert sagemaker_session_mock.create_feature_group.called_with(
 sagemaker_session_mock.create_feature_group.assert_called_with(
 feature_group_name="MyFeatureGroup",
 record_identifier_name="feature1",
 event_time_feature_name="feature2",
 feature_definitions=[fd.to_dict() for fd in feature_group_dummy_definitions],
 role_arn=role_arn,
 description=None,
 tags=None,
 online_store_config={"EnableOnlineStore": True},
 offline_store_config={
 "DisableGlueTableCreation": False,
 "S3StorageConfig": {"S3Uri": s3_uri},
 },
 )


def test_feature_store_create_online_only(
 sagemaker_session_mock, role_arn, feature_group_dummy_definitions
):
 feature_group = FeatureGroup(name="MyFeatureGroup", sagemaker_session=sagemaker_session_mock)
 feature_group.feature_definitions = feature_group_dummy_definitions
 feature_group.create(
 s3_uri=False,
 record_identifier_name="feature1",
 event_time_feature_name="feature2",
 role_arn=role_arn,
 enable_online_store=True,
 )
 sagemaker_session_mock.create_feature_group.assert_called_with(
 feature_group_name="MyFeatureGroup",
 record_identifier_name="feature1",
 event_time_feature_name="feature2",
 feature_definitions=[fd.to_dict() for fd in feature_group_dummy_definitions],
 role_arn=role_arn,
 description=None,
 tags=None,
 online_store_config={"EnableOnlineStore": True},
 )


def test_feature_store_delete(sagemaker_session_mock):
 feature_group = FeatureGroup(name="MyFeatureGroup", sagemaker_session=sagemaker_session_mock)
 feature_group.delete()
assert sagemaker_session_mock.delete_feature_group.called_with(
 sagemaker_session_mock.delete_feature_group.assert_called_with(
 feature_group_name="MyFeatureGroup"
 )


def test_feature_store_describe(sagemaker_session_mock):
 feature_group = FeatureGroup(name="MyFeatureGroup", sagemaker_session=sagemaker_session_mock)
 feature_group.describe()
assert sagemaker_session_mock.describe_feature_group.called_with(
 feature_group_name="MyFeatureGroup"
 sagemaker_session_mock.describe_feature_group.assert_called_with(
 feature_group_name="MyFeatureGroup", next_token=None
 )


def test_put_record(sagemaker_session_mock):
 feature_group = FeatureGroup(name="MyFeatureGroup", sagemaker_session=sagemaker_session_mock)
 feature_group.put_record(record=[])
assert sagemaker_session_mock.put_record.called_with(
 sagemaker_session_mock.put_record.assert_called_with(
 feature_group_name="MyFeatureGroup", record=[]
 )

Expand DownExpand Up@@ -268,7 +298,7 @@ def query(sagemaker_session_mock):
def test_athena_query_run(sagemaker_session_mock, query):
 sagemaker_session_mock.start_query_execution.return_value = {"QueryExecutionId": "query_id"}
 query.run(query_string="query", output_location="s3://some-bucket/some-path")
assert sagemaker_session_mock.start_query_execution.called_with(
 sagemaker_session_mock.start_query_execution.assert_called_with(
 catalog="catalog",
 database="database",
 query_string="query",
Expand All@@ -283,13 +313,13 @@ def test_athena_query_run(sagemaker_session_mock, query):
def test_athena_query_wait(sagemaker_session_mock, query):
 query._current_query_execution_id = "query_id"
 query.wait()
assert sagemaker_session_mock.wait_for_athena_query.called_with(query_execution_id="query_id")
 sagemaker_session_mock.wait_for_athena_query.assert_called_with(query_execution_id="query_id")


def test_athena_query_get_query_execution(sagemaker_session_mock, query):
 query._current_query_execution_id = "query_id"
 query.get_query_execution()
assert sagemaker_session_mock.wait_for_athena_query.called_with(query_execution_id="query_id")
 sagemaker_session_mock.get_query_execution.assert_called_with(query_execution_id="query_id")


@patch("tempfile.gettempdir", Mock(return_value="tmp"))
Expand All@@ -302,13 +332,13 @@ def test_athena_query_as_dataframe(read_csv, sagemaker_session_mock, query):
 query._result_bucket = "bucket"
 query._result_file_prefix = "prefix"
 query.as_dataframe()
assert sagemaker_session_mock.download_athena_query_result.called_with(
 sagemaker_session_mock.download_athena_query_result.assert_called_with(
 bucket="bucket",
 prefix="prefix",
 query_execution_id="query_id",
 filename="tmp/query_id.csv",
 )
assert read_csv.called_with("tmp/query_id.csv", delimiter=",")
 read_csv.assert_called_with("tmp/query_id.csv", delimiter=",")


@patch("tempfile.gettempdir", Mock(return_value="tmp"))
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
fix: Allow online store only FeatureGroups#2015

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

metrizable
merged 4 commits into

from

Dec 24, 2020
 Merged


fix: Allow online store only FeatureGroups
#2015
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
f71b8e0

fix: Allow online store only FeatureGroups

Dec 4, 2020
e961fff

Merge branch 'master' into master


metrizable Dec 18, 2020
414de39

Merge branch 'master' into master


metrizable Dec 21, 2020
93f7f1f

Merge branch 'master' into master


metrizable Dec 24, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


30 changes: 18 additions & 12 deletions
src/sagemaker/feature_store/feature_group.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -290,7 +290,7 @@ class FeatureGroup:

 def create(
 self,
 s3_uri: str,
 s3_uri: Union[str, bool],
 record_identifier_name: str,
 event_time_feature_name: str,
 role_arn: str,
Expand All@@ -305,7 +305,8 @@ def create(
 """Create a SageMaker FeatureStore FeatureGroup.

 Args:
 s3_uri (str): S3 URI of the offline store.
 s3_uri (Union[str, bool]): S3 URI of the offline store, set to
@metrizablemetrizableDec 22, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

would it be better if it were set to None or ""?
 ``False`` to disable offline store.
 record_identifier_name (str): name of the record identifier feature.
 event_time_feature_name (str): name of the event time feature.
 role_arn (str): ARN of the role used to call CreateFeatureGroup.
Expand DownExpand Up@@ -342,15 +343,18 @@ def create(
 create_feature_store_args.update({"online_store_config": online_store_config.to_dict()})

 # offline store configuration
 s3_storage_config = S3StorageConfig(s3_uri=s3_uri)
 if offline_store_kms_key_id:
 s3_storage_config.kms_key_id = offline_store_kms_key_id
 offline_store_config = OfflineStoreConfig(
 s3_storage_config=s3_storage_config,
 disable_glue_table_creation=disable_glue_table_creation,
 data_catalog_config=data_catalog_config,
 )
 create_feature_store_args.update({"offline_store_config": offline_store_config.to_dict()})
 if s3_uri:
@metrizablemetrizableDec 22, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the type differences are a bit odd, since s3_uri is expected to be bool in some cases.
 s3_storage_config = S3StorageConfig(s3_uri=s3_uri)
 if offline_store_kms_key_id:
 s3_storage_config.kms_key_id = offline_store_kms_key_id
 offline_store_config = OfflineStoreConfig(
 s3_storage_config=s3_storage_config,
 disable_glue_table_creation=disable_glue_table_creation,
 data_catalog_config=data_catalog_config,
 )
 create_feature_store_args.update(
 {"offline_store_config": offline_store_config.to_dict()}
 )

 return self.sagemaker_session.create_feature_group(**create_feature_store_args)

Expand All@@ -367,7 +371,9 @@ def describe(self, next_token: str = None) -> Dict[str, Any]:
 Returns:
 Response dict from the service.
 """
 return self.sagemaker_session.describe_feature_group(self.name, next_token)
 return self.sagemaker_session.describe_feature_group(
 feature_group_name=self.name, next_token=next_token
 )

 def load_feature_definitions(
 self,
Expand Down

22 changes: 22 additions & 0 deletions
tests/integ/test_feature_store.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -141,6 +141,28 @@ def create_table_ddl():
 )


def test_create_feature_store_online_only(
 feature_store_session,
 role,
 feature_group_name,
 pandas_data_frame,
):
 feature_group = FeatureGroup(name=feature_group_name, sagemaker_session=feature_store_session)
 feature_group.load_feature_definitions(data_frame=pandas_data_frame)

 with cleanup_feature_group(feature_group):
 output = feature_group.create(
 s3_uri=False,
 record_identifier_name="feature1",
 event_time_feature_name="feature3",
 role_arn=role,
 enable_online_store=True,
 )
 _wait_for_feature_group_create(feature_group)

 assert output["FeatureGroupArn"].endswith(f"feature-group/{feature_group_name}")


def test_create_feature_store(
 feature_store_session,
 role,
Expand Down

50 changes: 40 additions & 10 deletions
tests/unit/sagemaker/feature_store/test_feature_store.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,36 +79,66 @@ def test_feature_store_create(
 role_arn=role_arn,
 enable_online_store=True,
 )
assert sagemaker_session_mock.create_feature_group.called_with(
 sagemaker_session_mock.create_feature_group.assert_called_with(
 feature_group_name="MyFeatureGroup",
 record_identifier_name="feature1",
 event_time_feature_name="feature2",
 feature_definitions=[fd.to_dict() for fd in feature_group_dummy_definitions],
 role_arn=role_arn,
 description=None,
 tags=None,
 online_store_config={"EnableOnlineStore": True},
 offline_store_config={
 "DisableGlueTableCreation": False,
 "S3StorageConfig": {"S3Uri": s3_uri},
 },
 )


def test_feature_store_create_online_only(
 sagemaker_session_mock, role_arn, feature_group_dummy_definitions
):
 feature_group = FeatureGroup(name="MyFeatureGroup", sagemaker_session=sagemaker_session_mock)
 feature_group.feature_definitions = feature_group_dummy_definitions
 feature_group.create(
 s3_uri=False,
 record_identifier_name="feature1",
 event_time_feature_name="feature2",
 role_arn=role_arn,
 enable_online_store=True,
 )
 sagemaker_session_mock.create_feature_group.assert_called_with(
 feature_group_name="MyFeatureGroup",
 record_identifier_name="feature1",
 event_time_feature_name="feature2",
 feature_definitions=[fd.to_dict() for fd in feature_group_dummy_definitions],
 role_arn=role_arn,
 description=None,
 tags=None,
 online_store_config={"EnableOnlineStore": True},
 )


def test_feature_store_delete(sagemaker_session_mock):
 feature_group = FeatureGroup(name="MyFeatureGroup", sagemaker_session=sagemaker_session_mock)
 feature_group.delete()
assert sagemaker_session_mock.delete_feature_group.called_with(
 sagemaker_session_mock.delete_feature_group.assert_called_with(
 feature_group_name="MyFeatureGroup"
 )


def test_feature_store_describe(sagemaker_session_mock):
 feature_group = FeatureGroup(name="MyFeatureGroup", sagemaker_session=sagemaker_session_mock)
 feature_group.describe()
assert sagemaker_session_mock.describe_feature_group.called_with(
 feature_group_name="MyFeatureGroup"
 sagemaker_session_mock.describe_feature_group.assert_called_with(
 feature_group_name="MyFeatureGroup", next_token=None
 )


def test_put_record(sagemaker_session_mock):
 feature_group = FeatureGroup(name="MyFeatureGroup", sagemaker_session=sagemaker_session_mock)
 feature_group.put_record(record=[])
assert sagemaker_session_mock.put_record.called_with(
 sagemaker_session_mock.put_record.assert_called_with(
 feature_group_name="MyFeatureGroup", record=[]
 )

Expand DownExpand Up@@ -268,7 +298,7 @@ def query(sagemaker_session_mock):
def test_athena_query_run(sagemaker_session_mock, query):
 sagemaker_session_mock.start_query_execution.return_value = {"QueryExecutionId": "query_id"}
 query.run(query_string="query", output_location="s3://some-bucket/some-path")
assert sagemaker_session_mock.start_query_execution.called_with(
 sagemaker_session_mock.start_query_execution.assert_called_with(
 catalog="catalog",
 database="database",
 query_string="query",
Expand All@@ -283,13 +313,13 @@ def test_athena_query_run(sagemaker_session_mock, query):
def test_athena_query_wait(sagemaker_session_mock, query):
 query._current_query_execution_id = "query_id"
 query.wait()
assert sagemaker_session_mock.wait_for_athena_query.called_with(query_execution_id="query_id")
 sagemaker_session_mock.wait_for_athena_query.assert_called_with(query_execution_id="query_id")


def test_athena_query_get_query_execution(sagemaker_session_mock, query):
 query._current_query_execution_id = "query_id"
 query.get_query_execution()
assert sagemaker_session_mock.wait_for_athena_query.called_with(query_execution_id="query_id")
 sagemaker_session_mock.get_query_execution.assert_called_with(query_execution_id="query_id")


@patch("tempfile.gettempdir", Mock(return_value="tmp"))
Expand All@@ -302,13 +332,13 @@ def test_athena_query_as_dataframe(read_csv, sagemaker_session_mock, query):
 query._result_bucket = "bucket"
 query._result_file_prefix = "prefix"
 query.as_dataframe()
assert sagemaker_session_mock.download_athena_query_result.called_with(
 sagemaker_session_mock.download_athena_query_result.assert_called_with(
 bucket="bucket",
 prefix="prefix",
 query_execution_id="query_id",
 filename="tmp/query_id.csv",
 )
assert read_csv.called_with("tmp/query_id.csv", delimiter=",")
 read_csv.assert_called_with("tmp/query_id.csv", delimiter=",")


@patch("tempfile.gettempdir", Mock(return_value="tmp"))
Expand Down