ommlds 0.0.0.dev458__py3-none-any.whl → 0.0.0.dev460__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/__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',
@@ -38,7 +38,7 @@ class Project(ProjectBase):
 
         '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/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/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.dev458.dist-info → ommlds-0.0.0.dev460.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ommlds
-Version: 0.0.0.dev458
+Version: 0.0.0.dev460
 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.dev458
-Requires-Dist: omlish==0.0.0.dev458
+Requires-Dist: omdev==0.0.0.dev460
+Requires-Dist: omlish==0.0.0.dev460
 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.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,7 +40,7 @@ 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"
@@ -48,7 +48,7 @@ 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.dev458.dist-info → ommlds-0.0.0.dev460.dist-info}/RECORD

@@ -1,5 +1,5 @@
-ommlds/.omlish-manifests.json,sha256=B8lb6DKPpx-lvUmJJObifPZx-fy273KUbjQoHImyb7o,17992
-ommlds/__about__.py,sha256=XNUdE90MuxGmrq-8fqOcmIDOlrcApuoObzGrDUnxxMM,1759
+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
 ommlds/_hacks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -11,12 +11,12 @@ 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
-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
@@ -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.dev458.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-ommlds-0.0.0.dev458.dist-info/METADATA,sha256=b8d8j6_YrLFPOasPpJ4NyVqc5lNOuHC0S1We79UNN68,3224
-ommlds-0.0.0.dev458.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ommlds-0.0.0.dev458.dist-info/entry_points.txt,sha256=Z5YWtX7ClfiCKdW-dd_CSVvM0h4yQpJPi-2G3q6gNFo,35
-ommlds-0.0.0.dev458.dist-info/top_level.txt,sha256=Rbnk5d5wi58vnAXx13WFZqdQ4VX8hBCS2hEL3WeXOhY,7
-ommlds-0.0.0.dev458.dist-info/RECORD,,
+ommlds-0.0.0.dev460.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+ommlds-0.0.0.dev460.dist-info/METADATA,sha256=5845ATkqi5W-P5CrEj6n1JPkkp-cQ8CypPhcTMRzBfw,3224
+ommlds-0.0.0.dev460.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ommlds-0.0.0.dev460.dist-info/entry_points.txt,sha256=Z5YWtX7ClfiCKdW-dd_CSVvM0h4yQpJPi-2G3q6gNFo,35
+ommlds-0.0.0.dev460.dist-info/top_level.txt,sha256=Rbnk5d5wi58vnAXx13WFZqdQ4VX8hBCS2hEL3WeXOhY,7
+ommlds-0.0.0.dev460.dist-info/RECORD,,