ommlds 0.0.0.dev480__py3-none-any.whl → 0.0.0.dev503__py3-none-any.whl

ommlds/tools/git.py

@@ -3,15 +3,13 @@ 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
 from omlish import lang
@@ -20,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')
 
 
@@ -35,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
 
@@ -63,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(
@@ -97,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 = ''
@@ -165,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
 
@@ -191,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()
     )
 
@@ -216,9 +228,14 @@ class AiGitMessageGenerator(GitMessageGenerator):
         except FileNotFoundError:
             return False
 
+        hls = get_py_header_lines(f_src)
+
         return any(
-            l.startswith(GIT_DIFF_OMIT_MAGIC_COMMENT)
-            for l in f_src.splitlines()
+            hl.src.strip() in (
+                '# @omlish-generated',
+                GIT_DIFF_OMIT_MAGIC_COMMENT,
+            )
+            for hl in hls
         )
 
     # TODO: configurable

{ommlds-0.0.0.dev480.dist-info → ommlds-0.0.0.dev503.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ommlds
-Version: 0.0.0.dev480
+Version: 0.0.0.dev503
 Summary: ommlds
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,39 +14,41 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev480
-Requires-Dist: omlish==0.0.0.dev480
+Requires-Dist: omlish==0.0.0.dev503
 Provides-Extra: all
+Requires-Dist: omdev==0.0.0.dev503; 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.28; sys_platform == "darwin" and extra == "all"
+Requires-Dist: mlx-lm~=0.29; sys_platform == "darwin" and extra == "all"
 Requires-Dist: tiktoken~=0.12; extra == "all"
 Requires-Dist: tinygrad~=0.11; extra == "all"
 Requires-Dist: tokenizers~=0.22; extra == "all"
 Requires-Dist: torch~=2.9; extra == "all"
 Requires-Dist: transformers~=4.57; extra == "all"
-Requires-Dist: sentence-transformers~=5.1; extra == "all"
+Requires-Dist: sentence-transformers~=5.2; extra == "all"
 Requires-Dist: huggingface-hub~=0.36; extra == "all"
 Requires-Dist: datasets~=4.4; extra == "all"
 Requires-Dist: regex>=2025.0; extra == "all"
 Requires-Dist: numpy>=1.26; extra == "all"
 Requires-Dist: pytesseract~=0.3; extra == "all"
 Requires-Dist: rapidocr-onnxruntime~=1.4; extra == "all"
-Requires-Dist: pillow~=12.0; extra == "all"
-Requires-Dist: ddgs~=9.9; extra == "all"
+Requires-Dist: pillow~=12.1; extra == "all"
+Requires-Dist: ddgs~=9.10; extra == "all"
 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.dev503; 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.28; sys_platform == "darwin" and extra == "backends"
+Requires-Dist: mlx-lm~=0.29; sys_platform == "darwin" and extra == "backends"
 Requires-Dist: tiktoken~=0.12; extra == "backends"
 Requires-Dist: tinygrad~=0.11; extra == "backends"
 Requires-Dist: tokenizers~=0.22; extra == "backends"
 Requires-Dist: torch~=2.9; extra == "backends"
 Requires-Dist: transformers~=4.57; extra == "backends"
-Requires-Dist: sentence-transformers~=5.1; extra == "backends"
+Requires-Dist: sentence-transformers~=5.2; extra == "backends"
 Provides-Extra: huggingface
 Requires-Dist: huggingface-hub~=0.36; extra == "huggingface"
 Requires-Dist: datasets~=4.4; extra == "huggingface"
@@ -58,9 +60,9 @@ Provides-Extra: ocr
 Requires-Dist: pytesseract~=0.3; extra == "ocr"
 Requires-Dist: rapidocr-onnxruntime~=1.4; extra == "ocr"
 Provides-Extra: pillow
-Requires-Dist: pillow~=12.0; extra == "pillow"
+Requires-Dist: pillow~=12.1; extra == "pillow"
 Provides-Extra: search
-Requires-Dist: ddgs~=9.9; extra == "search"
+Requires-Dist: ddgs~=9.10; extra == "search"
 Provides-Extra: wiki
 Requires-Dist: mwparserfromhell~=0.7; extra == "wiki"
 Requires-Dist: wikitextparser~=0.56; extra == "wiki"