ommlds 0.0.0.dev475__py3-none-any.whl → 0.0.0.dev476__py3-none-any.whl

ommlds/cli/sessions/chat/chat/state/inject.py

@@ -1,11 +1,10 @@
-import typing as ta
-
 from omlish import inject as inj
 from omlish import lang
 
 from ...phases.injection import phase_callbacks
 from ...phases.types import ChatPhase
 from ...phases.types import ChatPhaseCallback
+from .configs import StateConfig
 
 
 with lang.auto_proxy_import(globals()):
@@ -17,24 +16,21 @@ with lang.auto_proxy_import(globals()):
 ##
 
 
-def bind_state(
-        *,
-        state: ta.Literal['new', 'continue', 'ephemeral'] = 'continue',
-) -> inj.Elements:
+def bind_state(cfg: StateConfig = StateConfig()) -> inj.Elements:
     els: list[inj.Elemental] = []
 
-    if state in ('continue', 'new'):
+    if cfg.state in ('continue', 'new'):
         els.append(inj.bind(_types.ChatStateManager, to_ctor=_storage.StateStorageChatStateManager, singleton=True))
 
-        if state == 'new':
+        if cfg.state == 'new':
             els.append(phase_callbacks().bind_item(to_fn=lang.typed_lambda(cm=_types.ChatStateManager)(
                 lambda cm: ChatPhaseCallback(ChatPhase.STARTING, cm.clear_state),
             )))
 
-    elif state == 'ephemeral':
+    elif cfg.state == 'ephemeral':
         els.append(inj.bind(_types.ChatStateManager, to_ctor=_inmemory.InMemoryChatStateManager, singleton=True))
 
     else:
-        raise TypeError(state)
+        raise TypeError(cfg.state)
 
     return inj.as_elements(*els)

ommlds/cli/sessions/chat/chat/state/inmemory.py

@@ -1,5 +1,4 @@
-import dataclasses as dc
-
+from omlish import dataclasses as dc
 from omlish import lang
 
 from ...... import minichain as mc

ommlds/cli/sessions/chat/chat/state/storage.py

@@ -1,6 +1,5 @@
-import dataclasses as dc
-
 from omlish import check
+from omlish import dataclasses as dc
 from omlish import lang
 
 from ...... import minichain as mc

ommlds/cli/sessions/chat/chat/state/types.py

@@ -1,8 +1,8 @@
 import abc
-import dataclasses as dc
 import datetime
 import typing as ta
 
+from omlish import dataclasses as dc
 from omlish import lang
 
 from ...... import minichain as mc

ommlds/cli/sessions/chat/chat/user/configs.py

@@ -0,0 +1,17 @@
+import typing as ta
+
+from omlish import dataclasses as dc
+
+from ...... import minichain as mc
+
+
+##
+
+
+@dc.dataclass(frozen=True, kw_only=True)
+class UserConfig:
+    initial_system_content: ta.Optional['mc.Content'] = None
+    initial_user_content: ta.Optional['mc.Content'] = None
+
+    interactive: bool = False
+    use_readline: bool | ta.Literal['auto'] = 'auto'

ommlds/cli/sessions/chat/chat/user/inject.py

@@ -1,5 +1,3 @@
-import typing as ta
-
 from omlish import inject as inj
 from omlish import lang
 
@@ -7,11 +5,13 @@ from ...... import minichain as mc
 from ...phases.injection import phase_callbacks
 from ...phases.types import ChatPhase
 from ...phases.types import ChatPhaseCallback
+from .configs import UserConfig
 
 
 with lang.auto_proxy_import(globals()):
+    from .....inputs import asyncs as _inputs_asyncs
+    from .....inputs import sync as _inputs_sync
     from ..state import types as _state
-    from . import inputs as _inputs
     from . import interactive as _interactive
     from . import oneshot as _oneshot
     from . import types as _types
@@ -20,28 +20,22 @@ with lang.auto_proxy_import(globals()):
 ##
 
 
-def bind_user(
-        *,
-        initial_system_content: ta.Optional['mc.Content'] = None,
-        initial_user_content: ta.Optional['mc.Content'] = None,
-        interactive: bool = False,
-        use_readline: bool | ta.Literal['auto'] = False,
-) -> inj.Elements:
+def bind_user(cfg: UserConfig = UserConfig()) -> inj.Elements:
     els: list[inj.Elemental] = []
 
     # FIXME: barf
-    if initial_system_content is not None:
+    if cfg.initial_system_content is not None:
         async def add_initial_system_content(cm: '_state.ChatStateManager') -> None:
-            await cm.extend_chat([mc.SystemMessage(initial_system_content)])
+            await cm.extend_chat([mc.SystemMessage(cfg.initial_system_content)])
 
         els.append(phase_callbacks().bind_item(to_fn=lang.typed_lambda(cm=_state.ChatStateManager)(
             lambda cm: ChatPhaseCallback(ChatPhase.STARTED, lambda: add_initial_system_content(cm)),
         )))
 
-    if interactive:
-        if initial_user_content is not None:
+    if cfg.interactive:
+        if cfg.initial_user_content is not None:
             async def add_initial_user_content(cm: '_state.ChatStateManager') -> None:
-                await cm.extend_chat([mc.UserMessage(initial_user_content)])
+                await cm.extend_chat([mc.UserMessage(cfg.initial_user_content)])
 
             els.append(phase_callbacks().bind_item(to_fn=lang.typed_lambda(cm=_state.ChatStateManager)(
                 lambda cm: ChatPhaseCallback(ChatPhase.STARTED, lambda: add_initial_user_content(cm)),
@@ -52,16 +46,16 @@ def bind_user(
         els.append(inj.bind(_types.UserChatInput, to_ctor=_interactive.InteractiveUserChatInput, singleton=True))
 
         els.extend([
-            inj.bind(_inputs.SyncStringInput, to_const=_inputs.InputSyncStringInput(use_readline=use_readline)),  # noqa
-            inj.bind(_inputs.AsyncStringInput, to_ctor=_inputs.ThreadAsyncStringInput, singleton=True),
+            inj.bind(_inputs_sync.SyncStringInput, to_const=_inputs_sync.InputSyncStringInput(use_readline=cfg.use_readline)),  # noqa
+            inj.bind(_inputs_asyncs.AsyncStringInput, to_ctor=_inputs_asyncs.ThreadAsyncStringInput, singleton=True),
         ])
 
     else:
-        if initial_user_content is None:
+        if cfg.initial_user_content is None:
             raise ValueError('Initial user content is required for non-interactive chat')
 
         els.extend([
-            inj.bind(_oneshot.OneshotUserChatInputInitialChat, to_const=[mc.UserMessage(initial_user_content)]),
+            inj.bind(_oneshot.OneshotUserChatInputInitialChat, to_const=[mc.UserMessage(cfg.initial_user_content)]),
             inj.bind(_types.UserChatInput, to_ctor=_oneshot.OneshotUserChatInput, singleton=True),
         ])
 

ommlds/cli/sessions/chat/chat/user/interactive.py

@@ -1,9 +1,9 @@
 import typing as ta
 
 from ...... import minichain as mc
-from .inputs import AsyncStringInput
-from .inputs import InputSyncStringInput
-from .inputs import SyncAsyncStringInput
+from .....inputs.asyncs import AsyncStringInput
+from .....inputs.asyncs import SyncAsyncStringInput
+from .....inputs.sync import InputSyncStringInput
 from .types import UserChatInput
 
 

ommlds/cli/sessions/chat/configs.py

@@ -1,38 +1,27 @@
-import dataclasses as dc
-import typing as ta
+from omlish import dataclasses as dc
 
-from .... import minichain as mc
+from ...backends.configs import BackendConfig
+from ...rendering.configs import RenderingConfig
+from .chat.ai.configs import AiConfig
+from .chat.state.configs import StateConfig
+from .chat.user.configs import UserConfig
+from .tools.configs import ToolsConfig
 
 
 ##
 
 
-DEFAULT_CHAT_MODEL_BACKEND = 'openai'
+DEFAULT_BACKEND = 'openai'
 
 
 ##
 
 
-@dc.dataclass(frozen=True)
+@dc.dataclass(frozen=True, kw_only=True)
 class ChatConfig:
-    _: dc.KW_ONLY
-
-    backend: str | None = None
-    model_name: str | None = None
-
-    state: ta.Literal['new', 'continue', 'ephemeral'] = 'continue'
-
-    initial_system_content: ta.Optional['mc.Content'] = None
-    initial_user_content: ta.Optional['mc.Content'] = None
-
-    interactive: bool = False
-    use_readline: bool | ta.Literal['auto'] = 'auto'
-
-    silent: bool = False
-    markdown: bool = False
-
-    stream: bool = False
-
-    enable_tools: bool = False
-    enabled_tools: ta.AbstractSet[str] | None = None
-    dangerous_no_tool_confirmation: bool = False
+    backend: BackendConfig = BackendConfig()
+    ai: AiConfig = AiConfig()
+    state: StateConfig = StateConfig()
+    user: UserConfig = UserConfig()
+    rendering: RenderingConfig = RenderingConfig()
+    tools: ToolsConfig = ToolsConfig()

ommlds/cli/sessions/chat/inject.py

@@ -2,20 +2,21 @@ from omlish import dataclasses as dc
 from omlish import inject as inj
 from omlish import lang
 
+from ...backends.types import DefaultBackendName
 from ..base import Session
-from .configs import DEFAULT_CHAT_MODEL_BACKEND
+from .configs import DEFAULT_BACKEND
 from .configs import ChatConfig
 
 
 with lang.auto_proxy_import(globals()):
+    from ...backends import inject as _backends
+    from ...rendering import inject as _rendering
     from . import driver as _driver
     from . import session as _session
-    from .backends import inject as _backends
     from .chat.ai import inject as _chat_ai
     from .chat.state import inject as _chat_state
     from .chat.user import inject as _chat_user
     from .phases import inject as _phases
-    from .rendering import inject as _rendering
     from .tools import inject as _tools
 
 
@@ -28,42 +29,20 @@ def bind_chat(cfg: ChatConfig) -> inj.Elements:
     #
 
     els.extend([
-        _backends.bind_backends(
-            backend=cfg.backend or DEFAULT_CHAT_MODEL_BACKEND,
-        ),
-
-        _chat_ai.bind_ai(
-            stream=cfg.stream,
-            silent=cfg.silent,
-            enable_tools=cfg.enable_tools,
-        ),
-
-        _chat_user.bind_user(
-            initial_system_content=cfg.initial_system_content,
-            initial_user_content=cfg.initial_user_content,
-            interactive=cfg.interactive,
-            use_readline=cfg.use_readline,
-        ),
-
-        _chat_state.bind_state(
-            state=cfg.state,
-        ),
+        _backends.bind_backends(cfg.backend),
 
-        _phases.bind_phases(),
+        _chat_ai.bind_ai(cfg.ai),
 
-        _rendering.bind_rendering(
-            markdown=cfg.markdown,
-        ),
-    ])
+        _chat_user.bind_user(cfg.user),
 
-    #
+        _chat_state.bind_state(cfg.state),
+
+        _phases.bind_phases(),
 
-    if cfg.enable_tools:
-        els.append(_tools.bind_tools(
-            silent=cfg.silent,
-            dangerous_no_confirmation=cfg.dangerous_no_tool_confirmation,
-            enabled_tools=cfg.enabled_tools,
-        ))
+        _rendering.bind_rendering(cfg.rendering),
+
+        _tools.bind_tools(cfg.tools),
+    ])
 
     #
 
@@ -80,4 +59,8 @@ def bind_chat(cfg: ChatConfig) -> inj.Elements:
 
     #
 
+    els.append(inj.bind(DefaultBackendName, to_const=DEFAULT_BACKEND))
+
+    #
+
     return inj.as_elements(*els)

ommlds/cli/sessions/chat/session.py

@@ -1,4 +1,4 @@
-import dataclasses as dc
+from omlish import dataclasses as dc
 
 from ..base import Session
 from .configs import ChatConfig

ommlds/cli/sessions/chat/tools/configs.py

@@ -0,0 +1,13 @@
+import typing as ta
+
+from omlish import dataclasses as dc
+
+
+##
+
+
+@dc.dataclass(frozen=True, kw_only=True)
+class ToolsConfig:
+    silent: bool = False
+    dangerous_no_confirmation: bool = False
+    enabled_tools: ta.Iterable[str] | None = None

ommlds/cli/sessions/chat/tools/inject.py

@@ -6,6 +6,7 @@ from omlish import inject as inj
 from omlish import lang
 
 from ..... import minichain as mc
+from .configs import ToolsConfig
 from .injection import bind_tool_context_provider_to_key
 from .injection import tool_catalog_entries
 from .injection import tool_context_providers
@@ -90,12 +91,7 @@ def _bind_fs_tools() -> inj.Elements:
 ##
 
 
-def bind_tools(
-        *,
-        silent: bool = False,
-        dangerous_no_confirmation: bool = False,
-        enabled_tools: ta.Iterable[str] | None = None,
-) -> inj.Elements:
+def bind_tools(cfg: ToolsConfig = ToolsConfig()) -> inj.Elements:
     els: list[inj.Elemental] = []
 
     #
@@ -106,7 +102,7 @@ def bind_tools(
 
     els.append(tool_catalog_entries().bind_items_provider(singleton=True))
 
-    for etn in check.not_isinstance(enabled_tools or [], str):
+    for etn in check.not_isinstance(cfg.enabled_tools or [], str):
         els.append(_TOOL_BINDERS[etn]())
 
     #
@@ -115,10 +111,10 @@ def bind_tools(
 
     els.append(exec_stack.push_bind(to_ctor=_execution.ToolUseExecutorImpl, singleton=True))
 
-    if not silent:
+    if not cfg.silent:
         els.append(exec_stack.push_bind(to_ctor=_rendering.ResultRenderingToolUseExecutor, singleton=True))
 
-        if dangerous_no_confirmation:
+        if cfg.dangerous_no_confirmation:
             els.append(exec_stack.push_bind(to_ctor=_rendering.ArgsRenderingToolUseExecutor, singleton=True))
 
     els.extend([
@@ -127,7 +123,7 @@ def bind_tools(
 
     #
 
-    if not dangerous_no_confirmation:
+    if not cfg.dangerous_no_confirmation:
         els.append(inj.bind(_confirmation.ToolExecutionConfirmation, to_ctor=_confirmation.InteractiveToolExecutionConfirmation, singleton=True))  # noqa
 
     #

ommlds/cli/sessions/chat/tools/injection.py

@@ -9,6 +9,7 @@ from ..... import minichain as mc
 with lang.auto_proxy_import(globals()):
     from . import execution as _execution
 
+
 ##
 
 

ommlds/cli/sessions/chat/tools/rendering.py

@@ -1,7 +1,7 @@
 import typing as ta
 
 from ..... import minichain as mc
-from ..rendering.types import ContentRendering
+from ....rendering.types import ContentRendering
 from .execution import ToolUseExecutor
 
 

ommlds/cli/sessions/completion/configs.py

@@ -1,4 +1,4 @@
-import dataclasses as dc
+from omlish import dataclasses as dc
 
 from .... import minichain as mc
 
@@ -6,7 +6,7 @@ from .... import minichain as mc
 ##
 
 
-DEFAULT_COMPLETION_MODEL_BACKEND = 'openai'
+DEFAULT_BACKEND = 'openai'
 
 
 ##

ommlds/cli/sessions/completion/inject.py

@@ -2,11 +2,15 @@ from omlish import dataclasses as dc
 from omlish import inject as inj
 from omlish import lang
 
+from ...backends.configs import BackendConfig
+from ...backends.types import DefaultBackendName
 from ..base import Session
+from .configs import DEFAULT_BACKEND
 from .configs import CompletionConfig
 
 
 with lang.auto_proxy_import(globals()):
+    from ...backends import inject as _backends
     from . import session as _session
 
 
@@ -25,4 +29,14 @@ def bind_completion(cfg: CompletionConfig) -> inj.Elements:
 
     #
 
+    els.extend([
+        _backends.bind_backends(BackendConfig(
+            backend=cfg.backend,
+        )),
+
+        inj.bind(DefaultBackendName, to_const=DEFAULT_BACKEND),
+    ])
+
+    #
+
     return inj.as_elements(*els)

ommlds/cli/sessions/completion/session.py

@@ -1,11 +1,9 @@
-import dataclasses as dc
-
 from omlish import check
-from omlish import lang
+from omlish import dataclasses as dc
 
 from .... import minichain as mc
+from ...backends.types import CompletionServiceBackendProvider
 from ..base import Session
-from .configs import DEFAULT_COMPLETION_MODEL_BACKEND
 from .configs import CompletionConfig
 
 
@@ -21,19 +19,17 @@ class CompletionSession(Session['CompletionSession.Config']):
             self,
             config: Config,
             *,
-            backend_catalog: mc.BackendCatalog,
+            service_provider: CompletionServiceBackendProvider,
     ) -> None:
         super().__init__(config)
 
-        self._backend_catalog = backend_catalog
+        self._service_provider = service_provider
 
     async def run(self) -> None:
         prompt = check.isinstance(self._config.content, str)
 
         mdl: mc.CompletionService
-        async with lang.async_maybe_managing(self._backend_catalog.new_backend(
-                mc.CompletionService,
-                self._config.backend or DEFAULT_COMPLETION_MODEL_BACKEND,
-        )) as mdl:
+        async with self._service_provider.provide_backend() as mdl:
             response = await mdl.invoke(mc.CompletionRequest(prompt))
-            print(response.v.strip())
+
+        print(response.v.strip())

ommlds/cli/sessions/embedding/configs.py

@@ -1,4 +1,4 @@
-import dataclasses as dc
+from omlish import dataclasses as dc
 
 from .... import minichain as mc
 
@@ -6,7 +6,7 @@ from .... import minichain as mc
 ##
 
 
-DEFAULT_EMBEDDING_MODEL_BACKEND = 'openai'
+DEFAULT_BACKEND = 'openai'
 
 
 ##

ommlds/cli/sessions/embedding/inject.py

@@ -2,11 +2,15 @@ from omlish import dataclasses as dc
 from omlish import inject as inj
 from omlish import lang
 
+from ...backends.configs import BackendConfig
+from ...backends.types import DefaultBackendName
 from ..base import Session
+from .configs import DEFAULT_BACKEND
 from .configs import EmbeddingConfig
 
 
 with lang.auto_proxy_import(globals()):
+    from ...backends import inject as _backends
     from . import session as _session
 
 
@@ -25,4 +29,14 @@ def bind_embedding(cfg: EmbeddingConfig) -> inj.Elements:
 
     #
 
+    els.extend([
+        _backends.bind_backends(BackendConfig(
+            backend=cfg.backend,
+        )),
+
+        inj.bind(DefaultBackendName, to_const=DEFAULT_BACKEND),
+    ])
+
+    #
+
     return inj.as_elements(*els)

ommlds/cli/sessions/embedding/session.py

@@ -1,11 +1,9 @@
-import dataclasses as dc
-
-from omlish import lang
+from omlish import dataclasses as dc
 from omlish.formats import json
 
 from .... import minichain as mc
+from ...backends.types import EmbeddingServiceBackendProvider
 from ..base import Session
-from .configs import DEFAULT_EMBEDDING_MODEL_BACKEND
 from .configs import EmbeddingConfig
 
 
@@ -21,17 +19,15 @@ class EmbeddingSession(Session['EmbeddingSession.Config']):
             self,
             config: Config,
             *,
-            backend_catalog: mc.BackendCatalog,
+            service_provider: EmbeddingServiceBackendProvider,
     ) -> None:
         super().__init__(config)
 
-        self._backend_catalog = backend_catalog
+        self._service_provider = service_provider
 
     async def run(self) -> None:
         mdl: mc.EmbeddingService
-        async with lang.async_maybe_managing(self._backend_catalog.new_backend(
-            mc.EmbeddingService,
-            self._config.backend or DEFAULT_EMBEDDING_MODEL_BACKEND,
-        )) as mdl:
+        async with self._service_provider.provide_backend() as mdl:
             response = await mdl.invoke(mc.EmbeddingRequest(self._config.content))
-            print(json.dumps_compact(list(map(float, response.v))))
+
+        print(json.dumps_compact(list(map(float, response.v))))

ommlds/cli/state/storage.py

@@ -1,8 +1,8 @@
 import abc
-import dataclasses as dc
 import os.path
 import typing as ta
 
+from omlish import dataclasses as dc
 from omlish import lang
 from omlish import marshal as msh
 from omlish.formats import json

ommlds/minichain/backends/catalogs/strings.py

@@ -39,7 +39,7 @@ class BackendStringBackendCatalog(BackendCatalog):
 
         al: list = list(rs.args or [])
 
-        # FIXME: lol
+        # FIXME: lol - move *into* local model classes as an injected dep?
         if al and isinstance(al[0], ModelRepo):
             [mr] = al
             mrr = check.not_none(self._model_repo_resolver)

ommlds/minichain/backends/impls/groq/chat.py

@@ -0,0 +1,69 @@
+import typing as ta
+
+from omlish import check
+from omlish import marshal as msh
+from omlish import typedvalues as tv
+from omlish.formats import json
+from omlish.http import all as http
+
+from .....backends.groq import protocol as pt
+from ....chat.choices.services import ChatChoicesRequest
+from ....chat.choices.services import ChatChoicesResponse
+from ....chat.choices.services import static_check_is_chat_choices_service
+from ....models.configs import ModelName
+from ....standard import ApiKey
+from ....standard import DefaultOptions
+from .names import MODEL_NAMES
+from .protocol import build_gq_request_message
+from .protocol import build_mc_choices_response
+
+
+##
+
+
+# @omlish-manifest $.minichain.registries.manifests.RegistryManifest(
+#     name='groq',
+#     type='ChatChoicesService',
+# )
+@static_check_is_chat_choices_service
+class GroqChatChoicesService:
+    DEFAULT_MODEL_NAME: ta.ClassVar[ModelName] = ModelName(check.not_none(MODEL_NAMES.default))
+
+    def __init__(
+            self,
+            *configs: ApiKey | ModelName | DefaultOptions,
+            http_client: http.AsyncHttpClient | None = None,
+    ) -> None:
+        super().__init__()
+
+        self._http_client = http_client
+
+        with tv.consume(*configs) as cc:
+            self._model_name = cc.pop(self.DEFAULT_MODEL_NAME)
+            self._api_key = ApiKey.pop_secret(cc, env='GROQ_API_KEY')
+            self._default_options: tv.TypedValues = DefaultOptions.pop(cc)
+
+    async def invoke(self, request: ChatChoicesRequest) -> ChatChoicesResponse:
+        gq_request = pt.ChatCompletionRequest(
+            messages=[
+                build_gq_request_message(m)
+                for m in request.v
+            ],
+            model=MODEL_NAMES.resolve(self._model_name.v),
+        )
+
+        raw_request = msh.marshal(gq_request)
+
+        http_response = await http.async_request(
+            'https://api.groq.com/openai/v1/chat/completions',
+            headers={
+                http.consts.HEADER_CONTENT_TYPE: http.consts.CONTENT_TYPE_JSON,
+                http.consts.HEADER_AUTH: http.consts.format_bearer_auth_header(check.not_none(self._api_key).reveal()),
+            },
+            data=json.dumps(raw_request).encode('utf-8'),
+            client=self._http_client,
+        )
+
+        raw_response = json.loads(check.not_none(http_response.data).decode('utf-8'))
+
+        return build_mc_choices_response(msh.unmarshal(raw_response, pt.ChatCompletionResponse))