ommlds 0.0.0.dev457__tar.gz → 0.0.0.dev459__tar.gz

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

@@ -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 → ommlds-0.0.0.dev459}/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-0.0.0.dev457 → ommlds-0.0.0.dev459}/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-0.0.0.dev457 → ommlds-0.0.0.dev459}/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-0.0.0.dev457 → ommlds-0.0.0.dev459}/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-0.0.0.dev457 → ommlds-0.0.0.dev459}/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-0.0.0.dev457 → ommlds-0.0.0.dev459}/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-0.0.0.dev457 → ommlds-0.0.0.dev459}/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-0.0.0.dev457 → ommlds-0.0.0.dev459}/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 → ommlds-0.0.0.dev459/ommlds.egg-info}/PKG-INFO

@@ -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 → ommlds-0.0.0.dev459}/ommlds.egg-info/requires.txt

@@ -1,17 +1,17 @@
-omdev==0.0.0.dev457
-omlish==0.0.0.dev457
+omdev==0.0.0.dev459
+omlish==0.0.0.dev459
 
 [all]
 llama-cpp-python~=0.3
 mlx~=0.29
-tiktoken~=0.11
+tiktoken~=0.12
 tinygrad~=0.11
 tokenizers~=0.22
 torch~=2.8
-transformers~=4.56
+transformers~=4.57
 sentence-transformers~=5.1
 huggingface-hub~=0.35
-datasets~=4.1
+datasets~=4.2
 numpy>=1.26
 pytesseract~=0.3
 rapidocr-onnxruntime~=1.4
@@ -29,11 +29,11 @@ mlx-lm~=0.28
 [backends]
 llama-cpp-python~=0.3
 mlx~=0.29
-tiktoken~=0.11
+tiktoken~=0.12
 tinygrad~=0.11
 tokenizers~=0.22
 torch~=2.8
-transformers~=4.56
+transformers~=4.57
 sentence-transformers~=5.1
 
 [backends:sys_platform == "darwin"]
@@ -41,7 +41,7 @@ mlx-lm~=0.28
 
 [huggingface]
 huggingface-hub~=0.35
-datasets~=4.1
+datasets~=4.2
 
 [numpy]
 numpy>=1.26

{ommlds-0.0.0.dev457 → ommlds-0.0.0.dev459}/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.dev457'
+version = '0.0.0.dev459'
 classifiers = [
     'Development Status :: 2 - Pre-Alpha',
     'Intended Audience :: Developers',
@@ -24,8 +24,8 @@ classifiers = [
 ]
 description = 'ommlds'
 dependencies = [
-    'omdev == 0.0.0.dev457',
-    'omlish == 0.0.0.dev457',
+    'omdev == 0.0.0.dev459',
+    'omlish == 0.0.0.dev459',
 ]
 
 [project.optional-dependencies]
@@ -33,14 +33,14 @@ all = [
     'llama-cpp-python ~= 0.3',
     'mlx ~= 0.29',
     'mlx-lm ~= 0.28; sys_platform == "darwin"',
-    'tiktoken ~= 0.11',
+    'tiktoken ~= 0.12',
     'tinygrad ~= 0.11',
     'tokenizers ~= 0.22',
     'torch ~= 2.8',
-    'transformers ~= 4.56',
+    'transformers ~= 4.57',
     'sentence-transformers ~= 5.1',
     'huggingface-hub ~= 0.35',
-    'datasets ~= 4.1',
+    'datasets ~= 4.2',
     'numpy >= 1.26',
     'pytesseract ~= 0.3',
     'rapidocr-onnxruntime ~= 1.4',
@@ -54,16 +54,16 @@ backends = [
     'llama-cpp-python ~= 0.3',
     'mlx ~= 0.29',
     'mlx-lm ~= 0.28; sys_platform == "darwin"',
-    'tiktoken ~= 0.11',
+    'tiktoken ~= 0.12',
     'tinygrad ~= 0.11',
     'tokenizers ~= 0.22',
     '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 = [
     'numpy >= 1.26',