port: kfp2

notebooks/official/pipelines/challenger_vs_blessed_deployment_method.ipynb

@@ -165,11 +165,11 @@
         "# Install the packages\n",
         "USER=''\n",
         "! pip3 install {USER} --upgrade google-cloud-aiplatform \\\n",
-        "                                'google-cloud-pipeline-components<2'\n",
+        "                                google-cloud-pipeline-components \\\n",
         "! pip3 install {USER}           tensorflow==2.5 \\\n",
         "                                tensorflow_hub\n",
         "  \n",
-        "! pip3 install {USER} --upgrade 'kfp<2'"
+        "! pip3 install {USER} --upgrade kfp"
       ]
     },
     {
@@ -325,10 +325,8 @@
       },
       "outputs": [],
       "source": [
-        "IS_COLAB = False\n",
         "# from google.colab import auth\n",
-        "# auth.authenticate_user()\n",
-        "# IS_COLAB = True"
+        "# auth.authenticate_user()"
       ]
     },
     {
@@ -382,7 +380,7 @@
       },
       "outputs": [],
       "source": [
-        "! gsutil mb -l $REGION -p $PROJECT_ID $BUCKET_URI"
+        "! gsutil mb -l {REGION} -p {PROJECT_ID} {BUCKET_URI}"
       ]
     },
     {
@@ -417,6 +415,9 @@
       },
       "outputs": [],
       "source": [
+        "import sys\n",
+        "\n",
+        "IS_COLAB = \"google.colab\" in sys.modules\n",
         "if (\n",
         "    SERVICE_ACCOUNT == \"\"\n",
         "    or SERVICE_ACCOUNT is None\n",
@@ -481,8 +482,8 @@
         "import tensorflow_hub as hub\n",
         "from google.cloud import aiplatform\n",
         "from google.cloud.aiplatform import gapic\n",
-        "from kfp.v2 import compiler\n",
-        "from kfp.v2.dsl import component"
+        "from kfp import compiler\n",
+        "from kfp.dsl import component"
       ]
     },
     {
@@ -1037,7 +1038,7 @@
         "        GetVertexModelOp\n",
         "    from google_cloud_pipeline_components.types import artifact_types\n",
         "    from google_cloud_pipeline_components.v1.endpoint import ModelDeployOp\n",
-        "    from kfp.v2.components import importer_node\n",
+        "    from kfp.dsl import importer_node\n",
         "\n",
         "    # Get the Vertex AI model resource of the blessed model\n",
         "    model = GetVertexModelOp(model_resource_name=blessed_model_resource)\n",
@@ -1107,7 +1108,7 @@
       "outputs": [],
       "source": [
         "compiler.Compiler().compile(\n",
-        "    pipeline_func=pipeline, package_path=\"challenger_vs_blessed.json\"\n",
+        "    pipeline_func=pipeline, package_path=\"challenger_vs_blessed.yaml\"\n",
         ")"
       ]
     },
@@ -1142,7 +1143,7 @@
         "\n",
         "job = aiplatform.PipelineJob(\n",
         "    display_name=\"challenger_vs_blessed\",\n",
-        "    template_path=\"challenger_vs_blessed.json\",\n",
+        "    template_path=\"challenger_vs_blessed.yaml\",\n",
         "    pipeline_root=PIPELINE_ROOT,\n",
         "    parameter_values={\n",
         "        \"blessed_model_resource\": blessed_model.resource_name,\n",