Fix lint and address issues

Signed-off-by: Kevin Zhang <kzhang@tecton.ai>
feast-dev · feast-ci-bot · Aug 19, 2022 · Aug 5, 2022 · Aug 10, 2022 · Aug 10, 2022
commit 1b12e4a5858a33e0c2ee64f3b84c41fc61f64bb2
@@ -82,7 +82,7 @@ In the Azure ML Studio, select *Notebooks* from the left-hand menu and then open
 ## 6. Running Feast Azure Tutorials locally without Azure workspace
 
 * If you are on a free tier instance, you will not be able to deploy the azure deployment because the azure workspace requires VCPUs and the free trial subscription does not have a quota.
-* The workaround is to remove the `Microsoft.MachineLearningServices/workspaces/computes` resource from `fs_snapse_azure_deploy.json` and setting up the environment locally.
+* The workaround is to remove the `Microsoft.MachineLearningServices/workspaces/computes` resource from `fs_synapse_azure_deploy.json` and setting up the environment locally.
     1. After deployment, find your `Azure SQL Pool` secrets by going to `Subscriptions-><Your Subscription>->Resource Group->Key Vault` and giving your account admin permissions to the keyvault. Retrieve the `FEAST-REGISTRY-PATH`, `FEAST-OFFLINE-STORE-CONN`, and `FEAST-ONLINE-STORE-CONN` secrets to use in your local environment.
     2. In your local environment, you will need to install the azure cli and login to the cli using `az login`.
     3. After everything is setup, you should be able to work through the first 2 tutorial notebooks without any errors (The 3rd notebook requires Azure workspace resources).
@@ -186,7 +186,10 @@ def get_historical_features(
                 entity_df[entity_df_event_timestamp_col], utc=True
             ).fillna(pandas.Timestamp.now())
 
-        # TODO: figure out how to deal with entity dataframes that are strings
+        elif isinstance(entity_df, str):
+            raise ValueError(
+                "string entities are currently not supported in the MsSQL offline store."
+            )
         (
             table_schema,
             table_name,
@@ -370,9 +373,10 @@ def persist(self, storage: SavedDatasetStorage):
             pyarrow.parquet.write_to_dataset(
                 self.to_arrow(), root_path=path, filesystem=filesystem
             )
+
     def supports_remote_storage_export(self) -> bool:
         return False
-    
+
     def to_remote_storage(self) -> List[str]:
         raise NotImplementedError()
 

@@ -0,0 +1 @@
+from .data_source import mssql_container  # noqa
@@ -3,7 +3,6 @@
 import pandas as pd
 import pytest
 from sqlalchemy import create_engine
-from testcontainers.core.container import DockerContainer
 from testcontainers.core.waiting_utils import wait_for_logs
 from testcontainers.mssql import SqlServerContainer
 
@@ -24,16 +23,10 @@
 MSSQL_PASSWORD = "yourStrong(!)Password"
 
 
-# This is the sql container to use if your machine doesn't support the official msql docker container.
 @pytest.fixture(scope="session")
 def mssql_container():
-    container = (
-        DockerContainer("mcr.microsoft.com/azure-sql-edge:1.0.6")
-        .with_exposed_ports("1433")
-        .with_env("ACCEPT_EULA", "1")
-        .with_env("MSSQL_USER", MSSQL_USER)
-        .with_env("MSSQL_SA_PASSWORD", MSSQL_PASSWORD)
-    )
+    container = SqlServerContainer(user=MSSQL_USER, password=MSSQL_PASSWORD)
+    container.start()
     container.start()
     log_string_to_wait_for = "Service Broker manager has started"
     wait_for_logs(container=container, predicate=log_string_to_wait_for, timeout=30)
@@ -50,8 +43,8 @@ def __init__(
     ):
         super().__init__(project_name)
         self.tables_created: List[str] = []
-        self.container = SqlServerContainer(user=MSSQL_USER, password=MSSQL_PASSWORD)
-        self.container.start()
+        self.container = fixture_request.getfixturevalue("mssql_container")
+
         if not self.container:
             raise RuntimeError(
                 "In order to use this data source "
@@ -109,4 +102,4 @@ def get_prefixed_table_name(self, destination_name: str) -> str:
         return f"{self.project_name}_{destination_name}"
 
     def teardown(self):
-        container.stop()
+        pass
diff --git a/sdk/python/feast/infra/offline_stores/offline_utils.py b/sdk/python/feast/infra/offline_stores/offline_utils.py
@@ -212,7 +212,7 @@ def build_point_in_time_query(
         "full_feature_names": full_feature_names,
         "final_output_feature_names": final_output_feature_names,
     }
-    
+
     query = template.render(template_context)
     return query
 

@@ -349,6 +349,7 @@ class Environment:
     python_feature_server: bool
     worker_id: str
     online_store_creator: Optional[OnlineStoreCreator] = None
+    fixture_request: Optional[pytest.FixtureRequest] = None
 
     def __post_init__(self):
         self.end_date = datetime.utcnow().replace(microsecond=0, second=0, minute=0)
@@ -457,6 +458,7 @@ def construct_test_environment(
         python_feature_server=test_repo_config.python_feature_server,
         worker_id=worker_id,
         online_store_creator=online_creator,
+        fixture_request=fixture_request,
     )
 
     return environment

@@ -26,7 +26,10 @@ def test_universal_cli(environment: Environment):
         try:
             repo_path = Path(repo_dir_name)
             feature_store_yaml = make_feature_store_yaml(
-                project, environment.test_repo_config, repo_path
+                project,
+                environment.test_repo_config,
+                repo_path,
+                fixture_request=environment.fixture_request,
             )
 
             repo_config = repo_path / "feature_store.yaml"
@@ -120,7 +123,10 @@ def test_odfv_apply(environment) -> None:
         try:
             repo_path = Path(repo_dir_name)
             feature_store_yaml = make_feature_store_yaml(
-                project, environment.test_repo_config, repo_path
+                project,
+                environment.test_repo_config,
+                repo_path,
+                fixture_request=environment.fixture_request,
             )
 
             repo_config = repo_path / "feature_store.yaml"
@@ -151,7 +157,9 @@ def test_nullable_online_store(test_nullable_online_store) -> None:
         try:
             repo_path = Path(repo_dir_name)
             feature_store_yaml = make_feature_store_yaml(
-                project, test_nullable_online_store, repo_path
+                project,
+                test_nullable_online_store,
+                repo_path,
             )
 
             repo_config = repo_path / "feature_store.yaml"

@@ -164,8 +164,15 @@ def _check_offline_and_online_features(
                 )
 
 
-def make_feature_store_yaml(project, test_repo_config, repo_dir_name: Path):
-    offline_creator: DataSourceCreator = test_repo_config.offline_store_creator(project)
+def make_feature_store_yaml(
+    project,
+    test_repo_config,
+    repo_dir_name: Path,
+    fixture_request: Optional[pytest.FixtureRequest],
+):
+    offline_creator: DataSourceCreator = test_repo_config.offline_store_creator(
+        project, fixture_request=fixture_request
+    )
 
     offline_store_config = offline_creator.create_offline_store_config()
     online_store = test_repo_config.online_store
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		from .data_source import mssql_container # noqa
Comment thread adchia marked this conversation as resolved. Outdated