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

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.transform.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.apply(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.types import Content
 
 
 ##
@@ -11,5 +11,5 @@ from ...content.materialize import CanContent
 class ToolExecutionError(Exception, lang.Abstract):
     @property
     @abc.abstractmethod
-    def content(self) -> CanContent:
+    def content(self) -> Content:
         raise NotImplementedError

ommlds/minichain/tools/jsonschema.py

@@ -4,8 +4,8 @@ TODO:
 """
 from omlish import check
 
-from ..content.prepare import ContentStrPreparer
-from ..content.prepare import default_content_str_preparer
+from ..content.transform.prepare import ContentStrPreparer
+from ..content.transform.prepare import default_content_str_preparer
 from .types import EnumToolDtype
 from .types import MappingToolDtype
 from .types import NullableToolDtype

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.types import Content
 from .types import EnumToolDtype
 from .types import MappingToolDtype
 from .types import NullableToolDtype
@@ -159,7 +159,7 @@ class ToolReflector:
 
     #
 
-    def _prepare_desc(self, s: CanContent) -> CanContent:
+    def _prepare_desc(self, s: Content | None) -> Content | None:
         if s is None:
             return None
         if not self._raw_descs and isinstance(s, str):
@@ -240,7 +240,7 @@ class ToolReflector:
                 ds_p = ds_p_dct.get(pn)
                 sig_p = sig_p_dct.get(pn)
 
-                p_desc: CanContent
+                p_desc: Content | None
                 if (p_desc := ovr_p.get('desc')) is None:
                     if ds_p is not None:
                         p_desc = ds_p.description

ommlds/minichain/tools/types.py

@@ -6,13 +6,10 @@ from omlish import cached
 from omlish import check
 from omlish import collections as col
 from omlish import dataclasses as dc
-from omlish import dispatch
 from omlish import lang
 from omlish import marshal as msh
 from omlish import reflect as rfl
 
-from ..content.materialize import CanContent
-from ..content.transforms.base import ContentTransform
 from ..content.types import Content
 
 
@@ -150,7 +147,7 @@ class ToolParam:
 
     _: dc.KW_ONLY
 
-    desc: CanContent = None
+    desc: Content | None = None
 
     type: ToolDtype | None = None
 
@@ -168,12 +165,12 @@ class ToolSpec:
 
     _: dc.KW_ONLY
 
-    desc: CanContent = None
+    desc: Content | None = None
 
     params: ta.Sequence[ToolParam] | None = None
     allow_additional_params: bool | None = None
 
-    returns_desc: CanContent = None
+    returns_desc: Content | None = None
     returns_type: ToolDtype | None = None
 
     @cached.property
@@ -207,11 +204,11 @@ class ToolUseResult(lang.Final):
 ##
 
 
-class _ToolUseContentTransform(ContentTransform, lang.Final, lang.NotInstantiable):
-    @dispatch.install_method(ContentTransform.apply)
-    def apply_tool_use(self, tu: ToolUse) -> ToolUse:
-        return tu  # TODO: args are Content
-
-    @dispatch.install_method(ContentTransform.apply)
-    def apply_tool_use_result(self, tur: ToolUseResult) -> ToolUseResult:
-        return dc.replace(tur, c=self.apply(tur.c))  # noqa
+# class _ToolUseContentTransform(ContentTransform, lang.Final, lang.NotInstantiable):
+#     @dispatch.install_method(ContentTransform.apply)
+#     def apply_tool_use(self, tu: ToolUse) -> ToolUse:
+#         return tu  # TODO: args are Content
+#
+#     @dispatch.install_method(ContentTransform.apply)
+#     def apply_tool_use_result(self, tur: ToolUseResult) -> ToolUseResult:
+#         return dc.replace(tur, c=self.apply(tur.c))  # noqa

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.dev496.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ommlds
-Version: 0.0.0.dev494
+Version: 0.0.0.dev496
 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.dev496
 Provides-Extra: all
-Requires-Dist: omdev==0.0.0.dev494; extra == "all"
+Requires-Dist: omdev==0.0.0.dev496; 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.dev496; 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"