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

ommlds/__about__.py

@@ -23,7 +23,7 @@ class Project(ProjectBase):
 
             # 'sentencepiece ~= 0.2',  # FIXME: https://github.com/google/sentencepiece/issues/1121
 
-            'tiktoken ~= 0.11',
+            'tiktoken ~= 0.12',
 
             # 'tinygrad @ git+https://github.com/tinygrad/tinygrad',
             'tinygrad ~= 0.11',
@@ -32,13 +32,13 @@ class Project(ProjectBase):
 
             'torch ~= 2.8',
 
-            'transformers ~= 4.56',
+            'transformers ~= 4.57',
             'sentence-transformers ~= 5.1',
         ],
 
         'huggingface': [
             'huggingface-hub ~= 0.35',
-            'datasets ~= 4.1',
+            'datasets ~= 4.2',
         ],
 
         'numpy': [

ommlds/backends/anthropic/protocol/sse/assemble.py

@@ -63,9 +63,10 @@ class AnthropicSseMessageAssembler(
         while True:
             ae: ta.Any = check.not_none((yield from self._next_event()))
             if isinstance(ae, AnthropicSseDecoderEvents.ContentBlockStart):
-                check.equal(ae.index, len(content))
+                # check.equal(ae.index, len(content))
                 c = yield from self._do_content_block(ae)
-                content.append(check.isinstance(c, Content))
+                if c is not None:
+                    content.append(check.isinstance(c, Content))
             elif isinstance(ae, AnthropicSseDecoderEvents.MessageDelta):
                 for k in ('stop_reason', 'stop_sequence'):
                     if (v := getattr(ae.delta, k)) is not None:
@@ -92,6 +93,8 @@ class AnthropicSseMessageAssembler(
             return (yield from self._do_text_content_block(cbs))
         elif isinstance(cbs.content_block, AnthropicSseDecoderEvents.ContentBlockStart.ToolUse):
             return (yield from self._do_tool_use_content_block(cbs))
+        elif isinstance(cbs.content_block, AnthropicSseDecoderEvents.ContentBlockStart.Thinking):
+            return (yield from self._do_thinking_content_block(cbs))
         else:
             raise TypeError(cbs.content_block)
 
@@ -101,11 +104,11 @@ class AnthropicSseMessageAssembler(
         while True:
             ae: ta.Any = check.not_none((yield from self._next_event()))
             if isinstance(ae, AnthropicSseDecoderEvents.ContentBlockDelta):
-                check.equal(ae.index, cbs.index)
+                # check.equal(ae.index, cbs.index)
                 cdc = check.isinstance(ae.delta, AnthropicSseDecoderEvents.ContentBlockDelta.TextDelta)
                 parts.append(cdc.text)
             elif isinstance(ae, AnthropicSseDecoderEvents.ContentBlockStop):
-                check.equal(ae.index, cbs.index)
+                # check.equal(ae.index, cbs.index)
                 return Text(''.join(parts))
             else:
                 raise TypeError(ae)
@@ -119,11 +122,11 @@ class AnthropicSseMessageAssembler(
         while True:
             ae: ta.Any = check.not_none((yield from self._next_event()))
             if isinstance(ae, AnthropicSseDecoderEvents.ContentBlockDelta):
-                check.equal(ae.index, cbs.index)
+                # check.equal(ae.index, cbs.index)
                 cdc = check.isinstance(ae.delta, AnthropicSseDecoderEvents.ContentBlockDelta.InputJsonDelta)
                 json_parts.append(cdc.partial_json)
             elif isinstance(ae, AnthropicSseDecoderEvents.ContentBlockStop):
-                check.equal(ae.index, cbs.index)
+                # check.equal(ae.index, cbs.index)
                 dj = ''.join(json_parts).strip()
                 if dj:
                     dd = check.isinstance(json.loads(dj), ta.Mapping)
@@ -138,3 +141,16 @@ class AnthropicSseMessageAssembler(
                 )
             else:
                 raise TypeError(ae)
+
+    def _do_thinking_content_block(self, cbs: AnthropicSseDecoderEvents.ContentBlockStart) -> ta.Any:
+        # csc = check.isinstance(cbs.content_block, AnthropicSseDecoderEvents.ContentBlockStart.Thinking)
+        while True:
+            ae: ta.Any = check.not_none((yield from self._next_event()))
+            if isinstance(ae, AnthropicSseDecoderEvents.ContentBlockDelta):
+                pass
+            elif isinstance(ae, AnthropicSseDecoderEvents.ContentBlockStop):
+                return None
+            else:
+                raise TypeError(ae)
+        return  # type: ignore  # noqa
+        yield  # noqa

ommlds/backends/anthropic/protocol/sse/events.py

@@ -80,6 +80,11 @@ class AnthropicSseDecoderEvents(lang.Namespace):
             name: str
             input: ta.Any
 
+        @dc.dataclass(frozen=True)
+        class Thinking(ContentBlock):
+            signature: str
+            thinking: str
+
         content_block: ContentBlock
         index: int
 
@@ -96,6 +101,14 @@ class AnthropicSseDecoderEvents(lang.Namespace):
         class InputJsonDelta(Delta):
             partial_json: str
 
+        @dc.dataclass(frozen=True)
+        class ThinkingDelta(Delta):
+            thinking: str
+
+        @dc.dataclass(frozen=True)
+        class SignatureDelta(Delta):
+            signature: str
+
         delta: Delta
         index: int
 

ommlds/cli/sessions/chat/code.py

@@ -16,10 +16,6 @@ from .state import ChatStateManager
 from .tools import ToolUseExecutor
 
 
-with lang.auto_proxy_import(globals()):
-    from omdev import ptk
-
-
 ##
 
 
@@ -90,7 +86,7 @@ class CodeChatSession(ChatSession['CodeChatSession.Config']):
                     req_msg = mc.UserMessage(self._config.initial_message)
                 else:
                     try:
-                        prompt = await ptk.prompt('> ')
+                        prompt = input('> ')  # FIXME: async lol
                     except EOFError:
                         break
                     req_msg = mc.UserMessage(prompt)

ommlds/cli/sessions/chat/interactive.py

@@ -10,10 +10,6 @@ from .printing import ChatSessionPrinter
 from .state import ChatStateManager
 
 
-with lang.auto_proxy_import(globals()):
-    from omdev import ptk
-
-
 ##
 
 
@@ -58,7 +54,10 @@ class InteractiveChatSession(ChatSession['InteractiveChatSession.Config']):
                 *([mc.ModelName(mn)] if (mn := self._config.model_name) is not None else []),
         )) as mdl:
             while True:
-                prompt = await ptk.prompt('> ')
+                try:
+                    prompt = input('> ')  # FIXME: async lol
+                except EOFError:
+                    break
 
                 req_msg = mc.UserMessage(prompt)
 

ommlds/cli/sessions/chat/printing.py

@@ -9,8 +9,8 @@ from .... import minichain as mc
 
 
 with lang.auto_proxy_import(globals()):
-    from omdev import ptk
-    from omdev.ptk import markdown as ptk_md
+    from rich import console as rich_console
+    from rich import markdown as rich_markdown
 
 
 ##
@@ -91,7 +91,4 @@ class MarkdownStringChatSessionPrinter(StringChatSessionPrinter):
         if not s:
             return
 
-        ptk.print_formatted_text(
-            ptk_md.Markdown(s),
-            style=ptk.Style(list(ptk_md.MARKDOWN_STYLE)),
-        )
+        rich_console.Console().print(rich_markdown.Markdown(s))

ommlds/cli/sessions/chat/tools.py

@@ -4,14 +4,11 @@ import typing as ta
 from omlish import check
 from omlish import lang
 from omlish.formats import json
+from omlish.term.confirm import confirm_action
 
 from .... import minichain as mc
 
 
-with lang.auto_proxy_import(globals()):
-    from omdev import ptk
-
-
 ##
 
 
@@ -50,7 +47,7 @@ class AskingToolExecutionConfirmation(ToolExecutionConfirmation):
             args=tr.args,
             # spec=msh.marshal(tce.spec),
         )
-        cr = await ptk.strict_confirm(f'Execute requested tool?\n\n{json.dumps_pretty(tr_dct)}\n\n')
+        cr = confirm_action(f'Execute requested tool?\n\n{json.dumps_pretty(tr_dct)}')  # FIXME: async lol
 
         if not cr:
             raise ToolExecutionRequestDeniedError

ommlds/minichain/backends/impls/transformers/tokens.py

@@ -72,7 +72,7 @@ class TransformersTokenizer(tks.BaseTokenizer):
             self,
             tokens: ta.Iterable[tks.Token],
     ) -> str:
-        return self._tfm_tokenizer.decode(tokens)
+        return self._tfm_tokenizer.decode(tokens)  # type: ignore[arg-type]
 
 
 ##

{ommlds-0.0.0.dev457.dist-info → ommlds-0.0.0.dev459.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ommlds
-Version: 0.0.0.dev457
+Version: 0.0.0.dev459
 Summary: ommlds
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,20 +14,20 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev457
-Requires-Dist: omlish==0.0.0.dev457
+Requires-Dist: omdev==0.0.0.dev459
+Requires-Dist: omlish==0.0.0.dev459
 Provides-Extra: all
 Requires-Dist: llama-cpp-python~=0.3; extra == "all"
 Requires-Dist: mlx~=0.29; extra == "all"
 Requires-Dist: mlx-lm~=0.28; sys_platform == "darwin" and extra == "all"
-Requires-Dist: tiktoken~=0.11; 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.8; extra == "all"
-Requires-Dist: transformers~=4.56; extra == "all"
+Requires-Dist: transformers~=4.57; extra == "all"
 Requires-Dist: sentence-transformers~=5.1; extra == "all"
 Requires-Dist: huggingface-hub~=0.35; extra == "all"
-Requires-Dist: datasets~=4.1; extra == "all"
+Requires-Dist: datasets~=4.2; extra == "all"
 Requires-Dist: numpy>=1.26; extra == "all"
 Requires-Dist: pytesseract~=0.3; extra == "all"
 Requires-Dist: rapidocr-onnxruntime~=1.4; extra == "all"
@@ -40,15 +40,15 @@ Provides-Extra: backends
 Requires-Dist: llama-cpp-python~=0.3; extra == "backends"
 Requires-Dist: mlx~=0.29; extra == "backends"
 Requires-Dist: mlx-lm~=0.28; sys_platform == "darwin" and extra == "backends"
-Requires-Dist: tiktoken~=0.11; 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.8; extra == "backends"
-Requires-Dist: transformers~=4.56; extra == "backends"
+Requires-Dist: transformers~=4.57; extra == "backends"
 Requires-Dist: sentence-transformers~=5.1; extra == "backends"
 Provides-Extra: huggingface
 Requires-Dist: huggingface-hub~=0.35; extra == "huggingface"
-Requires-Dist: datasets~=4.1; extra == "huggingface"
+Requires-Dist: datasets~=4.2; extra == "huggingface"
 Provides-Extra: numpy
 Requires-Dist: numpy>=1.26; extra == "numpy"
 Provides-Extra: ocr

{ommlds-0.0.0.dev457.dist-info → ommlds-0.0.0.dev459.dist-info}/RECORD

@@ -1,5 +1,5 @@
 ommlds/.omlish-manifests.json,sha256=B8lb6DKPpx-lvUmJJObifPZx-fy273KUbjQoHImyb7o,17992
-ommlds/__about__.py,sha256=Z9VIVQnuNBbIYEtIm9XZU4T2QGRqMNjtmQX2OOTaUc0,1759
+ommlds/__about__.py,sha256=ihOSwOzbSqpYjC0oisAXE8bAnknrAKuDPQ8RI2y0n7U,1759
 ommlds/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/huggingface.py,sha256=JfEyfKOxU3-SY_ojtXBJFNeD-NIuKjvMe3GL3e93wNA,1175
 ommlds/_hacks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -11,8 +11,8 @@ ommlds/backends/anthropic/protocol/_marshal.py,sha256=RHbwekaw21lTS_1KBX9z6dLpbm
 ommlds/backends/anthropic/protocol/types.py,sha256=f-_VXg_-KlhGIKp0R8vL50Rg_ZxqiBvQUGexQaDf8HY,2761
 ommlds/backends/anthropic/protocol/sse/__init__.py,sha256=LpijqXk0ceMDcgwOvZ8iLoh0I328JSfG8V0JalcZD3I,98
 ommlds/backends/anthropic/protocol/sse/_marshal.py,sha256=2No-qWRKV9ilOhC5NqHAA92DJF0fAcr4-OPvEP0KOjQ,627
-ommlds/backends/anthropic/protocol/sse/assemble.py,sha256=-DFdPfPYVOLws4iinQVwP9R9ZkDgZjER4KWvGIsWVRk,5718
-ommlds/backends/anthropic/protocol/sse/events.py,sha256=7k5Vl44dMbyK5TSzEfh9eHdsVwNN9syVOhTCfTka7FE,2182
+ommlds/backends/anthropic/protocol/sse/assemble.py,sha256=MVpA0iSU2LNMXy4VpIVV8Oe7nj3dgmXpfLe-7nnA5QE,6552
+ommlds/backends/anthropic/protocol/sse/events.py,sha256=pLscyLFpxcrtOijNPRgivrxYBFpE270oDW1dECjGtFg,2507
 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
@@ -88,13 +88,13 @@ ommlds/cli/sessions/base.py,sha256=oTqsqZ9jhBWFblANpVWLLIzmRfP8HO9QYtPnZ-GZxS0,4
 ommlds/cli/sessions/inject.py,sha256=sCwNFDhiyir1taxufFVEcHtaK_o14IcsQOvGUHWM9Jo,545
 ommlds/cli/sessions/chat/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/cli/sessions/chat/base.py,sha256=GlDBXZ-KymSokNl1a7uwX1abswmRE67Q0zOIHjhZb_0,796
-ommlds/cli/sessions/chat/code.py,sha256=oFQm8291Xz1-jZkHnrLD3usQOSNrLDFsEs3odc05cGU,4328
+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=SrsH9VT2FA6roZYHddIb5cVfNiDWdZLVdugAr8t2So4,2014
-ommlds/cli/sessions/chat/printing.py,sha256=kIqDpSg1amn3OEJjORCH5WN2PFOx-Y_p4e__CS16wxc,2376
+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/state.py,sha256=CjYkcpZ4fEBE0kPl1g101EDzq0MKy6S6E84dfDhwzcQ,2649
-ommlds/cli/sessions/chat/tools.py,sha256=nkkv7P5PBxI4WjGwRSkk982-edZlb57zs9lki4ifhF8,2340
+ommlds/cli/sessions/chat/tools.py,sha256=dj6ADr6RIJnoIKH5wxRLGkgKAfZ_TtnqNLQ6uO-1Gfg,2325
 ommlds/cli/sessions/completion/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/cli/sessions/completion/completion.py,sha256=2ZrzmHBCF3mG13ABcoiHva6OUzPpdF7qzByteaLNsxk,1077
 ommlds/cli/sessions/embedding/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -165,7 +165,7 @@ ommlds/minichain/backends/impls/tokenizers/__init__.py,sha256=47DEQpj8HBSa-_TImW
 ommlds/minichain/backends/impls/tokenizers/tokens.py,sha256=_8Q49k5YroG5wQI0cuK6kOJ3XYwjhpaAS04ejhzBsWw,1500
 ommlds/minichain/backends/impls/transformers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/minichain/backends/impls/transformers/sentence.py,sha256=1bFJ-ND3MOkj7mNsPuISrQCpqTs7npmmNmYcc2go-Fk,1393
-ommlds/minichain/backends/impls/transformers/tokens.py,sha256=bsisA3CIpvjM4TVldpIX8vSOLGyjljIrFdzGsTXuJco,2063
+ommlds/minichain/backends/impls/transformers/tokens.py,sha256=uS3-IWOJRUMBfPDVRrp3SCaXdE1yzEdKHQcyv0JZQIw,2089
 ommlds/minichain/backends/impls/transformers/transformers.py,sha256=Bb1RnvDlo8bzu24ByhDacDC0sN7R7KYZnPZ9hjbViBg,5287
 ommlds/minichain/backends/strings/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/minichain/backends/strings/manifests.py,sha256=kmlanVUAZqIh0P95Mm8H20e8ib3gEgYHHUlkCXDQGFk,413
@@ -325,9 +325,9 @@ ommlds/wiki/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU
 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.dev457.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-ommlds-0.0.0.dev457.dist-info/METADATA,sha256=k407nvbkhWU8OH5nuzDPbyHlzpSxapu_k1bDMA3BVQU,3224
-ommlds-0.0.0.dev457.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ommlds-0.0.0.dev457.dist-info/entry_points.txt,sha256=Z5YWtX7ClfiCKdW-dd_CSVvM0h4yQpJPi-2G3q6gNFo,35
-ommlds-0.0.0.dev457.dist-info/top_level.txt,sha256=Rbnk5d5wi58vnAXx13WFZqdQ4VX8hBCS2hEL3WeXOhY,7
-ommlds-0.0.0.dev457.dist-info/RECORD,,
+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,,