ommlds 0.0.0.dev454__tar.gz → 0.0.0.dev456__tar.gz

{ommlds-0.0.0.dev454/ommlds.egg-info → ommlds-0.0.0.dev456}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ommlds
-Version: 0.0.0.dev454
+Version: 0.0.0.dev456
 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.dev454
-Requires-Dist: omlish==0.0.0.dev454
+Requires-Dist: omdev==0.0.0.dev456
+Requires-Dist: omlish==0.0.0.dev456
 Provides-Extra: all
 Requires-Dist: llama-cpp-python~=0.3; extra == "all"
 Requires-Dist: mlx~=0.29; extra == "all"

{ommlds-0.0.0.dev454 → ommlds-0.0.0.dev456}/ommlds/minichain/_marshal.py

@@ -17,7 +17,7 @@ from .json import JsonValue
 class _TypedValuesFieldMarshalerFactory(msh.MarshalerFactory):
     tvs_rty: rfl.Type
 
-    def make_marshaler(self, ctx: msh.MarshalContext, rty: rfl.Type) -> ta.Callable[[], msh.Marshaler] | None:
+    def make_marshaler(self, ctx: msh.MarshalFactoryContext, rty: rfl.Type) -> ta.Callable[[], msh.Marshaler] | None:
         return lambda: build_typed_values_marshaler(ctx, self.tvs_rty)
 
 
@@ -25,7 +25,7 @@ class _TypedValuesFieldMarshalerFactory(msh.MarshalerFactory):
 class _TypedValuesFieldUnmarshalerFactory(msh.UnmarshalerFactory):
     tvs_rty: rfl.Type
 
-    def make_unmarshaler(self, ctx: msh.UnmarshalContext, rty: rfl.Type) -> ta.Callable[[], msh.Unmarshaler] | None:
+    def make_unmarshaler(self, ctx: msh.UnmarshalFactoryContext, rty: rfl.Type) -> ta.Callable[[], msh.Unmarshaler] | None:  # noqa
         return lambda: build_typed_values_unmarshaler(ctx, self.tvs_rty)
 
 
@@ -37,14 +37,14 @@ class MarshalJsonValue(lang.NotInstantiable, lang.Final):
 
 
 class _JsonValueMarshalerFactory(msh.MarshalerFactory):
-    def make_marshaler(self, ctx: msh.MarshalContext, rty: rfl.Type) -> ta.Callable[[], msh.Marshaler] | None:
+    def make_marshaler(self, ctx: msh.MarshalFactoryContext, rty: rfl.Type) -> ta.Callable[[], msh.Marshaler] | None:
         if rty is not MarshalJsonValue:
             return None
         return lambda: msh.NopMarshalerUnmarshaler()
 
 
 class _JsonValueUnmarshalerFactory(msh.UnmarshalerFactory):
-    def make_unmarshaler(self, ctx: msh.UnmarshalContext, rty: rfl.Type) -> ta.Callable[[], msh.Unmarshaler] | None:
+    def make_unmarshaler(self, ctx: msh.UnmarshalFactoryContext, rty: rfl.Type) -> ta.Callable[[], msh.Unmarshaler] | None:  # noqa
         if rty is not MarshalJsonValue:
             return None
         return lambda: msh.NopMarshalerUnmarshaler()

{ommlds-0.0.0.dev454 → ommlds-0.0.0.dev456}/ommlds/minichain/content/_marshal.py

@@ -53,10 +53,10 @@ class _ContentMarshaler(msh.Marshaler):
 
 
 class _ContentMarshalerFactory(msh.MarshalerFactory):
-    def make_marshaler(self, ctx: msh.MarshalContext, rty: rfl.Type) -> ta.Callable[[], msh.Marshaler] | None:
+    def make_marshaler(self, ctx: msh.MarshalFactoryContext, rty: rfl.Type) -> ta.Callable[[], msh.Marshaler] | None:
         if not (rty is MarshalContent or rty == _MARSHAL_CONTENT_UNION_RTY):
             return None
-        return lambda: _ContentMarshaler(ctx.make(ExtendedContent))
+        return lambda: _ContentMarshaler(ctx.make_marshaler(ExtendedContent))
 
 
 @dc.dataclass(frozen=True)
@@ -75,10 +75,10 @@ class _ContentUnmarshaler(msh.Unmarshaler):
 
 
 class _ContentUnmarshalerFactory(msh.UnmarshalerFactory):
-    def make_unmarshaler(self, ctx: msh.UnmarshalContext, rty: rfl.Type) -> ta.Callable[[], msh.Unmarshaler] | None:
+    def make_unmarshaler(self, ctx: msh.UnmarshalFactoryContext, rty: rfl.Type) -> ta.Callable[[], msh.Unmarshaler] | None:  # noqa
         if not (rty is MarshalContent or rty == _MARSHAL_CONTENT_UNION_RTY):
             return None
-        return lambda: _ContentUnmarshaler(ctx.make(ExtendedContent))
+        return lambda: _ContentUnmarshaler(ctx.make_unmarshaler(ExtendedContent))
 
 
 ##
@@ -106,10 +106,10 @@ class _CanContentMarshaler(msh.Marshaler):
 
 
 class _CanContentMarshalerFactory(msh.MarshalerFactory):
-    def make_marshaler(self, ctx: msh.MarshalContext, rty: rfl.Type) -> ta.Callable[[], msh.Marshaler] | None:
+    def make_marshaler(self, ctx: msh.MarshalFactoryContext, rty: rfl.Type) -> ta.Callable[[], msh.Marshaler] | None:
         if not (rty is MarshalCanContent or rty == _MARSHAL_CAN_CONTENT_UNION_RTY):
             return None
-        return lambda: _CanContentMarshaler(ctx.make(Content))
+        return lambda: _CanContentMarshaler(ctx.make_marshaler(Content))
 
 
 @dc.dataclass(frozen=True)
@@ -121,10 +121,10 @@ class _CanContentUnmarshaler(msh.Unmarshaler):
 
 
 class _CanContentUnmarshalerFactory(msh.UnmarshalerFactory):
-    def make_unmarshaler(self, ctx: msh.UnmarshalContext, rty: rfl.Type) -> ta.Callable[[], msh.Unmarshaler] | None:
+    def make_unmarshaler(self, ctx: msh.UnmarshalFactoryContext, rty: rfl.Type) -> ta.Callable[[], msh.Unmarshaler] | None:  # noqa
         if not (rty is MarshalCanContent or rty == _MARSHAL_CAN_CONTENT_UNION_RTY):
             return None
-        return lambda: _CanContentUnmarshaler(ctx.make(Content))
+        return lambda: _CanContentUnmarshaler(ctx.make_unmarshaler(Content))
 
 
 ##

{ommlds-0.0.0.dev454 → ommlds-0.0.0.dev456}/ommlds/minichain/llms/_marshal.py

@@ -17,14 +17,14 @@ from .tokens import Tokens
 
 
 class TokensMarshalerFactory(msh.MarshalerFactory):
-    def make_marshaler(self, ctx: msh.MarshalContext, rty: rfl.Type) -> ta.Callable[[], msh.Marshaler] | None:
+    def make_marshaler(self, ctx: msh.MarshalFactoryContext, rty: rfl.Type) -> ta.Callable[[], msh.Marshaler] | None:
         if rty is not Tokens:
             return None
 
         dc_rfl = dc.reflect(Tokens)
         dc_f = check.single(dc_rfl.fields.values())
         v_rty = rfl.type_(dc_f.type)
-        v_m = ctx.make(v_rty)
+        v_m = ctx.make_marshaler(v_rty)
         f_n = dc_f.name
 
         def inner() -> msh.Marshaler:
@@ -34,14 +34,14 @@ class TokensMarshalerFactory(msh.MarshalerFactory):
 
 
 class TokensUnmarshalerFactory(msh.UnmarshalerFactory):
-    def make_unmarshaler(self, ctx: msh.UnmarshalContext, rty: rfl.Type) -> ta.Callable[[], msh.Unmarshaler] | None:
+    def make_unmarshaler(self, ctx: msh.UnmarshalFactoryContext, rty: rfl.Type) -> ta.Callable[[], msh.Unmarshaler] | None:  # noqa
         if rty is not Tokens:
             return None
 
         dc_rfl = dc.reflect(Tokens)
         dc_f = check.single(dc_rfl.fields.values())
         v_rty = rfl.type_(dc_f.type)
-        v_u = ctx.make(v_rty)
+        v_u = ctx.make_unmarshaler(v_rty)
 
         def inner() -> msh.Unmarshaler:
             return msh.WrappedUnmarshaler(lambda _, v: Tokens(v), v_u)

{ommlds-0.0.0.dev454 → ommlds-0.0.0.dev456}/ommlds/minichain/services/_marshal.py

@@ -40,14 +40,14 @@ class _RequestResponseMarshaler(msh.Marshaler):
     def marshal(self, ctx: msh.MarshalContext, o: ta.Any) -> msh.Value:
         tv_types_set = o._typed_values_info().tv_types_set  # noqa  # FIXME
         tv_ta = tv.TypedValues[ta.Union[*tv_types_set]]  # type: ignore
-        tv_m = ctx.make(tv_ta)
+        tv_m = ctx.marshal_factory_context.make_marshaler(tv_ta)  # FIXME:
         tv_v = check.isinstance(tv_m.marshal(ctx, o._typed_values), ta.Sequence)  # noqa
 
         if self.v_m is None:
             orty: rfl.Generic = check.isinstance(rfl.type_(rfl.get_orig_class(o)), rfl.Generic)
             check.state(orty.cls in (Request, Response))
             v_rty, tv_rty = orty.args
-            v_v = ctx.make(v_rty).marshal(ctx, o.v)
+            v_v = ctx.marshal_factory_context.make_marshaler(v_rty).marshal(ctx, o.v)  # FIXME
         else:
             v_v = self.v_m.marshal(ctx, o.v)
 
@@ -58,7 +58,7 @@ class _RequestResponseMarshaler(msh.Marshaler):
 
 
 class _RequestResponseMarshalerFactory(msh.MarshalerFactory):
-    def make_marshaler(self, ctx: msh.MarshalContext, rty: rfl.Type) -> ta.Callable[[], msh.Marshaler] | None:
+    def make_marshaler(self, ctx: msh.MarshalFactoryContext, rty: rfl.Type) -> ta.Callable[[], msh.Marshaler] | None:
         if not _is_rr_rty(rty):
             return None
 
@@ -73,7 +73,7 @@ class _RequestResponseMarshalerFactory(msh.MarshalerFactory):
                 raise TypeError(rty)
             v_m: msh.Marshaler | None = None
             if not isinstance(v_rty, ta.TypeVar):
-                v_m = ctx.make(v_rty)
+                v_m = ctx.make_marshaler(v_rty)
             return _RequestResponseMarshaler(
                 rty,
                 _get_tv_fld(rty),
@@ -113,7 +113,7 @@ class _RequestResponseUnmarshaler(msh.Unmarshaler):
 
 
 class _RequestResponseUnmarshalerFactory(msh.UnmarshalerFactory):
-    def make_unmarshaler(self, ctx: msh.UnmarshalContext, rty: rfl.Type) -> ta.Callable[[], msh.Unmarshaler] | None:
+    def make_unmarshaler(self, ctx: msh.UnmarshalFactoryContext, rty: rfl.Type) -> ta.Callable[[], msh.Unmarshaler] | None:  # noqa
         if not _is_rr_rty(rty):
             return None
 
@@ -125,8 +125,8 @@ class _RequestResponseUnmarshalerFactory(msh.UnmarshalerFactory):
                 raise TypeError(rty)
             tv_types_set = check.isinstance(tv_rty, rfl.Union).args
             tv_ta = tv.TypedValues[ta.Union[*tv_types_set]]  # type: ignore
-            tv_u = ctx.make(tv_ta)
-            v_u = ctx.make(v_rty)
+            tv_u = ctx.make_unmarshaler(tv_ta)
+            v_u = ctx.make_unmarshaler(v_rty)
             return _RequestResponseUnmarshaler(
                 rty,
                 _get_tv_fld(rty),

{ommlds-0.0.0.dev454 → ommlds-0.0.0.dev456}/ommlds/minichain/tools/execution/reflect.py

@@ -41,7 +41,7 @@ def reflect_tool_catalog_entry(
         for p in sig.parameters.values():
             p_rty = rfl.type_(p.annotation)
             if not no_marshal_check:
-                msh.global_marshaling().new_unmarshal_context().make(p_rty)
+                msh.global_marshaling().new_unmarshal_factory_context().make_unmarshaler(p_rty)
             in_rtys[p.name] = p_rty
         tf_input = ToolFn.MarshalInput(in_rtys)
     else:
@@ -53,7 +53,7 @@ def reflect_tool_catalog_entry(
     if marshal_output:
         out_rty = rfl.type_(sig.return_annotation)
         if not no_marshal_check:
-            msh.global_marshaling().new_marshal_context().make(out_rty)
+            msh.global_marshaling().new_marshal_factory_context().make_marshaler(out_rty)
         tf_output = ToolFn.MarshalOutput(out_rty)
     else:
         if sig.return_annotation is not str:

{ommlds-0.0.0.dev454 → ommlds-0.0.0.dev456}/ommlds/minichain/vectors/_marshal.py

@@ -25,10 +25,10 @@ class _VectorMarshaler(msh.Marshaler):
 
 
 class _VectorMarshalerFactory(msh.MarshalerFactory):
-    def make_marshaler(self, ctx: msh.MarshalContext, rty: rfl.Type) -> ta.Callable[[], msh.Marshaler] | None:
+    def make_marshaler(self, ctx: msh.MarshalFactoryContext, rty: rfl.Type) -> ta.Callable[[], msh.Marshaler] | None:
         if rty is not Vector:
             return None
-        return lambda: _VectorMarshaler(ctx.make(ta.Sequence[float]))
+        return lambda: _VectorMarshaler(ctx.make_marshaler(ta.Sequence[float]))
 
 
 @dc.dataclass(frozen=True)
@@ -40,10 +40,10 @@ class _VectorUnmarshaler(msh.Unmarshaler):
 
 
 class _VectorUnmarshalerFactory(msh.UnmarshalerFactory):
-    def make_unmarshaler(self, ctx: msh.UnmarshalContext, rty: rfl.Type) -> ta.Callable[[], msh.Unmarshaler] | None:
+    def make_unmarshaler(self, ctx: msh.UnmarshalFactoryContext, rty: rfl.Type) -> ta.Callable[[], msh.Unmarshaler] | None:  # noqa
         if rty is not Vector:
             return None
-        return lambda: _VectorUnmarshaler(ctx.make(ta.Sequence[float]))
+        return lambda: _VectorUnmarshaler(ctx.make_unmarshaler(ta.Sequence[float]))
 
 
 ##

{ommlds-0.0.0.dev454 → ommlds-0.0.0.dev456/ommlds.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ommlds
-Version: 0.0.0.dev454
+Version: 0.0.0.dev456
 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.dev454
-Requires-Dist: omlish==0.0.0.dev454
+Requires-Dist: omdev==0.0.0.dev456
+Requires-Dist: omlish==0.0.0.dev456
 Provides-Extra: all
 Requires-Dist: llama-cpp-python~=0.3; extra == "all"
 Requires-Dist: mlx~=0.29; extra == "all"

{ommlds-0.0.0.dev454 → ommlds-0.0.0.dev456}/ommlds.egg-info/requires.txt

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

{ommlds-0.0.0.dev454 → ommlds-0.0.0.dev456}/pyproject.toml

@@ -13,7 +13,7 @@ urls = {source = 'https://github.com/wrmsr/omlish'}
 license = 'BSD-3-Clause'
 readme = 'README.md'
 requires-python = '>=3.13'
-version = '0.0.0.dev454'
+version = '0.0.0.dev456'
 classifiers = [
     'Development Status :: 2 - Pre-Alpha',
     'Intended Audience :: Developers',
@@ -24,8 +24,8 @@ classifiers = [
 ]
 description = 'ommlds'
 dependencies = [
-    'omdev == 0.0.0.dev454',
-    'omlish == 0.0.0.dev454',
+    'omdev == 0.0.0.dev456',
+    'omlish == 0.0.0.dev456',
 ]
 
 [project.optional-dependencies]