Refactor and bug fixes.

Deletes the stdlib.span package and moves simplecomponent into base.

Fixes a big in call to gather (should be *list not list)

Author: nrfulton

docs/examples/melp/lazy.py

@@ -1,6 +1,5 @@
 import asyncio
-from mellea.stdlib.span import Span, SimpleComponent
-from mellea.stdlib.base import SimpleContext, Context, CBlock, ModelOutputThunk
+from mellea.stdlib.base import SimpleContext, Context, CBlock, ModelOutputThunk, SimpleComponent
 from mellea.backends import Backend
 from mellea.backends.ollama import OllamaModelBackend
 

docs/examples/melp/lazy_fib.py

@@ -1,6 +1,5 @@
 import asyncio
-from mellea.stdlib.span import Span, SimpleComponent
-from mellea.stdlib.base import SimpleContext, Context, CBlock, ModelOutputThunk
+from mellea.stdlib.base import SimpleContext, Context, CBlock, ModelOutputThunk, SimpleComponent
 from mellea.stdlib.requirement import Requirement
 from mellea.backends import Backend
 from mellea.backends.ollama import OllamaModelBackend

docs/examples/melp/lazy_fib_sample.py

@@ -1,6 +1,5 @@
 import asyncio
-from mellea.stdlib.span import Span, SimpleComponent
-from mellea.stdlib.base import SimpleContext, Context, CBlock, ModelOutputThunk
+from mellea.stdlib.base import SimpleContext, Context, CBlock, ModelOutputThunk, SimpleComponent
 from mellea.stdlib.requirement import Requirement
 from mellea.backends import Backend
 from mellea.backends.ollama import OllamaModelBackend

docs/examples/melp/states.py

@@ -1,6 +1,4 @@
-import mellea
-from mellea.stdlib.base import CBlock, Context, SimpleContext
-from mellea.stdlib.span import Span, SimpleComponent
+from mellea.stdlib.base import SimpleContext, Context, CBlock, SimpleComponent
 from mellea.backends import Backend
 from mellea.backends.ollama import OllamaModelBackend
 import asyncio

mellea/backends/_utils.py

@@ -98,4 +98,4 @@ def generate_walk(c: CBlock | Component | ModelOutputThunk) -> list[ModelOutputT
             return []
         case Component():
             parts_walk = [generate_walk(p) for p in c.parts()]
-            return itertools.chain.from_iterable(parts_walk)  # aka flatten
+            return list(itertools.chain.from_iterable(parts_walk))  # aka flatten

mellea/backends/ollama.py

@@ -296,8 +296,9 @@ async def generate_from_chat_context(
             RuntimeError: If not called from a thread with a running event loop.
         """
         # Start by awaiting any necessary computation.
-        _to_compute = generate_walk(action)
-        await asyncio.gather([x.avalue() for x in _to_compute])
+        _to_compute = list(generate_walk(action))
+        coroutines = [x.avalue() for x in _to_compute]
+        await asyncio.gather(*coroutines)
         FancyLogger.get_logger().info(
             f"generate_from_chat_context awaited on {len(_to_compute)} uncomputed mots."
         )
@@ -419,7 +420,8 @@ async def generate_from_raw(
         _to_compute = []
         for act in actions:
             _to_compute.extend(generate_walk(act))
-        await asyncio.gather([x.avalue() for x in _to_compute])
+        coroutines = [x.avalue() for x in _to_compute]
+        await asyncio.gather(*coroutines)
 
         prompts = [self.formatter.print(action) for action in actions]
 

mellea/stdlib/base.py

@@ -656,3 +656,53 @@ class ModelToolCall:
     def call_func(self) -> Any:
         """A helper function for calling the function/tool represented by this object."""
         return self.func(**self.args)
+
+
+class SimpleComponent(Component):
+    """A Component that is make up of named spans."""
+
+    def __init__(self, **kwargs):
+        """Initialized a simple component of the constructor's kwargs."""
+        for key in kwargs.keys():
+            if type(kwargs[key]) is str:
+                kwargs[key] = CBlock(value=kwargs[key])
+        self._kwargs_type_check(kwargs)
+        self._kwargs = kwargs
+
+    def parts(self):
+        """Returns the values of the kwargs."""
+        return list(self._kwargs.values())
+
+    def _kwargs_type_check(self, kwargs):
+        for key in kwargs.keys():
+            value = kwargs[key]
+            assert issubclass(type(value), Component) or issubclass(
+                type(value), CBlock
+            ), f"Expected span but found {type(value)} of value: {value}"
+            assert type(key) is str
+        return True
+
+    @staticmethod
+    def make_simple_string(kwargs):
+        """Uses <|key|>value</|key|> to represent a simple component."""
+        return "\n".join(
+            [f"<|{key}|>{value}</|{key}|>" for (key, value) in kwargs.items()]
+        )
+
+    @staticmethod
+    def make_json_string(kwargs):
+        """Uses json."""
+        str_args = dict()
+        for key in kwargs.keys():
+            match kwargs[key]:
+                case ModelOutputThunk() | CBlock():
+                    str_args[key] = kwargs[key].value
+                case Component():
+                    str_args[key] = kwargs[key].format_for_llm()
+        import json
+
+        return json.dumps(str_args)
+
+    def format_for_llm(self):
+        """Uses a string rep."""
+        return SimpleComponent.make_json_string(self._kwargs)