Correct some issues in jupyter notebook

Author: yujiyokoo

languages/python/jupyter_notebook/CipherStash-Getting-Started.ipynb

@@ -170,9 +170,7 @@
    "cell_type": "code",
    "execution_count": null,
    "id": "b082598f-acc8-47bc-b561-c0f07d059f4b",
-   "metadata": {
-    "scrolled": true
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "%env CS_WORKSPACE_ID=<workspace_id>"
@@ -182,9 +180,7 @@
    "cell_type": "code",
    "execution_count": null,
    "id": "e01757fa-0d70-4d53-b33d-88bf02449d3c",
-   "metadata": {
-    "scrolled": true
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "%env CS_CLIENT_ACCESS_KEY=<client_access_key>"
@@ -194,9 +190,7 @@
    "cell_type": "code",
    "execution_count": null,
    "id": "348e6430-dae7-4183-8eab-46315b622f1c",
-   "metadata": {
-    "scrolled": true
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "%env CS_ENCRYPTION__CLIENT_ID=<client_id>"
@@ -206,9 +200,7 @@
    "cell_type": "code",
    "execution_count": null,
    "id": "e8ac364e-98a1-4687-b11e-4b935b6d8b70",
-   "metadata": {
-    "scrolled": true
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "%env CS_ENCRYPTION__CLIENT_KEY=<client_key>"
@@ -814,9 +806,9 @@
     "# JSONB containment 1\n",
     "cur.execute(\"SELECT * from examples WHERE cs_ste_vec_v1(encrypted_jsonb) @> cs_ste_vec_v1(%s)\", (CsJsonb({'top': { 'nested': ['a', 'b'] } }, \"examples\", \"encrypted_jsonb\").to_db_format(\"ste_vec\"),))\n",
     "found = cur.fetchall()\n",
-    "for row in found:\n",
-    "    print(f\"Record Found with JSONB query: {CsRow(row).row}\\n\")\n",
-    "    print(f\"JSONB inside the found record: {CsJsonb.from_parsed_json(row['encrypted_jsonb'])}\\n\")"
+    "for f in found:\n",
+    "    print(f\"Record Found with JSONB query: {CsRow(f).row}\\n\")\n",
+    "    print(f\"JSONB inside the found record: {CsJsonb.from_parsed_json(f['encrypted_jsonb'])}\\n\")"
    ]
   },
   {
@@ -835,11 +827,12 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "# JSONB containment 1\n",
+    "# JSONB containment 2\n",
     "cur.execute(\"SELECT * from examples WHERE cs_ste_vec_v1(encrypted_jsonb) <@ cs_ste_vec_v1(%s)\", (CsJsonb({\"num\": 2, \"category\": \"b\", 'top': {'nested': ['a'] } }, \"examples\", \"encrypted_jsonb\").to_db_format(\"ste_vec\"),))\n",
     "found = cur.fetchall()\n",
-    "for row in found:\n",
-    "    print(f\"Record Found with JSONB query: {CsRow(row).row}\\n\")\n"
+    "print(\"Record Found with JSONB query:\")\n",
+    "for f in found:\n",
+    "    print(f\"  {CsRow(f).row}\")"
    ]
   },
   {
@@ -866,28 +859,10 @@
     "\n",
     "results = cur.execute(query, (CsText(\"$.top.nested\", \"examples\", \"encrypted_jsonb\").to_db_format(\"ejson_path\"),))\n",
     "\n",
-    "# TODO add extracting 'p'\n",
-    "found = cur.fetchall()\n",
-    "for row in found:\n",
-    "    print(f\"Record Found with JSONB query: {row}\\n\")\n"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "f753ce40-139a-4e0d-ba5f-3a284bc70b83",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# JSONB containment 1\n",
-    "conn.rollback()\n",
-    "cur.execute(\"SELECT cs_ste_vec_value_v1(encrypted_jsonb, %s) AS val FROM examples\",\n",
-    "    (CsText(\"$.top.nested\", \"examples\", \"encrypted_jsonb\").to_db_format(\"ejson_path\"),)\n",
-    ")\n",
     "found = cur.fetchall()\n",
-    "# TODO add extracting 'p'\n",
-    "for row in found:\n",
-    "    print(f\"Record Found with JSONB query: {CsRow(row).row}\\n\")"
+    "print(\"values from '$.top.nested':\")\n",
+    "for f in found:\n",
+    "    print(f\"  {CsRow(f).row.get('val', {}).get('p')}\")"
    ]
   },
   {
@@ -916,9 +891,8 @@
     "\n",
     "found = cur.fetchall()\n",
     "\n",
-    "# TODO: extract 'p'\n",
-    "for e in found:\n",
-    "    print(f\"Record Found with JSONB query: {CsRow(row).row}\\n\")"
+    "for f in found:\n",
+    "    print(f\"Record Found with JSONB query: {CsRow(f).row}\\n\")"
    ]
   },
   {
@@ -946,8 +920,9 @@
     "    (CsText(\"$.num\", \"examples\", \"encrypted_jsonb\").to_db_format(\"ejson_path\"),)\n",
     ")\n",
     "found = cur.fetchall();\n",
-    "for e in found:\n",
-    "    print(f\"JSONB results: {e}\")"
+    "print(\"JSONB contents, ordered by 'num' desc:\")\n",
+    "for f in found:\n",
+    "    print(f\"  {CsRow(f).row.get('encrypted_jsonb')}\")"
    ]
   },
   {
@@ -978,9 +953,10 @@
     "\n",
     "found = cur.fetchall()\n",
     "\n",
-    "# TODO: exctract records\n",
-    "for e in found:\n",
-    "    print(f\"JSONB results: {e}\")\n"
+    "print(\"count, grouped by category:\")\n",
+    "for f in found:\n",
+    "    row = CsRow(f).row\n",
+    "    print(f\"  category: {row.get('category', {}).get('p')}, count: {row.get('count')}\")\n"
    ]
   },
   {