omdev 0.0.59__tar.gz → 0.0.60__tar.gz

{omdev-0.0.59/omdev.egg-info → omdev-0.0.60}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.59
+Version: 0.0.60
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,11 +14,11 @@ Classifier: Programming Language :: Python :: 3.15
 Requires-Python: >=3.14
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omcore==0.0.59
+Requires-Dist: omcore==0.0.60
 Provides-Extra: ominfra
-Requires-Dist: ominfra==0.0.59; extra == "ominfra"
+Requires-Dist: ominfra==0.0.60; extra == "ominfra"
 Provides-Extra: omllm
-Requires-Dist: omllm==0.0.59; extra == "omllm"
+Requires-Dist: omllm==0.0.60; extra == "omllm"
 Provides-Extra: black
 Requires-Dist: black~=26.5; extra == "black"
 Provides-Extra: c
@@ -27,7 +27,7 @@ Requires-Dist: pcpp~=1.30; extra == "c"
 Provides-Extra: doc
 Requires-Dist: docutils~=0.23; extra == "doc"
 Provides-Extra: mypy
-Requires-Dist: mypy~=2.3; extra == "mypy"
+Requires-Dist: mypy~=2.4; extra == "mypy"
 Provides-Extra: ocr
 Requires-Dist: pytesseract~=0.3; extra == "ocr"
 Requires-Dist: rapidocr-onnxruntime~=1.4; extra == "ocr"
@@ -59,19 +59,19 @@ Requires-Dist: tree-sitter-toml~=0.7; extra == "tui-syntax"
 Requires-Dist: tree-sitter-xml~=0.7; extra == "tui-syntax"
 Requires-Dist: tree-sitter-yaml~=0.7; extra == "tui-syntax"
 Provides-Extra: cext
-Requires-Dist: omdev-cext==0.0.59; extra == "cext"
+Requires-Dist: omdev-cext==0.0.60; extra == "cext"
 Provides-Extra: rs
-Requires-Dist: omdev-rs==0.0.59; extra == "rs"
+Requires-Dist: omdev-rs==0.0.60; extra == "rs"
 Provides-Extra: cli
-Requires-Dist: omdev-cli==0.0.59; extra == "cli"
+Requires-Dist: omdev-cli==0.0.60; extra == "cli"
 Provides-Extra: all
-Requires-Dist: ominfra==0.0.59; extra == "all"
-Requires-Dist: omllm==0.0.59; extra == "all"
+Requires-Dist: ominfra==0.0.60; extra == "all"
+Requires-Dist: omllm==0.0.60; extra == "all"
 Requires-Dist: black~=26.5; extra == "all"
 Requires-Dist: pycparser~=3.0; extra == "all"
 Requires-Dist: pcpp~=1.30; extra == "all"
 Requires-Dist: docutils~=0.23; extra == "all"
-Requires-Dist: mypy~=2.3; extra == "all"
+Requires-Dist: mypy~=2.4; extra == "all"
 Requires-Dist: pytesseract~=0.3; extra == "all"
 Requires-Dist: rapidocr-onnxruntime~=1.4; extra == "all"
 Requires-Dist: pillow~=12.3; extra == "all"
@@ -95,9 +95,9 @@ Requires-Dist: tree-sitter-sql~=0.3; extra == "all"
 Requires-Dist: tree-sitter-toml~=0.7; extra == "all"
 Requires-Dist: tree-sitter-xml~=0.7; extra == "all"
 Requires-Dist: tree-sitter-yaml~=0.7; extra == "all"
-Requires-Dist: omdev-cext==0.0.59; extra == "all"
-Requires-Dist: omdev-rs==0.0.59; extra == "all"
-Requires-Dist: omdev-cli==0.0.59; extra == "all"
+Requires-Dist: omdev-cext==0.0.60; extra == "all"
+Requires-Dist: omdev-rs==0.0.60; extra == "all"
+Requires-Dist: omdev-cli==0.0.60; extra == "all"
 Dynamic: license-file
 
 # Overview

{omdev-0.0.59 → omdev-0.0.60}/omdev/.om-manifests.json

@@ -235,7 +235,7 @@
     "module": ".py.classdot",
     "attr": "_CLI_MODULE",
     "file": "omdev/py/classdot.py",
-    "line": 63,
+    "line": 64,
     "value": {
       "!.cli.types.CliModule": {
         "name": "py/classdot",

{omdev-0.0.59 → omdev-0.0.60}/omdev/__about__.py

@@ -37,7 +37,7 @@ class Project(ProjectBase):
         ],
 
         'mypy': [
-            'mypy ~= 2.3',
+            'mypy ~= 2.4',
         ],
 
         'ocr': [

{omdev-0.0.59 → omdev-0.0.60}/omdev/cli/install.py

@@ -27,6 +27,7 @@ class InstallOpts:
     cli_ver: ta.Optional[str] = None
 
     py_ver: str = DEFAULT_PY_VER
+    py_ft: bool = False
 
     extras: ta.Sequence[str] = dc.field(default_factory=list)
 
@@ -83,7 +84,7 @@ class UvxInstallManager(InstallManager):
             'uv', 'tool',
             'install',
             '--refresh',
-            f'--python={opts.py_ver}+gil',
+            f'--python={opts.py_ver}+{"freethreaded" if opts.py_ft else "gil"}',
             _format_install_cli_pkg(opts),
             *itertools.chain.from_iterable(['--with', e] for e in (opts.extras or [])),
         ])
@@ -122,7 +123,7 @@ class PipxInstallManager(InstallManager):
         subprocess.check_call([
             'pipx',
             'install',
-            f'--python={opts.py_ver}',
+            f'--python={opts.py_ver}{"t" if opts.py_ft else ""}',
             _format_install_cli_pkg(opts),
             *itertools.chain.from_iterable(['--preinstall', e] for e in (opts.extras or [])),
         ])
@@ -152,6 +153,7 @@ def _main() -> None:
     parser.add_argument('-c', '--cli', default=DEFAULT_CLI_PKG)
     parser.add_argument('-V', '--version')
     parser.add_argument('-p', '--python', default=DEFAULT_PY_VER)
+    parser.add_argument('--ft', action='store_true')
     parser.add_argument('-m', '--manager')
     parser.add_argument('extra', nargs='*')
     args = parser.parse_args()
@@ -184,6 +186,7 @@ def _main() -> None:
         cli_pkg=cli,
         cli_ver=args.version,
         py_ver=py,
+        py_ft=bool(args.ft),
         extras=args.extra,
     ))
 

{omdev-0.0.59 → omdev-0.0.60}/omdev/dockerdev/config.toml

@@ -1,5 +1,5 @@
 base_image = 'ubuntu:24.04'
-base_image_id = 'sha256:008173c23f95b170204355c12626cb5a965d779a7e1283b09e9cffbb1bf33ca3'
+base_image_id = 'sha256:a853f94d226358a79c740cfc7bce0c289748f3fe3488d921d038ccd752c61b60'
 
 user = 'om'
 

omdev-0.0.60/omdev/dockerdev/resources/.python-versions.json

@@ -0,0 +1,19 @@
+{
+  "8": "3.8.20",
+  "9": "3.9.25",
+  "10": "3.10.22",
+  "11": "3.11.17",
+  "12": "3.12.15",
+  "13": "3.13.16",
+  "13d": "3.13.16d",
+  "13t": "3.13.16t",
+  "13dt": "3.13.16dt",
+  "14": "3.14.8",
+  "14d": "3.14.8d",
+  "14t": "3.14.8t",
+  "14dt": "3.14.8dt",
+  "15": "3.15.0rc3",
+  "15d": "3.15.0rc3d",
+  "15t": "3.15.0rc3t",
+  "15dt": "3.15.0rc3dt"
+}

omdev-0.0.60/omdev/dockerdev/resources/scripts/run-s3mock

@@ -0,0 +1,37 @@
+#!/bin/bash
+set -euo pipefail
+set -x
+
+S3MOCK_VERSION="${S3MOCK_VERSION:-5.2.3}"
+
+CACHE_DIR="${S3MOCK_CACHE_DIR:-$HOME/.cache/omdev/s3mock}"
+JAR="$CACHE_DIR/s3mock-$S3MOCK_VERSION-exec.jar"
+
+URL="https://repo.maven.apache.org/maven2/com/adobe/testing/s3mock/$S3MOCK_VERSION/s3mock-$S3MOCK_VERSION-exec.jar"
+
+mkdir -p "$CACHE_DIR"
+
+# Serialize first-time setup in case multiple agents race to start it.
+exec 9>"$CACHE_DIR/.lock"
+flock 9
+
+if ! test -s "$JAR"; then
+    TMP="$JAR.tmp.$$"
+    trap 'rm -f "$TMP"' EXIT
+
+    curl \
+        --fail \
+        --location \
+        --retry 3 \
+        --retry-all-errors \
+        --output "$TMP" \
+        "$URL"
+
+    mv "$TMP" "$JAR"
+    trap - EXIT
+fi
+
+flock -u 9
+exec 9>&-
+
+exec java -jar "$JAR" "$@"

{omdev-0.0.59 → omdev-0.0.60}/omdev/interp/pyenv/provider.py

@@ -125,7 +125,7 @@ class PyenvInterpProvider(InterpProvider):
         lst = await self._get_installable_versions(spec)
 
         if self._options.try_update and not any(v in spec for v in lst):
-            if self._pyenv.update():
+            if await self._pyenv.update():
                 lst = await self._get_installable_versions(spec)
 
         return lst

{omdev-0.0.59 → omdev-0.0.60}/omdev/js/quickjs/_quickjs/quickjs-libc.c

@@ -2853,7 +2853,7 @@ static int js_os_poll_internal(JSContext *ctx, int timeout_ms, int flags)
 {
     JSRuntime *rt = JS_GetRuntime(ctx);
     JSThreadState *ts = js_get_thread_state(rt);
-    int r, w, ret, nfds, min_delay;
+    int r, w, ret, nfds, min_delay, poll_nfds;
     JSOSRWHandler *rh;
     struct list_head *el;
     struct pollfd *pfd, *pfds, pfds_local[64];
@@ -2947,12 +2947,14 @@ static int js_os_poll_internal(JSContext *ctx, int timeout_ms, int flags)
     // linear-ish in practice because we bail out on the first hit,
     // i.e., it's probably good enough for now
     ret = 0;
+    /* poll() returns the number of ready descriptors, not the array length. */
+    poll_nfds = nfds;
     nfds = poll(pfds, nfds, min_delay);
     if (nfds < 0) {
         ret = -1;
         goto done;
     }
-    for (pfd = pfds; nfds-- > 0; pfd++) {
+    for (pfd = pfds; poll_nfds-- > 0; pfd++) {
         rh = find_rh(ts, pfd->fd);
         if (rh) {
             r = (POLLERR|POLLHUP|POLLNVAL|POLLIN) * !JS_IsNull(rh->rw_func[0]);

{omdev-0.0.59 → omdev-0.0.60}/omdev/js/quickjs/_quickjs/quickjs.c

@@ -2858,6 +2858,7 @@ JSContext *JS_NewContextRaw(JSRuntime *rt)
     ctx->class_proto = js_malloc_rt(rt, sizeof(ctx->class_proto[0]) *
                                     rt->class_count);
     if (!ctx->class_proto) {
+        remove_gc_object(&ctx->header);
         js_free_rt(rt, ctx);
         return NULL;
     }
@@ -42585,8 +42586,16 @@ static JSValue js_function_bind(JSContext *ctx, JSValueConst this_val,
     if (check_function(ctx, this_val))
         return JS_EXCEPTION;
 
-    func_obj = JS_NewObjectProtoClass(ctx, ctx->function_proto,
+    JSValue prototype = JS_GetPrototype(ctx, this_val);
+
+    if (JS_IsException(prototype))
+        return JS_EXCEPTION;
+    
+    func_obj = JS_NewObjectProtoClass(ctx, prototype,
                                  JS_CLASS_BOUND_FUNCTION);
+    
+    JS_FreeValue(ctx, prototype);
+
     if (JS_IsException(func_obj))
         return JS_EXCEPTION;
     p = JS_VALUE_GET_OBJ(func_obj);
@@ -48089,27 +48098,35 @@ static JSValue js_string_repeat(JSContext *ctx, JSValueConst this_val,
     JSValue str;
     StringBuffer b_s, *b = &b_s;
     JSString *p;
-    int64_t val;
+    double val;
     int n, len;
 
     str = JS_ToStringCheckObject(ctx, this_val);
     if (JS_IsException(str))
         goto fail;
-    if (JS_ToInt64Sat(ctx, &val, argv[0]))
+    if (JS_ToFloat64(ctx, &val, argv[0]))
         goto fail;
-    if (val < 0 || val > 2147483647) {
+    // ToIntegerOrInfinity: NaN maps to zero, everything else truncates
+    if (isnan(val))
+        val = 0;
+    else
+        val = trunc(val);
+    // only a negative or infinite count is out of range; a large finite
+    // count is not, it merely risks exceeding the maximum string length
+    if (val < 0 || val == INFINITY) {
         JS_ThrowRangeError(ctx, "invalid repeat count");
         goto fail;
     }
-    n = val;
     p = JS_VALUE_GET_STRING(str);
     len = p->len;
-    if (len == 0 || n == 1)
+    // any number of copies of the empty string is the empty string
+    if (len == 0 || val == 1)
         return str;
     if (val * len > JS_STRING_LEN_MAX) {
-        JS_ThrowRangeError(ctx, "invalid string length");
+        JS_ThrowRangeError(ctx, "string too long");
         goto fail;
     }
+    n = val;
     if (string_buffer_init2(ctx, b, n * len, p->is_wide_char))
         goto fail;
     if (len == 1) {
@@ -63001,7 +63018,8 @@ int JS_AddIntrinsicTypedArrays(JSContext *ctx)
 
 static double js__now_ms(void)
 {
-    return js__hrtime_ns() / 1e6;
+    uint64_t ns = js__hrtime_ns();
+    return (double)(ns / 1000000) + (double)(ns % 1000000) / 1e6;
 }
 
 static JSValue js_perf_now(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)

{omdev-0.0.59 → omdev-0.0.60}/omdev/js/quickjs/_quickjs/quickjs.h

@@ -315,7 +315,10 @@ static inline bool JS_VALUE_IS_NAN(JSValue v)
 #else /* !JS_NAN_BOXING */
 
 typedef union JSValueUnion {
-    int32_t int32;
+    /* JS_MKVAL() writes all 64 bits even though only 32 are needed:
+       leaving the upper half uninitialized makes GCC 14+ generate much
+       slower code on x86-64 */
+    uint64_t uint64;
     double float64;
     void *ptr;
     int32_t short_big_int;
@@ -329,10 +332,10 @@ typedef struct JSValue {
 #define JS_VALUE_GET_TAG(v) ((int32_t)(v).tag)
 /* same as JS_VALUE_GET_TAG, but return JS_TAG_FLOAT64 with NaN boxing */
 #define JS_VALUE_GET_NORM_TAG(v) JS_VALUE_GET_TAG(v)
-#define JS_VALUE_GET_INT(v) ((v).u.int32)
-#define JS_VALUE_GET_BOOL(v) ((v).u.int32)
+#define JS_VALUE_GET_INT(v) ((int)(v).u.uint64)
+#define JS_VALUE_GET_BOOL(v) ((int)(v).u.uint64)
 #define JS_VALUE_GET_FLOAT64(v) ((v).u.float64)
-#define JS_VALUE_GET_SHORT_BIG_INT(v) ((v).u.short_big_int)
+#define JS_VALUE_GET_SHORT_BIG_INT(v) ((int32_t)(v).u.uint64)
 #define JS_VALUE_GET_PTR(v) ((v).u.ptr)
 
 /* msvc doesn't understand designated initializers without /std:c++20 */
@@ -347,7 +350,7 @@ static inline JSValue JS_MKPTR(int64_t tag, void *ptr)
 static inline JSValue JS_MKVAL(int64_t tag, int32_t int32)
 {
     JSValue v;
-    v.u.int32 = int32;
+    v.u.uint64 = (uint32_t)int32;
     v.tag = tag;
     return v;
 }
@@ -364,7 +367,7 @@ static inline JSValue JS_MKNAN(void)
 #define JS_NAN             JS_MKNAN() /* alas, not a constant expression */
 #else
 #define JS_MKPTR(tag, p)   (JSValue){ (JSValueUnion){ .ptr = p }, tag }
-#define JS_MKVAL(tag, val) (JSValue){ (JSValueUnion){ .int32 = val }, tag }
+#define JS_MKVAL(tag, val) (JSValue){ (JSValueUnion){ .uint64 = (uint32_t)(val) }, tag }
 #define JS_NAN             (JSValue){ (JSValueUnion){ .float64 = NAN }, JS_TAG_FLOAT64 }
 #endif
 

{omdev-0.0.59 → omdev-0.0.60}/omdev/py/classdot.py

@@ -27,6 +27,7 @@ def gen_class_dot(roots: ta.Iterable[type]) -> dot.Graph:
         for base in cur.__bases__:
             if issubclass(base, root_tup):
                 stmts.append(dot.Edge(str(id(base)), str(id(cur))))
+        sub: ta.Any
         for sub in cur.__subclasses__():
             if issubclass(sub, root_tup):
                 if sub not in seen:

{omdev-0.0.59 → omdev-0.0.60}/omdev/pyproject/pkg.py

@@ -880,12 +880,27 @@ class _PyprojectMypycPackageGenerator(_PyprojectExtensionPackageGenerator):
                 for ext_inc in ext_cfg.include or []:
                     pkg_incs.add(importlib.util.resolve_name(ext_inc, ext_name))
 
+            def is_empty_init_py(fp: str) -> bool:
+                if os.path.basename(fp) != '__init__.py':
+                    return False
+                with open(fp) as f:
+                    src = f.read()
+                lines = [
+                    l
+                    for l in src.splitlines()
+                    if (s := l.strip()) and
+                    not s.startswith('#')
+                ]
+                return not bool(lines)
+
             ext_files = [
                 fp
                 for fn in sorted(os.listdir(ext_dir))
                 if os.path.isfile(fp := os.path.join(ext_dir, fn)) and
-                fp.endswith('.py')
+                fp.endswith('.py') and
+                not is_empty_init_py(fp)
             ]
+
             ext_lines.extend([
                 '[',
                 *[