From 61756d0e4c3425000baeb7565176e8d6ce2a5767 Mon Sep 17 00:00:00 2001 From: Takumi Ohyama Date: Wed, 13 Mar 2024 13:56:40 +0000 Subject: [PATCH 1/3] Updated aip version and removed the special kernel --- Makefile | 7 +-- kernels/gemini.sh | 38 --------------- .../gemini_for_multimodal_prompting.ipynb | 48 ++----------------- requirements.txt | 2 +- 4 files changed, 7 insertions(+), 88 deletions(-) delete mode 100755 kernels/gemini.sh diff --git a/Makefile b/Makefile index a9b353a0..f1a88a1a 100644 --- a/Makefile +++ b/Makefile @@ -19,8 +19,7 @@ kernels: \ tf_recommenders_kernel \ object_detection_kernel \ pytorch_kfp_kernel \ - langchain_kernel \ - gemini_kernel + langchain_kernel .PHONY: clean clean: @@ -62,7 +61,3 @@ object_detection_kernel: .PHONY: pytorch_kfp_kernel pytorch_kfp_kernel: ./kernels/pytorch_kfp.sh - -.PHONY: gemini_kernel -gemini_kernel: - ./kernels/gemini.sh diff --git a/kernels/gemini.sh b/kernels/gemini.sh deleted file mode 100755 index 89941195..00000000 --- a/kernels/gemini.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash -# -# To build the kernel: ./kernels/reinforcement_learning.sh -# To remove the kernel: ./kernels/reinforcement_learning.sh remove -# -# This scripts will create a ipython kernel named $MODULE -# populated with the reqs in ./notebooks/$MODULE/requirements.txt - - -MODULE=vertex_genai -ENVNAME=gemini_kernel -REPO_ROOT_DIR="$(dirname $(cd $(dirname $BASH_SOURCE) && pwd))" - -# Cleaning up the kernel and exiting if first arg is 'remove' -if [ "$1" == "remove" ]; then - echo Removing kernel $ENVNAME - jupyter kernelspec remove $ENVNAME - rm -r "$REPO_ROOT_DIR/notebooks/$MODULE/$ENVNAME" - exit 0 -fi - -cd $REPO_ROOT_DIR/notebooks/$MODULE - -# Setup virtual env and kernel -echo creating $ENVNAME at $(pwd) -python3 -m venv $ENVNAME - -# Registering the venv as an ipython kernel -source $ENVNAME/bin/activate -pip install -U pip -pip install ipykernel -python -m ipykernel install --user --name=$ENVNAME - -pip install --upgrade \ - google-cloud-aiplatform \ - pillow - -deactivate diff --git a/notebooks/vertex_genai/solutions/gemini_for_multimodal_prompting.ipynb b/notebooks/vertex_genai/solutions/gemini_for_multimodal_prompting.ipynb index 3648883f..a3be05ac 100644 --- a/notebooks/vertex_genai/solutions/gemini_for_multimodal_prompting.ipynb +++ b/notebooks/vertex_genai/solutions/gemini_for_multimodal_prompting.ipynb @@ -45,44 +45,6 @@ "For more information, see the [Generative AI on Vertex AI](https://cloud.google.com/vertex-ai/docs/generative-ai/learn/overview) documentation.\n" ] }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "### Setup" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "For this lab, you'll first need to build a special kernel containing all the dependencies we will need:" - ] - }, - { - "cell_type": "code", - "execution_count": null, - "metadata": {}, - "outputs": [], - "source": [ - "!cd ~/asl-ml-immersion && make gemini_kernel" - ] - }, - { - "attachments": { - "be2ef648-ac11-47ee-a130-b68861aa3a16.png": { - "image/png": "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mWe2jTbaqNZVQRzAPvPMM2txAX/uueeG72uuuWatJbj11lttl112CWmS3r777mv77LOPzTvvvCHP22+/PRx75513bNVVV7Uffvihln+7HcYe++23n22zzTYhHl3TE088MZSB9LkS0x3FbrzxxpAv5V5qqaWMbhj75513Xs2fLpM/kstsHeUmHficdtpp9ueff7YrktHKkW7MOIdW/ZJLLjF4kc9uu+1WmyUkI7rlpMWxvfbayxhPYa+//rptueWWIZzfZocddrAvv/wyHKv/s9Zaa9kxxxxTH5z7nV4EkybwiTV8iUPcdlYp0Xlhs/3vueee2/i4ZY95WK/bo446yh555BE7/vjjQwW98sorww9KuoQzSN50003tpptusmmmmcY23nhj+/777w2xvvjii/bUU0/Z+eefbwsvvLDttNNOYYBNV3L++ecPfX7S+e677+zdd99lN+zTZR5nnHHC+G3ppZcOg/Sff/7Zfv31V3vrrbfs77//Dr7t/vzxxx+hfE888YQdeeSRNv7449vpp59ujGPonnMBeP/994MPaX3zzTfhgrbAAgvYdtttF7p/nMOjjz5qZ5xxRhAvceguUQbOhzHLhRdeaAcccEDoIrLfzuDGecUYFwLGfttuu20oA+e/8847h/wpFyJcZZVV7JprrrFvv/02dBW50HCRoftK/Isvvjhw57fLsyWXXNLee++92sUnz8fD/LaAT5p4eKut+3rcVr6Vmr2ca6657JBDDgmtCYVGbHzHaN1ccB4WDvT4h4rFD0VLt8IKK4TUXn75Zbv22mvDPts55pijNi3M1ZSWiq7TTDPNFHxotSgrFQFh0jIsssgiNmjQoJA2Yqq3cccdN5wbPuxfffXV9tVXX9W7tf3OBYHJDFqsKaaYIvhfeumlts4664QWgICtttoqtBBMbGDZvJ3pQQcdZLPNNpstscQSoaX/5JNPbIIJJghpn3TSSTb11FOHz+qrrx4q/4477hjSyvvDuPSnn36Kuo8FswsuuMC23nprozXCaEm33377cJG66667bJ555jHP7+ijj7bnn38+TDTRmnOMruOPP/4Yfo9mld7vqXHhm3jiifOKXVpYpURH95KrsxsVgu5cvRHGJAIi7dW8O8KP50YL5aKjK0M3ZrXVVvPDodIiEBcdFRIbe+yxw3bWWWcN2zHGGCNs81qt6aabLogSB0SA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" - } - }, - "cell_type": "markdown", - "metadata": {}, - "source": [ - "Then you'll need to select the kernel in the notebook. Click on the current kernel on the top right corner of the notebook:\n", - "\n", - "\n", - "![image.png](attachment:be2ef648-ac11-47ee-a130-b68861aa3a16.png)" - ] - }, { "cell_type": "markdown", "metadata": { @@ -698,15 +660,15 @@ "toc_visible": true }, "environment": { - "kernel": "gemini_kernel", - "name": "tf2-gpu.2-12.m115", + "kernel": "python3", + "name": "tf2-cpu.2-11.m114", "type": "gcloud", - "uri": "gcr.io/deeplearning-platform-release/tf2-gpu.2-12:m115" + "uri": "gcr.io/deeplearning-platform-release/tf2-cpu.2-11:m114" }, "kernelspec": { - "display_name": "gemini_kernel (Local)", + "display_name": "Python 3 (Local)", "language": "python", - "name": "gemini_kernel" + "name": "python3" }, "language_info": { "codemirror_mode": { diff --git a/requirements.txt b/requirements.txt index 14166c00..c807a8c6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ # Requirements for asl-ml-immersion repository -google-cloud-aiplatform==1.33.1 +google-cloud-aiplatform==1.43.0 google-cloud-pipeline-components==1.0.44 pyyaml==5.3.1 kfp==1.8.22 From 3695d1d65bd17dd1491c47392a8a21948c9e52ac Mon Sep 17 00:00:00 2001 From: Takumi Ohyama Date: Wed, 13 Mar 2024 15:08:49 +0000 Subject: [PATCH 2/3] Tested vertex_genai folder --- notebooks/vertex_genai/labs/prompt_engineering.ipynb | 1 - notebooks/vertex_genai/solutions/prompt_engineering.ipynb | 1 - 2 files changed, 2 deletions(-) diff --git a/notebooks/vertex_genai/labs/prompt_engineering.ipynb b/notebooks/vertex_genai/labs/prompt_engineering.ipynb index 1bb5993f..ed52e97e 100644 --- a/notebooks/vertex_genai/labs/prompt_engineering.ipynb +++ b/notebooks/vertex_genai/labs/prompt_engineering.ipynb @@ -35,7 +35,6 @@ "metadata": {}, "outputs": [], "source": [ - "# tested on aiplatform==1.33.1\n", "from google.cloud import aiplatform\n", "from vertexai.language_models import (\n", " ChatModel,\n", diff --git a/notebooks/vertex_genai/solutions/prompt_engineering.ipynb b/notebooks/vertex_genai/solutions/prompt_engineering.ipynb index cc995065..62e82c41 100644 --- a/notebooks/vertex_genai/solutions/prompt_engineering.ipynb +++ b/notebooks/vertex_genai/solutions/prompt_engineering.ipynb @@ -35,7 +35,6 @@ "metadata": {}, "outputs": [], "source": [ - "# tested on aiplatform==1.33.1\n", "from google.cloud import aiplatform\n", "from vertexai.language_models import (\n", " ChatModel,\n", From 17f44ba88c8e2e7db6880cfa2905d794aa30592b Mon Sep 17 00:00:00 2001 From: Takumi Ohyama Date: Tue, 19 Mar 2024 14:29:42 +0000 Subject: [PATCH 3/3] Added type change from pd.Series->list --- .../solutions/semantic_search_with_vector_search_and_palm.ipynb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/notebooks/vertex_genai/solutions/semantic_search_with_vector_search_and_palm.ipynb b/notebooks/vertex_genai/solutions/semantic_search_with_vector_search_and_palm.ipynb index f113b4bf..a3c08ca4 100644 --- a/notebooks/vertex_genai/solutions/semantic_search_with_vector_search_and_palm.ipynb +++ b/notebooks/vertex_genai/solutions/semantic_search_with_vector_search_and_palm.ipynb @@ -164,7 +164,7 @@ "vectors = []\n", "\n", "for i in range(0, len(metadata), MAX_BATCH_SIZE):\n", - " batch = metadata.abstract[i : i + MAX_BATCH_SIZE]\n", + " batch = metadata.abstract[i : i + MAX_BATCH_SIZE].to_list()\n", " embeddings = model.get_embeddings(batch)\n", " vectors.extend([embedding.values for embedding in embeddings])" ]