Replace incorrect CsText use with CsJsonb

Author: yujiyokoo

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

@@ -262,7 +262,9 @@
    "cell_type": "code",
    "execution_count": null,
    "id": "4e7763c1-4155-4fe3-ab40-ef359adb7ca8",
-   "metadata": {},
+   "metadata": {
+    "scrolled": true
+   },
    "outputs": [],
    "source": [
     "%env PGPASSWORD=postgres\n",
@@ -300,7 +302,9 @@
    "cell_type": "code",
    "execution_count": null,
    "id": "56e04d28-4ebc-463a-b7d0-1ea3cf843f1b",
-   "metadata": {},
+   "metadata": {
+    "scrolled": true
+   },
    "outputs": [],
    "source": [
     "%env PGPASSWORD=postgres\n",
@@ -431,9 +435,7 @@
    "cell_type": "code",
    "execution_count": null,
    "id": "698c6970-62f0-4cfb-b779-7a5dbbe11d3a",
-   "metadata": {
-    "scrolled": true
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "from pprint import pprint\n",
@@ -857,7 +859,7 @@
    "source": [
     "query = \"SELECT cs_ste_vec_value_v1(encrypted_jsonb, %s) AS val FROM examples\"\n",
     "\n",
-    "results = cur.execute(query, (CsText(\"$.top.nested\", \"examples\", \"encrypted_jsonb\").to_db_format(\"ejson_path\"),))\n",
+    "results = cur.execute(query, (CsJsonb(\"$.top.nested\", \"examples\", \"encrypted_jsonb\").to_db_format(\"ejson_path\"),))\n",
     "\n",
     "found = cur.fetchall()\n",
     "print(\"values from '$.top.nested':\")\n",
@@ -884,8 +886,8 @@
     "\n",
     "cur.execute(\n",
     "    query,\n",
-    "    (CsText(\"$.num\", \"examples\", \"encrypted_jsonb\").to_db_format(\"ejson_path\"),\n",
-    "        CsText(\"1\", \"examples\", \"encrypted_jsonb\").to_db_format(\"ste_vec\")\n",
+    "    (CsJsonb(\"$.num\", \"examples\", \"encrypted_jsonb\").to_db_format(\"ejson_path\"),\n",
+    "        CsJsonb(1, \"examples\", \"encrypted_jsonb\").to_db_format(\"ste_vec\")\n",
     "    )\n",
     ")\n",
     "\n",
@@ -917,7 +919,7 @@
     "\n",
     "cur.execute(\n",
     "    query,\n",
-    "    (CsText(\"$.num\", \"examples\", \"encrypted_jsonb\").to_db_format(\"ejson_path\"),)\n",
+    "    (CsJsonb(\"$.num\", \"examples\", \"encrypted_jsonb\").to_db_format(\"ejson_path\"),)\n",
     ")\n",
     "found = cur.fetchall();\n",
     "print(\"JSONB contents, ordered by 'num' desc:\")\n",
@@ -947,8 +949,8 @@
     "\n",
     "cur.execute(\n",
     "    query,\n",
-    "    (CsText(\"$.category\", \"examples\", \"encrypted_jsonb\").to_db_format(\"ejson_path\"),\n",
-    "    CsText(\"$.category\", \"examples\", \"encrypted_jsonb\").to_db_format(\"ejson_path\"))\n",
+    "    (CsJsonb(\"$.category\", \"examples\", \"encrypted_jsonb\").to_db_format(\"ejson_path\"),\n",
+    "    CsJsonb(\"$.category\", \"examples\", \"encrypted_jsonb\").to_db_format(\"ejson_path\"))\n",
     ")\n",
     "\n",
     "found = cur.fetchall()\n",

languages/python/jupyter_notebook/cs_types.py

@@ -1,8 +1,6 @@
 from psycopg2.extras import RealDictCursor
-from pprint import pprint
 from datetime import datetime
 import json
-from enum import Enum
 
 class CsValue:
     def __init__(self, v, t: str, c: str):
@@ -99,4 +97,4 @@ def __init__(self, row):
                 self.row[k] = None
             else:
                 mapping = self.column_function_mapping.get(k, self.id_map)
-                self.row[k] = mapping(v)
+                self.row[k] = mapping(v)