ommlds 0.0.0.dev373__tar.gz → 0.0.0.dev375__tar.gz

{ommlds-0.0.0.dev373/ommlds.egg-info → ommlds-0.0.0.dev375}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ommlds
-Version: 0.0.0.dev373
+Version: 0.0.0.dev375
 Summary: ommlds
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,8 +12,8 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.13
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev373
-Requires-Dist: omlish==0.0.0.dev373
+Requires-Dist: omdev==0.0.0.dev375
+Requires-Dist: omlish==0.0.0.dev375
 Provides-Extra: all
 Requires-Dist: llama-cpp-python~=0.3; extra == "all"
 Requires-Dist: mlx~=0.27; extra == "all"

{ommlds-0.0.0.dev373 → ommlds-0.0.0.dev375}/ommlds/cli/sessions/chat.py

@@ -142,11 +142,11 @@ class PromptChatSession(Session['PromptChatSession.Config']):
                     check.state(resp_m.s is None)
 
                     tr: mc.ToolExecRequest = check.single(check.not_none(trs))
-                    tool = check.not_none(self._tool_map)[check.non_empty_str(tr.spec.name)]
+                    tool = check.not_none(self._tool_map)[check.non_empty_str(tr.name)]
 
                     tr_dct = dict(
                         id=tr.id,
-                        spec=msh.marshal(tr.spec),
+                        spec=msh.marshal(tool.spec),
                         args=tr.args,
                     )
                     cr = ptk.strict_confirm(f'Execute requested tool?\n\n{json.dumps_pretty(tr_dct)}\n\n')
@@ -157,7 +157,7 @@ class PromptChatSession(Session['PromptChatSession.Config']):
                     tool_res = tool.fn(**tr.args)
                     chat.append(mc.ToolExecResultMessage(
                         tr.id,
-                        check.non_empty_str(tr.spec.name),
+                        check.non_empty_str(tr.name),
                         json.dumps(tool_res),
                     ))
 

{ommlds-0.0.0.dev373 → ommlds-0.0.0.dev375}/ommlds/minichain/__init__.py

@@ -106,7 +106,7 @@ from .chat.templating import (  # noqa
     ChatTemplater,
 )
 
-from .chat.tools import (  # noqa
+from .chat.tools.types import (  # noqa
     Tool,
 )
 
@@ -156,10 +156,6 @@ from .content.prepare import (  # noqa
     prepare_content_str,
 )
 
-from .content.rendering import (  # noqa
-    StringRenderer,
-)
-
 from .content.sequence import (  # noqa
     BlockContent,
     InlineContent,

{ommlds-0.0.0.dev373 → ommlds-0.0.0.dev375}/ommlds/minichain/backends/llamacpp/chat.py

@@ -15,7 +15,7 @@ from ...chat.choices.services import static_check_is_chat_choices_service
 from ...chat.choices.types import AiChoice
 from ...chat.choices.types import ChatChoicesOptions
 from ...chat.messages import AiMessage
-from ...chat.tools import Tool
+from ...chat.tools.types import Tool
 from ...configs import Config
 from ...llms.types import MaxTokens
 from ...llms.types import Temperature

{ommlds-0.0.0.dev373 → ommlds-0.0.0.dev375}/ommlds/minichain/backends/openai/format.py

@@ -16,7 +16,7 @@ from ...chat.messages import SystemMessage
 from ...chat.messages import ToolExecResultMessage
 from ...chat.messages import UserMessage
 from ...chat.stream.types import AiMessageDelta
-from ...chat.tools import Tool
+from ...chat.tools.types import Tool
 from ...content.prepare import prepare_content_str
 from ...llms.types import MaxTokens
 from ...llms.types import Temperature
@@ -47,7 +47,7 @@ def build_request_message(m: Message) -> ta.Mapping[str, ta.Any]:
                     id=te.id,
                     function=dict(
                         arguments=check.not_none(te.raw_args),
-                        name=te.spec.name,
+                        name=te.name,
                     ),
                     type='function',
                 )
@@ -169,7 +169,7 @@ class OpenaiChatRequestHandler:
             tool_exec_requests=[
                 ToolExecRequest(
                     id=tc['id'],
-                    spec=self._process_options().tools_by_name[tc['function']['name']],
+                    name=tc['function']['name'],
                     args=json.loads(tc['function']['arguments'] or '{}'),
                     raw_args=tc['function']['arguments'],
                 )

{ommlds-0.0.0.dev373 → ommlds-0.0.0.dev375}/ommlds/minichain/backends/transformers/transformers.py

@@ -98,7 +98,7 @@ def build_chat_message(m: Message) -> ta.Mapping[str, ta.Any]:
                     id=te.id,
                     function=dict(
                         arguments=te.args,
-                        name=te.spec.name,
+                        name=te.name,
                     ),
                     type='function',
                 )

ommlds-0.0.0.dev375/ommlds/minichain/chat/tools/execution/context.py

@@ -0,0 +1,65 @@
+import contextlib
+import contextvars
+import typing as ta
+
+from omlish import collections as col
+from omlish import dataclasses as dc
+from omlish import lang
+
+
+T = ta.TypeVar('T')
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class ToolContext(lang.Final):
+    dct: col.TypeMap = col.TypeMap()
+
+    @classmethod
+    def new(cls, *objs: ta.Any) -> 'ToolContext':
+        return cls(col.TypeMap(objs))
+
+    #
+
+    def __len__(self) -> int:
+        return len(self.dct)
+
+    def __iter__(self) -> ta.Iterator[ta.Any]:
+        return iter(self.dct)
+
+    def get(self, ty: type[T]) -> T | None:
+        return self.dct.get(ty)
+
+    def __getitem__(self, cls: type[T]) -> T:
+        return self.dct[cls]
+
+    def get_any(self, cls: type | tuple[type, ...]) -> ta.Sequence[T]:
+        return self.dct.get_any(cls)
+
+
+##
+
+
+_TOOL_CONTEXT: contextvars.ContextVar[ToolContext] = contextvars.ContextVar(f'{__name__}._TOOL_CONTEXT')
+
+
+@contextlib.contextmanager
+def bind_tool_context(ctx: ToolContext) -> ta.Generator[ToolContext]:
+    try:
+        cur = _TOOL_CONTEXT.get()
+    except LookupError:
+        pass
+    else:
+        raise RuntimeError(f'Already bound: {cur}')
+
+    tok = _TOOL_CONTEXT.set(ctx)
+    try:
+        yield ctx
+    finally:
+        _TOOL_CONTEXT.reset(tok)
+
+
+def tool_context() -> ToolContext:
+    return _TOOL_CONTEXT.get()

ommlds-0.0.0.dev375/ommlds/minichain/chat/tools/execution/executors.py

@@ -0,0 +1,60 @@
+import abc
+import typing as ta
+
+from omlish import dataclasses as dc
+from omlish import lang
+
+from ....tools.fns import ToolFn
+from ....tools.fns import execute_tool_fn
+from .context import ToolContext
+from .context import bind_tool_context
+
+
+##
+
+
+class ToolExecutor(lang.Abstract):
+    @abc.abstractmethod
+    def execute_tool(
+            self,
+            ctx: ToolContext,
+            name: str,
+            args: ta.Mapping[str, ta.Any],
+    ) -> str:
+        raise NotImplementedError
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class ToolFnToolExecutor(ToolExecutor):
+    tool_fn: ToolFn
+
+    def execute_tool(
+            self,
+            ctx: ToolContext,
+            name: str,
+            args: ta.Mapping[str, ta.Any],
+    ) -> str:
+        with bind_tool_context(ctx):
+            return execute_tool_fn(
+                self.tool_fn,
+                args,
+            )
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class NameSwitchedToolExecutor(ToolExecutor):
+    tool_executors_by_name: ta.Mapping[str, ToolExecutor]
+
+    def execute_tool(
+            self,
+            ctx: ToolContext,
+            name: str,
+            args: ta.Mapping[str, ta.Any],
+    ) -> str:
+        return self.tool_executors_by_name[name].execute_tool(ctx, name, args)

ommlds-0.0.0.dev375/ommlds/minichain/chat/tools/execution/messages.py

@@ -0,0 +1,25 @@
+from ...messages import ToolExecRequest
+from ...messages import ToolExecResultMessage
+from .context import ToolContext
+from .executors import ToolExecutor
+
+
+##
+
+
+def execute_tool_request(
+        ctx: ToolContext,
+        tex: ToolExecutor,
+        ter: ToolExecRequest,
+) -> ToolExecResultMessage:
+    result_str = tex.execute_tool(
+        ctx,
+        ter.name,
+        ter.args,
+    )
+
+    return ToolExecResultMessage(
+        ter.id,
+        ter.name,
+        result_str,
+    )

ommlds-0.0.0.dev373/ommlds/minichain/chat/tools.py → ommlds-0.0.0.dev375/ommlds/minichain/chat/tools/types.py

@@ -1,8 +1,8 @@
 from omlish import dataclasses as dc
 from omlish import lang
 
-from ..tools.types import ToolSpec
-from .types import ChatOption
+from ...tools.types import ToolSpec
+from ..types import ChatOption
 
 
 ##

ommlds-0.0.0.dev375/ommlds/minichain/tools/fns.py

@@ -0,0 +1,88 @@
+"""
+TODO:
+ - should really return Content conventionally
+"""
+import typing as ta
+
+from omlish import check
+from omlish import dataclasses as dc
+from omlish import lang
+
+
+D = ta.TypeVar('D')
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class ToolFn(lang.Final):
+    fn: ta.Callable
+
+    #
+
+    @dc.dataclass(frozen=True)
+    class Input(lang.Sealed, lang.Abstract):
+        pass
+
+    @dc.dataclass(frozen=True)
+    class DataclassInput(Input, lang.Final, ta.Generic[D]):
+        cls: type[D]
+
+        def __post_init__(self) -> None:
+            check.isinstance(self.cls, type)
+            check.arg(dc.is_dataclass(self.cls))
+
+    @dc.dataclass(frozen=True)
+    class KwargsInput(Input, lang.Final):
+        pass
+
+    input: Input
+
+    #
+
+    @dc.dataclass(frozen=True)
+    class Output(lang.Sealed, lang.Abstract):
+        pass
+
+    @dc.dataclass(frozen=True)
+    class DataclassOutput(Output, lang.Final, ta.Generic[D]):
+        cls: type[D]
+
+        def __post_init__(self) -> None:
+            check.isinstance(self.cls, type)
+            check.arg(dc.is_dataclass(self.cls))
+
+    @dc.dataclass(frozen=True)
+    class RawStringOutput(Output, lang.Final):
+        pass
+
+    output: Output
+
+
+##
+
+
+def execute_tool_fn(
+        tfn: ToolFn,
+        args: ta.Mapping[str, ta.Any],
+) -> str:
+    fn = tfn.fn
+
+    out: ta.Any
+    if isinstance(tfn.input, ToolFn.DataclassInput):
+        raise NotImplementedError
+    elif isinstance(tfn.input, ToolFn.KwargsInput):
+        out = fn(**args)
+    else:
+        raise NotImplementedError
+
+    ret: str
+    if isinstance(tfn.output, ToolFn.DataclassOutput):
+        raise NotImplementedError
+    elif isinstance(tfn.output, ToolFn.RawStringOutput):
+        ret = check.isinstance(out, str)
+    else:
+        raise NotImplementedError
+
+    return ret

{ommlds-0.0.0.dev373 → ommlds-0.0.0.dev375}/ommlds/minichain/tools/types.py

@@ -176,7 +176,7 @@ class ToolSpec:
 @dc.dataclass(frozen=True)
 class ToolExecRequest(lang.Final):
     id: str
-    spec: ToolSpec
+    name: str
     args: ta.Mapping[str, ta.Any]
 
     _: dc.KW_ONLY

{ommlds-0.0.0.dev373 → ommlds-0.0.0.dev375/ommlds.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ommlds
-Version: 0.0.0.dev373
+Version: 0.0.0.dev375
 Summary: ommlds
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,8 +12,8 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.13
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev373
-Requires-Dist: omlish==0.0.0.dev373
+Requires-Dist: omdev==0.0.0.dev375
+Requires-Dist: omlish==0.0.0.dev375
 Provides-Extra: all
 Requires-Dist: llama-cpp-python~=0.3; extra == "all"
 Requires-Dist: mlx~=0.27; extra == "all"

{ommlds-0.0.0.dev373 → ommlds-0.0.0.dev375}/ommlds.egg-info/SOURCES.txt

@@ -150,7 +150,6 @@ ommlds/minichain/chat/messages.py
 ommlds/minichain/chat/metadata.py
 ommlds/minichain/chat/services.py
 ommlds/minichain/chat/templating.py
-ommlds/minichain/chat/tools.py
 ommlds/minichain/chat/types.py
 ommlds/minichain/chat/choices/__init__.py
 ommlds/minichain/chat/choices/adapters.py
@@ -160,6 +159,12 @@ ommlds/minichain/chat/stream/__init__.py
 ommlds/minichain/chat/stream/adapters.py
 ommlds/minichain/chat/stream/services.py
 ommlds/minichain/chat/stream/types.py
+ommlds/minichain/chat/tools/__init__.py
+ommlds/minichain/chat/tools/types.py
+ommlds/minichain/chat/tools/execution/__init__.py
+ommlds/minichain/chat/tools/execution/context.py
+ommlds/minichain/chat/tools/execution/executors.py
+ommlds/minichain/chat/tools/execution/messages.py
 ommlds/minichain/chat/transforms/__init__.py
 ommlds/minichain/chat/transforms/base.py
 ommlds/minichain/chat/transforms/uuids.py
@@ -171,7 +176,6 @@ ommlds/minichain/content/metadata.py
 ommlds/minichain/content/namespaces.py
 ommlds/minichain/content/placeholders.py
 ommlds/minichain/content/prepare.py
-ommlds/minichain/content/rendering.py
 ommlds/minichain/content/sequence.py
 ommlds/minichain/content/simple.py
 ommlds/minichain/content/text.py
@@ -224,6 +228,7 @@ ommlds/minichain/tokens/types.py
 ommlds/minichain/tokens/vocabs.py
 ommlds/minichain/tools/__init__.py
 ommlds/minichain/tools/_marshal.py
+ommlds/minichain/tools/fns.py
 ommlds/minichain/tools/jsonschema.py
 ommlds/minichain/tools/reflect.py
 ommlds/minichain/tools/types.py

{ommlds-0.0.0.dev373 → ommlds-0.0.0.dev375}/ommlds.egg-info/requires.txt

@@ -1,5 +1,5 @@
-omdev==0.0.0.dev373
-omlish==0.0.0.dev373
+omdev==0.0.0.dev375
+omlish==0.0.0.dev375
 
 [all]
 llama-cpp-python~=0.3

{ommlds-0.0.0.dev373 → ommlds-0.0.0.dev375}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '>=3.13'
-version = '0.0.0.dev373'
+version = '0.0.0.dev375'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,8 +22,8 @@ classifiers = [
 ]
 description = 'ommlds'
 dependencies = [
-    'omdev == 0.0.0.dev373',
-    'omlish == 0.0.0.dev373',
+    'omdev == 0.0.0.dev375',
+    'omlish == 0.0.0.dev375',
 ]
 
 [project.optional-dependencies]

ommlds-0.0.0.dev373/ommlds/minichain/content/rendering.py

@@ -1,36 +0,0 @@
-import collections.abc
-import io
-import typing as ta
-
-from omlish import dispatch
-
-from .types import Content
-
-
-##
-
-
-class StringRenderer:
-    def __init__(self, out: ta.TextIO) -> None:
-        super().__init__()
-
-        self._out = out
-
-    @dispatch.method
-    def render(self, c: Content) -> None:
-        raise TypeError(c)
-
-    @render.register
-    def render_str(self, c: str) -> None:
-        self._out.write(c)
-
-    @render.register
-    def render_sequence(self, s: collections.abc.Sequence) -> None:
-        for e in s:
-            self.render(e)
-
-    @classmethod
-    def render_to_str(cls, c: Content) -> str:
-        out = io.StringIO()
-        cls(out).render(c)
-        return out.getvalue()