Merge pull request #1507 from AnswerDotAI/use-plum-dispatch

Use plum dispatch

Author: jph00

nbdev/showdoc.py

@@ -7,13 +7,13 @@
 from .doclinks import *
 from .config import get_config
 
-from fastcore.dispatch import TypeDispatch
 from fastcore.docments import *
 from fastcore.utils import *
 
 from importlib import import_module
 import inspect, sys
 from collections import OrderedDict
+from plum import Function
 from textwrap import fill
 from types import FunctionType
 
@@ -189,7 +189,8 @@ def show_doc(sym,  # Symbol to document
     elif isinstance(renderer,str):
         p,m = renderer.rsplit('.', 1)
         renderer = getattr(import_module(p), m)
-    if isinstance(sym, TypeDispatch): pass
+    if isinstance(sym, Function): pass
+    elif isinstance_str(sym, "TypeDispatch"): pass  # use _str as TypeDispatch will be removed from fastcore
     else:return renderer(sym or show_doc, name=name, title_level=title_level)
 
 # %% ../nbs/api/08_showdoc.ipynb

nbs/api/08_showdoc.ipynb

@@ -32,13 +32,13 @@
     "from nbdev.doclinks import *\n",
     "from nbdev.config import get_config\n",
     "\n",
-    "from fastcore.dispatch import TypeDispatch\n",
     "from fastcore.docments import *\n",
     "from fastcore.utils import *\n",
     "\n",
     "from importlib import import_module\n",
     "import inspect, sys\n",
     "from collections import OrderedDict\n",
+    "from plum import Function\n",
     "from textwrap import fill\n",
     "from types import FunctionType"
    ]
@@ -648,7 +648,8 @@
     "    elif isinstance(renderer,str):\n",
     "        p,m = renderer.rsplit('.', 1)\n",
     "        renderer = getattr(import_module(p), m)\n",
-    "    if isinstance(sym, TypeDispatch): pass\n",
+    "    if isinstance(sym, Function): pass\n",
+    "    elif isinstance_str(sym, \"TypeDispatch\"): pass  # use _str as TypeDispatch will be removed from fastcore\n",
     "    else:return renderer(sym or show_doc, name=name, title_level=title_level)"
    ]
   },
@@ -1334,7 +1335,7 @@
    "outputs": [],
    "source": [
     "#|hide\n",
-    "from fastcore.dispatch import typedispatch"
+    "from plum import dispatch"
    ]
   },
   {
@@ -1345,23 +1346,23 @@
    "outputs": [],
    "source": [
     "#|hide\n",
-    "@typedispatch\n",
+    "@dispatch\n",
     "def _typ_test(\n",
     "    a:list, # A list\n",
     "    b:str, # A second integer\n",
     ") -> float:\n",
     "    \"Perform op\"\n",
     "    return a.extend(b)\n",
     "\n",
-    "@typedispatch\n",
+    "@dispatch\n",
     "def _typ_test(\n",
     "    a:str, # An integer\n",
     "    b:str # A str\n",
     ") -> float:\n",
     "    \"Perform op\"\n",
     "    return str(a) + b\n",
     "\n",
-    "test_eq(show_doc(_typ_test), None) # show_doc ignores typedispatch at the moment"
+    "test_eq(show_doc(_typ_test), None) # show_doc ignores dispatch at the moment"
    ]
   },
   {

settings.ini

@@ -15,7 +15,7 @@ language = English
 custom_sidebar = True
 license = apache2
 status = 5
-requirements = fastcore>=1.5.27 execnb>=0.1.12 astunparse ghapi>=1.0.3 watchdog asttokens setuptools
+requirements = fastcore>=1.5.27 execnb>=0.1.12 astunparse ghapi>=1.0.3 watchdog asttokens setuptools plum-dispatch
 pip_requirements = PyYAML
 conda_requirements = pyyaml
 conda_user = fastai