Use maven based submission by default for samples (#603)

* use maven based submission by default * Update Customer360.ipynb * Update product_recommendation_demo_advanced.ipynb
feathr-ai · Aug 25, 2022 · bf7993e · bf7993e
1 parent e9fc505
commit bf7993e
Show file tree

Hide file tree

Showing 7 changed files with 2,460 additions and 17 deletions.
diff --git a/docs/samples/customer360/Customer360.ipynb b/docs/samples/customer360/Customer360.ipynb
diff --git a/docs/samples/databricks/databricks_quickstart_nyc_taxi_driver.ipynb b/docs/samples/databricks/databricks_quickstart_nyc_taxi_driver.ipynb
@@ -229,14 +229,12 @@
         "cluster_id = ctx.tags().get(\"clusterId\").get()\n",
         "\n",
         "\n",
-        "feathr_runtime_location = \"https://azurefeathrstorage.blob.core.windows.net/public/feathr-assembly-LATEST.jar\"\n",
         "\n",
         "# databricks_config = {'run_name':'FEATHR_FILL_IN','existing_cluster_id':cluster_id,'libraries':[{'jar':'FEATHR_FILL_IN'}],'spark_jar_task':{'main_class_name':'FEATHR_FILL_IN','parameters':['FEATHR_FILL_IN']}}\n",
         "os.environ['spark_config__databricks__workspace_instance_url'] = \"https://\" + host_name\n",
         "os.environ['spark_config__databricks__config_template']='{\"run_name\":\"FEATHR_FILL_IN\",\"new_cluster\":{\"spark_version\":\"10.4.x-scala2.12\",\"node_type_id\":\"Standard_D3_v2\",\"num_workers\":2,\"spark_conf\":{\"FEATHR_FILL_IN\":\"FEATHR_FILL_IN\"}},\"libraries\":[{\"jar\":\"FEATHR_FILL_IN\"}],\"spark_jar_task\":{\"main_class_name\":\"FEATHR_FILL_IN\",\"parameters\":[\"FEATHR_FILL_IN\"]}}'\n",
         "# os.environ['spark_config__databricks__config_template']=json.dumps(databricks_config)\n",
         "os.environ['spark_config__databricks__work_dir']='dbfs:/feathr_getting_started'\n",
-        "os.environ['spark_config__databricks__feathr_runtime_location']=feathr_runtime_location\n",
         "os.environ['project_config__project_name']='feathr_getting_started'\n",
         "os.environ['DATABRICKS_WORKSPACE_TOKEN_VALUE'] = host_token"
       ]
@@ -1446,4 +1444,4 @@
   },
   "nbformat": 4,
   "nbformat_minor": 0
-}
+}
diff --git a/docs/samples/fraud_detection_demo.ipynb b/docs/samples/fraud_detection_demo.ipynb
@@ -239,12 +239,10 @@
                 "    workspace_dir: 'abfss://feathrazuretest3fs@feathrazuretest3storage.dfs.core.windows.net/fraud_detection_test'\n",
                 "    executor_size: 'Small'\n",
                 "    executor_num: 4\n",
-                "    feathr_runtime_location: wasbs://public@azurefeathrstorage.blob.core.windows.net/feathr-assembly-LATEST.jar\n",
                 "  databricks:\n",
                 "    workspace_instance_url: 'https://adb-2474129336842816.16.azuredatabricks.net'\n",
                 "    config_template: {'run_name':'','new_cluster':{'spark_version':'9.1.x-scala2.12','node_type_id':'Standard_D3_v2','num_workers':2,'spark_conf':{}},'libraries':[{'jar':''}],'spark_jar_task':{'main_class_name':'','parameters':['']}}\n",
                 "    work_dir: 'dbfs:/fraud_detection_test'\n",
-                "    feathr_runtime_location: https://azurefeathrstorage.blob.core.windows.net/public/feathr-assembly-LATEST.jar\n",
                 "online_store:\n",
                 "  redis:\n",
                 "    host: 'feathrazuretest3redis.redis.cache.windows.net'\n",

diff --git a/docs/samples/product_recommendation_demo.ipynb b/docs/samples/product_recommendation_demo.ipynb
@@ -234,12 +234,10 @@
         "    workspace_dir: 'abfss://feathrazuretest3fs@feathrazuretest3storage.dfs.core.windows.net/feathr_getting_started'\n",
         "    executor_size: 'Small'\n",
         "    executor_num: 4\n",
-        "    feathr_runtime_location: wasbs://public@azurefeathrstorage.blob.core.windows.net/feathr-assembly-LATEST.jar\n",
         "  databricks:\n",
         "    workspace_instance_url: 'https://adb-2474129336842816.16.azuredatabricks.net'\n",
         "    config_template: {'run_name':'','new_cluster':{'spark_version':'9.1.x-scala2.12','node_type_id':'Standard_D3_v2','num_workers':2,'spark_conf':{}},'libraries':[{'jar':''}],'spark_jar_task':{'main_class_name':'','parameters':['']}}\n",
         "    work_dir: 'dbfs:/feathr_getting_started'\n",
-        "    feathr_runtime_location: https://azurefeathrstorage.blob.core.windows.net/public/feathr-assembly-LATEST.jar\n",
         "online_store:\n",
         "  redis:\n",
         "    host: 'feathrazuretest3redis.redis.cache.windows.net'\n",

diff --git a/docs/samples/product_recommendation_demo_advanced.ipynb b/docs/samples/product_recommendation_demo_advanced.ipynb
diff --git a/feathr_project/feathr/constants.py b/feathr_project/feathr/constants.py
@@ -28,4 +28,4 @@
 TYPEDEF_ARRAY_DERIVED_FEATURE=f"array<feathr_derived_feature_{REGISTRY_TYPEDEF_VERSION}>"
 TYPEDEF_ARRAY_ANCHOR_FEATURE=f"array<feathr_anchor_feature_{REGISTRY_TYPEDEF_VERSION}>"
 
-FEATHR_MAVEN_ARTIFACT="com.linkedin.feathr:feathr_2.12:0.6.0"
+FEATHR_MAVEN_ARTIFACT="com.linkedin.feathr:feathr_2.12:0.6.2"
diff --git a/feathr_project/feathrcli/data/feathr_user_workspace/nyc_driver_demo.ipynb b/feathr_project/feathrcli/data/feathr_user_workspace/nyc_driver_demo.ipynb
@@ -222,12 +222,10 @@
         "    workspace_dir: 'abfss://feathrazuretest3fs@feathrazuretest3storage.dfs.core.windows.net/feathr_getting_started'\n",
         "    executor_size: 'Small'\n",
         "    executor_num: 4\n",
-        "    feathr_runtime_location: wasbs://public@azurefeathrstorage.blob.core.windows.net/feathr-assembly-LATEST.jar\n",
         "  databricks:\n",
         "    workspace_instance_url: 'https://adb-2474129336842816.16.azuredatabricks.net'\n",
         "    config_template: {'run_name':'','new_cluster':{'spark_version':'9.1.x-scala2.12','node_type_id':'Standard_D3_v2','num_workers':2,'spark_conf':{}},'libraries':[{'jar':''}],'spark_jar_task':{'main_class_name':'','parameters':['']}}\n",
         "    work_dir: 'dbfs:/feathr_getting_started'\n",
-        "    feathr_runtime_location: https://azurefeathrstorage.blob.core.windows.net/public/feathr-assembly-LATEST.jar\n",
         "online_store:\n",
         "  redis:\n",
         "    host: 'feathrazuretest3redis.redis.cache.windows.net'\n",
@@ -694,11 +692,8 @@
     }
   ],
   "metadata": {
-    "interpreter": {
-      "hash": "b3c5d8fd79e029a19bf620c04a250a0cafa2291ba3ed87972a3e2a099b099985"
-    },
     "kernelspec": {
-      "display_name": "Python 3.9.12 ('product_env': venv)",
+      "display_name": "Python 3.9.5 ('base')",
       "language": "python",
       "name": "python3"
     },
@@ -712,7 +707,12 @@
       "name": "python",
       "nbconvert_exporter": "python",
       "pygments_lexer": "ipython3",
-      "version": "3.9.12"
+      "version": "3.9.5"
+    },
+    "vscode": {
+      "interpreter": {
+        "hash": "3d597f4c481aa0f25dceb95d2a0067e73c0966dcbd003d741d821a7208527ecf"
+      }
     }
   },
   "nbformat": 4,