ommlds 0.0.0.dev515__tar.gz → 0.0.0.dev517__tar.gz

{ommlds-0.0.0.dev515/ommlds.egg-info → ommlds-0.0.0.dev517}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ommlds
-Version: 0.0.0.dev515
+Version: 0.0.0.dev517
 Summary: ommlds
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,20 +14,20 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev515
+Requires-Dist: omlish==0.0.0.dev517
 Provides-Extra: all
-Requires-Dist: omdev==0.0.0.dev515; extra == "all"
+Requires-Dist: omdev==0.0.0.dev517; 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"
+Requires-Dist: mlx-lm~=0.30; sys_platform == "darwin" and extra == "all"
 Requires-Dist: sentencepiece~=0.2; extra == "all"
 Requires-Dist: tiktoken~=0.12; extra == "all"
 Requires-Dist: tinygrad~=0.12; extra == "all"
 Requires-Dist: tokenizers~=0.22; extra == "all"
 Requires-Dist: torch~=2.10; extra == "all"
-Requires-Dist: transformers~=4.57; extra == "all"
+Requires-Dist: transformers~=5.0; extra == "all"
 Requires-Dist: sentence-transformers~=5.2; extra == "all"
-Requires-Dist: huggingface-hub~=0.36; extra == "all"
+Requires-Dist: huggingface-hub~=1.3; extra == "all"
 Requires-Dist: datasets~=4.5; extra == "all"
 Requires-Dist: regex>=2026.1; extra == "all"
 Requires-Dist: numpy>=1.26; extra == "all"
@@ -39,20 +39,20 @@ 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.dev515; extra == "omdev"
+Requires-Dist: omdev==0.0.0.dev517; 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"
-Requires-Dist: mlx-lm~=0.29; sys_platform == "darwin" and extra == "backends"
+Requires-Dist: mlx-lm~=0.30; sys_platform == "darwin" and extra == "backends"
 Requires-Dist: sentencepiece~=0.2; extra == "backends"
 Requires-Dist: tiktoken~=0.12; extra == "backends"
 Requires-Dist: tinygrad~=0.12; extra == "backends"
 Requires-Dist: tokenizers~=0.22; extra == "backends"
 Requires-Dist: torch~=2.10; extra == "backends"
-Requires-Dist: transformers~=4.57; extra == "backends"
+Requires-Dist: transformers~=5.0; extra == "backends"
 Requires-Dist: sentence-transformers~=5.2; extra == "backends"
 Provides-Extra: huggingface
-Requires-Dist: huggingface-hub~=0.36; extra == "huggingface"
+Requires-Dist: huggingface-hub~=1.3; extra == "huggingface"
 Requires-Dist: datasets~=4.5; extra == "huggingface"
 Provides-Extra: nanochat
 Requires-Dist: regex>=2026.1; extra == "nanochat"

{ommlds-0.0.0.dev515 → ommlds-0.0.0.dev517}/ommlds/__about__.py

@@ -22,7 +22,7 @@ class Project(ProjectBase):
             'llama-cpp-python ~= 0.3',
 
             'mlx ~= 0.30; sys_platform == "darwin"',
-            'mlx-lm ~= 0.29; sys_platform == "darwin"',
+            'mlx-lm ~= 0.30; sys_platform == "darwin"',
 
             'sentencepiece ~= 0.2',
 
@@ -35,12 +35,12 @@ class Project(ProjectBase):
 
             'torch ~= 2.10',
 
-            'transformers ~= 4.57',
+            'transformers ~= 5.0',
             'sentence-transformers ~= 5.2',
         ],
 
         'huggingface': [
-            'huggingface-hub ~= 0.36',
+            'huggingface-hub ~= 1.3',
             'datasets ~= 4.5',
         ],
 

{ommlds-0.0.0.dev515 → ommlds-0.0.0.dev517}/ommlds/backends/mlx/generation.py

@@ -238,7 +238,7 @@ class GenerationOutput:
 def stream_generate(
         model: 'mlx_nn.Module',
         tokenization: Tokenization,
-        prompt: ta.Union[str, 'mx.array'],
+        prompt: ta.Union[str, ta.Sequence[int], 'mx.array'],
         params: GenerationParams = GenerationParams(),
 ) -> ta.Generator[GenerationOutput]:
     if not isinstance(prompt, mx.array):
@@ -312,7 +312,7 @@ def stream_generate(
 def generate(
         model: 'mlx_nn.Module',
         tokenization: Tokenization,
-        prompt: ta.Union[str, 'mx.array'],
+        prompt: ta.Union[str, ta.Sequence[int], 'mx.array'],
         params: GenerationParams = GenerationParams(),
         *,
         verbose: bool = False,

{ommlds-0.0.0.dev515 → ommlds-0.0.0.dev517}/ommlds/backends/mlx/tokenization/detokenization/naive.py

@@ -1,3 +1,5 @@
+from omlish import check
+
 from ..types import Tokenizer
 from .base import BaseStreamingDetokenizer
 
@@ -36,14 +38,14 @@ class NaiveStreamingDetokenizer(BaseStreamingDetokenizer):
         self._tokens.append(token)
 
     def finalize(self) -> None:
-        self._text += self._tokenizer.decode(self._current_tokens)
+        self._text += check.isinstance(self._tokenizer.decode(self._current_tokens), str)
         self._current_tokens = []
         self._current_text = ''
 
     @property
     def text(self) -> str:
         if self._current_tokens:
-            self._current_text = self._tokenizer.decode(self._current_tokens)
+            self._current_text = check.isinstance(self._tokenizer.decode(self._current_tokens), str)
             if self._current_text.endswith('\ufffd') or (
                     self._tokenizer.clean_up_tokenization_spaces and
                     self._current_text and

{ommlds-0.0.0.dev515 → ommlds-0.0.0.dev517}/ommlds/backends/mlx/tokenization/tokenization.py

@@ -44,7 +44,7 @@ class Tokenization:
         try:
             token_id = int(token)
         except ValueError:
-            token_id = self._tokenizer.convert_tokens_to_ids(token)
+            token_id = check.isinstance(self._tokenizer.convert_tokens_to_ids(check.isinstance(token, str)), int)
 
         if token_id is None:
             raise ValueError(f"'{token}' is not a token for this tokenizer")

{ommlds-0.0.0.dev515 → ommlds-0.0.0.dev517}/ommlds/backends/transformers/streamers.py

@@ -12,19 +12,24 @@ P = ta.ParamSpec('P')
 
 
 class CancellableTextStreamer(tfm.TextStreamer):
+    class Tokenizer(ta.Protocol):
+        """Transformers base class still hard deps an AutoTokenizer despite only needing this one method."""
+
+        def decode(self, tokens: ta.Sequence[int], **kwargs: ta.Any) -> str: ...
+
     class Callback(ta.Protocol):
         def __call__(self, text: str, *, stream_end: bool) -> None: ...
 
     def __init__(
             self,
-            tokenizer: tfm.AutoTokenizer,
+            tokenizer: Tokenizer,
             callback: Callback,
             *,
             skip_prompt: bool = False,
             **decode_kwargs: ta.Any,
     ) -> None:
         super().__init__(
-            tokenizer,
+            ta.cast(tfm.AutoTokenizer, tokenizer),  # noqa
             skip_prompt=skip_prompt,
             **decode_kwargs,
         )

{ommlds-0.0.0.dev515 → ommlds-0.0.0.dev517}/ommlds/cli/_dataclasses.py

@@ -1450,6 +1450,153 @@ def _process_dataclass__d65d18393f357ae0fb02bb80268c6f1473462613():
     return _process_dataclass
 
 
+@_register(
+    plan_repr=(
+        "Plans(tup=(CopyPlan(fields=('profile', 'args')), EqPlan(fields=('profile', 'args')), FrozenPlan(fields=('profi"
+        "le', 'args'), allow_dynamic_dunder_attrs=False), HashPlan(action='add', fields=('profile', 'args'), cache=Fals"
+        "e), InitPlan(fields=(InitPlan.Field(name='profile', annotation=OpRef(name='init.fields.0.annotation'), default"
+        "=None, default_factory=None, init=True, override=False, field_type=FieldType.INSTANCE, coerce=None, validate=N"
+        "one, check_type=None), InitPlan.Field(name='args', annotation=OpRef(name='init.fields.1.annotation'), default="
+        "None, default_factory=None, init=True, override=False, field_type=FieldType.INSTANCE, coerce=None, validate=No"
+        "ne, check_type=None)), self_param='self', std_params=('profile', 'args'), kw_only_params=(), frozen=True, slot"
+        "s=False, post_init_params=None, init_fns=(), validate_fns=()), ReprPlan(fields=(ReprPlan.Field(name='profile',"
+        " kw_only=False, fn=None), ReprPlan.Field(name='args', kw_only=False, fn=None)), id=False, terse=False, default"
+        "_fn=None)))"
+    ),
+    plan_repr_sha1='3ca2bdd121559ad92e95a0e4bdf8210452f20e5d',
+    op_ref_idents=(
+        '__dataclass__init__fields__0__annotation',
+        '__dataclass__init__fields__1__annotation',
+    ),
+    cls_names=(
+        ('ommlds.cli.main', 'ProfileAspect.ConfigureContext'),
+    ),
+)
+def _process_dataclass__3ca2bdd121559ad92e95a0e4bdf8210452f20e5d():
+    def _process_dataclass(
+        *,
+        __dataclass__cls,
+        __dataclass__init__fields__0__annotation,
+        __dataclass__init__fields__1__annotation,
+        __dataclass__FieldFnValidationError,  # noqa
+        __dataclass__FieldTypeValidationError,  # noqa
+        __dataclass__FnValidationError,  # noqa
+        __dataclass__FrozenInstanceError=dataclasses.FrozenInstanceError,  # noqa
+        __dataclass__FunctionType=types.FunctionType,  # noqa
+        __dataclass__HAS_DEFAULT_FACTORY=dataclasses._HAS_DEFAULT_FACTORY,  # noqa
+        __dataclass__MISSING=dataclasses.MISSING,  # noqa
+        __dataclass__None=None,  # noqa
+        __dataclass__TypeError=TypeError,  # noqa
+        __dataclass___recursive_repr=reprlib.recursive_repr,  # noqa
+        __dataclass__isinstance=isinstance,  # noqa
+        __dataclass__object_setattr=object.__setattr__,  # noqa
+        __dataclass__property=property,  # noqa
+    ):
+        def __copy__(self):
+            if self.__class__ is not __dataclass__cls:
+                raise TypeError(self)
+            return __dataclass__cls(  # noqa
+                profile=self.profile,
+                args=self.args,
+            )
+
+        __copy__.__qualname__ = f"{__dataclass__cls.__qualname__}.__copy__"
+        if '__copy__' in __dataclass__cls.__dict__:
+            raise __dataclass__TypeError(f"Cannot overwrite attribute __copy__ in class {__dataclass__cls.__name__}")
+        setattr(__dataclass__cls, '__copy__', __copy__)
+
+        def __eq__(self, other):
+            if self is other:
+                return True
+            if self.__class__ is not other.__class__:
+                return NotImplemented
+            return (
+                self.profile == other.profile and
+                self.args == other.args
+            )
+
+        __eq__.__qualname__ = f"{__dataclass__cls.__qualname__}.__eq__"
+        if '__eq__' in __dataclass__cls.__dict__:
+            raise __dataclass__TypeError(f"Cannot overwrite attribute __eq__ in class {__dataclass__cls.__name__}")
+        setattr(__dataclass__cls, '__eq__', __eq__)
+
+        __dataclass___setattr_frozen_fields = {
+            'profile',
+            'args',
+        }
+
+        def __setattr__(self, name, value):
+            if (
+                type(self) is __dataclass__cls
+                or name in __dataclass___setattr_frozen_fields
+            ):
+                raise __dataclass__FrozenInstanceError(f"cannot assign to field {name!r}")
+            super(__dataclass__cls, self).__setattr__(name, value)
+
+        __setattr__.__qualname__ = f"{__dataclass__cls.__qualname__}.__setattr__"
+        if '__setattr__' in __dataclass__cls.__dict__:
+            raise __dataclass__TypeError(f"Cannot overwrite attribute __setattr__ in class {__dataclass__cls.__name__}")
+        setattr(__dataclass__cls, '__setattr__', __setattr__)
+
+        __dataclass___delattr_frozen_fields = {
+            'profile',
+            'args',
+        }
+
+        def __delattr__(self, name):
+            if (
+                type(self) is __dataclass__cls
+                or name in __dataclass___delattr_frozen_fields
+            ):
+                raise __dataclass__FrozenInstanceError(f"cannot delete field {name!r}")
+            super(__dataclass__cls, self).__delattr__(name)
+
+        __delattr__.__qualname__ = f"{__dataclass__cls.__qualname__}.__delattr__"
+        if '__delattr__' in __dataclass__cls.__dict__:
+            raise __dataclass__TypeError(f"Cannot overwrite attribute __delattr__ in class {__dataclass__cls.__name__}")
+        setattr(__dataclass__cls, '__delattr__', __delattr__)
+
+        def __hash__(self):
+            return hash((
+                self.profile,
+                self.args,
+            ))
+
+        __hash__.__qualname__ = f"{__dataclass__cls.__qualname__}.__hash__"
+        setattr(__dataclass__cls, '__hash__', __hash__)
+
+        def __init__(
+            self,
+            profile: __dataclass__init__fields__0__annotation,
+            args: __dataclass__init__fields__1__annotation,
+        ) -> __dataclass__None:
+            __dataclass__object_setattr(self, 'profile', profile)
+            __dataclass__object_setattr(self, 'args', args)
+
+        __init__.__qualname__ = f"{__dataclass__cls.__qualname__}.__init__"
+        if '__init__' in __dataclass__cls.__dict__:
+            raise __dataclass__TypeError(f"Cannot overwrite attribute __init__ in class {__dataclass__cls.__name__}")
+        setattr(__dataclass__cls, '__init__', __init__)
+
+        @__dataclass___recursive_repr()
+        def __repr__(self):
+            parts = []
+            parts.append(f"profile={self.profile!r}")
+            parts.append(f"args={self.args!r}")
+            return (
+                f"{self.__class__.__qualname__}("
+                f"{', '.join(parts)}"
+                f")"
+            )
+
+        __repr__.__qualname__ = f"{__dataclass__cls.__qualname__}.__repr__"
+        if '__repr__' in __dataclass__cls.__dict__:
+            raise __dataclass__TypeError(f"Cannot overwrite attribute __repr__ in class {__dataclass__cls.__name__}")
+        setattr(__dataclass__cls, '__repr__', __repr__)
+
+    return _process_dataclass
+
+
 @_register(
     plan_repr=(
         "Plans(tup=(CopyPlan(fields=('markdown',)), EqPlan(fields=('markdown',)), FrozenPlan(fields=('markdown',), allo"

{ommlds-0.0.0.dev515 → ommlds-0.0.0.dev517}/ommlds/cli/inject.py

@@ -17,6 +17,7 @@ with lang.auto_proxy_import(globals()):
 def bind_main(
         *,
         session_cfg: SessionConfig,
+        profile_name: str | None = None,
 ) -> inj.Elements:
     els: list[inj.Elemental] = []
 
@@ -30,7 +31,10 @@ def bind_main(
     #
 
     els.extend([
-        _sessions.bind_sessions(session_cfg),
+        _sessions.bind_sessions(
+            session_cfg,
+            profile_name=profile_name,
+        ),
 
         _state.bind_state(),
     ])

ommlds-0.0.0.dev517/ommlds/cli/main.py

@@ -0,0 +1,100 @@
+"""
+TODO:
+ - bootstrap lol
+"""
+import functools
+import typing as ta
+
+import anyio
+
+from omlish import inject as inj
+from omlish.argparse import all as ap
+from omlish.logs import all as logs
+
+from .inject import bind_main
+from .profiles import PROFILE_TYPES
+from .secrets import install_env_secrets
+from .sessions.base import Session
+from .sessions.configs import SessionConfig
+
+
+##
+
+
+MAIN_EXTRA_ARGS: ta.Sequence[ap.Arg] = [
+    ap.arg('-v', '--verbose', action='store_true'),
+]
+
+
+def _process_main_extra_args(args: ap.Namespace) -> None:
+    if args.verbose:
+        logs.configure_standard_logging('DEBUG')
+    else:
+        logs.configure_standard_logging('INFO')
+
+    logs.silence_noisy_loggers()
+
+
+##
+
+
+async def _run_session_cfg(
+        session_cfg: SessionConfig,
+        *,
+        profile_name: str | None = None,
+) -> None:
+    async with inj.create_async_managed_injector(bind_main(
+            session_cfg=session_cfg,
+            profile_name=profile_name,
+    )) as injector:
+        await (await injector[Session]).run()
+
+
+##
+
+
+MAIN_PROFILE_ARGS: ta.Sequence[ap.Arg] = [
+    ap.arg('-p', '--profile', default='chat'),
+    ap.arg('-h', '--help', action='store_true'),
+    ap.arg('args', nargs=ap.REMAINDER),
+]
+
+
+async def _a_main(argv: ta.Any = None) -> None:
+    parser = ap.ArgumentParser(add_help=False)
+
+    for a in [*MAIN_PROFILE_ARGS, *MAIN_EXTRA_ARGS]:
+        parser.add_argument(*a.args, **a.kwargs)
+
+    args, unk_args = parser.parse_known_args(argv)
+
+    _process_main_extra_args(args)
+
+    install_env_secrets()
+
+    profile_cls = PROFILE_TYPES[args.profile]
+    profile = profile_cls()
+
+    session_cfg = profile.configure([
+        *unk_args,
+        *(['--help'] if args.help else []),
+        *args.args,
+    ])
+
+    await _run_session_cfg(
+        session_cfg,
+        profile_name=args.profile,
+    )
+
+
+def _main(args: ta.Any = None) -> None:
+    anyio.run(
+        functools.partial(
+            _a_main,
+            args,
+        ),
+    )  # noqa
+
+
+if __name__ == '__main__':
+    _main()