omlish 0.0.0.dev443__tar.gz → 0.0.0.dev445__tar.gz

{omlish-0.0.0.dev443/omlish.egg-info → omlish-0.0.0.dev445}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omlish
-Version: 0.0.0.dev443
+Version: 0.0.0.dev445
 Summary: omlish
 Author: wrmsr
 License-Expression: BSD-3-Clause

{omlish-0.0.0.dev443 → omlish-0.0.0.dev445}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev443'
-__revision__ = '0dc6d8e2932a032b4a2cec65c010432d79c2b721'
+__version__ = '0.0.0.dev445'
+__revision__ = '68ca679313e2d1b22ba7545fe7f27bb938535ac3'
 
 
 #
@@ -174,6 +174,7 @@ class SetuptoolsBase:
             '*.cu',
             '*.g4',
             '*.h',
+            '*.hh',
 
             '.omlish-manifests.json',
 
@@ -184,6 +185,8 @@ class SetuptoolsBase:
 
 
 class Setuptools(SetuptoolsBase):
+    cexts = True
+
     find_packages = {
         'include': [Project.name, f'{Project.name}.*'],
         'exclude': [*SetuptoolsBase.find_packages['exclude']],

{omlish-0.0.0.dev443 → omlish-0.0.0.dev445}/omlish/formats/json/stream/lexing.py

@@ -17,8 +17,10 @@ from ....funcs.genmachine import GenMachine
 from .errors import JsonStreamError
 
 
-with lang.auto_proxy_import(globals()):
+if ta.TYPE_CHECKING:
     import unicodedata
+else:
+    unicodedata = lang.proxy_import('unicodedata')
 
 
 ##
@@ -190,7 +192,9 @@ class JsonStreamLexer(GenMachine[str, Token]):
 
         self._allow_extended_idents = allow_extended_idents
 
-        self._char_in_it: ta.Iterator[str] | None = None
+        self._char_in_str: str | None = None
+        self._char_in_str_len: int = 0
+        self._char_in_str_pos: int = 0
 
         self._ofs = 0
         self._line = 1
@@ -223,29 +227,29 @@ class JsonStreamLexer(GenMachine[str, Token]):
         return c
 
     def _yield_char_in(self, c: str) -> str:
-        if self._char_in_it is not None:
+        if self._char_in_str is not None:
             raise JsonStreamError
 
-        if len(c) > 1:
-            in_it = iter(c)
-            next(in_it)
-            self._char_in_it = in_it
+        if (cl := len(c)) > 1:
+            self._char_in_str = c
+            self._char_in_str_len = cl
+            self._char_in_str_pos = 1
             c = c[0]
 
         self._advance_pos(c)
 
         return c
 
-    def _it_char_in(self) -> str | None:
-        if (it := self._char_in_it) is None:
+    def _str_char_in(self) -> str | None:
+        if (s := self._char_in_str) is None:
             return None
 
-        try:
-            c = next(it)
-        except StopIteration:
-            self._char_in_it = None
+        if (p := self._char_in_str_pos) >= self._char_in_str_len:
+            self._char_in_str = None
             return None
 
+        c = s[p]
+        self._char_in_str_pos += 1
         return self._advance_pos(c)
 
     def _make_tok(
@@ -278,7 +282,7 @@ class JsonStreamLexer(GenMachine[str, Token]):
                 c = peek
                 peek = None
             else:
-                if (c := self._it_char_in()) is None:  # type: ignore[assignment]
+                if (c := self._str_char_in()) is None:  # type: ignore[assignment]
                     c = self._yield_char_in((yield None))  # noqa
 
             if not c:
@@ -320,13 +324,17 @@ class JsonStreamLexer(GenMachine[str, Token]):
 
         buf = self._buf
 
-        char_in_it = self._char_in_it
+        char_in_str = self._char_in_str
+        char_in_str_len = self._char_in_str_len
+        char_in_str_pos = self._char_in_str_pos
         ofs = self._ofs
         line = self._line
         col = self._col
 
         def restore_state():
-            self._char_in_it = char_in_it
+            self._char_in_str = char_in_str
+            self._char_in_str_len = char_in_str_len
+            self._char_in_str_pos = char_in_str_pos
             self._ofs = ofs
             self._line = line
             self._col = col
@@ -335,11 +343,17 @@ class JsonStreamLexer(GenMachine[str, Token]):
         while True:
             c: str | None = None
 
-            if char_in_it is not None:
-                try:
-                    c = next(char_in_it)
-                except StopIteration:
-                    char_in_it = None
+            if char_in_str is not None:
+                if char_in_str_pos < char_in_str_len:
+                    # FIXME: handle str chunks separately
+                    # if (qp := char_in_str.find(q)) >= 0 and (not qp or (char_in_str[qp - 1] != '\\')):
+                    #     ofs += qp + 1
+                    #     line += char_in_str.count('\n', end=)
+                    #     if (np := char_in_str.rfind('\n')) >= 0
+                    c = char_in_str[char_in_str_pos]
+                    char_in_str_pos += 1
+                else:
+                    char_in_str = None
 
             if c is None:
                 try:
@@ -349,9 +363,9 @@ class JsonStreamLexer(GenMachine[str, Token]):
                     self._raise('Unexpected end of input')
 
                 if len(c) > 1:
-                    in_it = iter(c)
-                    next(in_it)
-                    char_in_it = in_it
+                    char_in_str = c
+                    char_in_str_len = len(char_in_str)
+                    char_in_str_pos = 1
                     c = c[0]
 
             if c and len(c) != 1:
@@ -396,7 +410,7 @@ class JsonStreamLexer(GenMachine[str, Token]):
 
         while True:
             try:
-                if (c := self._it_char_in()) is None:  # type: ignore[assignment]
+                if (c := self._str_char_in()) is None:  # type: ignore[assignment]
                     c = self._yield_char_in((yield None))  # noqa
             except GeneratorExit:
                 self._raise('Unexpected end of input')
@@ -431,7 +445,7 @@ class JsonStreamLexer(GenMachine[str, Token]):
                 raw += c
                 try:
                     for _ in range(len(svs) - 1):
-                        if (c := self._it_char_in()) is None:  # type: ignore[assignment]
+                        if (c := self._str_char_in()) is None:  # type: ignore[assignment]
                             c = self._yield_char_in((yield None))  # noqa
                         if not c:
                             break
@@ -479,7 +493,7 @@ class JsonStreamLexer(GenMachine[str, Token]):
         raw = c
         while True:
             try:
-                if (c := self._it_char_in()) is None:  # type: ignore[assignment]
+                if (c := self._str_char_in()) is None:  # type: ignore[assignment]
                     c = self._yield_char_in((yield None))  # noqa
             except GeneratorExit:
                 self._raise('Unexpected end of input')
@@ -498,7 +512,7 @@ class JsonStreamLexer(GenMachine[str, Token]):
 
     def _do_unicode_escape(self):
         try:
-            if (c := self._it_char_in()) is None:
+            if (c := self._str_char_in()) is None:
                 c = self._yield_char_in((yield None))  # noqa
         except GeneratorExit:
             self._raise('Unexpected end of input')
@@ -509,7 +523,7 @@ class JsonStreamLexer(GenMachine[str, Token]):
         ux = []
         for _ in range(4):
             try:
-                if (c := self._it_char_in()) is None:
+                if (c := self._str_char_in()) is None:
                     c = self._yield_char_in((yield None))  # noqa
             except GeneratorExit:
                 self._raise('Unexpected end of input')
@@ -536,7 +550,7 @@ class JsonStreamLexer(GenMachine[str, Token]):
 
         while True:
             try:
-                if (c := self._it_char_in()) is None:  # type: ignore[assignment]
+                if (c := self._str_char_in()) is None:  # type: ignore[assignment]
                     c = self._yield_char_in((yield None))  # noqa
             except GeneratorExit:
                 self._raise('Unexpected end of input')
@@ -567,7 +581,7 @@ class JsonStreamLexer(GenMachine[str, Token]):
 
         pos = self.pos
         try:
-            if (oc := self._it_char_in()) is None:
+            if (oc := self._str_char_in()) is None:
                 oc = self._yield_char_in((yield None))  # noqa
         except GeneratorExit:
             self._raise('Unexpected end of input')
@@ -575,7 +589,7 @@ class JsonStreamLexer(GenMachine[str, Token]):
         if oc == '/':
             while True:
                 try:
-                    if (ic := self._it_char_in()) is None:
+                    if (ic := self._str_char_in()) is None:
                         ic = self._yield_char_in((yield None))  # noqa
                 except GeneratorExit:
                     self._raise('Unexpected end of input')
@@ -598,7 +612,7 @@ class JsonStreamLexer(GenMachine[str, Token]):
             lc: str | None = None
             while True:
                 try:
-                    if (ic := self._it_char_in()) is None:
+                    if (ic := self._str_char_in()) is None:
                         ic = self._yield_char_in((yield None))  # noqa
                 except GeneratorExit:
                     self._raise('Unexpected end of input')

{omlish-0.0.0.dev443 → omlish-0.0.0.dev445}/omlish/inject/binder.py

@@ -32,8 +32,10 @@ from .types import Scope
 from .types import Unscoped
 
 
-with lang.auto_proxy_import(globals()):
+if ta.TYPE_CHECKING:
     from .impl import inspect as _inspect
+else:
+    _inspect = lang.proxy_import('.impl.inspect', __package__)
 
 
 T = ta.TypeVar('T')

{omlish-0.0.0.dev443 → omlish-0.0.0.dev445}/omlish/inject/impl/elements.py

@@ -51,8 +51,10 @@ from .providers2 import make_provider_impl
 from .scopes import make_scope_impl
 
 
-with lang.auto_proxy_import(globals()):
+if ta.TYPE_CHECKING:
     from . import privates as _privates
+else:
+    _privates = lang.proxy_import('.privates', __package__)
 
 
 ElementT = ta.TypeVar('ElementT', bound=Element)

{omlish-0.0.0.dev443 → omlish-0.0.0.dev445}/omlish/inject/impl/scopes.py

@@ -31,8 +31,10 @@ from .bindings import BindingImpl
 from .providers import ProviderImpl
 
 
-with lang.auto_proxy_import(globals()):
+if ta.TYPE_CHECKING:
     from . import injector as _injector
+else:
+    _injector = lang.proxy_import('.injector', __package__)
 
 
 ##

{omlish-0.0.0.dev443 → omlish-0.0.0.dev445}/omlish/inject/injector.py

@@ -8,8 +8,10 @@ from .inspect import KwargsTarget
 from .keys import Key
 
 
-with lang.auto_proxy_import(globals()):
+if ta.TYPE_CHECKING:
     from .impl import injector as _injector
+else:
+    _injector = lang.proxy_import('.impl.injector', __package__)
 
 
 T = ta.TypeVar('T')

{omlish-0.0.0.dev443 → omlish-0.0.0.dev445}/omlish/inject/inspect.py

@@ -4,8 +4,10 @@ from .. import lang
 from .keys import Key
 
 
-with lang.auto_proxy_import(globals()):
+if ta.TYPE_CHECKING:
     from .impl import inspect as _inspect
+else:
+    _inspect = lang.proxy_import('.impl.inspect', __package__)
 
 
 T = ta.TypeVar('T')

{omlish-0.0.0.dev443 → omlish-0.0.0.dev445}/omlish/inject/managed.py

@@ -11,10 +11,14 @@ from .elements import Elemental
 from .impl.inspect import build_kwargs_target
 
 
-with lang.auto_proxy_import(globals()):
+if ta.TYPE_CHECKING:
     from . import injector as _injector
     from . import maysync as _maysync
     from . import sync as _sync
+else:
+    _injector = lang.proxy_import('.injector', __package__)
+    _maysync = lang.proxy_import('.maysync', __package__)
+    _sync = lang.proxy_import('.sync', __package__)
 
 
 T = ta.TypeVar('T')

{omlish-0.0.0.dev443 → omlish-0.0.0.dev445}/omlish/inject/maysync.py

@@ -6,8 +6,10 @@ from .elements import as_elements
 from .sync import Injector
 
 
-with lang.auto_proxy_import(globals()):
+if ta.TYPE_CHECKING:
     from .impl import maysync as _maysync
+else:
+    _maysync = lang.proxy_import('.impl.maysync', __package__)
 
 
 T = ta.TypeVar('T')

{omlish-0.0.0.dev443 → omlish-0.0.0.dev445}/omlish/inject/scopes.py

@@ -14,10 +14,14 @@ from .providers import Provider
 from .types import Scope
 
 
-with lang.auto_proxy_import(globals()):
+if ta.TYPE_CHECKING:
     from . import injector as _injector
     from . import maysync as _maysync
     from . import sync as _sync
+else:
+    _injector = lang.proxy_import('.injector', __package__)
+    _maysync = lang.proxy_import('.maysync', __package__)
+    _sync = lang.proxy_import('.sync', __package__)
 
 
 ##
@@ -112,7 +116,7 @@ def maysync_enter_seeded_scope(
         ss: SeededScope,
         keys: ta.Mapping[Key, ta.Any],
 ) -> ta.ContextManager[None]:
-    return lang.sync_await_context_manager(async_enter_seeded_scope(
+    return lang.sync_async_with(async_enter_seeded_scope(
         i[AsyncInjector],
         ss,
         keys,

{omlish-0.0.0.dev443 → omlish-0.0.0.dev445}/omlish/inject/sync.py

@@ -8,8 +8,10 @@ from .inspect import KwargsTarget
 from .keys import Key
 
 
-with lang.auto_proxy_import(globals()):
+if ta.TYPE_CHECKING:
     from .impl import sync as _sync
+else:
+    _sync = lang.proxy_import('.impl.sync', __package__)
 
 
 T = ta.TypeVar('T')

{omlish-0.0.0.dev443 → omlish-0.0.0.dev445}/omlish/lang/__init__.py

@@ -1,4 +1,4 @@
-from .imports.proxyinit import auto_proxy_init as _auto_proxy_init
+from .imports.proxy import auto_proxy_init as _auto_proxy_init
 
 
 with _auto_proxy_init(globals(), update_exports=True):
@@ -274,13 +274,9 @@ with _auto_proxy_init(globals(), update_exports=True):
 
     from .imports.proxy import (  # noqa
         proxy_import,
-
         auto_proxy_import,
-    )
 
-    from .imports.proxyinit import (  # noqa
         proxy_init,
-
         auto_proxy_init,
     )
 
@@ -466,7 +462,7 @@ with _auto_proxy_init(globals(), update_exports=True):
         sync_async_list,
 
         SyncAwaitContextManager,
-        sync_await_context_manager,
+        sync_async_with,
 
         SyncToAsyncContextManager,
         as_async_context_manager,

omlish-0.0.0.dev445/omlish/lang/imports/_capture.cc

@@ -0,0 +1,101 @@
+// @omlish-cext
+#include <atomic>
+
+#define PY_SSIZE_T_CLEAN
+#define Py_BUILD_CORE 1
+#include "Python.h"
+#include "internal/pycore_frame.h"
+#undef Py_BUILD_CORE
+
+#if PY_VERSION_HEX < 0x030D0000
+#  error "This extension requires CPython 3.13+"
+#endif
+
+//
+
+#define _MODULE_NAME "_capture"
+#define _PACKAGE_NAME "omlish.lang.imports"
+#define _MODULE_FULL_NAME _PACKAGE_NAME "." _MODULE_NAME
+
+//
+
+static PyObject *
+_set_frame_builtins(PyObject *self, PyObject *args)
+{
+    PyObject *frame_obj;
+    PyObject *old_builtins;
+    PyObject *new_builtins;
+
+    if (!PyArg_ParseTuple(
+        args, "OO!O!",
+        &frame_obj,
+        &PyDict_Type, &old_builtins,
+        &PyDict_Type, &new_builtins
+    )) {
+        return NULL;
+    }
+
+    if (!PyFrame_Check(frame_obj)) {
+        PyErr_SetString(PyExc_TypeError, "first argument must be a frame object");
+        return NULL;
+    }
+
+    PyFrameObject *frame = (PyFrameObject *)frame_obj;
+    _PyInterpreterFrame *iframe = frame->f_frame;
+
+    if (!iframe) {
+        PyErr_SetString(PyExc_ValueError, "frame has no underlying interpreter frame");
+        return NULL;
+    }
+
+    std::atomic_ref<PyObject*> builtins_ref(iframe->f_builtins);
+    PyObject* expected = old_builtins;
+    bool success = builtins_ref.compare_exchange_strong(
+        expected,
+        new_builtins,
+        std::memory_order_acq_rel,
+        std::memory_order_acquire
+    );
+
+    if (success) {
+        Py_RETURN_TRUE;
+    } else {
+        Py_RETURN_FALSE;
+    }
+}
+
+//
+
+PyDoc_STRVAR(capture_doc, _MODULE_NAME);
+
+static PyMethodDef capture_methods[] = {
+    {"_set_frame_builtins", _set_frame_builtins, METH_VARARGS, "_set_frame_builtins"},
+    {NULL, NULL, 0, NULL}
+};
+
+static struct PyModuleDef_Slot capture_slots[] = {
+    {Py_mod_gil, Py_MOD_GIL_NOT_USED},
+    {Py_mod_multiple_interpreters, Py_MOD_MULTIPLE_INTERPRETERS_SUPPORTED},
+    {0, NULL}
+};
+
+static struct PyModuleDef capture_module = {
+    .m_base = PyModuleDef_HEAD_INIT,
+    .m_name = _MODULE_NAME,
+    .m_doc = capture_doc,
+    .m_size = 0,
+    .m_methods = capture_methods,
+    .m_slots = capture_slots,
+    .m_traverse = NULL,
+    .m_clear = NULL,
+    .m_free = NULL,
+};
+
+extern "C" {
+
+PyMODINIT_FUNC PyInit__capture(void)
+{
+    return PyModuleDef_Init(&capture_module);
+}
+
+}