ommlds 0.0.0.dev476__py3-none-any.whl → 0.0.0.dev477__py3-none-any.whl

ommlds/.omlish-manifests.json

@@ -198,7 +198,7 @@
     "module": ".minichain.backends.impls.groq.chat",
     "attr": null,
     "file": "ommlds/minichain/backends/impls/groq/chat.py",
-    "line": 24,
+    "line": 26,
     "value": {
       "!.minichain.registries.manifests.RegistryManifest": {
         "module": "ommlds.minichain.backends.impls.groq.chat",
@@ -213,7 +213,7 @@
     "module": ".minichain.backends.impls.groq.names",
     "attr": "_BACKEND_STRINGS_MANIFEST",
     "file": "ommlds/minichain/backends/impls/groq/names.py",
-    "line": 27,
+    "line": 40,
     "value": {
       "!.minichain.backends.strings.manifests.BackendStringsManifest": {
         "service_cls_names": [
@@ -237,7 +237,7 @@
     "module": ".minichain.backends.impls.groq.stream",
     "attr": null,
     "file": "ommlds/minichain/backends/impls/groq/stream.py",
-    "line": 31,
+    "line": 33,
     "value": {
       "!.minichain.registries.manifests.RegistryManifest": {
         "module": "ommlds.minichain.backends.impls.groq.stream",

ommlds/backends/groq/protocol.py

@@ -103,13 +103,41 @@ class ChatCompletionRequest(lang.Final):
     stream: bool | None = None
     stream_options: ta.Mapping[str, ta.Any] | None = None
     temperature: float | None = None
-    tool_choice: str | None = None
-    tools: ta.Sequence[ta.Mapping[str, ta.Any]] | None = None
+    ool_choice: str | None = None
+
+    @dc.dataclass(frozen=True, kw_only=True)
+    @_set_class_marshal_options
+    class Tool(lang.Final):
+        @dc.dataclass(frozen=True, kw_only=True)
+        @_set_class_marshal_options
+        class Function(lang.Final):
+            description: str | None = None
+            name: str
+            parameters: ta.Mapping[str, ta.Any] | None = None  # json schema
+            strict: bool | None = None
+
+        function: Function
+        type: ta.Literal['function', 'browser_search', 'code_interpreter'] = 'function'
+
+    tools: ta.Sequence[Tool] | None = None
+
     top_logprobs: int | None = None
     top_p: float | None = None
     user: str | None = None
 
 
+@dc.dataclass(frozen=True, kw_only=True)
+@_set_class_marshal_options
+class ExecutedTool(lang.Final):
+    arguments: str
+    index: int
+    type: str
+    browser_results: ta.Sequence[ta.Any] | None = None
+    code_results: ta.Sequence[ta.Any] | None = None
+    output: str | None = None
+    search_results: ta.Any | None = None
+
+
 @dc.dataclass(frozen=True, kw_only=True)
 @_set_class_marshal_options
 class ChatCompletionResponse(lang.Final):
@@ -125,10 +153,27 @@ class ChatCompletionResponse(lang.Final):
         class Message(lang.Final):
             annotations: ta.Sequence[ta.Mapping[str, ta.Any]] | None = None
             content: str | None = None
-            executed_tools: ta.Sequence[ta.Mapping[str, ta.Any]] | None = None
+
+            executed_tools: ta.Sequence[ExecutedTool] | None = None
+
             reasoning: str | None = None
             role: ta.Literal['assistant'] = 'assistant'
-            tool_calls: ta.Sequence[ta.Mapping[str, ta.Any]] | None = None
+
+            @dc.dataclass(frozen=True, kw_only=True)
+            @_set_class_marshal_options
+            class ToolCall(lang.Final):
+                id: str
+
+                @dc.dataclass(frozen=True, kw_only=True)
+                @_set_class_marshal_options
+                class Function(lang.Final):
+                    arguments: str
+                    name: str
+
+                function: Function
+                type: ta.Literal['function'] = 'function'
+
+            tool_calls: ta.Sequence[ToolCall] | None = None
 
         message: Message
 
@@ -167,6 +212,26 @@ class ChatCompletionChunk(lang.Final):
             channel: str | None = None
             reasoning: str | None = None
 
+            @dc.dataclass(frozen=True, kw_only=True)
+            @_set_class_marshal_options
+            class ToolCall(lang.Final):
+                index: int
+                id: str | None = None
+
+                @dc.dataclass(frozen=True, kw_only=True)
+                @_set_class_marshal_options
+                class Function(lang.Final):
+                    arguments: str | None = None
+                    name: str | None = None
+
+                function: Function | None = None
+
+                type: ta.Literal['function'] = 'function'
+
+            tool_calls: ta.Sequence[ToolCall] | None = None
+
+            executed_tools: ta.Sequence[ExecutedTool] | None = None
+
         delta: Delta
         logprobs: ta.Mapping[str, ta.Any] | None = None
         finish_reason: ta.Literal['stop', 'length', 'tool_calls', 'function_call'] | None = None

ommlds/cli/sessions/chat/tools/configs.py

@@ -1,6 +1,7 @@
 import typing as ta
 
 from omlish import dataclasses as dc
+from omlish import lang
 
 
 ##
@@ -11,3 +12,11 @@ class ToolsConfig:
     silent: bool = False
     dangerous_no_confirmation: bool = False
     enabled_tools: ta.Iterable[str] | None = None
+
+
+##
+
+
+@dc.dataclass(frozen=True, kw_only=True)
+class ToolSetConfig(lang.Abstract):
+    pass

ommlds/cli/sessions/chat/tools/fs/configs.py

@@ -0,0 +1,12 @@
+from omlish import dataclasses as dc
+from omlish import lang
+
+from ..configs import ToolSetConfig
+
+
+##
+
+
+@dc.dataclass(frozen=True, kw_only=True)
+class FsToolSetConfig(ToolSetConfig, lang.Final):
+    pass

ommlds/cli/sessions/chat/tools/fs/inject.py

@@ -0,0 +1,35 @@
+import os
+
+from omlish import inject as inj
+
+from ..injection import ToolSetBinder
+from ..injection import bind_tool_context_provider_to_key
+from ..injection import tool_catalog_entries
+from .configs import FsToolSetConfig
+
+
+##
+
+
+def bind_fs_tools(cfg: FsToolSetConfig) -> inj.Elements:
+    from ......minichain.lib.fs.context import FsContext
+    from ......minichain.lib.fs.tools.ls import ls_tool
+    from ......minichain.lib.fs.tools.read import read_tool
+
+    return inj.as_elements(
+        tool_catalog_entries().bind_item_consts(
+            ls_tool(),
+            read_tool(),
+        ),
+
+        inj.bind(FsContext(
+            root_dir=os.getcwd(),
+        )),
+        bind_tool_context_provider_to_key(FsContext),
+    )
+
+
+##
+
+
+FS_TOOL_SET_BINDER = ToolSetBinder(FsToolSetConfig, bind_fs_tools)

ommlds/cli/sessions/chat/tools/inject.py

@@ -1,13 +1,10 @@
-import os
-import typing as ta
-
 from omlish import check
 from omlish import inject as inj
 from omlish import lang
 
 from ..... import minichain as mc
 from .configs import ToolsConfig
-from .injection import bind_tool_context_provider_to_key
+from .injection import ToolSetBinder
 from .injection import tool_catalog_entries
 from .injection import tool_context_providers
 
@@ -21,65 +18,6 @@ with lang.auto_proxy_import(globals()):
 ##
 
 
-_TOOL_BINDERS: dict[str, ta.Callable[[], inj.Elements]] = {}
-
-
-def _tool_binder(name: str) -> ta.Callable[[ta.Callable[[], inj.Elements]], ta.Callable[[], inj.Elements]]:
-    def inner(fn):
-        check.not_in(name, _TOOL_BINDERS)
-        _TOOL_BINDERS[name] = fn
-        return fn
-    return inner
-
-
-#
-
-
-@_tool_binder('weather')
-def _bind_weather_tool() -> inj.Elements:
-    from .weather import WEATHER_TOOL
-
-    return inj.as_elements(
-        tool_catalog_entries().bind_item_consts(WEATHER_TOOL),
-    )
-
-
-@_tool_binder('todo')
-def _bind_todo_tools() -> inj.Elements:
-    from .....minichain.lib.todo.context import TodoContext
-    from .....minichain.lib.todo.tools.read import todo_read_tool
-    from .....minichain.lib.todo.tools.write import todo_write_tool
-
-    return inj.as_elements(
-        tool_catalog_entries().bind_item_consts(
-            todo_read_tool(),
-            todo_write_tool(),
-        ),
-
-        inj.bind(TodoContext()),
-        bind_tool_context_provider_to_key(TodoContext),
-    )
-
-
-@_tool_binder('fs')
-def _bind_fs_tools() -> inj.Elements:
-    from .....minichain.lib.fs.context import FsContext
-    from .....minichain.lib.fs.tools.ls import ls_tool
-    from .....minichain.lib.fs.tools.read import read_tool
-
-    return inj.as_elements(
-        tool_catalog_entries().bind_item_consts(
-            ls_tool(),
-            read_tool(),
-        ),
-
-        inj.bind(FsContext(
-            root_dir=os.getcwd(),
-        )),
-        bind_tool_context_provider_to_key(FsContext),
-    )
-
-
 # if tools_config.enable_unsafe_tools_do_not_use_lol:
 #     from ...minichain.lib.bash import bash_tool
 #     els.append(bind_tool(bash_tool()))
@@ -103,7 +41,16 @@ def bind_tools(cfg: ToolsConfig = ToolsConfig()) -> inj.Elements:
     els.append(tool_catalog_entries().bind_items_provider(singleton=True))
 
     for etn in check.not_isinstance(cfg.enabled_tools or [], str):
-        els.append(_TOOL_BINDERS[etn]())
+        from .fs.inject import FS_TOOL_SET_BINDER
+        from .todo.inject import TODO_TOOL_SET_BINDER
+        from .weather.inject import WEATHER_TOOL_SET_BINDER
+        ts_binder: ToolSetBinder = {  # type: ignore[assignment]  # FIXME: placeholder obviously lol
+            'fs': FS_TOOL_SET_BINDER,
+            'todo': TODO_TOOL_SET_BINDER,
+            'weather': WEATHER_TOOL_SET_BINDER,
+        }[etn]
+
+        els.append(ts_binder.fn(ts_binder.cfg_cls()))
 
     #
 

ommlds/cli/sessions/chat/tools/injection.py

@@ -1,15 +1,20 @@
 import typing as ta
 
+from omlish import dataclasses as dc
 from omlish import inject as inj
 from omlish import lang
 
 from ..... import minichain as mc
+from .configs import ToolSetConfig
 
 
 with lang.auto_proxy_import(globals()):
     from . import execution as _execution
 
 
+ToolSetConfigT = ta.TypeVar('ToolSetConfigT', bound='ToolSetConfig')
+
+
 ##
 
 
@@ -28,3 +33,12 @@ def bind_tool_context_provider_to_key(key: ta.Any) -> inj.Elements:
         lambda v: _execution.ToolContextProvider(lambda: [v]),
         v=key,
     ), singleton=True)
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class ToolSetBinder(lang.Final, ta.Generic[ToolSetConfigT]):
+    cfg_cls: type[ToolSetConfig]
+    fn: ta.Callable[[ToolSetConfigT], inj.Elements]

ommlds/cli/sessions/chat/tools/todo/configs.py

@@ -0,0 +1,12 @@
+from omlish import dataclasses as dc
+from omlish import lang
+
+from ..configs import ToolSetConfig
+
+
+##
+
+
+@dc.dataclass(frozen=True, kw_only=True)
+class TodoToolSetConfig(ToolSetConfig, lang.Final):
+    pass

ommlds/cli/sessions/chat/tools/todo/inject.py

@@ -0,0 +1,31 @@
+from omlish import inject as inj
+
+from ..injection import ToolSetBinder
+from ..injection import bind_tool_context_provider_to_key
+from ..injection import tool_catalog_entries
+from .configs import TodoToolSetConfig
+
+
+##
+
+
+def bind_todo_tools(cfg: TodoToolSetConfig) -> inj.Elements:
+    from ......minichain.lib.todo.context import TodoContext
+    from ......minichain.lib.todo.tools.read import todo_read_tool
+    from ......minichain.lib.todo.tools.write import todo_write_tool
+
+    return inj.as_elements(
+        tool_catalog_entries().bind_item_consts(
+            todo_read_tool(),
+            todo_write_tool(),
+        ),
+
+        inj.bind(TodoContext()),
+        bind_tool_context_provider_to_key(TodoContext),
+    )
+
+
+##
+
+
+TODO_TOOL_SET_BINDER = ToolSetBinder(TodoToolSetConfig, bind_todo_tools)

ommlds/cli/sessions/chat/tools/weather/configs.py

@@ -0,0 +1,12 @@
+from omlish import dataclasses as dc
+from omlish import lang
+
+from ..configs import ToolSetConfig
+
+
+##
+
+
+@dc.dataclass(frozen=True, kw_only=True)
+class WeatherToolSetConfig(ToolSetConfig, lang.Final):
+    pass

ommlds/cli/sessions/chat/tools/weather/inject.py

@@ -0,0 +1,22 @@
+from omlish import inject as inj
+
+from ..injection import ToolSetBinder
+from ..injection import tool_catalog_entries
+from .configs import WeatherToolSetConfig
+
+
+##
+
+
+def bind_weather_tools(cfg: WeatherToolSetConfig) -> inj.Elements:
+    from .tools import WEATHER_TOOL
+
+    return inj.as_elements(
+        tool_catalog_entries().bind_item_consts(WEATHER_TOOL),
+    )
+
+
+##
+
+
+WEATHER_TOOL_SET_BINDER = ToolSetBinder(WeatherToolSetConfig, bind_weather_tools)

ommlds/cli/sessions/chat/tools/{weather.py → weather/tools.py}

@@ -1,4 +1,4 @@
-from ..... import minichain as mc
+from ...... import minichain as mc
 
 
 ##

ommlds/minichain/backends/impls/groq/chat.py

@@ -10,11 +10,13 @@ from .....backends.groq import protocol as pt
 from ....chat.choices.services import ChatChoicesRequest
 from ....chat.choices.services import ChatChoicesResponse
 from ....chat.choices.services import static_check_is_chat_choices_service
+from ....chat.tools.types import Tool
 from ....models.configs import ModelName
 from ....standard import ApiKey
 from ....standard import DefaultOptions
 from .names import MODEL_NAMES
-from .protocol import build_gq_request_message
+from .protocol import build_gq_request_messages
+from .protocol import build_gq_request_tool
 from .protocol import build_mc_choices_response
 
 
@@ -44,12 +46,16 @@ class GroqChatChoicesService:
             self._default_options: tv.TypedValues = DefaultOptions.pop(cc)
 
     async def invoke(self, request: ChatChoicesRequest) -> ChatChoicesResponse:
+        tools: list[pt.ChatCompletionRequest.Tool] = []
+        with tv.TypedValues(*request.options).consume() as oc:
+            t: Tool
+            for t in oc.pop(Tool, []):
+                tools.append(build_gq_request_tool(t))
+
         gq_request = pt.ChatCompletionRequest(
-            messages=[
-                build_gq_request_message(m)
-                for m in request.v
-            ],
+            messages=build_gq_request_messages(request.v),
             model=MODEL_NAMES.resolve(self._model_name.v),
+            tools=tools or None,
         )
 
         raw_request = msh.marshal(gq_request)

ommlds/minichain/backends/impls/groq/names.py

@@ -4,6 +4,19 @@ https://console.groq.com/docs/models
 curl -X GET "https://api.groq.com/openai/v1/models" \
      -H "Authorization: Bearer $GROQ_API_KEY" \
      -H "Content-Type: application/json"
+
+"compound-beta",
+"compound-beta-mini",
+"gemma2-9b-it",
+"llama-3.1-8b-instant",
+"llama-3.3-70b-versatile",
+"meta-llama/llama-4-maverick-17b-128e-instruct",
+"meta-llama/llama-4-scout-17b-16e-instruct",
+"meta-llama/llama-guard-4-12b",
+"moonshotai/kimi-k2-instruct",
+"openai/gpt-oss-120b",
+"openai/gpt-oss-20b",
+"qwen/qwen3-32b",
 """
 from ....models.names import ModelNameCollection
 from ...strings.manifests import BackendStringsManifest

ommlds/minichain/backends/impls/groq/protocol.py

@@ -1,46 +1,143 @@
+import itertools
+
 from omlish import check
+from omlish.formats import json
 
 from .....backends.groq import protocol as pt
 from ....chat.choices.services import ChatChoicesResponse
 from ....chat.choices.types import AiChoice
 from ....chat.messages import AiMessage
-from ....chat.messages import Message
+from ....chat.messages import AnyAiMessage
+from ....chat.messages import Chat
 from ....chat.messages import SystemMessage
+from ....chat.messages import ToolUseMessage
+from ....chat.messages import ToolUseResultMessage
 from ....chat.messages import UserMessage
+from ....chat.stream.types import AiChoiceDelta
 from ....chat.stream.types import AiChoiceDeltas
 from ....chat.stream.types import ContentAiChoiceDelta
+from ....chat.stream.types import ToolUseAiChoiceDelta
+from ....chat.tools.types import Tool
+from ....content.prepare import prepare_content_str
+from ....tools.jsonschema import build_tool_spec_params_json_schema
+from ....tools.types import ToolUse
 
 
 ##
 
 
-def build_gq_request_message(mc_msg: Message) -> pt.ChatCompletionRequest.Message:
-    if isinstance(mc_msg, SystemMessage):
-        return pt.ChatCompletionRequest.SystemMessage(
-            content=check.isinstance(mc_msg.c, str),
-        )
+def build_gq_request_messages(chat: Chat) -> list[pt.ChatCompletionRequest.Message]:
+    gq_msgs: list[pt.ChatCompletionRequest.Message] = []
 
-    elif isinstance(mc_msg, UserMessage):
-        return pt.ChatCompletionRequest.UserMessage(
-            content=check.isinstance(mc_msg.c, str),
-        )
+    for _, g in itertools.groupby(chat, lambda mc_m: isinstance(mc_m, AnyAiMessage)):
+        mc_msgs = list(g)
 
-    else:
-        raise TypeError(mc_msg)
+        if isinstance(mc_msgs[0], AnyAiMessage):
+            tups: list[tuple[AiMessage | None, list[ToolUseMessage]]] = []
+            for mc_msg in mc_msgs:
+                if isinstance(mc_msg, AiMessage):
+                    tups.append((mc_msg, []))
+
+                elif isinstance(mc_msg, ToolUseMessage):
+                    if not tups:
+                        tups.append((None, []))
+                    tups[-1][1].append(mc_msg)
+
+                else:
+                    raise TypeError(mc_msg)
+
+            for mc_ai_msg, mc_tu_msgs in tups:
+                gq_msgs.append(pt.ChatCompletionRequest.AssistantMessage(
+                    content=check.isinstance(mc_ai_msg.c, str) if mc_ai_msg is not None else None,
+                    tool_calls=[
+                        pt.ChatCompletionRequest.AssistantMessage.ToolCall(
+                            function=pt.ChatCompletionRequest.AssistantMessage.ToolCall.Function(
+                                name=mc_tu_msg.tu.name,
+                                arguments=check.not_none(mc_tu_msg.tu.raw_args),
+                            ),
+                            id=check.not_none(mc_tu_msg.tu.id),
+                        )
+                        for mc_tu_msg in mc_tu_msgs
+                    ] if mc_tu_msgs else None,
+                ))
+
+        else:
+            for mc_msg in mc_msgs:
+                if isinstance(mc_msg, SystemMessage):
+                    gq_msgs.append(pt.ChatCompletionRequest.SystemMessage(
+                        content=check.isinstance(mc_msg.c, str),
+                    ))
+
+                elif isinstance(mc_msg, UserMessage):
+                    gq_msgs.append(pt.ChatCompletionRequest.UserMessage(
+                        content=check.isinstance(mc_msg.c, str),
+                    ))
+
+                elif isinstance(mc_msg, ToolUseResultMessage):
+                    gq_msgs.append(pt.ChatCompletionRequest.ToolMessage(
+                        tool_call_id=check.not_none(mc_msg.tur.id),
+                        content=check.isinstance(mc_msg.tur.c, str),
+                    ))
+
+                else:
+                    raise TypeError(mc_msg)
+
+    return gq_msgs
+
+
+def build_gq_request_tool(t: Tool) -> pt.ChatCompletionRequest.Tool:
+    return pt.ChatCompletionRequest.Tool(
+        function=pt.ChatCompletionRequest.Tool.Function(
+            name=check.not_none(t.spec.name),
+            description=prepare_content_str(t.spec.desc),
+            parameters=build_tool_spec_params_json_schema(t.spec),
+        ),
+    )
 
 
 def build_mc_choices_response(gq_resp: pt.ChatCompletionResponse) -> ChatChoicesResponse:
-    return ChatChoicesResponse([
-        AiChoice([AiMessage(
-            check.isinstance(gq_choice.message.content, str),
-        )])
-        for gq_choice in gq_resp.choices
-    ])
+    def build_choice(gq_choice: pt.ChatCompletionResponse.Choice) -> AiChoice:
+        gq_msg = gq_choice.message
+
+        lst: list[AnyAiMessage] = []
+
+        if gq_msg.content is not None:
+            lst.append(AiMessage(
+                check.isinstance(gq_msg.content, str),
+            ))
+
+        for gq_tc in gq_msg.tool_calls or []:
+            lst.append(ToolUseMessage(ToolUse(
+                id=gq_tc.id,
+                name=gq_tc.function.name,
+                args=json.loads(gq_tc.function.arguments or '{}'),
+                raw_args=gq_tc.function.arguments,
+            )))
+
+        return AiChoice(lst)
+
+    return ChatChoicesResponse(list(map(build_choice, gq_resp.choices)))
 
 
 def build_mc_ai_choice_deltas(delta: pt.ChatCompletionChunk.Choice.Delta) -> AiChoiceDeltas:
-    if delta.role in (None, 'assistant') and delta.content is not None:
-        return AiChoiceDeltas([ContentAiChoiceDelta(delta.content)])
+    if delta.role in (None, 'assistant'):
+        lst: list[AiChoiceDelta] = []
 
-    else:
+        if delta.content is not None:
+            lst.append(ContentAiChoiceDelta(delta.content))
+
+        for tc in delta.tool_calls or []:
+            tc_fn = check.not_none(tc.function)
+            lst.append(ToolUseAiChoiceDelta(
+                id=tc.id,
+                name=check.not_none(tc_fn.name),
+                args=json.loads(tc_fn.arguments or '{}'),
+            ))
+
+        return AiChoiceDeltas(lst)
+
+    elif delta.channel in ('analysis', 'commentary'):
         return AiChoiceDeltas([])
+
+    else:
+        raise ValueError(delta)

ommlds/minichain/backends/impls/groq/stream.py

@@ -14,6 +14,7 @@ from ....chat.stream.services import ChatChoicesStreamRequest
 from ....chat.stream.services import ChatChoicesStreamResponse
 from ....chat.stream.services import static_check_is_chat_choices_stream_service
 from ....chat.stream.types import AiChoicesDeltas
+from ....chat.tools.types import Tool
 from ....configs import Config
 from ....resources import UseResources
 from ....standard import ApiKey
@@ -21,7 +22,8 @@ from ....stream.services import StreamResponseSink
 from ....stream.services import new_stream_response
 from .chat import GroqChatChoicesService
 from .names import MODEL_NAMES
-from .protocol import build_gq_request_message
+from .protocol import build_gq_request_messages
+from .protocol import build_gq_request_tool
 from .protocol import build_mc_ai_choice_deltas
 
 
@@ -50,14 +52,16 @@ class GroqChatChoicesStreamService:
     READ_CHUNK_SIZE: ta.ClassVar[int] = -1
 
     async def invoke(self, request: ChatChoicesStreamRequest) -> ChatChoicesStreamResponse:
-        # check.isinstance(request, ChatRequest)
+        tools: list[pt.ChatCompletionRequest.Tool] = []
+        with tv.TypedValues(*request.options).consume() as oc:
+            t: Tool
+            for t in oc.pop(Tool, []):
+                tools.append(build_gq_request_tool(t))
 
         gq_request = pt.ChatCompletionRequest(
-            messages=[
-                build_gq_request_message(m)
-                for m in request.v
-            ],
+            messages=build_gq_request_messages(request.v),
             model=MODEL_NAMES.resolve(self._model_name.v),
+            tools=tools or None,
             stream=True,
         )
 

ommlds/minichain/chat/stream/joining.py

@@ -73,6 +73,7 @@ class AiChoiceDeltaJoiner:
                 id=d.id,
                 name=check.not_none(d.name),
                 args=d.args or {},
+                raw_args=json.dumps_compact(d.args),
             )))
 
         else:

ommlds/minichain/tools/reflect.py

@@ -15,10 +15,10 @@ import textwrap
 import types
 import typing as ta
 
-from omdev.py import docstrings
 from omlish import check
 from omlish import collections as col
 from omlish import dataclasses as dc
+from omlish import lang
 from omlish import metadata as md
 from omlish import reflect as rfl
 from omlish.lite.cached import cached_nullary
@@ -37,6 +37,10 @@ from .types import TupleToolDtype
 from .types import UnionToolDtype
 
 
+with lang.auto_proxy_import(globals()):
+    from omdev.py import docstrings
+
+
 ##
 
 

{ommlds-0.0.0.dev476.dist-info → ommlds-0.0.0.dev477.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ommlds
-Version: 0.0.0.dev476
+Version: 0.0.0.dev477
 Summary: ommlds
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,8 +14,8 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev476
-Requires-Dist: omlish==0.0.0.dev476
+Requires-Dist: omdev==0.0.0.dev477
+Requires-Dist: omlish==0.0.0.dev477
 Provides-Extra: all
 Requires-Dist: llama-cpp-python~=0.3; extra == "all"
 Requires-Dist: mlx~=0.29; extra == "all"

{ommlds-0.0.0.dev476.dist-info → ommlds-0.0.0.dev477.dist-info}/RECORD

@@ -1,4 +1,4 @@
-ommlds/.omlish-manifests.json,sha256=iFZm89KS4aONhIRo1mbtKiHARMrNZ4SfQLSNgJO_Iek,25355
+ommlds/.omlish-manifests.json,sha256=8dexRefvFsIfCdj0aNLHnjBb_Qn14SRsImSkiO-R-G8,25355
 ommlds/__about__.py,sha256=5ekfRjb6SiK6o6SAusykyPQ_oxy46_IEga7nD0EL0cI,1839
 ommlds/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/_hacks/__init__.py,sha256=ajfw7dMKH8UuloeQ5MSxWwgAmdWf2v8gm-K3uLP9wtY,196
@@ -22,7 +22,7 @@ ommlds/backends/google/protocol/_marshal.py,sha256=LWikcdMDrKQ0lMtclNXwK9qamijUB
 ommlds/backends/google/protocol/types.py,sha256=JDft5-5sPuy8sFWTvid4JuC9a9EnuQizt9dyAV2L56s,17536
 ommlds/backends/groq/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/backends/groq/_marshal.py,sha256=3o4CVK9VbP_UnEbXZ4fQJuZK3Sy9xnkXTTempSDSvgE,602
-ommlds/backends/groq/protocol.py,sha256=ufZ6UIJnQfei28q9o6GpPiD9AJ_LZa9SSOWP7B79qcg,5871
+ommlds/backends/groq/protocol.py,sha256=ieKrjlxcDE5RqWcugc996O5Ksy4Chse_RdigPQPbP2Y,7823
 ommlds/backends/llamacpp/__init__.py,sha256=zXFpLXE4a2vEl0jcPDyKlPHHfZ3Z8Dz0twhEIyZ8-vg,59
 ommlds/backends/llamacpp/buildwheel.py,sha256=q9ghCLVbm8Jm6syrZlBP-x1qNDd0wSl15B2OXBtDBQ8,3813
 ommlds/backends/llamacpp/logging.py,sha256=nCEC6ASEuTpJqx47DMLhnbr5KelDlbxhM0nKQt4bc3w,773
@@ -145,13 +145,22 @@ ommlds/cli/sessions/chat/phases/injection.py,sha256=ZUFRRLp3HNhKaPBW6aiw5XFEGNkq
 ommlds/cli/sessions/chat/phases/manager.py,sha256=_wfc0FfL5h_5L-6hnYb3U3kiRmkGDkJu7wGj5Cgz7_Y,727
 ommlds/cli/sessions/chat/phases/types.py,sha256=w1pAEydJYaHzSzdlqygCwKxvVZnfo_R_xJqq8wBzZsQ,512
 ommlds/cli/sessions/chat/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ommlds/cli/sessions/chat/tools/configs.py,sha256=nyOD8J5dWUCaYY-AXEOAqUwZA46wl70c9WD7TZh4Vl8,244
+ommlds/cli/sessions/chat/tools/configs.py,sha256=DuRT3In_VHLur6UpvFI8EY5bOqmdLNMSNTUvbzCLFOo,361
 ommlds/cli/sessions/chat/tools/confirmation.py,sha256=I_nYBIIoeprCShUaVpN4v01YOAdY6iJEM5-ybc0p8VA,1072
 ommlds/cli/sessions/chat/tools/execution.py,sha256=4sRuZWZjNBo852hhLZjqTqEZpgu9KPXHEawiICIMUdc,1576
-ommlds/cli/sessions/chat/tools/inject.py,sha256=oz1UOx-HM0h6LJ2BXYLDED2C-m7v54RI_2ILk_5lfB4,3780
-ommlds/cli/sessions/chat/tools/injection.py,sha256=RDtsOuy4qycaVq_v8J6_u8ZCUycBg0hAN8qr0rojFKw,838
+ommlds/cli/sessions/chat/tools/inject.py,sha256=MzORGqT4sNLu3ApNoExNjD8OLFKFmwpHmN_-qNVBlp8,2634
+ommlds/cli/sessions/chat/tools/injection.py,sha256=BGpkYciYNVlfyi6HcQqgrtLyWbFuIXJx-yr2eC4TmYY,1161
 ommlds/cli/sessions/chat/tools/rendering.py,sha256=-BO-rY_WycmAf1WC9jhiRqnBJiQOtUA5jaXcOC2K6aw,1404
-ommlds/cli/sessions/chat/tools/weather.py,sha256=vZXOHdRGGlkDEXasW5foc58MyEMOc79bhIfIgrumRlo,302
+ommlds/cli/sessions/chat/tools/fs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ommlds/cli/sessions/chat/tools/fs/configs.py,sha256=hwQ3WRP6hYxjIx-m8z_ZZZ-HwiREuIpa2gRKzeqkoHk,205
+ommlds/cli/sessions/chat/tools/fs/inject.py,sha256=hq2PHA9ZgfmghOZ4RlagtfJfJAk0cdEsH90WZuVjlvY,806
+ommlds/cli/sessions/chat/tools/todo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ommlds/cli/sessions/chat/tools/todo/configs.py,sha256=pcdjTKsRB4J_iBET2tcOx-32EHqtecxLg4JtelMyh1o,207
+ommlds/cli/sessions/chat/tools/todo/inject.py,sha256=FU4fCGWJKXviNvSsjoAENM1My1-zUrrbkL2RPelLqik,805
+ommlds/cli/sessions/chat/tools/weather/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ommlds/cli/sessions/chat/tools/weather/configs.py,sha256=VzamzIHkTOVVEKeH5pCq3oWZdREpT2O73v0CImCerDU,210
+ommlds/cli/sessions/chat/tools/weather/inject.py,sha256=HSB6gCp23T2HME07FzBiiFpWnloErCIO7yTWcOu5DVk,456
+ommlds/cli/sessions/chat/tools/weather/tools.py,sha256=TeXOmxTtuKgiGNl00t4pcHqhh3HSTeiEZRyZv1rs7Pg,303
 ommlds/cli/sessions/completion/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/cli/sessions/completion/configs.py,sha256=ZibOyJxIMbclzKDK_mj8jVzFJxjkyVWmo1Tb9ZnQQ1M,240
 ommlds/cli/sessions/completion/inject.py,sha256=vk3ewhXWGemKcOllr1iG_nMz5523qEu40MI62Dlx9AQ,933
@@ -203,10 +212,10 @@ ommlds/minichain/backends/impls/google/search.py,sha256=y5_6seSRU8CFnLA_Ja8XEMbI
 ommlds/minichain/backends/impls/google/stream.py,sha256=ITownhKSOJB4IG23wWZJepUImSM6vJsDMOM9W1STpwU,8013
 ommlds/minichain/backends/impls/google/tools.py,sha256=Tty0gsyx7-PbeoNqMuql_ewQ6q-ZsDaDdsD5ShinGVY,5089
 ommlds/minichain/backends/impls/groq/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ommlds/minichain/backends/impls/groq/chat.py,sha256=jXomRPouYrlFBsFvviSsR4T6l6Cpf8Ut5TiqhjuzkjY,2451
-ommlds/minichain/backends/impls/groq/names.py,sha256=M_NRKpcbFgnN0ZAVaQMQFHRZV62lE8hZ2qoDiM_A8gs,748
-ommlds/minichain/backends/impls/groq/protocol.py,sha256=kLHcVjwyh5AosKXWengDJZBdHWUwMrmCd_2ZKgor0EA,1451
-ommlds/minichain/backends/impls/groq/stream.py,sha256=RDcDfTb2zH1rco0jEzNNqu04MXv7Fbqm5AlTimdQqK0,4850
+ommlds/minichain/backends/impls/groq/chat.py,sha256=XXJznM6h2fBBtrY8MggMUNJf8thyFTM3p1XzFImwkAk,2743
+ommlds/minichain/backends/impls/groq/names.py,sha256=RnvBSytxPF1a9Bj_OPVELuD1nAKJnJrG3ZwJfYo6Szs,1075
+ommlds/minichain/backends/impls/groq/protocol.py,sha256=3sLC8wX0jnUOSMf3WqXH8zKT8RCSFKrbx5VyqaPViUQ,5242
+ommlds/minichain/backends/impls/groq/stream.py,sha256=in62MWfQLfXRVPpoFdJyLNGZ_bRfXymmVTdQpEuAfCU,5092
 ommlds/minichain/backends/impls/huggingface/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/minichain/backends/impls/huggingface/configs.py,sha256=6jsBtPNXOP57PcpxNTVLGWLc-18Iwn_lDbGouwCJTIQ,258
 ommlds/minichain/backends/impls/huggingface/repos.py,sha256=8BDxJmra9elSQL2vzp2nr2p4Hpq56A3zTk7hTTnfJU4,861
@@ -256,7 +265,7 @@ ommlds/minichain/chat/choices/types.py,sha256=OPnMUp0KUKGGPJKsQZiXUtd8Z9b_JnhOy7
 ommlds/minichain/chat/stream/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/minichain/chat/stream/_marshal.py,sha256=r6NYBUviV7jIssaFprzv2rVEj8cFEuBlt71BSMZ-448,397
 ommlds/minichain/chat/stream/adapters.py,sha256=3hKo3-MLtVIB-Nhdlxt17LP9vZESr-2fBZQ3Yr6l_Ps,1077
-ommlds/minichain/chat/stream/joining.py,sha256=oPxLT4qEYWCaxclnZvt54ztQP5md4V6u6Uwn4qd2e9M,2936
+ommlds/minichain/chat/stream/joining.py,sha256=N0vAg1UJbwnXl5dRkmb-EP5_MfhRgF0liZ45OEDY0XA,2989
 ommlds/minichain/chat/stream/services.py,sha256=TxNEOm85QEFYtKb59q_uP6eSNh75v1fF-IpsJjhY4to,1252
 ommlds/minichain/chat/stream/types.py,sha256=kpHsWLNHk7hmaNPDSCqLH-ECSAiz83lRfr00LhSWb5U,1589
 ommlds/minichain/chat/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -358,7 +367,7 @@ ommlds/minichain/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 ommlds/minichain/tools/_marshal.py,sha256=9np2tuzGfRwL5BMCd6QYChzimtTBUfHxT4IoEA6v3Eg,410
 ommlds/minichain/tools/fns.py,sha256=UVgj9f0vnjFzP5uP4zpN4slOA5nEOD8Ob1aJwKrSggA,3930
 ommlds/minichain/tools/jsonschema.py,sha256=20i3Yrw91nzgYRcZfVfrDjtFEpGD1Gc_5iiFhq1KV8w,4233
-ommlds/minichain/tools/reflect.py,sha256=V3hjemdLxH-0pI_XwuFPSyQaWlWjvQcGs_Wss5qvQr8,8624
+ommlds/minichain/tools/reflect.py,sha256=fI0b6ZGaJbk-Ll7oXuByX5fVWHh5UaUW37O5WHbZlyA,8694
 ommlds/minichain/tools/types.py,sha256=z1OP4sHumsSnqxTD3eL8tgTHarDmw7VWUyJu9cW7Yho,4868
 ommlds/minichain/tools/execution/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/minichain/tools/execution/catalog.py,sha256=sBde49FSClTreX8KO5pZ2-EE1NyTZOoagNdowN3n5pE,2002
@@ -399,9 +408,9 @@ ommlds/wiki/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU
 ommlds/wiki/utils/io.py,sha256=UKgDJGtmpnWvIqVd2mJc2QNPOqlToEY1GEveNp6_pMo,7088
 ommlds/wiki/utils/progress.py,sha256=EhvKcMFYtsarCQhIahlO6f0SboyAKP3UwUyrnVnP-Vk,3222
 ommlds/wiki/utils/xml.py,sha256=sNJNkZ9rT8B-kJMO6bRz8J1USy4fyPx0m2PwTX7vxYY,3846
-ommlds-0.0.0.dev476.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-ommlds-0.0.0.dev476.dist-info/METADATA,sha256=Jx-CeBHDUtMiNkl1KouPEGBdWRs7bTxw2f4_tf8cs7w,3344
-ommlds-0.0.0.dev476.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ommlds-0.0.0.dev476.dist-info/entry_points.txt,sha256=Z5YWtX7ClfiCKdW-dd_CSVvM0h4yQpJPi-2G3q6gNFo,35
-ommlds-0.0.0.dev476.dist-info/top_level.txt,sha256=Rbnk5d5wi58vnAXx13WFZqdQ4VX8hBCS2hEL3WeXOhY,7
-ommlds-0.0.0.dev476.dist-info/RECORD,,
+ommlds-0.0.0.dev477.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+ommlds-0.0.0.dev477.dist-info/METADATA,sha256=ncQdlJg91UEeoFaW8OiTM2ipyNxyVbm4oHwycfYcSHM,3344
+ommlds-0.0.0.dev477.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ommlds-0.0.0.dev477.dist-info/entry_points.txt,sha256=Z5YWtX7ClfiCKdW-dd_CSVvM0h4yQpJPi-2G3q6gNFo,35
+ommlds-0.0.0.dev477.dist-info/top_level.txt,sha256=Rbnk5d5wi58vnAXx13WFZqdQ4VX8hBCS2hEL3WeXOhY,7
+ommlds-0.0.0.dev477.dist-info/RECORD,,