ommlds 0.0.0.dev515__py3-none-any.whl → 0.0.0.dev516__py3-none-any.whl

ommlds/cli/profiles.py

@@ -0,0 +1,449 @@
+import abc
+import sys
+import typing as ta
+
+from omlish import check
+from omlish import dataclasses as dc
+from omlish import lang
+from omlish.argparse import all as ap
+
+from .sessions.chat.configs import ChatConfig
+from .sessions.chat.interfaces.bare.configs import BareInterfaceConfig
+from .sessions.chat.interfaces.configs import InterfaceConfig
+from .sessions.chat.interfaces.textual.configs import TextualInterfaceConfig
+from .sessions.completion.configs import CompletionConfig
+from .sessions.configs import SessionConfig
+from .sessions.embedding.configs import EmbeddingConfig
+
+
+SessionConfigT = ta.TypeVar('SessionConfigT', bound=SessionConfig)
+SessionConfigU = ta.TypeVar('SessionConfigU', bound=SessionConfig)
+
+
+##
+
+
+class Profile(lang.Abstract, ta.Generic[SessionConfigT]):
+    @abc.abstractmethod
+    def configure(self, argv: ta.Sequence[str]) -> SessionConfigT:
+        raise NotImplementedError
+
+
+##
+
+
+class ProfileAspect(lang.Abstract, ta.Generic[SessionConfigT]):
+    @property
+    def name(self) -> str:
+        return lang.camel_to_snake(type(self).__name__).lower()
+
+    @property
+    def default_parser_arg_group(self) -> str | None:
+        return self.name
+
+    @property
+    def parser_args(self) -> ta.Sequence[ap.Arg]:
+        return []
+
+    @ta.final
+    @dc.dataclass(frozen=True)
+    class ConfigureContext(ta.Generic[SessionConfigU]):
+        profile: 'Profile[SessionConfigU]'
+        args: ap.Namespace
+
+    @abc.abstractmethod
+    def configure(self, ctx: ConfigureContext[SessionConfigT], cfg: SessionConfigT) -> SessionConfigT:
+        raise NotImplementedError
+
+
+class AspectProfile(Profile[SessionConfigT], lang.Abstract):
+    @abc.abstractmethod
+    def _build_aspects(self) -> ta.Sequence[ProfileAspect[SessionConfigT]]:
+        return []
+
+    __aspects: ta.Sequence[ProfileAspect[SessionConfigT]]
+
+    @ta.final
+    @property
+    def aspects(self) -> ta.Sequence[ProfileAspect[SessionConfigT]]:
+        try:
+            return self.__aspects
+        except AttributeError:
+            pass
+        self.__aspects = aspects = tuple(self._build_aspects())
+        return aspects
+
+    #
+
+    @abc.abstractmethod
+    def initial_config(self) -> SessionConfigT:
+        raise NotImplementedError
+
+    #
+
+    def configure(self, argv: ta.Sequence[str]) -> SessionConfigT:
+        parser = ap.ArgumentParser()
+
+        pa_grps: dict[str, ta.Any] = {}
+        for a in self.aspects:
+            for pa in a.parser_args:
+                if (pa_gn := lang.opt_coalesce(pa.group, a.default_parser_arg_group)) is not None:
+                    check.non_empty_str(pa_gn)
+                    try:
+                        pa_grp = pa_grps[pa_gn]
+                    except KeyError:
+                        pa_grps[pa_gn] = pa_grp = parser.add_argument_group(pa_gn)
+                    pa_grp.add_argument(*pa.args, **pa.kwargs)
+                else:
+                    parser.add_argument(*pa.args, **pa.kwargs)
+
+        args = parser.parse_args(argv)
+
+        cfg_ctx = ProfileAspect.ConfigureContext(
+            self,
+            args,
+        )
+        cfg = self.initial_config()
+        for a in self.aspects:
+            cfg = a.configure(cfg_ctx, cfg)
+
+        return cfg
+
+
+##
+
+
+class ChatProfile(AspectProfile[ChatConfig]):
+    class Backend(ProfileAspect[ChatConfig]):
+        parser_args: ta.ClassVar[ta.Sequence[ap.Arg]] = [
+            ap.arg('-b', '--backend'),
+        ]
+
+        def configure(self, ctx: ProfileAspect.ConfigureContext[ChatConfig], cfg: ChatConfig) -> ChatConfig:
+            return dc.replace(
+                cfg,
+                driver=dc.replace(
+                    cfg.driver,
+                    backend=dc.replace(
+                        cfg.driver.backend,
+                        backend=ctx.args.backend,
+                    ),
+                ),
+            )
+
+    #
+
+    class Interface(ProfileAspect[ChatConfig]):
+        parser_args: ta.ClassVar[ta.Sequence[ap.Arg]] = [
+            ap.arg('-i', '--interactive', action='store_true'),
+            ap.arg('-T', '--textual', action='store_true'),
+            ap.arg('-e', '--editor', action='store_true'),
+        ]
+
+        def configure(self, ctx: ProfileAspect.ConfigureContext[ChatConfig], cfg: ChatConfig) -> ChatConfig:
+            if ctx.args.editor:
+                check.arg(not ctx.args.interactive)
+                check.arg(not ctx.args.message)
+                raise NotImplementedError
+
+            if ctx.args.textual:
+                check.isinstance(cfg.interface, BareInterfaceConfig)
+                cfg = dc.replace(
+                    cfg,
+                    interface=TextualInterfaceConfig(**{
+                        f.name: getattr(cfg.interface, f.name)
+                        for f in dc.fields(InterfaceConfig)
+                    }),
+                )
+
+            else:
+                cfg = dc.replace(
+                    cfg,
+                    driver=dc.replace(
+                        cfg.driver,
+                        ai=dc.replace(
+                            cfg.driver.ai,
+                            verbose=True,
+                        ),
+                    ),
+                    interface=dc.replace(
+                        check.isinstance(cfg.interface, BareInterfaceConfig),
+                        interactive=ctx.args.interactive,
+                    ),
+                )
+
+            return cfg
+
+    #
+
+    class Input(ProfileAspect[ChatConfig]):
+        parser_args: ta.ClassVar[ta.Sequence[ap.Arg]] = [
+            ap.arg('message', nargs='*'),
+        ]
+
+        def configure(self, ctx: ProfileAspect.ConfigureContext[ChatConfig], cfg: ChatConfig) -> ChatConfig:
+            if ctx.args.interactive or ctx.args.textual:
+                check.arg(not ctx.args.message)
+
+            elif ctx.args.message:
+                ps: list[str] = []
+
+                for a in ctx.args.message:
+                    if a == '-':
+                        ps.append(sys.stdin.read())
+
+                    elif a.startswith('@'):
+                        with open(a[1:]) as f:
+                            ps.append(f.read())
+
+                    else:
+                        ps.append(a)
+
+                c = ' '.join(ps)
+
+                cfg = dc.replace(
+                    cfg,
+                    driver=dc.replace(
+                        cfg.driver,
+                        user=dc.replace(
+                            cfg.driver.user,
+                            initial_user_content=c,
+                        ),
+                    ),
+                )
+
+            else:
+                raise ValueError('Must specify input')
+
+            return cfg
+
+    #
+
+    class State(ProfileAspect[ChatConfig]):
+        parser_args: ta.ClassVar[ta.Sequence[ap.Arg]] = [
+            ap.arg('-n', '--new', action='store_true'),
+            ap.arg('--ephemeral', action='store_true'),
+        ]
+
+        def configure(self, ctx: ProfileAspect.ConfigureContext[ChatConfig], cfg: ChatConfig) -> ChatConfig:
+            return dc.replace(
+                cfg,
+                driver=dc.replace(
+                    cfg.driver,
+                    state=dc.replace(
+                        cfg.driver.state,
+                        state='ephemeral' if ctx.args.ephemeral else 'new' if ctx.args.new else 'continue',
+                    ),
+                ),
+            )
+
+    #
+
+    class Output(ProfileAspect[ChatConfig]):
+        parser_args: ta.ClassVar[ta.Sequence[ap.Arg]] = [
+            ap.arg('-s', '--stream', action='store_true'),
+            ap.arg('-M', '--markdown', action='store_true'),
+        ]
+
+        def configure(self, ctx: ProfileAspect.ConfigureContext[ChatConfig], cfg: ChatConfig) -> ChatConfig:
+            return dc.replace(
+                cfg,
+                driver=dc.replace(
+                    cfg.driver,
+                    ai=dc.replace(
+                        cfg.driver.ai,
+                        stream=bool(ctx.args.stream),
+                    ),
+                ),
+                rendering=dc.replace(
+                    cfg.rendering,
+                    markdown=bool(ctx.args.markdown),
+                ),
+            )
+
+    #
+
+    class Tools(ProfileAspect[ChatConfig]):
+        parser_args: ta.ClassVar[ta.Sequence[ap.Arg]] = [
+            ap.arg('--enable-fs-tools', action='store_true'),
+            ap.arg('--enable-todo-tools', action='store_true'),
+            # ap.arg('--enable-unsafe-tools-do-not-use-lol', action='store_true'),
+            ap.arg('--enable-test-weather-tool', action='store_true'),
+        ]
+
+        def configure_with_tools(
+                self,
+                ctx: ProfileAspect.ConfigureContext[ChatConfig],
+                cfg: ChatConfig,
+                enabled_tools: ta.Iterable[str],
+        ) -> ChatConfig:
+            check.not_isinstance(enabled_tools, str)
+
+            return dc.replace(
+                cfg,
+                driver=dc.replace(
+                    cfg.driver,
+                    ai=dc.replace(
+                        cfg.driver.ai,
+                        enable_tools=True,
+                    ),
+                    tools=dc.replace(
+                        cfg.driver.tools,
+                        enabled_tools={  # noqa
+                            *(cfg.driver.tools.enabled_tools or []),
+                            *enabled_tools,
+                        },
+                    ),
+                ),
+                interface=dc.replace(
+                    cfg.interface,
+                    enable_tools=True,
+                ),
+            )
+
+        def configure(self, ctx: ProfileAspect.ConfigureContext[ChatConfig], cfg: ChatConfig) -> ChatConfig:
+            if not (
+                    ctx.args.enable_fs_tools or
+                    ctx.args.enable_todo_tools or
+                    # ctx.args.enable_unsafe_tools_do_not_use_lol or
+                    ctx.args.enable_test_weather_tool
+            ):
+                return cfg
+
+            return self.configure_with_tools(ctx, cfg, {
+                *(['fs'] if ctx.args.enable_fs_tools else []),
+                *(['todo'] if ctx.args.enable_todo_tools else []),
+                *(['weather'] if ctx.args.enable_test_weather_tool else []),
+            })
+
+    #
+
+    class Code(ProfileAspect[ChatConfig]):
+        parser_args: ta.ClassVar[ta.Sequence[ap.Arg]] = [
+            ap.arg('-c', '--code', action='store_true'),
+        ]
+
+        def configure_for_code(self, ctx: ProfileAspect.ConfigureContext[ChatConfig], cfg: ChatConfig) -> ChatConfig:
+            cfg = dc.replace(
+                cfg,
+                driver=dc.replace(
+                    cfg.driver,
+                    ai=dc.replace(
+                        cfg.driver.ai,
+                        enable_tools=True,
+                    ),
+                ),
+            )
+
+            if ctx.args.new or ctx.args.ephemeral:
+                from ..minichain.lib.code.prompts import CODE_AGENT_SYSTEM_PROMPT
+                system_content = CODE_AGENT_SYSTEM_PROMPT
+
+                cfg = dc.replace(
+                    cfg,
+                    driver=dc.replace(
+                        cfg.driver,
+                        user=dc.replace(
+                            cfg.driver.user,
+                            initial_system_content=system_content,
+                        ),
+                    ),
+                )
+
+            return cfg
+
+        def configure(self, ctx: ProfileAspect.ConfigureContext[ChatConfig], cfg: ChatConfig) -> ChatConfig:
+            if not ctx.args.code:
+                return cfg
+
+            return self.configure_for_code(ctx, cfg)
+
+    #
+
+    def _build_aspects(self) -> ta.Sequence[ProfileAspect[ChatConfig]]:
+        return [
+            *super()._build_aspects(),
+            self.Backend(),
+            self.Interface(),
+            self.Input(),
+            self.State(),
+            self.Output(),
+            self.Tools(),
+            self.Code(),
+        ]
+
+    def initial_config(self) -> ChatConfig:
+        return ChatConfig()
+
+
+#
+
+
+class CodeProfile(ChatProfile):
+    class Tools(ChatProfile.Tools):
+        parser_args: ta.ClassVar[ta.Sequence[ap.Arg]] = []
+
+        def configure(self, ctx: ProfileAspect.ConfigureContext[ChatConfig], cfg: ChatConfig) -> ChatConfig:
+            return self.configure_with_tools(ctx, cfg, {
+                'fs',
+                'todo',
+            })
+
+    class Code(ChatProfile.Code):
+        parser_args: ta.ClassVar[ta.Sequence[ap.Arg]] = []
+
+        def configure(self, ctx: ProfileAspect.ConfigureContext[ChatConfig], cfg: ChatConfig) -> ChatConfig:
+            return self.configure_for_code(ctx, cfg)
+
+
+##
+
+
+class CompletionProfile(Profile):
+    def configure(self, argv: ta.Sequence[str]) -> SessionConfig:
+        parser = ap.ArgumentParser()
+        parser.add_argument('prompt', nargs='*')
+        parser.add_argument('-b', '--backend', default='openai')
+        args = parser.parse_args(argv)
+
+        content = ' '.join(args.prompt)
+
+        cfg = CompletionConfig(
+            content=check.non_empty_str(content),
+            backend=args.backend,
+        )
+
+        return cfg
+
+
+##
+
+
+class EmbedProfile(Profile):
+    def configure(self, argv: ta.Sequence[str]) -> SessionConfig:
+        parser = ap.ArgumentParser()
+        parser.add_argument('prompt', nargs='*')
+        parser.add_argument('-b', '--backend', default='openai')
+        args = parser.parse_args(argv)
+
+        content = ' '.join(args.prompt)
+
+        cfg = EmbeddingConfig(
+            content=check.non_empty_str(content),
+            backend=args.backend,
+        )
+
+        return cfg
+
+
+##
+
+
+PROFILE_TYPES: ta.Mapping[str, type[Profile]] = {
+    'chat': ChatProfile,
+    'code': CodeProfile,
+
+    'complete': CompletionProfile,
+
+    'embed': EmbedProfile,
+}

ommlds/cli/sessions/chat/interfaces/textual/app.py

@@ -16,6 +16,7 @@ from omlish.logs import all as logs
 
 from ...... import minichain as mc
 from .....backends.types import BackendName
+from ....types import SessionProfileName
 from ...drivers.events.types import AiDeltaChatEvent
 from ...drivers.events.types import AiMessagesChatEvent
 from ...drivers.types import ChatDriver
@@ -100,6 +101,7 @@ class ChatApp(
             backend_name: BackendName | None = None,
             devtools_setup: tx.DevtoolsSetup | None = None,
             input_history_manager: InputHistoryManager,
+            session_profile_name: SessionProfileName | None = None,
     ) -> None:
         super().__init__()
 
@@ -111,6 +113,7 @@ class ChatApp(
         self._chat_event_queue = chat_event_queue
         self._backend_name = backend_name
         self._input_history_manager = input_history_manager
+        self._session_profile_name = session_profile_name
 
         self._chat_action_queue: asyncio.Queue[ta.Any] = asyncio.Queue()
 
@@ -328,6 +331,7 @@ class ChatApp(
 
         await self._mount_messages(
             WelcomeMessage('\n'.join([
+                *([f'Profile: {self._session_profile_name}'] if self._session_profile_name is not None else []),
                 f'Backend: {self._backend_name or "?"}',
                 f'Dir: {os.getcwd()}',
             ])),

ommlds/cli/sessions/inject.py

@@ -5,6 +5,7 @@ from .chat.configs import ChatConfig
 from .completion.configs import CompletionConfig
 from .configs import SessionConfig
 from .embedding.configs import EmbeddingConfig
+from .types import SessionProfileName
 
 
 with lang.auto_proxy_import(globals()):
@@ -16,11 +17,20 @@ with lang.auto_proxy_import(globals()):
 ##
 
 
-def bind_sessions(cfg: SessionConfig) -> inj.Elements:
+def bind_sessions(
+        cfg: SessionConfig,
+        *,
+        profile_name: str | None = None,
+) -> inj.Elements:
     els: list[inj.Elemental] = []
 
     #
 
+    if profile_name is not None:
+        els.append(inj.bind(SessionProfileName, to_const=profile_name))
+
+    #
+
     if isinstance(cfg, ChatConfig):
         els.append(_chat.bind_chat(cfg))
 

ommlds/cli/sessions/types.py

@@ -0,0 +1,7 @@
+import typing as ta
+
+
+##
+
+
+SessionProfileName = ta.NewType('SessionProfileName', str)

ommlds/minichain/backends/impls/transformers/tokens.py

@@ -69,13 +69,15 @@ class TransformersTokenizer(tks.BaseTokenizer):
     ) -> list[tks.Token]:
         ts = self._tfm_tokenizer.tokenize(text)
         ids = self._tfm_tokenizer.convert_tokens_to_ids(ts)
-        return ids
+        return ta.cast('list[tks.Token]', ids)
 
     def _decode(
             self,
             tokens: ta.Iterable[tks.Token],
     ) -> str:
-        return self._tfm_tokenizer.decode(tokens)  # type: ignore[arg-type]
+        if not isinstance(tokens, (tuple, list)):  # Yes actually special cased by transformers
+            tokens = list(tokens)
+        return check.isinstance(self._tfm_tokenizer.decode(ta.cast('list[int]', tokens)), str)
 
 
 ##

{ommlds-0.0.0.dev515.dist-info → ommlds-0.0.0.dev516.dist-info}/METADATA

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