add plum-dispatch to dev-deps and add test to xtras

Author: RensDimmendaal

fastcore/_modidx.py

@@ -578,7 +578,6 @@
                                 'fastcore.xtras._ceil': ('xtras.html#_ceil', 'fastcore/xtras.py'),
                                 'fastcore.xtras._has_property_getter': ('xtras.html#_has_property_getter', 'fastcore/xtras.py'),
                                 'fastcore.xtras._is_property': ('xtras.html#_is_property', 'fastcore/xtras.py'),
-                                'fastcore.xtras._is_type_dispatch': ('xtras.html#_is_type_dispatch', 'fastcore/xtras.py'),
                                 'fastcore.xtras._property_getter': ('xtras.html#_property_getter', 'fastcore/xtras.py'),
                                 'fastcore.xtras._repr_dict': ('xtras.html#_repr_dict', 'fastcore/xtras.py'),
                                 'fastcore.xtras._sparkchar': ('xtras.html#_sparkchar', 'fastcore/xtras.py'),

fastcore/xtras.py

@@ -429,9 +429,11 @@ def exec_eval(code,   # Code to exec/eval
     else: exec(code, g, l)
 
 # %% ../nbs/03_xtras.ipynb
-def _is_type_dispatch(x): return type(x).__name__ == "Function"  # assumes plum-dispatch library is used
-def _unwrapped_type_dispatch_func(x): return x.methods[0].implementation if _is_type_dispatch(x) else x
+def _unwrapped_type_dispatch_func(x): 
+    # use isinstance_str to avoid adding plum-dispatch as dependency to fastcore
+    return x.methods[0].implementation if isinstance_str(x,"Function") else x
 
+# %% ../nbs/03_xtras.ipynb
 def _is_property(x): return type(x)==property
 def _has_property_getter(x): return _is_property(x) and hasattr(x, 'fget') and hasattr(x.fget, 'func')
 def _property_getter(x): return x.fget.func if _has_property_getter(x) else x

nbs/03_xtras.ipynb

@@ -1896,9 +1896,41 @@
    "outputs": [],
    "source": [
     "#|export\n",
-    "def _is_type_dispatch(x): return type(x).__name__ == \"Function\"  # assumes plum-dispatch library is used\n",
-    "def _unwrapped_type_dispatch_func(x): return x.methods[0].implementation if _is_type_dispatch(x) else x\n",
+    "def _unwrapped_type_dispatch_func(x): \n",
+    "    # use isinstance_str to avoid adding plum-dispatch as dependency to fastcore\n",
+    "    return x.methods[0].implementation if isinstance_str(x,\"Function\") else x"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "This function helps us identify the first declared raw function of a dispatched function:"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "from plum import Function\n",
+    "\n",
+    "def f1(x): return \"Any\"\n",
+    "def f2(x:int): return \"Int\"\n",
+    "\n",
+    "df = Function(f1).dispatch(f1).dispatch(f2)\n",
     "\n",
+    "test_eq(_unwrapped_type_dispatch_func(df), f1)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "#|export\n",
     "def _is_property(x): return type(x)==property\n",
     "def _has_property_getter(x): return _is_property(x) and hasattr(x, 'fget') and hasattr(x.fget, 'func')\n",
     "def _property_getter(x): return x.fget.func if _has_property_getter(x) else x\n",

settings.ini

@@ -17,7 +17,7 @@ license = apache2
 status = 5
 nbs_path = nbs
 doc_path = _docs
-dev_requirements = numpy nbdev>=0.2.39 matplotlib pillow torch pandas nbclassic pysymbol_llm llms-txt
+dev_requirements = numpy nbdev>=0.2.39 matplotlib pillow torch pandas nbclassic pysymbol_llm llms-txt plum-dispatch
 git_url = https://github.com/AnswerDotAI/fastcore/
 lib_path = fastcore
 title = fastcore
@@ -38,4 +38,3 @@ clear_all = False
 put_version_in_init = True
 cell_number = False
 skip_procs = 
-