ommlds 0.0.0.dev494__py3-none-any.whl → 0.0.0.dev495__py3-none-any.whl

ommlds/minichain/backends/strings/resolving.py

@@ -4,9 +4,9 @@ TODO:
   - interop with registry somehow, probably? or is it strictly a different concern?
 """
 import abc
-import dataclasses as dc
 import typing as ta
 
+from omlish import dataclasses as dc
 from omlish import lang
 from omlish.manifests.globals import GlobalManifestLoader
 

ommlds/minichain/chat/messages.py

@@ -9,7 +9,7 @@ from omlish import marshal as msh
 from omlish import typedvalues as tv
 
 from .._typedvalues import _tv_field_metadata
-from ..content.materialize import CanContent
+from ..content.cancontent import CanContent
 from ..content.transforms.base import ContentTransform
 from ..content.types import Content
 from ..metadata import MetadataContainer

ommlds/minichain/content/_marshal.py

@@ -1,18 +1,19 @@
 import collections.abc
-import dataclasses as dc
 import typing as ta
 
 from omlish import check
+from omlish import dataclasses as dc
 from omlish import lang
 from omlish import marshal as msh
 from omlish import reflect as rfl
 
+from .cancontent import CanContent
+from .cancontent import _InnerCanContent
 from .images import ImageContent  # noqa
 from .json import JsonContent  # noqa
-from .materialize import CanContent
-from .materialize import _InnerCanContent
 from .sequence import BlockContent  # noqa
 from .sequence import InlineContent  # noqa
+from .tag import TagContent  # noqa
 from .text import TextContent  # noqa
 from .types import CONTENT_RUNTIME_TYPES
 from .types import Content
@@ -161,10 +162,11 @@ def _install_standard_marshaling() -> None:
     extended_content_poly = msh.Polymorphism(
         ExtendedContent,
         [
-            msh.Impl(InlineContent, 'inline'),
             msh.Impl(BlockContent, 'block'),
             msh.Impl(ImageContent, 'image'),
+            msh.Impl(InlineContent, 'inline'),
             msh.Impl(JsonContent, 'json'),
+            msh.Impl(TagContent, 'tag'),
             msh.Impl(TextContent, 'text'),
         ],
     )

ommlds/minichain/content/cancontent.py

@@ -0,0 +1,32 @@
+import typing as ta
+
+from omlish.text import templating as tpl
+
+from .namespaces import ContentNamespace
+from .placeholders import ContentPlaceholder
+from .placeholders import ContentPlaceholderMarker
+from .types import ExtendedContent
+
+
+##
+
+
+_InnerCanContent: ta.TypeAlias = ta.Union[  # noqa
+    str,
+    ExtendedContent,
+
+    ContentPlaceholder,
+    type[ContentPlaceholderMarker],
+
+    type[ContentNamespace],
+
+    tpl.Templater,
+]
+
+CanContent: ta.TypeAlias = ta.Union[  # noqa
+    ta.Iterable['CanContent'],
+
+    None,
+
+    _InnerCanContent,
+]

ommlds/minichain/content/materialize.py

@@ -2,13 +2,14 @@
 TODO:
  - ExtendedCanContent
 """
-import dataclasses as dc
 import typing as ta
 
 from omlish import check
+from omlish import dataclasses as dc
 from omlish import dispatch
 from omlish.text import templating as tpl
 
+from .cancontent import CanContent
 from .namespaces import ContentNamespace
 from .placeholders import ContentPlaceholder
 from .placeholders import ContentPlaceholderMarker
@@ -19,30 +20,6 @@ from .types import ExtendedContent
 ##
 
 
-_InnerCanContent: ta.TypeAlias = ta.Union[  # noqa
-    str,
-    ExtendedContent,
-
-    ContentPlaceholder,
-    type[ContentPlaceholderMarker],
-
-    type[ContentNamespace],
-
-    tpl.Templater,
-]
-
-CanContent: ta.TypeAlias = ta.Union[  # noqa
-    ta.Iterable['CanContent'],
-
-    None,
-
-    _InnerCanContent,
-]
-
-
-##
-
-
 ContentPlaceholderKey: ta.TypeAlias = ContentPlaceholder | type[ContentPlaceholderMarker]
 ContentPlaceholderMap: ta.TypeAlias = ta.Mapping[ContentPlaceholderKey, CanContent]
 ContentPlaceholderFn: ta.TypeAlias = ta.Callable[[ContentPlaceholderKey], CanContent]

ommlds/minichain/content/prepare.py

@@ -1,14 +1,14 @@
 """
 TODO:
- - re-softwrap
+ - re-docwrap
 """
 import abc
-import dataclasses as dc
 import typing as ta
 
+from omlish import dataclasses as dc
 from omlish import lang
 
-from .materialize import CanContent
+from .cancontent import CanContent
 from .materialize import materialize_content
 from .transforms.interleave import interleave_content
 from .transforms.squeeze import squeeze_content

ommlds/minichain/content/sequence.py

@@ -8,8 +8,8 @@ import typing as ta
 from omlish import dataclasses as dc
 from omlish import lang
 
+from .cancontent import CanContent
 from .simple import SimpleExtendedContent
-from .types import Content
 
 
 ##
@@ -17,7 +17,7 @@ from .types import Content
 
 @dc.dataclass(frozen=True)
 class SequenceContent(SimpleExtendedContent, lang.Abstract):
-    l: ta.Sequence[Content]
+    l: ta.Sequence[CanContent]
 
 
 @dc.dataclass(frozen=True)

ommlds/minichain/content/tag.py

@@ -0,0 +1,19 @@
+"""
+TODO:
+ - track BlockContent nesting depth?
+ - section names? dedicated 'section' content with header and body?
+"""
+from omlish import dataclasses as dc
+from omlish import lang
+
+from .cancontent import CanContent
+from .simple import SimpleExtendedContent
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class TagContent(SimpleExtendedContent, lang.Final):
+    tag: str
+    body: CanContent

ommlds/minichain/content/transforms/interleave.py

@@ -4,9 +4,11 @@ from omlish import dataclasses as dc
 from omlish import dispatch
 from omlish import lang
 
+from ..cancontent import CanContent
 from ..sequence import BlockContent
 from ..sequence import InlineContent
 from ..types import Content
+from ..types import ExtendedContent
 
 
 ##
@@ -27,15 +29,15 @@ class ContentInterleaver:
         self._inline_separator = inline_separator if inline_separator is not None else separator
         self._block_separator = block_separator if block_separator is not None else separator
 
-    def _interleave(self, l: ta.Iterable[Content], separator: Content | None) -> ta.Sequence[Content]:
+    def _interleave(self, l: ta.Iterable[CanContent], separator: Content | None) -> ta.Sequence[Content]:
         cs: ta.Iterable[Content] = map(self.interleave, l)
         if separator is not None:
             cs = lang.interleave(cs, separator)
         return list(cs)
 
     @dispatch.method()
-    def interleave(self, c: Content) -> Content:
-        return c
+    def interleave(self, c: CanContent) -> Content:
+        raise TypeError(c)
 
     @interleave.register
     def interleave_str(self, c: str) -> Content:
@@ -45,6 +47,11 @@ class ContentInterleaver:
     def interleave_sequence(self, c: ta.Sequence) -> Content:
         return self._interleave(c, self._sequence_separator)
 
+    @interleave.register
+    def interleave_extended_content(self, c: ExtendedContent) -> Content:
+        # FIXME:
+        return c
+
     @interleave.register
     def interleave_inline_content(self, c: InlineContent) -> Content:
         return dc.replace(c, l=self._interleave(c.l, self._inline_separator))

ommlds/minichain/lib/fs/tools/read.py

@@ -27,7 +27,7 @@ MAX_LINE_LENGTH = 2_000
 
 @tool_spec_override(
     desc=f"""
-         Reads a file from the local filesystem. You can access any file directly by using this tool.
+        Reads a file from the local filesystem. You can access any file directly by using this tool.
 
         Assume this tool is able to read all files on the machine. If the User provides a path to a file assume that
         path is valid. It is okay to read a file that does not exist; an error will be returned.

ommlds/minichain/lib/fs/tools/recursivels/rendering.py

@@ -5,10 +5,10 @@ TODO:
   - any directory with unlisted children will be suffixed inline with '...'
   - absence of '...' indicates an empty directory
 """
-import dataclasses as dc
 import typing as ta
 
 from omlish import check
+from omlish import dataclasses as dc
 from omlish import lang
 
 from .running import DirLsItem

ommlds/minichain/lib/fs/tools/recursivels/running.py

@@ -1,8 +1,8 @@
-import dataclasses as dc
 import os.path
 import typing as ta
 
 from omlish import check
+from omlish import dataclasses as dc
 from omlish import lang
 
 

ommlds/minichain/lib/todo/types.py

@@ -3,9 +3,9 @@ TODO:
  - enums lol
   - * with ToolParam-like desc metadata somehow *
 """
-import dataclasses as dc
 import typing as ta
 
+from omlish import dataclasses as dc
 from omlish import lang
 
 from ...tools.reflect import tool_param_metadata

ommlds/minichain/meta/firstinwins.py

@@ -0,0 +1,131 @@
+import typing as ta
+
+from omlish import check
+from omlish import dataclasses as dc
+from omlish import lang
+
+from ..services.requests import Request
+from ..services.responses import Response
+from ..services.services import Service
+from ..types import Option
+from ..types import Output
+
+
+with lang.auto_proxy_import(globals()):
+    import asyncio
+
+
+RequestV = ta.TypeVar('RequestV')
+OptionT = ta.TypeVar('OptionT', bound=Option)
+
+ResponseV = ta.TypeVar('ResponseV')
+OutputT = ta.TypeVar('OutputT', bound=Output)
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class FirstInWinsServiceCancelledError(Exception):
+    e: BaseException
+
+
+class FirstInWinsServiceExceptionGroup(ExceptionGroup):
+    pass
+
+
+@dc.dataclass(frozen=True)
+class FirstInWinsServiceOutput(Output):
+    first_in_wins_service: 'FirstInWinsService'
+    response_service: Service
+    service_exceptions: ta.Mapping[Service, Exception] | None = None
+
+
+class FirstInWinsService(
+    lang.Abstract,
+    ta.Generic[
+        RequestV,
+        OptionT,
+        ResponseV,
+        OutputT,
+    ],
+):
+    def __init__(
+            self,
+            *services: Service[
+                Request[
+                    RequestV,
+                    OptionT,
+                ],
+                Response[
+                    ResponseV,
+                    OutputT,
+                ],
+            ],
+    ) -> None:
+        super().__init__()
+
+        self._services = check.not_empty(services)
+
+
+##
+
+
+class AsyncioFirstInWinsService(
+    FirstInWinsService[
+        RequestV,
+        OptionT,
+        ResponseV,
+        OutputT,
+    ],
+):
+    async def invoke(self, request: Request[RequestV, OptionT]) -> Response[ResponseV, OutputT]:
+        tasks: list = []
+        services_by_task: dict = {}
+        for svc in self._services:
+            task: asyncio.Task = asyncio.create_task(svc.invoke(request))  # type: ignore[arg-type]
+            tasks.append(task)
+            services_by_task[task] = svc
+
+        failures_by_service: dict[Service, Exception] = {}
+
+        try:
+            pending = set(tasks)
+
+            while pending:
+                done, pending = await asyncio.wait(pending, return_when=asyncio.FIRST_COMPLETED)
+
+                for t in done:
+                    svc = services_by_task[t]
+
+                    try:
+                        response = t.result()
+                    except asyncio.CancelledError as exc:
+                        failures_by_service[svc] = FirstInWinsServiceCancelledError(exc)
+                        continue
+                    except Exception as exc:  # noqa
+                        failures_by_service[svc] = exc
+                        continue
+
+                    for p in pending:
+                        p.cancel()
+
+                    await asyncio.gather(*pending, return_exceptions=True)
+
+                    return response.with_outputs(FirstInWinsServiceOutput(
+                        self,
+                        svc,
+                        failures_by_service,
+                    ))
+
+            raise FirstInWinsServiceExceptionGroup(
+                'All service calls failed',
+                list(failures_by_service.values()),
+            )
+
+        finally:
+            for t in tasks:
+                if not t.done():
+                    t.cancel()
+
+            await asyncio.gather(*tasks, return_exceptions=True)

ommlds/minichain/text/applypatch.py

@@ -20,11 +20,12 @@
 A self-contained **pure-Python 3.9+** utility for applying human-readable "pseudo-diff" patch files to a collection of
 text files.
 """
-import dataclasses as dc
 import enum
 import pathlib
 import typing as ta
 
+from omlish import dataclasses as dc
+
 
 ##
 # Domain objects

ommlds/minichain/text/toolparsing/llamacpp/types.py

@@ -1,4 +1,4 @@
-import dataclasses as dc
+from omlish import dataclasses as dc
 
 
 ##

ommlds/minichain/tokens/specials.py

@@ -1,7 +1,7 @@
-import dataclasses as dc
 import typing as ta
 
 from omlish import check
+from omlish import dataclasses as dc
 from omlish import lang
 
 from .types import NonSpecialToken

ommlds/minichain/tools/execution/errorhandling.py

@@ -0,0 +1,35 @@
+import typing as ta
+
+from ...content.materialize import ContentMaterializer
+from ...content.types import Content
+from .context import ToolContext
+from .errors import ToolExecutionError
+from .executors import ToolExecutor
+
+
+##
+
+
+class ErrorHandlingToolExecutor(ToolExecutor):
+    def __init__(
+            self,
+            *,
+            wrapped: ToolExecutor,
+            content_materializer: ContentMaterializer = ContentMaterializer(),
+    ) -> None:
+        super().__init__()
+
+        self._wrapped = wrapped
+        self._content_materializer = content_materializer
+
+    async def execute_tool(
+            self,
+            ctx: ToolContext,
+            name: str,
+            args: ta.Mapping[str, ta.Any],
+    ) -> Content:
+        try:
+            return await self._wrapped.execute_tool(ctx, name, args)
+
+        except ToolExecutionError as txe:
+            return self._content_materializer.materialize(txe.content)

ommlds/minichain/tools/execution/errors.py

@@ -2,7 +2,7 @@ import abc
 
 from omlish import lang
 
-from ...content.materialize import CanContent
+from ...content.cancontent import CanContent
 
 
 ##

ommlds/minichain/tools/reflect.py

@@ -23,7 +23,7 @@ from omlish import metadata as md
 from omlish import reflect as rfl
 from omlish.lite.cached import cached_nullary
 
-from ..content.materialize import CanContent
+from ..content.cancontent import CanContent
 from .types import EnumToolDtype
 from .types import MappingToolDtype
 from .types import NullableToolDtype

ommlds/minichain/tools/types.py

@@ -11,7 +11,7 @@ from omlish import lang
 from omlish import marshal as msh
 from omlish import reflect as rfl
 
-from ..content.materialize import CanContent
+from ..content.cancontent import CanContent
 from ..content.transforms.base import ContentTransform
 from ..content.types import Content
 

ommlds/minichain/vectors/_marshal.py

@@ -2,10 +2,10 @@
 TODO:
  - serialize as base64 bytes? at least support deserializing as it
 """
-import dataclasses as dc
 import typing as ta
 
 from omlish import check
+from omlish import dataclasses as dc
 from omlish import lang
 from omlish import marshal as msh
 from omlish import reflect as rfl

{ommlds-0.0.0.dev494.dist-info → ommlds-0.0.0.dev495.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ommlds
-Version: 0.0.0.dev494
+Version: 0.0.0.dev495
 Summary: ommlds
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,9 +14,9 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev494
+Requires-Dist: omlish==0.0.0.dev495
 Provides-Extra: all
-Requires-Dist: omdev==0.0.0.dev494; extra == "all"
+Requires-Dist: omdev==0.0.0.dev495; extra == "all"
 Requires-Dist: llama-cpp-python~=0.3; extra == "all"
 Requires-Dist: mlx~=0.30; sys_platform == "darwin" and extra == "all"
 Requires-Dist: mlx-lm~=0.29; sys_platform == "darwin" and extra == "all"
@@ -38,7 +38,7 @@ Requires-Dist: mwparserfromhell~=0.7; extra == "all"
 Requires-Dist: wikitextparser~=0.56; extra == "all"
 Requires-Dist: lxml>=5.3; python_version < "3.13" and extra == "all"
 Provides-Extra: omdev
-Requires-Dist: omdev==0.0.0.dev494; extra == "omdev"
+Requires-Dist: omdev==0.0.0.dev495; extra == "omdev"
 Provides-Extra: backends
 Requires-Dist: llama-cpp-python~=0.3; extra == "backends"
 Requires-Dist: mlx~=0.30; sys_platform == "darwin" and extra == "backends"