ommlds 0.0.0.dev426__py3-none-any.whl → 0.0.0.dev485__py3-none-any.whl

ommlds/wiki/analyze.py

@@ -30,7 +30,6 @@ import contextlib
 import dataclasses as dc
 import glob
 import io
-import logging
 import os.path
 import signal
 import threading
@@ -42,10 +41,10 @@ import sqlalchemy as sa
 import sqlalchemy.exc
 
 from omlish import cached
-from omlish import concurrent as cfu
 from omlish import lang
 from omlish import marshal as msh
 from omlish import multiprocessing as mpu
+from omlish.concurrent import all as conc
 from omlish.formats import json
 from omlish.logs import all as logs
 from omlish.os import deathpacts
@@ -56,7 +55,7 @@ from .text import wtp  # noqa
 from .utils.progress import ProgressReporter
 
 
-log = logging.getLogger(__name__)
+log = logs.get_module_logger(globals())
 
 
 ##
@@ -214,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
 
@@ -269,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,
@@ -324,7 +323,7 @@ def _main() -> None:
                 num_rows=mp_manager.Value('i', 0),
             )
 
-            ex = es.enter_context(cfu.new_executor(  # noqa
+            ex = es.enter_context(conc.new_executor(  # noqa
                 args.num_workers,
                 cf.ProcessPoolExecutor,
                 mp_context=mp_context,
@@ -338,7 +337,7 @@ def _main() -> None:
                 num_rows=mpu.DummyValueProxy(0),
             )
 
-            ex = es.enter_context(cfu.ImmediateExecutor())
+            ex = es.enter_context(conc.ImmediateExecutor())
 
         futs: list[cf.Future] = [
             ex.submit(

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ommlds
-Version: 0.0.0.dev426
+Version: 0.0.0.dev485
 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.dev426
-Requires-Dist: omlish==0.0.0.dev426
+Requires-Dist: omdev==0.0.0.dev485
+Requires-Dist: omlish==0.0.0.dev485
 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"