fixes #30

Author: jph00

01_funccall.ipynb

@@ -645,8 +645,9 @@
    "outputs": [],
    "source": [
     "#| exports\n",
-    "def get_schema(f:callable, pname='input_schema')->dict:\n",
+    "def get_schema(f:Union[callable,dict], pname='input_schema')->dict:\n",
     "    \"Generate JSON schema for a class, function, or method\"\n",
+    "    if isinstance(f, dict): return f\n",
     "    schema = _get_nested_schema(f)\n",
     "    desc = f.__doc__\n",
     "    assert desc, \"Docstring missing!\"\n",
@@ -1530,14 +1531,14 @@
      "output_type": "stream",
      "text": [
       "Traceback (most recent call last):\n",
-      "  File \"/var/folders/51/b2_szf2945n072c0vj2cyty40000gn/T/ipykernel_12053/775515280.py\", line 12, in python\n",
+      "  File \"/var/folders/51/b2_szf2945n072c0vj2cyty40000gn/T/ipykernel_46879/2963369439.py\", line 14, in python\n",
       "    try: return _run(code, glb, loc)\n",
       "                ^^^^^^^^^^^^^^^^^^^^\n",
-      "  File \"/var/folders/51/b2_szf2945n072c0vj2cyty40000gn/T/ipykernel_12053/1858893181.py\", line 18, in _run\n",
+      "  File \"/var/folders/51/b2_szf2945n072c0vj2cyty40000gn/T/ipykernel_46879/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/51/b2_szf2945n072c0vj2cyty40000gn/T/ipykernel_12053/775515280.py\", line 9, in handler\n",
+      "  File \"/var/folders/51/b2_szf2945n072c0vj2cyty40000gn/T/ipykernel_46879/2963369439.py\", line 9, in handler\n",
       "    def handler(*args): raise TimeoutError()\n",
       "                        ^^^^^^^^^^^^^^^^^^^^\n",
       "TimeoutError\n",
@@ -1858,7 +1859,7 @@
     }
    ],
    "source": [
-    "call_func('sums', {'a': 1, 'b': 2}, ns=[sums])"
+    "await call_func('sums', {'a': 1, 'b': 2}, ns=[sums])"
    ]
   },
   {
@@ -1879,7 +1880,7 @@
     }
    ],
    "source": [
-    "call_func('subs', {'a': 1, 'b': 2}, ns=mk_ns(d))"
+    "await call_func('subs', {'a': 1, 'b': 2}, ns=mk_ns(d))"
    ]
   },
   {
@@ -1932,7 +1933,9 @@
     "    \"Awaits 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",
-    "    return await func(**fc_inputs)"
+    "    res = func(**fc_inputs)\n",
+    "    if inspect.iscoroutine(res): res = await res\n",
+    "    return res"
    ]
   },
   {

toolslm/funccall.py

@@ -112,8 +112,9 @@ def _get_nested_schema(obj):
     return schema
 
 # %% ../01_funccall.ipynb 35
-def get_schema(f:callable, pname='input_schema')->dict:
+def get_schema(f:Union[callable,dict], pname='input_schema')->dict:
     "Generate JSON schema for a class, function, or method"
+    if isinstance(f, dict): return f
     schema = _get_nested_schema(f)
     desc = f.__doc__
     assert desc, "Docstring missing!"
@@ -201,4 +202,6 @@ async def call_func_async(fc_name, fc_inputs, ns):
     "Awaits 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]
-    return await func(**fc_inputs)
+    res = func(**fc_inputs)
+    if inspect.iscoroutine(res): res = await res
+    return res