ommlds 0.0.0.dev459__tar.gz → 0.0.0.dev461__tar.gz

{ommlds-0.0.0.dev459/ommlds.egg-info → ommlds-0.0.0.dev461}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ommlds
-Version: 0.0.0.dev459
+Version: 0.0.0.dev461
 Summary: ommlds
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,8 +14,8 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev459
-Requires-Dist: omlish==0.0.0.dev459
+Requires-Dist: omdev==0.0.0.dev461
+Requires-Dist: omlish==0.0.0.dev461
 Provides-Extra: all
 Requires-Dist: llama-cpp-python~=0.3; extra == "all"
 Requires-Dist: mlx~=0.29; extra == "all"

{ommlds-0.0.0.dev459 → ommlds-0.0.0.dev461}/ommlds/.omlish-manifests.json

@@ -592,7 +592,7 @@
     "module": ".tools.git",
     "attr": null,
     "file": "ommlds/tools/git.py",
-    "line": 188,
+    "line": 186,
     "value": {
       "!omdev.tools.git.messages.GitMessageGeneratorManifest": {
         "module": "ommlds.tools.git",
@@ -606,7 +606,7 @@
     "module": ".tools.ocr",
     "attr": "_CLI_MODULE",
     "file": "ommlds/tools/ocr.py",
-    "line": 89,
+    "line": 82,
     "value": {
       "!omdev.cli.types.CliModule": {
         "name": "ocr",

{ommlds-0.0.0.dev459 → ommlds-0.0.0.dev461}/ommlds/backends/google/protocol/types.py

@@ -583,6 +583,7 @@ class GenerateContentResponse(lang.Final):
     class Candidate(lang.Final):
         content: Content | None = None
         finish_reason: FinishReason | None = None
+        finish_message: str | None = None
         # safety_ratings: ta.Sequence[SafetyRating] | None = None
         # citation_metadata: CitationMetadata | None = None
         token_count: int | None = None

{ommlds-0.0.0.dev459 → ommlds-0.0.0.dev461}/ommlds/cli/sessions/chat/printing.py

@@ -1,6 +1,7 @@
 import abc
 import typing as ta
 
+from omdev.tui import rich
 from omlish import check
 from omlish import lang
 from omlish.formats import json
@@ -8,11 +9,6 @@ from omlish.formats import json
 from .... import minichain as mc
 
 
-with lang.auto_proxy_import(globals()):
-    from rich import console as rich_console
-    from rich import markdown as rich_markdown
-
-
 ##
 
 
@@ -22,7 +18,7 @@ class ChatSessionPrinter(lang.Abstract):
         raise NotImplementedError
 
 
-##
+#
 
 
 class StringChatSessionPrinter(ChatSessionPrinter, lang.Abstract):
@@ -59,7 +55,7 @@ class StringChatSessionPrinter(ChatSessionPrinter, lang.Abstract):
             raise TypeError(obj)
 
 
-##
+#
 
 
 class SimpleStringChatSessionPrinter(StringChatSessionPrinter):
@@ -82,7 +78,7 @@ class SimpleStringChatSessionPrinter(StringChatSessionPrinter):
         self._str_printer(s)
 
 
-##
+#
 
 
 class MarkdownStringChatSessionPrinter(StringChatSessionPrinter):
@@ -91,4 +87,40 @@ class MarkdownStringChatSessionPrinter(StringChatSessionPrinter):
         if not s:
             return
 
-        rich_console.Console().print(rich_markdown.Markdown(s))
+        rich.Console().print(rich.Markdown(s))
+
+
+##
+
+
+class StreamPrinter(lang.ExitStacked, lang.Abstract):
+    @abc.abstractmethod
+    def feed(self, s: str) -> None:
+        raise NotImplementedError
+
+
+#
+
+
+class SimpleStreamPrinter(StreamPrinter):
+    def feed(self, s: str) -> None:
+        print(s, end='', flush=True)
+
+    def _exit_contexts(self) -> None:
+        super()._exit_contexts()
+        print(flush=True)
+
+
+#
+
+
+class MarkdownStreamPrinter(StreamPrinter):
+    def __init__(self) -> None:
+        super().__init__()
+
+    def _enter_contexts(self) -> None:
+        super()._enter_contexts()
+        self._ir: rich.MarkdownLiveStream = self._enter_context(rich.IncrementalMarkdownLiveStream())
+
+    def feed(self, s: str) -> None:
+        self._ir.feed(s)

{ommlds-0.0.0.dev459 → ommlds-0.0.0.dev461}/ommlds/cli/sessions/chat/prompt.py

@@ -9,6 +9,9 @@ from .base import DEFAULT_CHAT_MODEL_BACKEND
 from .base import ChatOptions
 from .base import ChatSession
 from .printing import ChatSessionPrinter
+from .printing import MarkdownStreamPrinter
+from .printing import SimpleStreamPrinter
+from .printing import StreamPrinter
 from .state import ChatStateManager
 from .tools import ToolUseExecutor
 
@@ -81,13 +84,20 @@ class PromptChatSession(ChatSession['PromptChatSession.Config']):
                     (self._chat_options or []),
             ))).v as st_resp:
                 lst: list[str] = []
-                async for o in st_resp:
-                    if o:
-                        c = check.isinstance(check.single(check.single(o.choices).deltas), mc.ContentAiChoiceDelta).c
-                        if c is not None:
-                            print(check.isinstance(c, str), end='', flush=True)
-                            lst.append(check.isinstance(c, str))
-                print()
+
+                sp_cls: type[StreamPrinter]
+                if self._config.markdown:
+                    sp_cls = MarkdownStreamPrinter
+                else:
+                    sp_cls = SimpleStreamPrinter
+                with sp_cls() as sp:
+                    async for o in st_resp:
+                        if o:
+                            c = check.isinstance(check.single(check.single(o.choices).deltas), mc.ContentAiChoiceDelta).c  # noqa
+                            if c is not None:
+                                s = check.isinstance(c, str)
+                                sp.feed(s)
+                                lst.append(s)
 
             resp_m = mc.AiMessage(''.join(lst))
             new_chat.append(resp_m)

{ommlds-0.0.0.dev459 → ommlds-0.0.0.dev461}/ommlds/tools/git.py

@@ -23,10 +23,8 @@ from ..minichain.backends.impls.openai.chat import OpenaiChatChoicesService
 from ..server.client import McServerClient
 
 
-if ta.TYPE_CHECKING:
+with lang.auto_proxy_import(globals()):
     from ..minichain.backends.impls.mlx import chat as mc_mlx_chat
-else:
-    mc_mlx_chat = lang.proxy_import('..minichain.backends.impls.mlx.chat', __package__)
 
 
 GitAiBackendConfigT = ta.TypeVar('GitAiBackendConfigT', bound='GitAiBackend.Config')

{ommlds-0.0.0.dev459 → ommlds-0.0.0.dev461}/ommlds/tools/ocr.py

@@ -13,20 +13,13 @@ from omlish import check
 from omlish import lang
 
 
-if ta.TYPE_CHECKING:
+with lang.auto_proxy_import(globals()):
     import pytesseract
     import rapidocr_onnxruntime as rapidocr
     from PIL import Image
 
     from omdev.clipboard import darwin_cf as darwin_clipboard
 
-else:
-    pytesseract = lang.proxy_import('pytesseract')
-    rapidocr = lang.proxy_import('rapidocr_onnxruntime')
-    Image = lang.proxy_import('PIL.Image')
-
-    darwin_clipboard = lang.proxy_import('omdev.clipboard.darwin_cf')
-
 
 ##
 

{ommlds-0.0.0.dev459 → ommlds-0.0.0.dev461}/ommlds/wiki/text/mfh.py

@@ -13,14 +13,10 @@ from omlish import lang
 from omlish import marshal as msh
 
 
-if ta.TYPE_CHECKING:
+with lang.auto_proxy_import(globals()):
     import mwparserfromhell as mfh
     import mwparserfromhell.nodes as mfn
 
-else:
-    mfh = lang.proxy_import('mwparserfromhell')
-    mfn = lang.proxy_import('mwparserfromhell.nodes')
-
 
 Wikicode: ta.TypeAlias = 'mfh.wikicode.Wikicode'
 

{ommlds-0.0.0.dev459 → ommlds-0.0.0.dev461}/ommlds/wiki/text/wtp.py

@@ -26,10 +26,8 @@ from omlish import cached
 from omlish import lang
 
 
-if ta.TYPE_CHECKING:
+with lang.auto_proxy_import(globals()):
     import wikitextparser as wtp
-else:
-    wtp = lang.proxy_import('wikitextparser')
 
 
 WikiText: ta.TypeAlias = 'wtp.WikiText'

{ommlds-0.0.0.dev459 → ommlds-0.0.0.dev461/ommlds.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ommlds
-Version: 0.0.0.dev459
+Version: 0.0.0.dev461
 Summary: ommlds
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,8 +14,8 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev459
-Requires-Dist: omlish==0.0.0.dev459
+Requires-Dist: omdev==0.0.0.dev461
+Requires-Dist: omlish==0.0.0.dev461
 Provides-Extra: all
 Requires-Dist: llama-cpp-python~=0.3; extra == "all"
 Requires-Dist: mlx~=0.29; extra == "all"

{ommlds-0.0.0.dev459 → ommlds-0.0.0.dev461}/ommlds.egg-info/requires.txt

@@ -1,5 +1,5 @@
-omdev==0.0.0.dev459
-omlish==0.0.0.dev459
+omdev==0.0.0.dev461
+omlish==0.0.0.dev461
 
 [all]
 llama-cpp-python~=0.3

{ommlds-0.0.0.dev459 → ommlds-0.0.0.dev461}/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.dev459'
+version = '0.0.0.dev461'
 classifiers = [
     'Development Status :: 2 - Pre-Alpha',
     'Intended Audience :: Developers',
@@ -24,8 +24,8 @@ classifiers = [
 ]
 description = 'ommlds'
 dependencies = [
-    'omdev == 0.0.0.dev459',
-    'omlish == 0.0.0.dev459',
+    'omdev == 0.0.0.dev461',
+    'omlish == 0.0.0.dev461',
 ]
 
 [project.optional-dependencies]