toolslm 0.2.2__tar.gz → 0.2.3__tar.gz

{toolslm-0.2.2/toolslm.egg-info → toolslm-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: toolslm
-Version: 0.2.2
+Version: 0.2.3
 Summary: Tools to make language models a bit easier to use
 Home-page: https://github.com/AnswerDotAI/toolslm
 Author: Jeremy Howard

{toolslm-0.2.2 → toolslm-0.2.3}/settings.ini

@@ -1,7 +1,7 @@
 [DEFAULT]
 repo = toolslm
 lib_name = toolslm
-version = 0.2.2
+version = 0.2.3
 min_python = 3.9
 license = apache2
 black_formatting = False

toolslm-0.2.3/toolslm/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.2.3"

{toolslm-0.2.2 → toolslm-0.2.3}/toolslm/funccall.py

@@ -183,18 +183,20 @@ def python(
     finally: signal.alarm(0)
 
 # %% ../01_funccall.ipynb
-def mk_ns(*funcs_or_objs):
+def mk_ns(fs):
+    if isinstance(fs, abc.Mapping): return fs
     merged = {}
-    for o in funcs_or_objs:
-        if isinstance(o, type): merged |= {n:getattr(o,n) for n,m in o.__dict__.items() if isinstance(m, (staticmethod, classmethod))}
-        if isinstance(o, object): merged |= {n:getattr(o,n) for n, m in inspect.getmembers(o, inspect.ismethod)} | {n:m for n,m in o.__class__.__dict__.items() if isinstance(m, staticmethod)}
-        if callable(o) and hasattr(o, '__name__'): merged |= {o.__name__: o}
+    for o in listify(fs):
+        if isinstance(o, dict): merged |= o
+        elif isinstance(o, type): merged |= {n:getattr(o,n) for n,m in o.__dict__.items() if isinstance(m, (staticmethod, classmethod))}
+        elif callable(o) and hasattr(o, '__name__'): merged |= {o.__name__: o}
+        merged |= {n:getattr(o,n) for n, m in inspect.getmembers(o, inspect.ismethod)} | {n:m for n,m in o.__class__.__dict__.items() if isinstance(m, staticmethod)}
     return merged
 
 # %% ../01_funccall.ipynb
 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)
+    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()}

{toolslm-0.2.2 → toolslm-0.2.3/toolslm.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: toolslm
-Version: 0.2.2
+Version: 0.2.3
 Summary: Tools to make language models a bit easier to use
 Home-page: https://github.com/AnswerDotAI/toolslm
 Author: Jeremy Howard

toolslm-0.2.2/toolslm/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.2.2"