omdev 0.0.59__tar.gz → 0.0.61__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.59
+Version: 0.0.61
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,20 +14,20 @@ 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.61
 Provides-Extra: ominfra
-Requires-Dist: ominfra==0.0.59; extra == "ominfra"
+Requires-Dist: ominfra==0.0.61; extra == "ominfra"
 Provides-Extra: omllm
-Requires-Dist: omllm==0.0.59; extra == "omllm"
+Requires-Dist: omllm==0.0.61; extra == "omllm"
 Provides-Extra: black
-Requires-Dist: black~=26.5; extra == "black"
+Requires-Dist: black~=26.10; extra == "black"
 Provides-Extra: c
 Requires-Dist: pycparser~=3.0; extra == "c"
 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.61; extra == "cext"
 Provides-Extra: rs
-Requires-Dist: omdev-rs==0.0.59; extra == "rs"
+Requires-Dist: omdev-rs==0.0.61; extra == "rs"
 Provides-Extra: cli
-Requires-Dist: omdev-cli==0.0.59; extra == "cli"
+Requires-Dist: omdev-cli==0.0.61; extra == "cli"
 Provides-Extra: all
-Requires-Dist: ominfra==0.0.59; extra == "all"
-Requires-Dist: omllm==0.0.59; extra == "all"
-Requires-Dist: black~=26.5; extra == "all"
+Requires-Dist: ominfra==0.0.61; extra == "all"
+Requires-Dist: omllm==0.0.61; extra == "all"
+Requires-Dist: black~=26.10; 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.61; extra == "all"
+Requires-Dist: omdev-rs==0.0.61; extra == "all"
+Requires-Dist: omdev-cli==0.0.61; extra == "all"
 Dynamic: license-file
 
 # Overview

{omdev-0.0.59 → omdev-0.0.61}/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.61}/omdev/__about__.py

@@ -23,7 +23,7 @@ class Project(ProjectBase):
         #
 
         'black': [
-            'black ~= 26.5',
+            'black ~= 26.10',
         ],
 
         'c': [
@@ -37,7 +37,7 @@ class Project(ProjectBase):
         ],
 
         'mypy': [
-            'mypy ~= 2.3',
+            'mypy ~= 2.4',
         ],
 
         'ocr': [

{omdev-0.0.59 → omdev-0.0.61}/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.61}/omdev/dockerdev/config.py

@@ -26,6 +26,8 @@ class Config:
 
     dep_sets: ta.Sequence[str] | None = None
 
+    cuda_version: str | None = None
+
     jdks: ta.Sequence[str] | None = None
 
     nvm_versions: ta.Sequence[str] | None = None

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

@@ -1,5 +1,5 @@
 base_image = 'ubuntu:24.04'
-base_image_id = 'sha256:008173c23f95b170204355c12626cb5a965d779a7e1283b09e9cffbb1bf33ca3'
+base_image_id = 'sha256:534baea6a22c03a63003dbc8dbe78fe34bc0d7e595d9a9dc9834884ff530eb55'
 
 user = 'om'
 
@@ -9,6 +9,8 @@ dep_sets = [
     'x11',
 ]
 
+cuda_version = '13.4'
+
 jdks = [
     'zulu21-ca-jdk',
     'zulu25-ca-jdk',

{omdev-0.0.59 → omdev-0.0.61}/omdev/dockerdev/gen.py

@@ -89,6 +89,13 @@ def gen_ops(cfg: Config) -> ta.Sequence[Op]:
         cache_mounts=APT_CACHE_MOUNTS,
     ))
 
+    if cfg.cuda_version is not None:
+        ops.append(fragment_section(
+            'cuda',
+            static_env={'CUDA_VERSION': cfg.cuda_version},
+            cache_mounts=APT_CACHE_MOUNTS,
+        ))
+
     ops.append(fragment_section(
         'cmake',
         cache_mounts=APT_CACHE_MOUNTS,
@@ -105,6 +112,8 @@ def gen_ops(cfg: Config) -> ta.Sequence[Op]:
         cache_mounts=APT_CACHE_MOUNTS,
     ))
 
+    ops.append(fragment_section('deadsnakes'))
+
     ##
     # langs
 

omdev-0.0.61/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.59 → omdev-0.0.61}/omdev/dockerdev/resources/depsets/system.toml

@@ -75,6 +75,7 @@ deps = [
 
   # sandboxing
   'bubblewrap',
+  'runsc',
 
   # data formats
   'libxml2-dev',

omdev-0.0.61/omdev/dockerdev/resources/fragments/cuda.sh

@@ -0,0 +1,22 @@
+case "$(dpkg --print-architecture)" in \
+    amd64) CUDA_REPO_ARCH=x86_64 ;; \
+    arm64) CUDA_REPO_ARCH=sbsa ;; \
+    *) echo "Unsupported CUDA architecture: $(dpkg --print-architecture)" >&2 ; exit 1 ;; \
+esac ;
+
+curl -fsSLo /tmp/cuda-keyring.deb \
+    "https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2404/${CUDA_REPO_ARCH}/cuda-keyring_1.1-1_all.deb" ;
+sudo dpkg -i /tmp/cuda-keyring.deb ;
+rm /tmp/cuda-keyring.deb ;
+
+sudo apt-get update ;
+sudo apt-get install -y --no-install-recommends \
+    "cuda-toolkit-$(echo ${CUDA_VERSION} | tr . -)" \
+;
+
+echo '\n
+export CUDA_HOME="/usr/local/cuda"\n
+export PATH="$CUDA_HOME/bin:$PATH"\n
+export LD_LIBRARY_PATH="/usr/local/nvidia/lib:/usr/local/nvidia/lib64:$CUDA_HOME/lib64${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"\n
+export LIBRARY_PATH="$CUDA_HOME/lib64/stubs${LIBRARY_PATH:+:$LIBRARY_PATH}"\n
+' >> ~/.bashrc ;

omdev-0.0.61/omdev/dockerdev/resources/fragments/deadsnakes.sh

@@ -0,0 +1,2 @@
+sudo add-apt-repository ppa:deadsnakes/ppa &&
+sudo apt update ;

{omdev-0.0.59 → omdev-0.0.61}/omdev/dockerdev/resources/fragments/om.sh

@@ -1,4 +1,6 @@
 curl -LsSf 'https://raw.githubusercontent.com/wrmsr/om/master/omdev/cli/install.py' | bash --login -c 'python3 - $@' - \
+  --ft \
+  \
   'omcore[cext,mypyc,plus]' \
   'omdev[cext]' \
   'ominfra' \
@@ -6,3 +8,10 @@ curl -LsSf 'https://raw.githubusercontent.com/wrmsr/om/master/omdev/cli/install.
   \
   'pip' \
 ;
+
+bash --login -c 'om $@' - cli python -m omdev.imports.pycz \
+  omcore \
+  omdev \
+  ominfra \
+  omllm \
+;

omdev-0.0.61/omdev/dockerdev/resources/scripts/run-elasticsearch

@@ -0,0 +1,95 @@
+#!/bin/bash
+set -euo pipefail
+
+set -x
+
+ELASTICSEARCH_VERSION="${ELASTICSEARCH_VERSION:-8.19.22}"
+
+CACHE_DIR="${ELASTICSEARCH_CACHE_DIR:-$HOME/.cache/omdev/elasticsearch}"
+
+case "$(uname -m)" in
+    x86_64|amd64)
+        ARCH=x86_64
+        ;;
+    aarch64|arm64)
+        ARCH=aarch64
+        ;;
+    *)
+        echo "Unsupported architecture: $(uname -m)" >&2
+        exit 1
+        ;;
+esac
+
+NAME="elasticsearch-$ELASTICSEARCH_VERSION-linux-$ARCH"
+ARCHIVE="$CACHE_DIR/$NAME.tar.gz"
+DIST_DIR="$CACHE_DIR/$NAME"
+
+URL="https://artifacts.elastic.co/downloads/elasticsearch/$NAME.tar.gz"
+
+STATE_DIR="${ELASTICSEARCH_STATE_DIR:-$CACHE_DIR/state-$ELASTICSEARCH_VERSION}"
+DATA_DIR="${ELASTICSEARCH_DATA_DIR:-$STATE_DIR/data}"
+LOGS_DIR="${ELASTICSEARCH_LOGS_DIR:-$STATE_DIR/logs}"
+
+mkdir -p "$CACHE_DIR" "$DATA_DIR" "$LOGS_DIR"
+
+# Serialize first-time setup in case multiple agents race to start it.
+exec 9>"$CACHE_DIR/.lock"
+flock 9
+
+if ! test -s "$ARCHIVE"; then
+    TMP="$ARCHIVE.tmp.$$"
+    trap 'rm -f "$TMP"' EXIT
+
+    curl \
+        --fail \
+        --location \
+        --retry 3 \
+        --retry-all-errors \
+        --output "$TMP" \
+        "$URL"
+
+    EXPECTED_SHA512="$(
+        curl \
+            --fail \
+            --location \
+            --retry 3 \
+            --retry-all-errors \
+            "$URL.sha512" |
+        awk '{print $1}'
+    )"
+
+    ACTUAL_SHA512="$(sha512sum "$TMP" | awk '{print $1}')"
+
+    test "$ACTUAL_SHA512" = "$EXPECTED_SHA512"
+
+    mv "$TMP" "$ARCHIVE"
+    trap - EXIT
+fi
+
+if ! test -x "$DIST_DIR/bin/elasticsearch"; then
+    TMP="$DIST_DIR.tmp.$$"
+    trap 'rm -rf "$TMP"' EXIT
+
+    rm -rf "$TMP"
+    mkdir "$TMP"
+
+    tar \
+        -xzf "$ARCHIVE" \
+        -C "$TMP" \
+        --strip-components=1
+
+    mv "$TMP" "$DIST_DIR"
+    trap - EXIT
+fi
+
+flock -u 9
+exec 9>&-
+
+export ES_JAVA_OPTS="${ES_JAVA_OPTS:--Xms750m -Xmx750m}"
+
+exec "$DIST_DIR/bin/elasticsearch" \
+    -Ediscovery.type=single-node \
+    -Expack.security.enabled=false \
+    -Epath.data="$DATA_DIR" \
+    -Epath.logs="$LOGS_DIR" \
+    "$@"

omdev-0.0.61/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.61}/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.61}/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.61}/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.61}/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.61}/omdev/manifests/building.py

@@ -32,6 +32,7 @@ import re
 import shlex
 import subprocess
 import sys
+import tempfile
 import time
 import typing as ta
 
@@ -130,14 +131,17 @@ class ManifestBuilder:
             *,
             subprocess_kwargs: ta.Mapping[str, ta.Any] | None = None,
             module_dumper_payload_src: str | None = None,
+            profile: bool = False,
     ) -> None:
         super().__init__()
 
         self._base_dir = base_dir
         self._subprocess_kwargs = subprocess_kwargs
         self._module_dumper_payload_src = module_dumper_payload_src
+        self._profile = profile
 
         self._sem = asyncio.Semaphore(concurrency)
+        self._num_dumped = 0
 
     #
 
@@ -236,7 +240,7 @@ class ManifestBuilder:
                 )
 
                 origins.append(origin)
-                targets.append({
+                targets.append({  # noqa
                     'origin': dc.asdict(origin),  # noqa
                     'kind': 'inline',
                     'cls_mod_name': cls_mod_name,
@@ -257,7 +261,7 @@ class ManifestBuilder:
                 )
 
                 origins.append(origin)
-                targets.append({
+                targets.append({  # noqa
                     'origin': dc.asdict(origin),  # noqa
                     'kind': 'attr',
                     'attr': attr_name,
@@ -280,18 +284,37 @@ class ManifestBuilder:
             *,
             shell_wrap: bool = True,
             warn_threshold_s: float | None = 1.,
-    ):
+    ) -> ta.Any:
+        n = self._num_dumped  # noqa
+        self._num_dumped += 1
+
         dumper_payload_src: str
         if self._module_dumper_payload_src is not None:
             dumper_payload_src = self._module_dumper_payload_src
         else:
             dumper_payload_src = _module_manifest_dumper_payload_src()
 
+        runner_src = f'_ModuleManifestDumper({fm.mod_name!r})({", ".join(repr(tgt) for tgt in targets)})'
+
         subproc_src = '\n\n'.join([
             dumper_payload_src,
-            f'_ModuleManifestDumper({fm.mod_name!r})({", ".join(repr(tgt) for tgt in targets)})\n',
+            runner_src,
         ])
 
+        if self._profile:
+            ps_fd, ps_fp = tempfile.mkstemp(suffix='.pstats')
+            os.close(ps_fd)
+
+            subproc_src = '\n'.join([
+                'import cProfile',
+                'with cProfile.Profile() as prof:',
+                *[
+                    f'    {l}'
+                    for l in subproc_src.splitlines()
+                ],
+                f'prof.dump_stats({ps_fp!r})',
+            ])
+
         args = [
             sys.executable,
             '-c',
@@ -315,7 +338,10 @@ class ManifestBuilder:
 
         end_time = time.time()
 
-        if warn_threshold_s is not None and (elapsed_time := (end_time - start_time)) >= warn_threshold_s:
+        elapsed_time = (end_time - start_time)
+        if self._profile:
+            log.info('Manifest extraction for %s took %.2f s, profile written to %s', fm.file, elapsed_time, ps_fp)  # noqa
+        elif warn_threshold_s is not None and elapsed_time >= warn_threshold_s:
             log.warning('Manifest extraction took a long time: %s, %.2f s', fm.file, elapsed_time)
 
         sp_lines = subproc_out.decode().strip().splitlines()

{omdev-0.0.59 → omdev-0.0.61}/omdev/manifests/main.py

@@ -32,6 +32,7 @@ def _gen_cmd(args) -> None:
     builder = ManifestBuilder(
         base_dir,
         jobs,
+        profile=bool(args.profile),
     )
 
     async def do():
@@ -70,6 +71,7 @@ def _main(argv=None) -> None:
     parser_gen.add_argument('-w', '--write', action='store_true')
     parser_gen.add_argument('-q', '--quiet', action='store_true')
     parser_gen.add_argument('-j', '--jobs', type=int)
+    parser_gen.add_argument('--profile', action='store_true')
     parser_gen.add_argument('package', nargs='*')
     parser_gen.set_defaults(func=_gen_cmd)