ommlds 0.0.0.dev459__py3-none-any.whl → 0.0.0.dev461__py3-none-any.whl

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/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/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/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/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/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/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/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.dist-info → ommlds-0.0.0.dev461.dist-info}/METADATA

@@ -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.dist-info → ommlds-0.0.0.dev461.dist-info}/RECORD

@@ -1,4 +1,4 @@
-ommlds/.omlish-manifests.json,sha256=B8lb6DKPpx-lvUmJJObifPZx-fy273KUbjQoHImyb7o,17992
+ommlds/.omlish-manifests.json,sha256=rrjnJ9Ux5kxBEZc3jHSKc_BRwyiV0OW11sIVQRFUkf8,17992
 ommlds/__about__.py,sha256=ihOSwOzbSqpYjC0oisAXE8bAnknrAKuDPQ8RI2y0n7U,1759
 ommlds/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/huggingface.py,sha256=JfEyfKOxU3-SY_ojtXBJFNeD-NIuKjvMe3GL3e93wNA,1175
@@ -16,7 +16,7 @@ ommlds/backends/anthropic/protocol/sse/events.py,sha256=pLscyLFpxcrtOijNPRgivrxY
 ommlds/backends/google/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/backends/google/protocol/__init__.py,sha256=OWmhuCS_sZ08ZaBtSSDRIudHKzkzgmqxY-3jgQxTidw,105
 ommlds/backends/google/protocol/_marshal.py,sha256=LWikcdMDrKQ0lMtclNXwK9qamijUBzK62nrEVo2OFtc,305
-ommlds/backends/google/protocol/types.py,sha256=keJGINgvsDy38tfeBsThvnOKOC-aJN1eNvJUdEzzT_4,17452
+ommlds/backends/google/protocol/types.py,sha256=-szndCfo4h4TnfWY23B-_ksgDO0W_Qnu958h4NEWJFw,17494
 ommlds/backends/llamacpp/__init__.py,sha256=zXFpLXE4a2vEl0jcPDyKlPHHfZ3Z8Dz0twhEIyZ8-vg,59
 ommlds/backends/llamacpp/buildwheel.py,sha256=q9ghCLVbm8Jm6syrZlBP-x1qNDd0wSl15B2OXBtDBQ8,3813
 ommlds/backends/llamacpp/logging.py,sha256=nCEC6ASEuTpJqx47DMLhnbr5KelDlbxhM0nKQt4bc3w,773
@@ -91,8 +91,8 @@ ommlds/cli/sessions/chat/base.py,sha256=GlDBXZ-KymSokNl1a7uwX1abswmRE67Q0zOIHjhZ
 ommlds/cli/sessions/chat/code.py,sha256=6hnjibVMTxSUciIIsDPsLHLGMlJNNUZtVQJxFkpi8sM,4269
 ommlds/cli/sessions/chat/inject.py,sha256=uF-QJvONu5sntXxaEu5KTYy2MUaSY8c5oJz0HpK3c7E,2621
 ommlds/cli/sessions/chat/interactive.py,sha256=gurYiDCQSY_5llcE75zvEbpVp77AbKSfgY243Z68bLw,2039
-ommlds/cli/sessions/chat/printing.py,sha256=b1HyripqYnRobLyTPgRidcDLvxIpyqPzgUMiXdklBGE,2327
-ommlds/cli/sessions/chat/prompt.py,sha256=T2h04r9LYA9urYKQZZldoT0Jon_jpKgcbQmtS9xquj8,4915
+ommlds/cli/sessions/chat/printing.py,sha256=3f6icLamt7Wd7oiTshGVnIgC5YAsx_CBvZ4QH_7_mFs,2921
+ommlds/cli/sessions/chat/prompt.py,sha256=tB8Wsy1FYXU6Gq-xOUTVpk8PVAu03mh7lcXf7xO7uJ4,5288
 ommlds/cli/sessions/chat/state.py,sha256=CjYkcpZ4fEBE0kPl1g101EDzq0MKy6S6E84dfDhwzcQ,2649
 ommlds/cli/sessions/chat/tools.py,sha256=dj6ADr6RIJnoIKH5wxRLGkgKAfZ_TtnqNLQ6uO-1Gfg,2325
 ommlds/cli/sessions/completion/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -311,23 +311,23 @@ ommlds/server/client.py,sha256=4CeYj43nHwUmuxwD4lkAZjcaPlrWw7MDdenldj377IU,1735
 ommlds/server/server.py,sha256=8l6jPEvUMrTd7iLUOGcUUzXWYA7l1ZzI2lkA8XqGOBA,4205
 ommlds/server/service.py,sha256=WleUNyWqcnvZ_CNk6h1WVSTy1_xT9wJg4dduiJilGDY,2282
 ommlds/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ommlds/tools/git.py,sha256=3VW5KXpuHIg0Xz7h5Z4tXIKWwhpb4rafEfZ2BzK_adU,8170
-ommlds/tools/ocr.py,sha256=CjN2lKhQCQNMwR2wdEpzZhaJJ9c8P9Dv1HmiQju7jeQ,2049
+ommlds/tools/git.py,sha256=3MWI5cZ9ZmsjNMEoQXwj-AZNYyzA2xp1srFjzUv7U1Y,8095
+ommlds/tools/ocr.py,sha256=UP2XK4-ELyhK2BnuBr7-DwUbkDIcX9xdvfXVimM19Y8,1839
 ommlds/wiki/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/wiki/analyze.py,sha256=38SvHF0X_z8OkjvbBc5tLj35e9pvqi53yg9tls-ay5A,9544
 ommlds/wiki/convert.py,sha256=4UqEKMWW03HwrfxYTn0wmXobYVrTSK2x9Lx-2MeJW8M,2531
 ommlds/wiki/models.py,sha256=MV7WqEqJJ_JTwIhaPNbQnRa_w7tO7mJggPu0xitJyLM,2473
 ommlds/wiki/xml.py,sha256=8Xt4roJ9cyOlZMxT4L5NHbkaeMlgXt3wmjiArmiMh28,2925
 ommlds/wiki/text/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ommlds/wiki/text/mfh.py,sha256=pQTRVYDouI9z1UevHL8jVC8s4mscQMrw3dyOvBlXWzA,6792
-ommlds/wiki/text/wtp.py,sha256=M4HVq0Fl7yVc9rlftqo8SfapU9MmW0hhqssqGIN6Ofk,2233
+ommlds/wiki/text/mfh.py,sha256=Qk2WjmtZgoEMgZtBbYjKnWZhusx_VA5CIDSbUatfIAk,6702
+ommlds/wiki/text/wtp.py,sha256=Ga4dGfUsLwbS2i9LJd4xwSbHAAnwnReWGQgOrRIcedQ,2200
 ommlds/wiki/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/wiki/utils/io.py,sha256=UKgDJGtmpnWvIqVd2mJc2QNPOqlToEY1GEveNp6_pMo,7088
 ommlds/wiki/utils/progress.py,sha256=EhvKcMFYtsarCQhIahlO6f0SboyAKP3UwUyrnVnP-Vk,3222
 ommlds/wiki/utils/xml.py,sha256=vVV8Ctn13aaRM9eYfs9Wd6rHn5WOCEUzQ44fIhOvJdg,3754
-ommlds-0.0.0.dev459.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-ommlds-0.0.0.dev459.dist-info/METADATA,sha256=OeNw_AZ8fyJklAOIseIioZMCUlLi44Dg-o84sqBau1U,3224
-ommlds-0.0.0.dev459.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ommlds-0.0.0.dev459.dist-info/entry_points.txt,sha256=Z5YWtX7ClfiCKdW-dd_CSVvM0h4yQpJPi-2G3q6gNFo,35
-ommlds-0.0.0.dev459.dist-info/top_level.txt,sha256=Rbnk5d5wi58vnAXx13WFZqdQ4VX8hBCS2hEL3WeXOhY,7
-ommlds-0.0.0.dev459.dist-info/RECORD,,
+ommlds-0.0.0.dev461.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+ommlds-0.0.0.dev461.dist-info/METADATA,sha256=ictJNO5iWFoU9TN6EDbf_r6HMeWvbLYsr-n0zf7-cSg,3224
+ommlds-0.0.0.dev461.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ommlds-0.0.0.dev461.dist-info/entry_points.txt,sha256=Z5YWtX7ClfiCKdW-dd_CSVvM0h4yQpJPi-2G3q6gNFo,35
+ommlds-0.0.0.dev461.dist-info/top_level.txt,sha256=Rbnk5d5wi58vnAXx13WFZqdQ4VX8hBCS2hEL3WeXOhY,7
+ommlds-0.0.0.dev461.dist-info/RECORD,,