ommlds 0.0.0.dev496__tar.gz → 0.0.0.dev497__tar.gz

{ommlds-0.0.0.dev496/ommlds.egg-info → ommlds-0.0.0.dev497}/PKG-INFO

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

{ommlds-0.0.0.dev496 → ommlds-0.0.0.dev497}/ommlds/.omlish-manifests.json

@@ -929,7 +929,7 @@
     "module": ".tools.git",
     "attr": null,
     "file": "ommlds/tools/git.py",
-    "line": 190,
+    "line": 196,
     "value": {
       "!omdev.tools.git.messages.GitMessageGeneratorManifest": {
         "module": "ommlds.tools.git",

{ommlds-0.0.0.dev496 → ommlds-0.0.0.dev497}/ommlds/cli/main.py

@@ -16,7 +16,7 @@ from omlish.argparse import all as ap
 from omlish.logs import all as logs
 
 from .inject import bind_main
-from .secrets import install_secrets
+from .secrets import install_env_secrets
 from .sessions.base import Session
 from .sessions.chat.configs import ChatConfig
 from .sessions.chat.interfaces.bare.configs import BareInterfaceConfig
@@ -387,7 +387,7 @@ async def _a_main(argv: ta.Any = None) -> None:
 
     _process_main_extra_args(args)
 
-    install_secrets()
+    install_env_secrets()
 
     profile_cls = PROFILE_TYPES[args.profile]
     profile = profile_cls()

{ommlds-0.0.0.dev496 → ommlds-0.0.0.dev497}/ommlds/cli/secrets.py

@@ -6,7 +6,7 @@ from omdev.home.secrets import load_secrets
 ##
 
 
-def install_secrets() -> None:
+def install_env_secrets() -> None:
     # FIXME: lol garbage
     for key in [
         'ANTHROPIC_API_KEY',

{ommlds-0.0.0.dev496 → ommlds-0.0.0.dev497}/ommlds/tools/git.py

@@ -3,15 +3,12 @@ TODO:
  - move omit magic to omdev lol
 """
 import abc
-import concurrent.futures as cf
 import dataclasses as dc
-import os.path
 import re
 import typing as ta
 import urllib.request
 
 from omdev.git.magic import GIT_DIFF_OMIT_MAGIC_COMMENT
-from omdev.home.secrets import load_secrets
 from omdev.py.srcheaders import get_py_header_lines
 from omdev.tools.git.messages import GitMessageGenerator
 from omlish import check
@@ -21,14 +18,10 @@ from omlish.http import all as http
 from omlish.subprocesses.sync import subprocesses
 
 from .. import minichain as mc
-from ..minichain.backends.impls.openai.chat import OpenaiChatChoicesService
+from ..cli.secrets import install_env_secrets
 from ..server.client import McServerClient
 
 
-with lang.auto_proxy_import(globals()):
-    from ..minichain.backends.impls.mlx import chat as mc_mlx_chat
-
-
 GitAiBackendConfigT = ta.TypeVar('GitAiBackendConfigT', bound='GitAiBackend.Config')
 
 
@@ -36,7 +29,7 @@ GitAiBackendConfigT = ta.TypeVar('GitAiBackendConfigT', bound='GitAiBackend.Conf
 
 
 class GitAiBackend(Configurable[GitAiBackendConfigT], lang.Abstract):
-    @dc.dataclass(frozen=True)
+    @dc.dataclass(frozen=True, kw_only=True)
     class Config(Configurable.Config):
         max_tokens: int | None = 128
 
@@ -64,22 +57,35 @@ def _get_single_ai_message_str(resp: mc.ChatChoicesResponse) -> str:
 #
 
 
-class OpenaiGitAiBackend(GitAiBackend['OpenaiGitAiBackend.Config']):
-    @dc.dataclass(frozen=True)
+class StandardGitAiBackend(GitAiBackend['StandardGitAiBackend.Config']):
+    @dc.dataclass(frozen=True, kw_only=True)
     class Config(GitAiBackend.Config):
-        pass
+        backend: str | None = None
 
-    def __init__(self, config: Config = Config()) -> None:
+    DEFAULT_BACKEND_NAME: str = 'openai'
+
+    def __init__(
+            self,
+            config: Config = Config(),
+            *,
+            backend_catalog: ta.Optional['mc.BackendCatalog'] = None,
+    ) -> None:
         super().__init__(config)
 
+        if backend_catalog is None:
+            backend_catalog = mc.BackendStringBackendCatalog()
+        self._backend_catalog = backend_catalog
+
     def run_prompt(self, prompt: str) -> str:
-        # FIXME:
-        for key in ['OPENAI_API_KEY']:
-            if (sec := load_secrets().try_get(key.lower())) is not None:
-                os.environ[key] = sec.reveal()
+        install_env_secrets()  # FIXME
+
+        be = self._backend_catalog.get_backend(
+            mc.ChatChoicesService,  # type: ignore[type-abstract]
+            self._config.backend or self.DEFAULT_BACKEND_NAME,
+        )
 
-        llm = OpenaiChatChoicesService(
-            http_client=http.SyncAsyncHttpClient(http.client()),
+        llm = be.factory(
+            http_client=http.SyncAsyncHttpClient(http.client()),  # FIXME
         )
 
         resp = lang.sync_await(llm.invoke(mc.ChatChoicesRequest(
@@ -98,51 +104,51 @@ def _strip_markdown_code_block(text: str) -> str:
     return match.group(1)
 
 
-class MlxGitAiBackend(GitAiBackend['MlxGitAiBackend.Config']):
-    @dc.dataclass(frozen=True)
-    class Config(GitAiBackend.Config):
-        model: str = 'mlx-community/Qwen2.5-Coder-32B-Instruct-8bit'
-
-        run_in_subprocess: bool = True
-        subprocess_timeout: float | None = 60.
-
-    def __init__(self, config: Config = Config()) -> None:
-        super().__init__(config)
-
-    def _run_prompt(self, prompt: str) -> str:
-        with mc_mlx_chat.MlxChatChoicesService(mc.ModelRepo.parse(self._config.model)) as llm:
-            resp = lang.sync_await(llm.invoke(mc.ChatChoicesRequest(
-                [mc.UserMessage(prompt)],
-                # FIXME: *((MaxTokens(self._config.max_tokens),) if self._config.max_tokens is not None else ()),
-            )))
-            text = _get_single_ai_message_str(resp)
-
-            text = _strip_markdown_code_block(text)
-
-            return text
-
-    def run_prompt(self, prompt: str) -> str:
-        if self._config.run_in_subprocess:
-            # tokenizers installs a pthread_atfork callback at *import* time:
-            #   https://github.com/huggingface/tokenizers/blob/4f1a810aa258d287e6936315e63fbf58bde2a980/bindings/python/src/lib.rs#L57
-            # then complains about `TOKENIZERS_PARALLELISM` at the next fork (which presumably will happen immediately
-            # after this to `git commit`, despite it being conceptually just a fork/exe).
-            # TODO: a generic subprocessing minichain service wrapper?
-            with cf.ProcessPoolExecutor() as exe:
-                return exe.submit(
-                    self._run_prompt,
-                    prompt,
-                ).result(timeout=self._config.subprocess_timeout)
-
-        else:
-            return self._run_prompt(prompt)
+# class MlxGitAiBackend(GitAiBackend['MlxGitAiBackend.Config']):
+#     @dc.dataclass(frozen=True, kw_only=True)
+#     class Config(GitAiBackend.Config):
+#         model: str = 'mlx-community/Qwen2.5-Coder-32B-Instruct-8bit'
+#
+#         run_in_subprocess: bool = True
+#         subprocess_timeout: float | None = 60.
+#
+#     def __init__(self, config: Config = Config()) -> None:
+#         super().__init__(config)
+#
+#     def _run_prompt(self, prompt: str) -> str:
+#         with mc_mlx_chat.MlxChatChoicesService(mc.ModelRepo.parse(self._config.model)) as llm:
+#             resp = lang.sync_await(llm.invoke(mc.ChatChoicesRequest(
+#                 [mc.UserMessage(prompt)],
+#                 # FIXME: *((MaxTokens(self._config.max_tokens),) if self._config.max_tokens is not None else ()),
+#             )))
+#             text = _get_single_ai_message_str(resp)
+#
+#             text = _strip_markdown_code_block(text)
+#
+#             return text
+#
+#     def run_prompt(self, prompt: str) -> str:
+#         if self._config.run_in_subprocess:
+#             # tokenizers installs a pthread_atfork callback at *import* time:
+#             #   https://github.com/huggingface/tokenizers/blob/4f1a810aa258d287e6936315e63fbf58bde2a980/bindings/python/src/lib.rs#L57  # noqa
+#             # then complains about `TOKENIZERS_PARALLELISM` at the next fork (which presumably will happen immediately
+#             # after this to `git commit`, despite it being conceptually just a fork/exe).
+#             # TODO: a generic subprocessing minichain service wrapper?
+#             with cf.ProcessPoolExecutor() as exe:
+#                 return exe.submit(
+#                     self._run_prompt,
+#                     prompt,
+#                 ).result(timeout=self._config.subprocess_timeout)
+#
+#         else:
+#             return self._run_prompt(prompt)
 
 
 #
 
 
 class LocalhostHttpPostGitAiBackend(GitAiBackend['LocalhostHttpPostGitAiBackend.Config']):
-    @dc.dataclass(frozen=True)
+    @dc.dataclass(frozen=True, kw_only=True)
     class Config(GitAiBackend.Config):
         port: int = 5067
         path: str = ''
@@ -166,7 +172,7 @@ class LocalhostHttpPostGitAiBackend(GitAiBackend['LocalhostHttpPostGitAiBackend.
 
 
 class McServerGitAiBackend(GitAiBackend['McServerGitAiBackend.Config']):
-    @dc.dataclass(frozen=True)
+    @dc.dataclass(frozen=True, kw_only=True)
     class Config(GitAiBackend.Config):
         pass
 
@@ -192,18 +198,23 @@ class AiGitMessageGenerator(GitMessageGenerator):
     def __init__(
             self,
             *,
-            backend: GitAiBackend | None = None,
+            backend: GitAiBackend | str | None = None,
     ) -> None:
         super().__init__()
 
         if backend is None:
             backend = self.DEFAULT_BACKEND
-        self._backend = backend
+        elif isinstance(backend, str):
+            backend = StandardGitAiBackend(
+                config=StandardGitAiBackend.Config(
+                    backend=backend,
+                ),
+            )
+        self._backend = check.isinstance(backend, GitAiBackend)
 
     DEFAULT_BACKEND: ta.ClassVar[GitAiBackend] = (
-        OpenaiGitAiBackend()
+        StandardGitAiBackend()
         # LocalhostHttpPostGitAiBackend()
-        # MlxGitAiBackend()
         # McServerGitAiBackend()
     )
 

{ommlds-0.0.0.dev496 → ommlds-0.0.0.dev497/ommlds.egg-info}/PKG-INFO

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

{ommlds-0.0.0.dev496 → ommlds-0.0.0.dev497}/ommlds.egg-info/requires.txt

@@ -1,7 +1,7 @@
-omlish==0.0.0.dev496
+omlish==0.0.0.dev497
 
 [all]
-omdev==0.0.0.dev496
+omdev==0.0.0.dev497
 llama-cpp-python~=0.3
 tiktoken~=0.12
 tinygrad~=0.11
@@ -55,7 +55,7 @@ pytesseract~=0.3
 rapidocr-onnxruntime~=1.4
 
 [omdev]
-omdev==0.0.0.dev496
+omdev==0.0.0.dev497
 
 [pillow]
 pillow~=12.0

{ommlds-0.0.0.dev496 → ommlds-0.0.0.dev497}/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.dev496'
+version = '0.0.0.dev497'
 classifiers = [
     'Development Status :: 2 - Pre-Alpha',
     'Intended Audience :: Developers',
@@ -24,12 +24,12 @@ classifiers = [
 ]
 description = 'ommlds'
 dependencies = [
-    'omlish == 0.0.0.dev496',
+    'omlish == 0.0.0.dev497',
 ]
 
 [project.optional-dependencies]
 all = [
-    'omdev == 0.0.0.dev496',
+    'omdev == 0.0.0.dev497',
     'llama-cpp-python ~= 0.3',
     'mlx ~= 0.30; sys_platform == "darwin"',
     'mlx-lm ~= 0.29; sys_platform == "darwin"',
@@ -52,7 +52,7 @@ all = [
     'lxml >= 5.3; python_version < "3.13"',
 ]
 omdev = [
-    'omdev == 0.0.0.dev496',
+    'omdev == 0.0.0.dev497',
 ]
 backends = [
     'llama-cpp-python ~= 0.3',