fixes #64

Author: jph00

fastlite/_modidx.py

@@ -8,6 +8,7 @@
   'syms': { 'fastlite.core': { 'fastlite.core.Database.create': ('core.html#database.create', 'fastlite/core.py'),
                                'fastlite.core.Database.get_tables': ('core.html#database.get_tables', 'fastlite/core.py'),
                                'fastlite.core.Database.import_file': ('core.html#database.import_file', 'fastlite/core.py'),
+                               'fastlite.core.Database.link_dcs': ('core.html#database.link_dcs', 'fastlite/core.py'),
                                'fastlite.core.Database.q': ('core.html#database.q', 'fastlite/core.py'),
                                'fastlite.core.Database.set_classes': ('core.html#database.set_classes', 'fastlite/core.py'),
                                'fastlite.core.Database.t': ('core.html#database.t', 'fastlite/core.py'),

fastlite/core.py

@@ -16,6 +16,7 @@
 from fastcore.xtras import hl_md, dataclass_src
 from apswutils.db import *
 from apswutils.utils import rows_from_file,TypeTracker,Format
+from apswutils.db import NotFoundError
 import types
 
 try: from graphviz import Source
@@ -102,9 +103,18 @@ def create_mod(db, mod_fn, with_views=False, store=True, suf=''):
     "Create module for dataclasses for `db`"
     mod_fn = str(mod_fn)
     if not mod_fn.endswith('.py'): mod_fn+='.py'
+    dcs = all_dcs(db, with_views, store=store, suf=suf)
+    strlist = ', '.join([f'"{o.__name__}"' for o in dcs])
     with open(mod_fn, 'w') as f:
+        print(f'__all__ = [{strlist}]', file=f)
         print('from dataclasses import dataclass', file=f)
-        for o in all_dcs(db, with_views, store=store, suf=suf): print(dataclass_src(o), file=f)
+        for o in dcs: print(dataclass_src(o), file=f)
+
+# %% ../nbs/00_core.ipynb
+@patch
+def link_dcs(self:Database, mod):
+    "Set the internal dataclass type links for tables using `mod` (created via `create_mod`)"
+    for o in mod.__all__: self.t[o.lower()].cls = getattr(mod, o)
 
 # %% ../nbs/00_core.ipynb
 @patch
@@ -131,7 +141,8 @@ def __call__(
     if as_cls and hasattr(self,'cls'):
         if with_pk: res = ((k,self.cls(**v)) for k,v in res)
         else: res = (self.cls(**o) for o in res)
-    return next(res) if fetchone else list(res)
+    try: return next(res) if fetchone else list(res)
+    except StopIteration: raise NotFoundError from None
 
 # %% ../nbs/00_core.ipynb
 @patch

nbs/00_core.ipynb

@@ -42,6 +42,7 @@
     "from fastcore.xtras import hl_md, dataclass_src\n",
     "from apswutils.db import *\n",
     "from apswutils.utils import rows_from_file,TypeTracker,Format\n",
+    "from apswutils.db import NotFoundError\n",
     "import types\n",
     "\n",
     "try: from graphviz import Source\n",
@@ -444,6 +445,26 @@
     "art1_obj"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "__main__.Artist"
+      ]
+     },
+     "execution_count": null,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "artist.cls"
+   ]
+  },
   {
    "cell_type": "markdown",
    "metadata": {},
@@ -504,9 +525,12 @@
     "    \"Create module for dataclasses for `db`\"\n",
     "    mod_fn = str(mod_fn)\n",
     "    if not mod_fn.endswith('.py'): mod_fn+='.py'\n",
+    "    dcs = all_dcs(db, with_views, store=store, suf=suf)\n",
+    "    strlist = ', '.join([f'\"{o.__name__}\"' for o in dcs])\n",
     "    with open(mod_fn, 'w') as f:\n",
+    "        print(f'__all__ = [{strlist}]', file=f)\n",
     "        print('from dataclasses import dataclass', file=f)\n",
-    "        for o in all_dcs(db, with_views, store=store, suf=suf): print(dataclass_src(o), file=f)"
+    "        for o in dcs: print(dataclass_src(o), file=f)"
    ]
   },
   {
@@ -518,6 +542,19 @@
     "create_mod(db, 'db_dc')"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "#| export\n",
+    "@patch\n",
+    "def link_dcs(self:Database, mod):\n",
+    "    \"Set the internal dataclass type links for tables using `mod` (created via `create_mod`)\"\n",
+    "    for o in mod.__all__: self.t[o.lower()].cls = getattr(mod, o)"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -571,7 +608,8 @@
     "    if as_cls and hasattr(self,'cls'):\n",
     "        if with_pk: res = ((k,self.cls(**v)) for k,v in res)\n",
     "        else: res = (self.cls(**o) for o in res)\n",
-    "    return next(res) if fetchone else list(res)"
+    "    try: return next(res) if fetchone else list(res)\n",
+    "    except StopIteration: raise NotFoundError from None"
    ]
   },
   {
@@ -688,6 +726,29 @@
     "artist.fetchone('Name=?', ('AC/DC',))"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [
+    {
+     "ename": "NotFoundError",
+     "evalue": "",
+     "output_type": "error",
+     "traceback": [
+      "\u001b[0;31m---------------------------------------------------------------------------\u001b[0m",
+      "\u001b[0;31mNotFoundError\u001b[0m                             Traceback (most recent call last)",
+      "Cell \u001b[0;32mIn[41], line 1\u001b[0m\n\u001b[0;32m----> 1\u001b[0m \u001b[43martist\u001b[49m\u001b[38;5;241;43m.\u001b[39;49m\u001b[43mfetchone\u001b[49m\u001b[43m(\u001b[49m\u001b[38;5;124;43m'\u001b[39;49m\u001b[38;5;124;43mName=?\u001b[39;49m\u001b[38;5;124;43m'\u001b[39;49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43m(\u001b[49m\u001b[38;5;124;43m'\u001b[39;49m\u001b[38;5;124;43mAC/D\u001b[39;49m\u001b[38;5;124;43m'\u001b[39;49m\u001b[43m,\u001b[49m\u001b[43m)\u001b[49m\u001b[43m)\u001b[49m\n",
+      "Cell \u001b[0;32mIn[39], line 12\u001b[0m, in \u001b[0;36mfetchone\u001b[0;34m(self, where, where_args, select, as_cls, xtra, **kwargs)\u001b[0m\n\u001b[1;32m      2\u001b[0m \u001b[38;5;129m@patch\u001b[39m\n\u001b[1;32m      3\u001b[0m \u001b[38;5;28;01mdef\u001b[39;00m \u001b[38;5;21mfetchone\u001b[39m(\n\u001b[1;32m      4\u001b[0m     \u001b[38;5;28mself\u001b[39m:(Table\u001b[38;5;241m|\u001b[39mView),\n\u001b[0;32m   (...)\u001b[0m\n\u001b[1;32m      9\u001b[0m     xtra:\u001b[38;5;28mdict\u001b[39m\u001b[38;5;241m|\u001b[39m\u001b[38;5;28;01mNone\u001b[39;00m\u001b[38;5;241m=\u001b[39m\u001b[38;5;28;01mNone\u001b[39;00m, \u001b[38;5;66;03m# Extra constraints\u001b[39;00m\n\u001b[1;32m     10\u001b[0m     \u001b[38;5;241m*\u001b[39m\u001b[38;5;241m*\u001b[39mkwargs)\u001b[38;5;241m-\u001b[39m\u001b[38;5;241m>\u001b[39m\u001b[38;5;28mlist\u001b[39m:\n\u001b[1;32m     11\u001b[0m     \u001b[38;5;124m\"\u001b[39m\u001b[38;5;124mShortcut for `__call__` that returns one item\u001b[39m\u001b[38;5;124m\"\u001b[39m\n\u001b[0;32m---> 12\u001b[0m     \u001b[38;5;28;01mreturn\u001b[39;00m \u001b[38;5;28;43mself\u001b[39;49m\u001b[43m(\u001b[49m\u001b[43mwhere\u001b[49m\u001b[38;5;241;43m=\u001b[39;49m\u001b[43mwhere\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43mwhere_args\u001b[49m\u001b[38;5;241;43m=\u001b[39;49m\u001b[43mwhere_args\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43mselect\u001b[49m\u001b[38;5;241;43m=\u001b[39;49m\u001b[43mselect\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43mas_cls\u001b[49m\u001b[38;5;241;43m=\u001b[39;49m\u001b[43mas_cls\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43mxtra\u001b[49m\u001b[38;5;241;43m=\u001b[39;49m\u001b[43mxtra\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43mfetchone\u001b[49m\u001b[38;5;241;43m=\u001b[39;49m\u001b[38;5;28;43;01mTrue\u001b[39;49;00m\u001b[43m)\u001b[49m\n",
+      "Cell \u001b[0;32mIn[35], line 27\u001b[0m, in \u001b[0;36m__call__\u001b[0;34m(self, where, where_args, order_by, limit, offset, select, with_pk, as_cls, xtra, fetchone, **kwargs)\u001b[0m\n\u001b[1;32m     25\u001b[0m     \u001b[38;5;28;01melse\u001b[39;00m: res \u001b[38;5;241m=\u001b[39m (\u001b[38;5;28mself\u001b[39m\u001b[38;5;241m.\u001b[39mcls(\u001b[38;5;241m*\u001b[39m\u001b[38;5;241m*\u001b[39mo) \u001b[38;5;28;01mfor\u001b[39;00m o \u001b[38;5;129;01min\u001b[39;00m res)\n\u001b[1;32m     26\u001b[0m \u001b[38;5;28;01mtry\u001b[39;00m: \u001b[38;5;28;01mreturn\u001b[39;00m \u001b[38;5;28mnext\u001b[39m(res) \u001b[38;5;28;01mif\u001b[39;00m fetchone \u001b[38;5;28;01melse\u001b[39;00m \u001b[38;5;28mlist\u001b[39m(res)\n\u001b[0;32m---> 27\u001b[0m \u001b[38;5;28;01mexcept\u001b[39;00m \u001b[38;5;167;01mStopIteration\u001b[39;00m: \u001b[38;5;28;01mraise\u001b[39;00m NotFoundError \u001b[38;5;28;01mfrom\u001b[39;00m \u001b[38;5;28;01mNone\u001b[39;00m\n",
+      "\u001b[0;31mNotFoundError\u001b[0m: "
+     ]
+    }
+   ],
+   "source": [
+    "artist.fetchone('Name=?', ('AC/D',))"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,