Revise new command and remove global spinner

pydanny · pydanny · commit d42de3ca9f0d · 2025-02-20T10:31:40.000Z
diff --git a/nbs/00_core.ipynb b/nbs/00_core.ipynb
@@ -163,33 +163,6 @@
     "}"
    ]
   },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "Show the user that during delays the system is thinking, not stopped. "
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "#| export\n",
-    "def with_spinner(f):\n",
-    "    \"Wraps a command with a spinner using rich.console.status\"\n",
-    "    @wraps(f)\n",
-    "    def _inner(*args, **kwargs):        \n",
-    "        with console.status(\"\", spinner=\"dots\") as status:          \n",
-    "            try:\n",
-    "                result = f(*args, **kwargs)\n",
-    "                return result\n",
-    "            except Exception as e:\n",
-    "                raise e\n",
-    "    return _inner"
-   ]
-  },
   {
    "cell_type": "markdown",
    "metadata": {},
@@ -209,9 +182,6 @@
     "\n",
     "    # Remove call_parse so it doesn't conflict with typer\n",
     "    func = getattr(func, '__wrapped__', func)\n",
-    "    \n",
-    "    # Wrap the function in a spinner\n",
-    "    func = with_spinner(func)    \n",
     "\n",
     "    # dd to typer.app and \n",
     "    kwargs = dict(\n",
diff --git a/nbs/01_commands.ipynb b/nbs/01_commands.ipynb
@@ -35,7 +35,9 @@
     "from fastcore.docments import *\n",
     "from fastcore.meta import delegates\n",
     "from fastcore.script import call_parse\n",
+    "from fastcore.shutil import rmtree,move\n",
     "from fastcore.utils import *\n",
+    "from nbdev.quarto import nbdev_readme, refresh_quarto_yml, fs_watchdog\n",
     "from rich import print\n",
     "from rich.console import Console\n",
     "from shutil import which"
@@ -49,7 +51,10 @@
    "outputs": [],
    "source": [
     "#| export\n",
-    "from nbdev import cli, release, config, quarto, doclinks, merge, migrate, sync\n",
+    "from nbdev import cli, release, quarto, doclinks, merge, migrate, sync\n",
+    "from nbdev.cli import _update_repo_meta, extract_tgz, _render_nb\n",
+    "from nbdev.config import *\n",
+    "from nbdev.doclinks import nbdev_export\n",
     "from nbdev import clean as nbclean\n",
     "from nbdev import test as nbtest"
    ]
@@ -226,7 +231,7 @@
     "    target: Annotated[pathlib.Path, typer.Argument(help=\"Path to create project\")],\n",
     "    **kwargs):\n",
     "    \"\"\"\n",
-    "    Create an nbdev project. If the target directory does not exist, it creates it.\n",
+    "    Create an nbdev project. If the target directory does not exist, creates it.\n",
     "    \n",
     "    Usage:\n",
     "    \n",
@@ -238,16 +243,54 @@
     "    \n",
     "    Learn more [nbz.answer.ai/commands#new](https://nbz.answer.ai/commands#new)\n",
     "    \"\"\"\n",
+    "    # Target directory\n",
     "    if not target.exists(): \n",
-    "        console.print(f'Creating {target} directory')\n",
+    "        console.print(f'Creating and changing to {target} directory')\n",
     "        target.mkdir()\n",
-    "    console.print(f'Changing directory to {target}')\n",
+    "        os.chdir(target)\n",
     "    olddir = pathlib.Path('.')\n",
-    "    os.chdir(target)\n",
-    "    resp=nbdev_new(**kwargs)\n",
-    "    os.chdir(olddir)\n",
-    "    console.print(f'Changing directory back')\n",
-    "    return resp\n",
+    "    \n",
+    "    \"Create an nbdev project.\"\n",
+    "    from ghapi.core import GhApi\n",
+    "    nbdev_create_config.__wrapped__(**kwargs)\n",
+    "    with console.status('',spinner=\"dots\"):\n",
+    "        cfg = get_config()\n",
+    "        _update_repo_meta(cfg)\n",
+    "        path = Path()\n",
+    "\n",
+    "        _ORG_OR_USR,_REPOSITORY = 'fastai','nbdev-template'\n",
+    "        _TEMPLATE = f'{_ORG_OR_USR}/{_REPOSITORY}'\n",
+    "        template = kwargs.get('template', _TEMPLATE)\n",
+    "        try: org_or_usr, repo = template.split('/')\n",
+    "        except ValueError: org_or_usr, repo = _ORG_OR_USR, _REPOSITORY\n",
+    "\n",
+    "        tag = kwargs.get('tag', None)\n",
+    "        if tag is None:\n",
+    "            with warnings.catch_warnings():\n",
+    "                warnings.simplefilter('ignore', UserWarning)\n",
+    "                tag = GhApi(gh_host='https://api.github.com', authenticate=False).repos.get_latest_release(org_or_usr, repo).tag_name\n",
+    "\n",
+    "        url = f\"https://github.com/{org_or_usr}/{repo}/archive/{tag}.tar.gz\"\n",
+    "        extract_tgz(url)\n",
+    "        tmpl_path = path/f'{repo}-{tag}'\n",
+    "\n",
+    "        cfg.nbs_path.mkdir(exist_ok=True)\n",
+    "        nbexists = bool(first(cfg.nbs_path.glob('*.ipynb')))\n",
+    "        _nbs_path_sufs = ('.ipynb','.css')\n",
+    "        for o in tmpl_path.ls():\n",
+    "            p = cfg.nbs_path if o.suffix in _nbs_path_sufs else path\n",
+    "            if o.name == '_quarto.yml': continue\n",
+    "            if o.name == 'index.ipynb': _render_nb(o, cfg)\n",
+    "            if o.name == '00_core.ipynb' and not nbexists: move(o, p)\n",
+    "            elif not (path/o.name).exists(): move(o, p)\n",
+    "        rmtree(tmpl_path)\n",
+    "\n",
+    "        refresh_quarto_yml()\n",
+    "        nbdev_export.__wrapped__()\n",
+    "        nbdev_readme.__wrapped__()\n",
+    "\n",
+    "        # return back to the original directory\n",
+    "        os.chdir(olddir)\n",
     "new.rich_help_panel = 'Getting started'\n",
     "new.no_args_is_help=False\n"
    ]
@@ -257,7 +300,18 @@
    "execution_count": null,
    "id": "5f1dda42",
    "metadata": {},
-   "outputs": [],
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "<bound method Path.exists of Path('.')>"
+      ]
+     },
+     "execution_count": null,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
    "source": [
     "path = pathlib.Path()\n",
     "path.exists"
diff --git a/nbz/_modidx.py b/nbz/_modidx.py
@@ -10,5 +10,4 @@
                               'nbz.commands.delegates_sorted': ('commands.html#delegates_sorted', 'nbz/commands.py'),
                               'nbz.commands.new': ('commands.html#new', 'nbz/commands.py')},
             'nbz.core': { 'nbz.core.add_nyi_command': ('core.html#add_nyi_command', 'nbz/core.py'),
-                          'nbz.core.helper': ('core.html#helper', 'nbz/core.py'),
-                          'nbz.core.with_spinner': ('core.html#with_spinner', 'nbz/core.py')}}}
+                          'nbz.core.helper': ('core.html#helper', 'nbz/core.py')}}}
diff --git a/nbz/commands.py b/nbz/commands.py
@@ -13,13 +13,18 @@
 from fastcore.docments import *
 from fastcore.meta import delegates
 from fastcore.script import call_parse
+from fastcore.shutil import rmtree,move
 from fastcore.utils import *
+from nbdev.quarto import nbdev_readme, refresh_quarto_yml, fs_watchdog
 from rich import print
 from rich.console import Console
 from shutil import which
 
 # %% ../nbs/01_commands.ipynb 3
-from nbdev import cli, release, config, quarto, doclinks, merge, migrate, sync
+from nbdev import cli, release, quarto, doclinks, merge, migrate, sync
+from nbdev.cli import _update_repo_meta, extract_tgz, _render_nb
+from nbdev.config import *
+from nbdev.doclinks import nbdev_export
 from nbdev import clean as nbclean
 from nbdev import test as nbtest
 
@@ -132,7 +137,7 @@ def new(
     target: Annotated[pathlib.Path, typer.Argument(help="Path to create project")],
     **kwargs):
     """
-    Create an nbdev project. If the target directory does not exist, it creates it.
+    Create an nbdev project. If the target directory does not exist, creates it.
     
     Usage:
     
@@ -144,16 +149,54 @@ def new(
     
     Learn more [nbz.answer.ai/commands#new](https://nbz.answer.ai/commands#new)
     """
+    # Target directory
     if not target.exists(): 
-        console.print(f'Creating {target} directory')
+        console.print(f'Creating and changing to {target} directory')
         target.mkdir()
-    console.print(f'Changing directory to {target}')
+        os.chdir(target)
     olddir = pathlib.Path('.')
-    os.chdir(target)
-    resp=nbdev_new(**kwargs)
-    os.chdir(olddir)
-    console.print(f'Changing directory back')
-    return resp
+    
+    "Create an nbdev project."
+    from ghapi.core import GhApi
+    nbdev_create_config.__wrapped__(**kwargs)
+    with console.status('',spinner="dots"):
+        cfg = get_config()
+        _update_repo_meta(cfg)
+        path = Path()
+
+        _ORG_OR_USR,_REPOSITORY = 'fastai','nbdev-template'
+        _TEMPLATE = f'{_ORG_OR_USR}/{_REPOSITORY}'
+        template = kwargs.get('template', _TEMPLATE)
+        try: org_or_usr, repo = template.split('/')
+        except ValueError: org_or_usr, repo = _ORG_OR_USR, _REPOSITORY
+
+        tag = kwargs.get('tag', None)
+        if tag is None:
+            with warnings.catch_warnings():
+                warnings.simplefilter('ignore', UserWarning)
+                tag = GhApi(gh_host='https://api.github.com', authenticate=False).repos.get_latest_release(org_or_usr, repo).tag_name
+
+        url = f"https://github.com/{org_or_usr}/{repo}/archive/{tag}.tar.gz"
+        extract_tgz(url)
+        tmpl_path = path/f'{repo}-{tag}'
+
+        cfg.nbs_path.mkdir(exist_ok=True)
+        nbexists = bool(first(cfg.nbs_path.glob('*.ipynb')))
+        _nbs_path_sufs = ('.ipynb','.css')
+        for o in tmpl_path.ls():
+            p = cfg.nbs_path if o.suffix in _nbs_path_sufs else path
+            if o.name == '_quarto.yml': continue
+            if o.name == 'index.ipynb': _render_nb(o, cfg)
+            if o.name == '00_core.ipynb' and not nbexists: move(o, p)
+            elif not (path/o.name).exists(): move(o, p)
+        rmtree(tmpl_path)
+
+        refresh_quarto_yml()
+        nbdev_export.__wrapped__()
+        nbdev_readme.__wrapped__()
+
+        # return back to the original directory
+        os.chdir(olddir)
 new.rich_help_panel = 'Getting started'
 new.no_args_is_help=False
 
diff --git a/nbz/core.py b/nbz/core.py
@@ -3,7 +3,7 @@
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/00_core.ipynb.
 
 # %% auto 0
-__all__ = ['app', 'commands', 'console', 'nyi_commands', 'helper', 'with_spinner', 'add_nyi_command']
+__all__ = ['app', 'commands', 'console', 'nyi_commands', 'helper', 'add_nyi_command']
 
 # %% ../nbs/00_core.ipynb 4
 import types
@@ -71,27 +71,11 @@ def helper(ctx: typer.Context):
 }
 
 # %% ../nbs/00_core.ipynb 14
-def with_spinner(f):
-    "Wraps a command with a spinner using rich.console.status"
-    @wraps(f)
-    def _inner(*args, **kwargs):        
-        with console.status("", spinner="dots") as status:          
-            try:
-                result = f(*args, **kwargs)
-                return result
-            except Exception as e:
-                raise e
-    return _inner
-
-# %% ../nbs/00_core.ipynb 16
 console = Console()
 for fname,func in commands.items():
 
     # Remove call_parse so it doesn't conflict with typer
     func = getattr(func, '__wrapped__', func)
-    
-    # Wrap the function in a spinner
-    func = with_spinner(func)    
 
     # dd to typer.app and 
     kwargs = dict(
@@ -114,15 +98,15 @@ def _inner(*args, **kwargs):
     # Save to the global names 
     globals()[fname] = func
 
-# %% ../nbs/00_core.ipynb 19
+# %% ../nbs/00_core.ipynb 17
 # Not yet implemented
 # TODO: fix store_true on these commands. 
 nyi_commands = {
     'export': doclinks.nbdev_export,
     'export_cli': cli.nb_export_cli,
 }
 
-# %% ../nbs/00_core.ipynb 20
+# %% ../nbs/00_core.ipynb 18
 def add_nyi_command(fname):
     @app.command(rich_help_panel='Not yet implemented')
     def func():
@@ -131,7 +115,7 @@ def func():
     func.__name__ = fname
     globals()[fname] = func
 
-# %% ../nbs/00_core.ipynb 22
+# %% ../nbs/00_core.ipynb 20
 # Add NYI panel
 for fname in nyi_commands.keys():
     add_nyi_command(fname)
