ommlds 0.0.0.dev436__py3-none-any.whl → 0.0.0.dev480__py3-none-any.whl

ommlds/specs/mcp/protocol.py

@@ -0,0 +1,266 @@
+"""
+https://modelcontextprotocol.io/specification/2025-06-18
+https://modelcontextprotocol.io/specification/2025-06-18/schema
+"""
+import abc
+import typing as ta
+
+from omlish import collections as col
+from omlish import dataclasses as dc
+from omlish import lang
+from omlish import marshal as msh
+
+
+msh.register_global_module_import('._marshal', __package__)
+
+
+##
+
+
+def _set_class_marshal_options(cls):
+    msh.update_object_metadata(
+        cls,
+        field_naming=msh.Naming.LOW_CAMEL,
+        field_defaults=msh.FieldMetadata(
+            options=msh.FieldOptions(
+                omit_if=lang.is_none,
+            ),
+        ),
+    )
+    return cls
+
+
+##
+
+
+@dc.dataclass(frozen=True, kw_only=True)
+class Message(lang.Sealed, lang.Abstract):
+    @property
+    @abc.abstractmethod
+    def json_rpc_method_name(self) -> str:
+        raise NotImplementedError
+
+
+class ClientRequest(Message, lang.Abstract):
+    pass
+
+
+class ClientResult(Message, lang.Abstract):
+    pass
+
+
+class ServerRequest(Message, lang.Abstract):
+    pass
+
+
+class ServerResult(Message, lang.Abstract):
+    pass
+
+
+class Notification(Message, lang.Abstract):
+    pass
+
+
+#
+
+
+@dc.dataclass(frozen=True, kw_only=True)
+class WithMeta(lang.Sealed, lang.Abstract):
+    meta_: ta.Mapping[str, ta.Any] | None = dc.field(default=None) | msh.with_field_metadata(name='_meta')
+
+
+##
+
+
+@dc.dataclass(frozen=True, kw_only=True)
+@_set_class_marshal_options
+class Implementation(lang.Final):
+    name: str
+    version: str
+
+
+DEFAULT_PROTOCOL_VERSION = '2025-06-18'
+
+
+@dc.dataclass(frozen=True, kw_only=True)
+@_set_class_marshal_options
+class ClientCapabilities:
+    elicitation: ta.Any | None = None
+
+    experimental: ta.Mapping[str, ta.Any] | None = None
+
+    @dc.dataclass(frozen=True, kw_only=True)
+    @_set_class_marshal_options
+    class Roots:
+        list_changed: bool | None = None
+
+    roots: Roots | None = None
+
+    sampling: ta.Any | None = None
+
+
+@dc.dataclass(frozen=True, kw_only=True)
+@_set_class_marshal_options
+class InitializeRequest(ClientRequest):
+    json_rpc_method_name: ta.ClassVar[str] = 'initialize'
+
+    client_info: Implementation
+    protocol_version: str = DEFAULT_PROTOCOL_VERSION
+    capabilities: ClientCapabilities = ClientCapabilities()
+
+
+@dc.dataclass(frozen=True, kw_only=True)
+@_set_class_marshal_options
+class ServerCapabilities:
+    completions: ta.Any | None = None
+
+    experimental: ta.Mapping[str, ta.Any] | None = None
+
+    logging: ta.Any | None = None
+
+    @dc.dataclass(frozen=True, kw_only=True)
+    @_set_class_marshal_options
+    class Prompts:
+        list_changed: bool | None = None
+
+    prompts: Prompts | None = None
+
+    @dc.dataclass(frozen=True, kw_only=True)
+    @_set_class_marshal_options
+    class Resources:
+        list_changed: bool | None = None
+        subscribe: bool | None = None
+
+    resources: Resources | None = None
+
+    @dc.dataclass(frozen=True, kw_only=True)
+    @_set_class_marshal_options
+    class Tools:
+        list_changed: bool | None = None
+
+    tools: Tools | None = None
+
+
+@dc.dataclass(frozen=True, kw_only=True)
+@_set_class_marshal_options
+class InitializeResult(ClientResult, WithMeta):
+    json_rpc_method_name: ta.ClassVar[str] = 'initialize'
+
+    server_info: Implementation
+    protocol_version: str
+    capabilities: ServerCapabilities
+
+
+@dc.dataclass(frozen=True, kw_only=True)
+@_set_class_marshal_options
+class InitializedNotification(Notification):
+    json_rpc_method_name: ta.ClassVar[str] = 'initialized'
+
+
+##
+
+
+@dc.dataclass(frozen=True, kw_only=True)
+@_set_class_marshal_options
+class ToolAnnotations(lang.Final):
+    destructive_hint: bool | None = None
+    idempotent_hint: bool | None = None
+    open_world_hint: bool | None = None
+    read_only_hint: bool | None = None
+    title: str | None = None
+
+
+@dc.dataclass(frozen=True, kw_only=True)
+@_set_class_marshal_options
+class Tool(lang.Final):
+    name: str
+    title: str | None = None
+
+    description: str | None = None
+
+    annotations: ToolAnnotations | None = None
+
+    input_schema: ta.Any
+    output_schema: ta.Any | None = None
+
+
+@dc.dataclass(frozen=True, kw_only=True)
+@_set_class_marshal_options
+class ListToolsRequest(ClientRequest):
+    json_rpc_method_name: ta.ClassVar[str] = 'tools/list'
+
+    cursor: str | None = None
+
+
+@dc.dataclass(frozen=True, kw_only=True)
+@_set_class_marshal_options
+class ListToolsResult(ClientResult, WithMeta):
+    json_rpc_method_name: ta.ClassVar[str] = 'tools/list'
+
+    tools: ta.Sequence[Tool]
+    next_cursor: str | None = None
+
+
+##
+
+
+class ContentBlock(lang.Abstract):
+    pass
+
+
+@dc.dataclass(frozen=True, kw_only=True)
+@_set_class_marshal_options
+class TextContentBlock(ContentBlock, lang.Final):
+    text: str
+
+
+##
+
+
+@dc.dataclass(frozen=True, kw_only=True)
+@_set_class_marshal_options
+class CallToolRequest(ClientRequest):
+    json_rpc_method_name: ta.ClassVar[str] = 'tools/call'
+
+    name: str
+    arguments: ta.Mapping[str, ta.Any] | None = None
+
+
+@dc.dataclass(frozen=True, kw_only=True)
+@_set_class_marshal_options
+class CallToolResult(ClientResult, WithMeta):
+    json_rpc_method_name: ta.ClassVar[str] = 'tools/call'
+
+    content: ta.Sequence[ContentBlock]
+    is_error: bool | None = None
+    structured_content: ta.Mapping[str, ta.Any] | None = None
+
+
+##
+
+
+@dc.dataclass(frozen=True, kw_only=True)
+@_set_class_marshal_options
+class PingRequest(ClientRequest, WithMeta):
+    json_rpc_method_name: ta.ClassVar[str] = 'ping'
+
+
+@dc.dataclass(frozen=True, kw_only=True)
+@_set_class_marshal_options
+class PingResult(ClientResult):
+    json_rpc_method_name: ta.ClassVar[str] = 'ping'
+
+
+##
+
+
+MESSAGE_TYPES_BY_JSON_RPC_METHOD_NAME: ta.Mapping[type[Message], ta.Mapping[str, type[Message]]] = {
+    bty: col.make_map_by(lambda mty: mty.json_rpc_method_name, lang.deep_subclasses(bty, concrete_only=True))  # type: ignore  # noqa
+    for bty in [
+        ClientRequest,
+        ClientResult,
+        ServerRequest,
+        ServerResult,
+        Notification,
+    ]
+}

ommlds/tools/git.py

@@ -16,6 +16,7 @@ from omdev.tools.git.messages import GitMessageGenerator
 from omlish import check
 from omlish import lang
 from omlish.configs.classes import Configurable
+from omlish.http import all as http
 from omlish.subprocesses.sync import subprocesses
 
 from .. import minichain as mc
@@ -23,10 +24,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')
@@ -45,6 +44,22 @@ class GitAiBackend(Configurable[GitAiBackendConfigT], lang.Abstract):
         raise NotImplementedError
 
 
+def _get_single_ai_message_str(resp: mc.ChatChoicesResponse) -> str:
+    return check.not_empty(
+        check.isinstance(
+            check.isinstance(
+                check.single(
+                    check.single(
+                        resp.v,
+                    ).ms,
+                ),
+                mc.AiMessage,
+            ).c,
+            str,
+        ),
+    )
+
+
 #
 
 
@@ -62,13 +77,15 @@ class OpenaiGitAiBackend(GitAiBackend['OpenaiGitAiBackend.Config']):
             if (sec := load_secrets().try_get(key.lower())) is not None:
                 os.environ[key] = sec.reveal()
 
-        llm = OpenaiChatChoicesService()
+        llm = OpenaiChatChoicesService(
+            http_client=http.SyncAsyncHttpClient(http.client()),
+        )
 
-        resp = llm.invoke(mc.ChatChoicesRequest(
+        resp = lang.sync_await(llm.invoke(mc.ChatChoicesRequest(
             [mc.UserMessage(prompt)],
             # FIXME:  *((MaxTokens(self._config.max_tokens),) if self._config.max_tokens is not None else ()),
-        ))
-        return check.not_empty(check.isinstance(resp.v[0].m.c, str))
+        )))
+        return _get_single_ai_message_str(resp)
 
 
 #
@@ -93,11 +110,11 @@ class MlxGitAiBackend(GitAiBackend['MlxGitAiBackend.Config']):
 
     def _run_prompt(self, prompt: str) -> str:
         with mc_mlx_chat.MlxChatChoicesService(mc.ModelRepo.parse(self._config.model)) as llm:
-            resp = llm.invoke(mc.ChatChoicesRequest(
+            resp = lang.sync_await(llm.invoke(mc.ChatChoicesRequest(
                 [mc.UserMessage(prompt)],
                 # FIXME: *((MaxTokens(self._config.max_tokens),) if self._config.max_tokens is not None else ()),
-            ))
-            text = check.not_empty(check.isinstance(resp.v[0].m.c, str))
+            )))
+            text = _get_single_ai_message_str(resp)
 
             text = _strip_markdown_code_block(text)
 

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')
-
 
 ##
 
@@ -34,7 +27,7 @@ else:
 Ocr: ta.TypeAlias = ta.Callable[['Image.Image'], str]
 
 OCR_BACKENDS: ta.Mapping[str, Ocr] = {
-    'rapidocr': lambda img: '\n'.join(text[1] for text in rapidocr.RapidOCR()(img)[0] or []),
+    'rapidocr': lambda img: '\n'.join(text[1] for text in rapidocr.RapidOCR()(_get_img_png_bytes(img))[0] or []),
     'tesseract': lambda img: pytesseract.image_to_string(img),
 }
 
@@ -62,6 +55,12 @@ def _get_img_data(file: str | None) -> ta.Any:
         return sys.stdin.buffer
 
 
+def _get_img_png_bytes(img: 'Image.Image') -> bytes:
+    out = io.BytesIO()
+    img.save(out, format='PNG')
+    return out.getvalue()
+
+
 def _main() -> None:
     parser = argparse.ArgumentParser()
     parser.add_argument('file', nargs='?')

ommlds/wiki/analyze.py

@@ -213,7 +213,7 @@ class FileAnalyzer:
         self.verbose and print()
         return True
 
-    @logs.error_logging(log)
+    @logs.exception_logging(log)
     def run(self, file_name: str) -> None:
         log.info(f'{self._ctx.deathpact=} {file_name}')  # noqa
 
@@ -268,7 +268,7 @@ class FileAnalyzer:
             self._flush_rows()
 
 
-@logs.error_logging(log)
+@logs.exception_logging(log)
 def analyze_file(
         file_name: str,
         db_url: str,

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/wiki/utils/xml.py

@@ -24,7 +24,7 @@ else:
 
 T = ta.TypeVar('T')
 
-Element: ta.TypeAlias = ta.Union[ET.Element, 'lxml_etree.Element']
+Element: ta.TypeAlias = ta.Union[ET.Element, 'lxml_etree.Element']  # type: ignore[valid-type]
 
 
 ##
@@ -83,8 +83,8 @@ class ElementToKwargs:
                 raise KeyError(k)
             kw[k] = v
 
-        if el.attrib:
-            for k, v in el.attrib.items():
+        if el.attrib:  # type: ignore
+            for k, v in el.attrib.items():  # type: ignore
                 k = strip_ns(k)
 
                 if k in self.attrs:
@@ -99,7 +99,7 @@ class ElementToKwargs:
                 else:
                     raise KeyError(k)
 
-        for cel in el:
+        for cel in el:  # type: ignore
             k = strip_ns(cel.tag)
 
             if k in self.scalars:
@@ -123,7 +123,7 @@ class ElementToKwargs:
                 raise KeyError(k)
 
         if self.text is not None:
-            set_kw(self.text, el.text)
+            set_kw(self.text, el.text)  # type: ignore
 
         return kw
 

{ommlds-0.0.0.dev436.dist-info → ommlds-0.0.0.dev480.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ommlds
-Version: 0.0.0.dev436
+Version: 0.0.0.dev480
 Summary: ommlds
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,50 +14,53 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev436
-Requires-Dist: omlish==0.0.0.dev436
+Requires-Dist: omdev==0.0.0.dev480
+Requires-Dist: omlish==0.0.0.dev480
 Provides-Extra: all
 Requires-Dist: llama-cpp-python~=0.3; extra == "all"
-Requires-Dist: mlx~=0.28; extra == "all"
-Requires-Dist: mlx-lm~=0.26; sys_platform == "darwin" and extra == "all"
-Requires-Dist: tiktoken~=0.11; extra == "all"
+Requires-Dist: mlx~=0.30; sys_platform == "darwin" and extra == "all"
+Requires-Dist: mlx-lm~=0.28; sys_platform == "darwin" and 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: torch~=2.9; extra == "all"
+Requires-Dist: transformers~=4.57; extra == "all"
 Requires-Dist: sentence-transformers~=5.1; extra == "all"
-Requires-Dist: huggingface-hub~=0.34; extra == "all"
-Requires-Dist: datasets~=4.0; extra == "all"
+Requires-Dist: huggingface-hub~=0.36; extra == "all"
+Requires-Dist: datasets~=4.4; extra == "all"
+Requires-Dist: regex>=2025.0; extra == "all"
 Requires-Dist: numpy>=1.26; extra == "all"
 Requires-Dist: pytesseract~=0.3; extra == "all"
 Requires-Dist: rapidocr-onnxruntime~=1.4; extra == "all"
-Requires-Dist: pillow~=11.3; extra == "all"
-Requires-Dist: ddgs~=9.5; extra == "all"
+Requires-Dist: pillow~=12.0; extra == "all"
+Requires-Dist: ddgs~=9.9; extra == "all"
 Requires-Dist: mwparserfromhell~=0.7; extra == "all"
 Requires-Dist: wikitextparser~=0.56; extra == "all"
 Requires-Dist: lxml>=5.3; python_version < "3.13" and extra == "all"
 Provides-Extra: backends
 Requires-Dist: llama-cpp-python~=0.3; extra == "backends"
-Requires-Dist: mlx~=0.28; extra == "backends"
-Requires-Dist: mlx-lm~=0.26; sys_platform == "darwin" and extra == "backends"
-Requires-Dist: tiktoken~=0.11; extra == "backends"
+Requires-Dist: mlx~=0.30; sys_platform == "darwin" and extra == "backends"
+Requires-Dist: mlx-lm~=0.28; sys_platform == "darwin" and 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: torch~=2.9; 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.34; extra == "huggingface"
-Requires-Dist: datasets~=4.0; extra == "huggingface"
+Requires-Dist: huggingface-hub~=0.36; extra == "huggingface"
+Requires-Dist: datasets~=4.4; extra == "huggingface"
+Provides-Extra: nanochat
+Requires-Dist: regex>=2025.0; extra == "nanochat"
 Provides-Extra: numpy
 Requires-Dist: numpy>=1.26; extra == "numpy"
 Provides-Extra: ocr
 Requires-Dist: pytesseract~=0.3; extra == "ocr"
 Requires-Dist: rapidocr-onnxruntime~=1.4; extra == "ocr"
 Provides-Extra: pillow
-Requires-Dist: pillow~=11.3; extra == "pillow"
+Requires-Dist: pillow~=12.0; extra == "pillow"
 Provides-Extra: search
-Requires-Dist: ddgs~=9.5; extra == "search"
+Requires-Dist: ddgs~=9.9; extra == "search"
 Provides-Extra: wiki
 Requires-Dist: mwparserfromhell~=0.7; extra == "wiki"
 Requires-Dist: wikitextparser~=0.56; extra == "wiki"