Added email validation trigger

00_datamodel.ipynb

@@ -471,7 +471,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 279,
+   "execution_count": 296,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -486,13 +486,28 @@
     "    errors:ContactErrors = field(default_factory=lambda: ContactErrors())\n",
     "    is_valid:bool=True\n",
     "\n",
-    "    def from_contacts_dict(self, c):\n",
+    "    def validate_contact_email(self, duplicate_ok):\n",
+    "        if self.email is None or self.email == \"\":\n",
+    "            self.is_valid = False\n",
+    "            self.errors.email= \"Email is empty\"\n",
+    "        elif not validate_email(self.email):\n",
+    "            self.is_valid = False\n",
+    "            self.errors.email= \"Format email not correct\"\n",
+    "        elif not duplicate_ok:\n",
+    "            if check_duplicates(self.email, Contacts().get_emails()):\n",
+    "                self.is_valid = False\n",
+    "                self.errors.email= \"Duplicated email\"\n",
+    "        else: pass\n",
+    "\n",
+    "\n",
+    "    def from_contacts_dict(self, c, validate=True, duplicate_ok=True):\n",
     "        self.firstname = c['firstname']\n",
     "        self.lastname = c['lastname']\n",
     "        self.phone = c['phone']\n",
     "        self.email = c['email']\n",
     "        self.id = c['id']\n",
-    "        self.check_valid(duplicate_ok=True)\n",
+    "        if validate:\n",
+    "            self.check_valid(duplicate_ok=duplicate_ok)\n",
     "\n",
     "    def check_valid(self, duplicate_ok=False):\n",
     "        self.is_valid = True\n",
@@ -512,17 +527,7 @@
     "            self.errors.phone= \"Format phone not correct\"\n",
     "        else: pass\n",
     "\n",
-    "        if self.email is None or self.email == \"\":\n",
-    "            self.is_valid = False\n",
-    "            self.errors.email= \"Email is empty\"\n",
-    "        elif not validate_email(self.email):\n",
-    "            self.is_valid = False\n",
-    "            self.errors.email= \"Format email not correct\"\n",
-    "        elif not duplicate_ok:\n",
-    "            if check_duplicates(self.email, Contacts().get_emails()):\n",
-    "                self.is_valid = False\n",
-    "                self.errors.email= \"Duplicated email\"\n",
-    "        else: pass\n",
+    "        self.validate_contact_email(duplicate_ok=duplicate_ok)\n",
     "\n",
     "    def commit(self, duplicate_ok=True):\n",
     "        self.check_valid(duplicate_ok=duplicate_ok)\n",
@@ -549,7 +554,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 280,
+   "execution_count": 297,
    "metadata": {},
    "outputs": [
     {
@@ -565,7 +570,7 @@
        "True"
       ]
      },
-     "execution_count": 280,
+     "execution_count": 297,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -580,7 +585,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 281,
+   "execution_count": 298,
    "metadata": {},
    "outputs": [
     {
@@ -589,7 +594,7 @@
        "True"
       ]
      },
-     "execution_count": 281,
+     "execution_count": 298,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -604,7 +609,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 282,
+   "execution_count": 299,
    "metadata": {},
    "outputs": [
     {
@@ -623,7 +628,7 @@
        " 'rahuketu@gmail.com']"
       ]
      },
-     "execution_count": 282,
+     "execution_count": 299,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -634,7 +639,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 283,
+   "execution_count": 300,
    "metadata": {},
    "outputs": [
     {
@@ -643,7 +648,7 @@
        "Contact[[None, None], [None, None], [None, None], [None, None], [True, '']]"
       ]
      },
-     "execution_count": 283,
+     "execution_count": 300,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -654,7 +659,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 284,
+   "execution_count": 301,
    "metadata": {},
    "outputs": [
     {
@@ -670,7 +675,7 @@
        "True"
       ]
      },
-     "execution_count": 284,
+     "execution_count": 301,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -687,7 +692,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 258,
+   "execution_count": 302,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -698,7 +703,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 259,
+   "execution_count": 303,
    "metadata": {},
    "outputs": [
     {
@@ -756,7 +761,7 @@
        "  'id': 10}]"
       ]
      },
-     "execution_count": 259,
+     "execution_count": 303,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -775,7 +780,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 260,
+   "execution_count": 304,
    "metadata": {},
    "outputs": [
     {
@@ -788,7 +793,7 @@
        " 'id': 1}"
       ]
      },
-     "execution_count": 260,
+     "execution_count": 304,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -800,7 +805,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 261,
+   "execution_count": 305,
    "metadata": {},
    "outputs": [
     {
@@ -813,7 +818,7 @@
        " 'id': 2}"
       ]
      },
-     "execution_count": 261,
+     "execution_count": 305,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -824,7 +829,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 262,
+   "execution_count": 306,
    "metadata": {},
    "outputs": [],
    "source": [

01_main.ipynb

@@ -9,7 +9,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 766,
+   "execution_count": 28,
    "metadata": {},
    "outputs": [
     {
@@ -28,7 +28,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 767,
+   "execution_count": 29,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -41,7 +41,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 768,
+   "execution_count": 30,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -51,7 +51,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 769,
+   "execution_count": 31,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -62,7 +62,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 770,
+   "execution_count": 32,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -74,7 +74,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 771,
+   "execution_count": 33,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -90,7 +90,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 772,
+   "execution_count": 34,
    "metadata": {},
    "outputs": [
     {
@@ -103,7 +103,7 @@
        " 'id': 1}"
       ]
      },
-     "execution_count": 772,
+     "execution_count": 34,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -115,7 +115,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 773,
+   "execution_count": 35,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -127,7 +127,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 774,
+   "execution_count": 36,
    "metadata": {},
    "outputs": [
     {
@@ -173,7 +173,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 775,
+   "execution_count": 37,
    "metadata": {},
    "outputs": [
     {
@@ -186,7 +186,7 @@
        " 'id': 2}"
       ]
      },
-     "execution_count": 775,
+     "execution_count": 37,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -197,7 +197,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 776,
+   "execution_count": 38,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -218,8 +218,8 @@
     "        c.lastname = request.form['lastname']\n",
     "        c.phone=request.form['phone']\n",
     "        c.email=request.form['email']\n",
-    "        c.check_valid(duplicate_ok=True)\n",
-    "        if c.commit(duplicate_ok=True):\n",
+    "        c.check_valid(duplicate_ok=False)\n",
+    "        if c.commit(duplicate_ok=False):\n",
     "            flash(\"Updated Contract\")\n",
     "            return redirect(\"/contacts/\"+str(id))\n",
     "        else: return render_template('edit.html', contact=c)"
@@ -227,7 +227,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 777,
+   "execution_count": 39,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -241,7 +241,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 778,
+   "execution_count": 40,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -255,7 +255,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 779,
+   "execution_count": 41,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -265,7 +265,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 780,
+   "execution_count": 42,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -277,7 +277,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 781,
+   "execution_count": 43,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -299,7 +299,24 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 783,
+   "execution_count": 44,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "#|export\n",
+    "@app.get(\"/contacts/<int:id>/email\")\n",
+    "def contact_email_get(id:int=0):\n",
+    "    c_dict = Contacts().get(id)\n",
+    "    c = Contact()\n",
+    "    c.from_contacts_dict(c_dict, validate=False)\n",
+    "    c.email = request.arg.get('email')\n",
+    "    c.validate_contact_email(duplicate_ok=False)\n",
+    "    return c.errors.email"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 46,
    "metadata": {},
    "outputs": [],
    "source": [

contactdb.json

@@ -1 +1 @@
-[{"firstname":"John","lastname":"Doe","phone":"555-1001","email":"john.doe@example.com","id":0},{"firstname":"Jane","lastname":"Smith","phone":"555-5678","email":"jane.smith@example.com","id":1},{"firstname":"Alice","lastname":"Johnson","phone":"555-8765","email":"alice.johnson@example.com","id":2},{"firstname":"Bob","lastname":"Williams","phone":"555-4321","email":"bob.williams@example.com","id":3},{"firstname":"Charlie","lastname":"Brown","phone":"555-9876","email":"charlie.brown@example.com","id":4},{"firstname":"Diana","lastname":"Miller","phone":"555-6543","email":"diana.miller@example.com","id":5},{"firstname":"Edward","lastname":"Davis","phone":"555-3456","email":"edward.davis@example.com","id":6},{"firstname":"Fiona","lastname":"Garcia","phone":"555-6789","email":"fiona.garcia@example.com","id":7},{"firstname":"George","lastname":"Martinez","phone":"555-7890","email":"george.martinez@example.com","id":8},{"firstname":"Hannah","lastname":"Rodriguez","phone":"555-8901","email":"hannah.rodriguez@example.com","id":9},{"firstname":"Rahul","lastname":"Saraf","phone":"555-1200","email":"rahuketu@gmail.com","id":10}]
+[{"firstname":"Jane","lastname":"Smith","phone":"555-5678","email":"jane.smith@example.com","id":1},{"firstname":"Alice","lastname":"Johnson","phone":"555-8765","email":"alice.johnson@example.com","id":2},{"firstname":"Bob","lastname":"Williams","phone":"555-4321","email":"bob.williams@example.com","id":3},{"firstname":"Charlie","lastname":"Brown","phone":"555-9876","email":"charlie.brown@example.com","id":4},{"firstname":"Diana","lastname":"Miller","phone":"555-6543","email":"diana.miller@example.com","id":5},{"firstname":"Edward","lastname":"Davis","phone":"555-3456","email":"edward.davis@example.com","id":6},{"firstname":"Fiona","lastname":"Garcia","phone":"555-6789","email":"fiona.garcia@example.com","id":7},{"firstname":"George","lastname":"Martinez","phone":"555-7890","email":"george.martinez@example.com","id":8},{"firstname":"Hannah","lastname":"Rodriguez","phone":"555-8901","email":"hannah.rodriguez@example.com","id":9}]

datamodel.py

@@ -100,13 +100,28 @@ class Contact:
     errors:ContactErrors = field(default_factory=lambda: ContactErrors())
     is_valid:bool=True
 
-    def from_contacts_dict(self, c):
+    def validate_contact_email(self, duplicate_ok):
+        if self.email is None or self.email == "":
+            self.is_valid = False
+            self.errors.email= "Email is empty"
+        elif not validate_email(self.email):
+            self.is_valid = False
+            self.errors.email= "Format email not correct"
+        elif not duplicate_ok:
+            if check_duplicates(self.email, Contacts().get_emails()):
+                self.is_valid = False
+                self.errors.email= "Duplicated email"
+        else: pass
+
+
+    def from_contacts_dict(self, c, validate=True, duplicate_ok=True):
         self.firstname = c['firstname']
         self.lastname = c['lastname']
         self.phone = c['phone']
         self.email = c['email']
         self.id = c['id']
-        self.check_valid(duplicate_ok=True)
+        if validate:
+            self.check_valid(duplicate_ok=duplicate_ok)
 
     def check_valid(self, duplicate_ok=False):
         self.is_valid = True
@@ -126,17 +141,7 @@ class Contact:
             self.errors.phone= "Format phone not correct"
         else: pass
 
-        if self.email is None or self.email == "":
-            self.is_valid = False
-            self.errors.email= "Email is empty"
-        elif not validate_email(self.email):
-            self.is_valid = False
-            self.errors.email= "Format email not correct"
-        elif not duplicate_ok:
-            if check_duplicates(self.email, Contacts().get_emails()):
-                self.is_valid = False
-                self.errors.email= "Duplicated email"
-        else: pass
+        self.validate_contact_email(duplicate_ok=duplicate_ok)
 
     def commit(self, duplicate_ok=True):
         self.check_valid(duplicate_ok=duplicate_ok)

main.py

@@ -1,7 +1,8 @@
 # AUTOGENERATED! DO NOT EDIT! File to edit: 01_main.ipynb.
 
 # %% auto 0
-__all__ = ['app', 'index', 'contacts', 'view', 'edit', 'delete', 'delete_htmx', 'contact_new_get', 'contact_new']
+__all__ = ['app', 'index', 'contacts', 'view', 'edit', 'delete', 'delete_htmx', 'contact_new_get', 'contact_new',
+           'contact_email_get']
 
 # %% 01_main.ipynb 2
 import pandas as pd
@@ -50,8 +51,8 @@ def edit(id):
         c.lastname = request.form['lastname']
         c.phone=request.form['phone']
         c.email=request.form['email']
-        c.check_valid(duplicate_ok=True)
-        if c.commit(duplicate_ok=True):
+        c.check_valid(duplicate_ok=False)
+        if c.commit(duplicate_ok=False):
             flash("Updated Contract")
             return redirect("/contacts/"+str(id))
         else: return render_template('edit.html', contact=c)
@@ -89,3 +90,13 @@ def contact_new():
     else: 
         print(c)
         return render_template('new.html', contact=c)
+
+# %% 01_main.ipynb 17
+@app.get("/contacts/<int:id>/email")
+def contact_email_get(id:int=0):
+    c_dict = Contacts().get(id)
+    c = Contact()
+    c.from_contacts_dict(c_dict, validate=False)
+    c.email = request.arg.get('email')
+    c.validate_contact_email(duplicate_ok=False)
+    return c.errors.email

templates/edit.html

@@ -6,7 +6,10 @@
             <legend>Contact Values</legend>
             <p>
                 <label for="email">Email</label>
-                <input name="email" id="email" type="email" placeholder="Email" value="{{contact.email or ''}}">
+                <input name="email" id="email" type="email"
+                hx-get="'/contacts/{{contact.id}}/email"
+                hx-target="next .error"
+                placeholder="Email" value="{{contact.email or ''}}">
                 {% if contact.errors.email %}
                 <span class="error">{{ contact.errors.email}}</span>
                 {% endif %}

templates/new.html

@@ -6,7 +6,10 @@
             <legend>Contact Values</legend>
             <p>
                 <label for="email">Email</label>
-                <input name="email" id="email" type="email" placeholder="Email" value="{{contact.email or ''}}">
+                <input name="email" id="email" type="email"
+                hx-get="'/contacts/{{contact.id}}/email"
+                hx-target="next .error"
+                placeholder="Email" value="{{contact.email or ''}}">
                 {% if contact.errors.email %}
                 <span class="error">{{ contact.errors.email}}</span>
                 {% endif %}