fixes #33

Author: jph00

01_funccall.ipynb

@@ -1542,14 +1542,14 @@
      "output_type": "stream",
      "text": [
       "Traceback (most recent call last):\n",
-      "  File \"/var/folders/5c/jls7k26j1tq6l03cl_kvpnwh0000gn/T/ipykernel_97636/2963369439.py\", line 14, in python\n",
+      "  File \"/var/folders/51/b2_szf2945n072c0vj2cyty40000gn/T/ipykernel_62370/2963369439.py\", line 14, in python\n",
       "    try: return _run(code, glb, loc)\n",
       "                ^^^^^^^^^^^^^^^^^^^^\n",
-      "  File \"/var/folders/5c/jls7k26j1tq6l03cl_kvpnwh0000gn/T/ipykernel_97636/1858893181.py\", line 18, in _run\n",
+      "  File \"/var/folders/51/b2_szf2945n072c0vj2cyty40000gn/T/ipykernel_62370/1858893181.py\", line 18, in _run\n",
       "    try: exec(compiled_code, glb, loc)\n",
       "         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n",
       "  File \"<ast>\", line 1, in <module>\n",
-      "  File \"/var/folders/5c/jls7k26j1tq6l03cl_kvpnwh0000gn/T/ipykernel_97636/2963369439.py\", line 9, in handler\n",
+      "  File \"/var/folders/51/b2_szf2945n072c0vj2cyty40000gn/T/ipykernel_62370/2963369439.py\", line 9, in handler\n",
       "    def handler(*args): raise TimeoutError()\n",
       "                        ^^^^^^^^^^^^^^^^^^^^\n",
       "TimeoutError\n",
@@ -1841,9 +1841,11 @@
     "    \"Call the function `fc_name` with the given `fc_inputs` using namespace `ns`.\"\n",
     "    if not isinstance(ns, abc.Mapping): ns = mk_ns(*ns)\n",
     "    func = ns[fc_name]\n",
+    "    # Clean up bad param names\n",
+    "    inps = {re.sub(r'\\W', '', k):v for k,v in fc_inputs.items()}\n",
     "    try: return func(**fc_inputs)\n",
     "    except Exception as e:\n",
-    "        if raise_on_err: raise e\n",
+    "        if raise_on_err: raise e from None\n",
     "        else: return traceback.format_exc()"
    ]
   },
@@ -1917,39 +1919,6 @@
     "test_fail(call_func, args=['subs', {'a': 1, 'b': '3'}], kwargs={'ns': mk_ns(d)})"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "b19298ac",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "%%ai\n",
-    "How do I get the whole traceback of an error instead of just str(e) like above?"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "6ec89b42",
-   "metadata": {},
-   "source": [
-    "To get the whole traceback of an error instead of just `str(e)`, you can use the `traceback` module, which you've already imported in your code. Modify the `call_func` function to capture and return the full traceback when an error occurs:\n",
-    "\n",
-    "```python\n",
-    "#| exports\n",
-    "def call_func(fc_name, fc_inputs, ns, raise_on_err=True):\n",
-    "    \"Call the function `fc_name` with the given `fc_inputs` using namespace `ns`.\"\n",
-    "    if not isinstance(ns, abc.Mapping): ns = mk_ns(*ns)\n",
-    "    func = ns[fc_name]\n",
-    "    try: return func(**fc_inputs)\n",
-    "    except Exception as e:\n",
-    "        if raise_on_err: raise e\n",
-    "        else: return traceback.format_exc()\n",
-    "```\n",
-    "\n",
-    "This replaces `str(e)` with `traceback.format_exc()`, which returns the full traceback as a string, including the error type, message, and the call stack that led to the error. This gives you much more context about where and why the error occurred."
-   ]
-  },
   {
    "cell_type": "markdown",
    "id": "591574b8-6b53-4908-8159-b87be42133f7",
@@ -2002,7 +1971,7 @@
     "    if inspect.iscoroutine(res):\n",
     "        try: res = await res\n",
     "        except Exception as e:\n",
-    "            if raise_on_err: raise e\n",
+    "            if raise_on_err: raise e from None\n",
     "            else: return traceback.format_exc()\n",
     "    return res"
    ]
@@ -2035,7 +2004,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "test_eq(await call_func_async('asums', {'a': 1, 'b': '2'}, ns=[asums], raise_on_err=False), \"unsupported operand type(s) for +: 'int' and 'str'\")"
+    "r = await call_func_async('asums', {'a': 1, 'b': '2'}, ns=[asums], raise_on_err=False)\n",
+    "assert \"unsupported operand type(s) for +: 'int' and 'str'\" in r"
    ]
   },
   {

toolslm/funccall.py

@@ -195,18 +195,20 @@ def call_func(fc_name, fc_inputs, ns, raise_on_err=True):
     "Call the function `fc_name` with the given `fc_inputs` using namespace `ns`."
     if not isinstance(ns, abc.Mapping): ns = mk_ns(*ns)
     func = ns[fc_name]
+    # Clean up bad param names
+    inps = {re.sub(r'\W', '', k):v for k,v in fc_inputs.items()}
     try: return func(**fc_inputs)
     except Exception as e:
-        if raise_on_err: raise e
+        if raise_on_err: raise e from None
         else: return traceback.format_exc()
 
-# %% ../01_funccall.ipynb 106
+# %% ../01_funccall.ipynb 104
 async def call_func_async(fc_name, fc_inputs, ns, raise_on_err=True):
     "Awaits the function `fc_name` with the given `fc_inputs` using namespace `ns`."
     res = call_func(fc_name, fc_inputs, ns, raise_on_err=raise_on_err)
     if inspect.iscoroutine(res):
         try: res = await res
         except Exception as e:
-            if raise_on_err: raise e
+            if raise_on_err: raise e from None
             else: return traceback.format_exc()
     return res