fix: reenable CI

Change-Id: Id7bba03ddb94a712abcaf000493c69508d0c65c5
GoogleCloudPlatform · Sep 19, 2024 · 5a3e266 · 5a3e266
1 parent 6e48fd5
commit 5a3e266
Show file tree

Hide file tree

Showing 4 changed files with 175 additions and 417 deletions.
diff --git a/applications/rag/example_notebooks/rag-kaggle-ray-sql-interactive.ipynb b/applications/rag/example_notebooks/rag-kaggle-ray-sql-interactive.ipynb
@@ -37,9 +37,9 @@
    "id": "c7ff518d-f4d2-481b-b408-2c2507565611",
    "metadata": {},
    "source": [
-    "## Creating the Database Connection\n",
+    "## Download the Data\n",
     "\n",
-    "Let's now set up a connection to your CloudSQL database:"
+    "Let's now import required modules:"
    ]
   },
   {
@@ -60,42 +60,7 @@
     "from datasets import load_dataset_builder, load_dataset, Dataset\n",
     "from huggingface_hub import snapshot_download\n",
     "from google.cloud.sql.connector import Connector, IPTypes\n",
-    "import sqlalchemy\n",
-    "\n",
-    "# initialize parameters\n",
-    "\n",
-    "INSTANCE_CONNECTION_NAME = os.environ[\"CLOUDSQL_INSTANCE_CONNECTION_NAME\"]\n",
-    "print(f\"Your instance connection name is: {INSTANCE_CONNECTION_NAME}\")\n",
-    "DB_NAME = \"pgvector-database\"\n",
-    "\n",
-    "db_username_file = open(\"/etc/secret-volume/username\", \"r\")\n",
-    "DB_USER = db_username_file.read()\n",
-    "db_username_file.close()\n",
-    "\n",
-    "db_password_file = open(\"/etc/secret-volume/password\", \"r\")\n",
-    "DB_PASS = db_password_file.read()\n",
-    "db_password_file.close()\n",
-    "\n",
-    "# initialize Connector object\n",
-    "connector = Connector()\n",
-    "\n",
-    "# function to return the database connection object\n",
-    "def getconn():\n",
-    "    conn = connector.connect(\n",
-    "        INSTANCE_CONNECTION_NAME,\n",
-    "        \"pg8000\",\n",
-    "        user=DB_USER,\n",
-    "        password=DB_PASS,\n",
-    "        db=DB_NAME,\n",
-    "        ip_type=IPTypes.PRIVATE\n",
-    "    )\n",
-    "    return conn\n",
-    "\n",
-    "# create connection pool with 'creator' argument to our connection object function\n",
-    "pool = sqlalchemy.create_engine(\n",
-    "    \"postgresql+pg8000://\",\n",
-    "    creator=getconn,\n",
-    ")"
+    "import sqlalchemy"
    ]
   },
   {
@@ -322,6 +287,40 @@
     "from sqlalchemy.orm import scoped_session, sessionmaker, mapped_column\n",
     "from pgvector.sqlalchemy import Vector\n",
     "\n",
+    "# initialize parameters\n",
+    "\n",
+    "INSTANCE_CONNECTION_NAME = os.environ[\"CLOUDSQL_INSTANCE_CONNECTION_NAME\"]\n",
+    "print(f\"Your instance connection name is: {INSTANCE_CONNECTION_NAME}\")\n",
+    "DB_NAME = \"pgvector-database\"\n",
+    "\n",
+    "db_username_file = open(\"/etc/secret-volume/username\", \"r\")\n",
+    "DB_USER = db_username_file.read()\n",
+    "db_username_file.close()\n",
+    "\n",
+    "db_password_file = open(\"/etc/secret-volume/password\", \"r\")\n",
+    "DB_PASS = db_password_file.read()\n",
+    "db_password_file.close()\n",
+    "\n",
+    "# initialize Connector object\n",
+    "connector = Connector()\n",
+    "\n",
+    "# function to return the database connection object\n",
+    "def getconn():\n",
+    "    conn = connector.connect(\n",
+    "        INSTANCE_CONNECTION_NAME,\n",
+    "        \"pg8000\",\n",
+    "        user=DB_USER,\n",
+    "        password=DB_PASS,\n",
+    "        db=DB_NAME,\n",
+    "        ip_type=IPTypes.PRIVATE\n",
+    "    )\n",
+    "    return conn\n",
+    "\n",
+    "# create connection pool with 'creator' argument to our connection object function\n",
+    "pool = sqlalchemy.create_engine(\n",
+    "    \"postgresql+pg8000://\",\n",
+    "    creator=getconn,\n",
+    ")\n",
     "\n",
     "Base = declarative_base()\n",
     "DBSession = scoped_session(sessionmaker())\n",