pynect 0.2.7 → 0.2.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pynect",
-  "version": "0.2.7",
+  "version": "0.2.10",
   "packageManager": "bun@1.4.4",
   "description": "Typed, optionally Pydantic-validated Python calls from Node.js and Bun through embedded CPython.",
   "main": "dist/index.js",
@@ -29,8 +29,7 @@
     "scripts/cli.js",
     "scripts/ensure-native.js",
     "scripts/postinstall.js",
-    "scripts/pyfig.js",
-    "scripts/python-provisioner.js",
+    "scripts/python.js",
     "scripts/smoke-python-boundary.js",
     "binding.gyp",
     "README.md",
@@ -86,7 +85,7 @@
     "node-gyp": "^11.5.0",
     "node-gyp-build": "^4.8.4",
     "pacwich": "^0.7.3",
-    "pyfig": "^0.6.2",
+    "pyfig": "^0.7.0",
     "semver": "^7.8.5"
   },
   "devDependencies": {

package/prebuilds/darwin-arm64/pynect-prebuild.json

@@ -6,5 +6,5 @@
   "pythonAbi": "cp310-abi3",
   "pythonLibraryName": "libpython3.dylib",
   "napi": 8,
-  "nativeFingerprint": "sha256:e375cc859a1ef9a6e8e72f182886c847c2489e9ed5a6017f08d43dd01425bd52"
+  "nativeFingerprint": "sha256:9cfa5f1c9ffc2988456c3560130f8e2a4bc8df0755003cea0645ccc4f13a1d37"
 }

package/prebuilds/darwin-x64/pynect-prebuild.json

@@ -6,5 +6,5 @@
   "pythonAbi": "cp310-abi3",
   "pythonLibraryName": "libpython3.dylib",
   "napi": 8,
-  "nativeFingerprint": "sha256:e375cc859a1ef9a6e8e72f182886c847c2489e9ed5a6017f08d43dd01425bd52"
+  "nativeFingerprint": "sha256:9cfa5f1c9ffc2988456c3560130f8e2a4bc8df0755003cea0645ccc4f13a1d37"
 }

package/prebuilds/linux-arm64/pynect-prebuild.json

@@ -6,6 +6,6 @@
   "pythonAbi": "cp310-abi3",
   "pythonLibraryName": "libpython3.so",
   "napi": 8,
-  "nativeFingerprint": "sha256:e375cc859a1ef9a6e8e72f182886c847c2489e9ed5a6017f08d43dd01425bd52",
+  "nativeFingerprint": "sha256:9cfa5f1c9ffc2988456c3560130f8e2a4bc8df0755003cea0645ccc4f13a1d37",
   "glibc": "2.39"
 }

package/prebuilds/linux-x64/pynect-prebuild.json

@@ -6,6 +6,6 @@
   "pythonAbi": "cp310-abi3",
   "pythonLibraryName": "libpython3.so",
   "napi": 8,
-  "nativeFingerprint": "sha256:e375cc859a1ef9a6e8e72f182886c847c2489e9ed5a6017f08d43dd01425bd52",
+  "nativeFingerprint": "sha256:9cfa5f1c9ffc2988456c3560130f8e2a4bc8df0755003cea0645ccc4f13a1d37",
   "glibc": "2.35"
 }

package/prebuilds/win32-arm64/pynect-prebuild.json

@@ -6,5 +6,5 @@
   "pythonAbi": "cp310-abi3",
   "pythonLibraryName": "python3.dll",
   "napi": 8,
-  "nativeFingerprint": "sha256:e375cc859a1ef9a6e8e72f182886c847c2489e9ed5a6017f08d43dd01425bd52"
+  "nativeFingerprint": "sha256:9cfa5f1c9ffc2988456c3560130f8e2a4bc8df0755003cea0645ccc4f13a1d37"
 }

package/prebuilds/win32-x64/pynect-prebuild.json

@@ -6,5 +6,5 @@
   "pythonAbi": "cp310-abi3",
   "pythonLibraryName": "python3.dll",
   "napi": 8,
-  "nativeFingerprint": "sha256:e375cc859a1ef9a6e8e72f182886c847c2489e9ed5a6017f08d43dd01425bd52"
+  "nativeFingerprint": "sha256:9cfa5f1c9ffc2988456c3560130f8e2a4bc8df0755003cea0645ccc4f13a1d37"
 }

package/python/pynect_runtime.py

@@ -433,7 +433,7 @@ def _make_error(exc_type: str, message: str, tb: str) -> Dict[str, Any]:
 # Diagnostic helpers
 
 def get_python_info() -> Dict[str, Any]:
-    """Return basic Python interpreter information (used by PythonDetector)."""
+    """Return basic information about the embedded Python interpreter."""
     import platform
     return {
         "version":      sys.version,

package/python/type_inspector.py

@@ -11,6 +11,7 @@ Returns a JSON-serializable dict matching RawModuleInspection in TypeGenerator.t
 from __future__ import annotations
 
 import inspect
+import collections.abc
 import json
 import importlib
 import sys
@@ -40,6 +41,9 @@ def _get_annotation(annotation: Any) -> str:
         return 'None'
     if isinstance(annotation, str):
         return annotation
+    origin = getattr(annotation, '__origin__', None)
+    if origin is collections.abc.Callable:
+        return _stringify_generic(annotation)
     if hasattr(annotation, '__name__'):
         return annotation.__name__
     if hasattr(annotation, '__origin__'):
@@ -63,6 +67,14 @@ def _stringify_generic(tp: Any) -> str:
         parts = [_get_annotation(a) for a in args]
         return f"Union[{', '.join(parts)}]"
 
+    if origin is collections.abc.Callable:
+        if len(args) == 2 and args[0] is Ellipsis:
+            return f"Callable[..., {_get_annotation(args[1])}]"
+        if args:
+            parameters = ', '.join(_get_annotation(a) for a in args[:-1])
+            return f"Callable[[{parameters}], {_get_annotation(args[-1])}]"
+        return 'Callable'
+
     # typing.Optional[X]  is Union[X, None]
     if len(args) == 2 and type(None) in args:
         non_none = [a for a in args if a is not type(None)][0]

package/scripts/build-native.js

@@ -3,16 +3,17 @@
 const fs = require('fs');
 const path = require('path');
 const { spawnSync } = require('child_process');
-const { ensurePynectPython } = require('./pyfig');
+const { preparePython } = require('./python');
 
 const ROOT = path.resolve(__dirname, '..');
 
 async function main() {
   const projectRoot = process.env.PYNECT_PROJECT_ROOT || process.env.INIT_CWD || ROOT;
-  const { python } = await ensurePynectPython({
+  const { environment } = await preparePython({
     projectRoot,
-    pythonPath: process.env.PYNECT_PYTHON,
+    python: process.env.PYNECT_PYTHON,
   });
+  const { python } = environment;
   const embedding = python.embedding;
   const stableAbiLibrary = process.platform === 'win32'
     ? embedding.stableAbiLibraryPath || path.join(embedding.libraryDirectory, 'python3.lib')

package/scripts/postinstall.js

@@ -29,8 +29,8 @@ async function main() {
 
   const result = await syncProject({ projectRoot });
   console.log(
-    `[pynect] Synchronized ${result.plan.requirements.length} Python requirement(s) ` +
-    `with uv in ${path.dirname(result.plan.stateFile)}.`,
+    `[pynect] Prepared ${result.plan.dependencies.length} Python dependency constraint(s) ` +
+    `with Pyfig in ${result.environment.python.virtualEnvironment}.`,
   );
 }
 

package/scripts/python.js

@@ -0,0 +1,33 @@
+'use strict';
+
+const path = require('path');
+const { Python, resolveProjectRoot } = require('pyfig');
+
+function projectRoot(explicit) {
+  const hint = explicit || process.env.PYNECT_PROJECT_ROOT || process.env.INIT_CWD;
+  return hint ? path.resolve(hint) : resolveProjectRoot(process.cwd());
+}
+
+function createPython(options = {}) {
+  return new Python({
+    ...options,
+    projectRoot: projectRoot(options.projectRoot),
+    requireEmbedding: true,
+    requireGil: true,
+    env: options.env ? { ...process.env, ...options.env } : process.env,
+  });
+}
+
+async function preparePython(options = {}) {
+  const runtime = createPython(options);
+  const environment = await runtime.prepare();
+  if (!environment.python.embedding) {
+    throw new Error(
+      `Python ${environment.python.version} at ${environment.python.executable} is missing ` +
+      'Python.h or its CPython embedding library.',
+    );
+  }
+  return { runtime, environment };
+}
+
+module.exports = { createPython, preparePython, projectRoot };

package/scripts/smoke-python-boundary.js

@@ -1,48 +1,56 @@
 'use strict';
 
+process.env.PYNECT_PREFER_LOCAL ??= '1';
+
 const path = require('path');
-const { ensurePynectEnvironment } = require('./pyfig');
+const { preparePython } = require('./python');
 
 const ROOT = path.resolve(__dirname, '..');
 
 async function main() {
-  const { client, environment } = await ensurePynectEnvironment({ projectRoot: ROOT });
+  const { runtime, environment } = await preparePython({ projectRoot: ROOT });
   const { python } = environment;
   const expected = normalize(python.executable);
   const pynect = require('../dist');
 
-  const detector = new pynect.PythonDetector({ projectRoot: ROOT });
-  const detected = await detector.detect();
-  assertSamePython(detected.executable, expected, 'PythonDetector');
-  const probed = detector.probe(detected.executable);
-  if (!probed) throw new Error('PythonDetector could not probe the selected repository Python.');
-  assertSamePython(probed.executable, expected, 'PythonDetector.probe');
-
-  const selected = client.pythonSync(
-    ['-c', 'import sys; print(sys.executable)'],
+  const selected = runtime.uvSync(
+    ['run', '--', 'python', '-c', 'import sys; print(sys.executable)'],
     { encoding: 'utf8' },
   );
-  assertSuccess(selected, 'PyfigClient.pythonSync');
-  assertSamePython(selected.stdout.trim(), expected, 'PyfigClient.pythonSync');
-
-  const pip = client.pipSync(['list', '--format', 'json'], { encoding: 'utf8' });
-  assertSuccess(pip, 'PyfigClient.pipSync');
+  assertSuccess(selected, 'Pyfig Python uvSync run');
+  assertSamePython(selected.stdout.trim(), expected, 'Pyfig Python uvSync run');
 
-  const uvPip = client.uvSync(
+  const uvPip = runtime.uvSync(
     ['pip', 'list', '--format', 'json'],
     { encoding: 'utf8' },
   );
   assertSuccess(uvPip, 'PyfigClient.uvSync pip');
 
-  const inspector = client.pythonSync(
-    [path.join(ROOT, 'python', 'type_inspector.py'), 'json'],
+  const inspector = runtime.uvSync(
+    ['run', '--', 'python', path.join(ROOT, 'python', 'type_inspector.py'), 'json'],
     { encoding: 'utf8' },
   );
   assertSuccess(inspector, 'codegen inspector');
   JSON.parse(inspector.stdout);
+  const callbackInspection = runtime.uvSync(
+    ['run', '--', 'python', path.join(ROOT, 'python', 'type_inspector.py'), 'pynect_callback_fixture'],
+    {
+      encoding: 'utf8',
+      env: {
+        ...process.env,
+        PYTHONPATH: path.join(ROOT, 'tests', 'fixtures'),
+      },
+    },
+  );
+  assertSuccess(callbackInspection, 'callback type inspector');
+  const inspectedCallback = JSON.parse(callbackInspection.stdout).functions
+    .find(item => item.name === 'invoke')?.parameters?.[0]?.type;
+  if (inspectedCallback !== 'Callable[[Any], Any]') {
+    throw new Error(`Callback annotation was inspected as ${String(inspectedCallback)}.`);
+  }
 
-  const worker = client.pythonSync(
-    [path.join(ROOT, 'python', 'isolated_worker.py')],
+  const worker = runtime.uvSync(
+    ['run', '--', 'python', path.join(ROOT, 'python', 'isolated_worker.py')],
     {
       encoding: 'utf8',
       input: `${JSON.stringify({
@@ -69,10 +77,43 @@ async function main() {
     projectRoot: ROOT,
     allowUnsafeCode: true,
     logLevel: 'error',
+    pythonModulePaths: [path.join(ROOT, 'tests', 'fixtures')],
+    threadPool: { size: 1 },
+    callbacks: { maxDepth: 2 },
   });
   try {
     const embedded = await pynect.py.eval('__import__("sys").executable');
     assertSamePython(embedded, expected, 'embedded CPython');
+    const fixture = await pynect.importModule('pynect_callback_fixture');
+    const asyncCallback = async value => {
+      await Promise.resolve();
+      return value * 3;
+    };
+    if (await fixture.invoke(asyncCallback, 4) !== 12) {
+      throw new Error('Async JavaScript callback returned the wrong value.');
+    }
+    await fixture.retain(asyncCallback);
+    await assertRejects(
+      () => fixture.invoke_retained(4),
+      /callback.*(?:disposed|registered)|(?:disposed|registered).*callback/i,
+      'settled callback lifetime',
+    );
+
+    const reentrantCallback = async value => fixture.double(value);
+    if (await fixture.invoke(reentrantCallback, 5) !== 10) {
+      throw new Error('Reentrant JavaScript callback returned the wrong value.');
+    }
+
+    let recursiveCallback;
+    recursiveCallback = async depth => {
+      if (depth <= 0) return 0;
+      return fixture.invoke(recursiveCallback, depth - 1);
+    };
+    await assertRejects(
+      () => fixture.invoke(recursiveCallback, 2),
+      /recursion depth 3 exceeds the configured maximum of 2/,
+      'callback recursion limit',
+    );
   } finally {
     await pynect.shutdown();
   }
@@ -80,6 +121,16 @@ async function main() {
   console.log(`Python ${python.version} boundary verified: ${python.executable}`);
 }
 
+async function assertRejects(action, pattern, label) {
+  try {
+    await action();
+  } catch (error) {
+    if (pattern.test(String(error?.message || error))) return;
+    throw new Error(`${label} failed with an unexpected error: ${error?.message || error}`);
+  }
+  throw new Error(`${label} did not reject.`);
+}
+
 function assertSuccess(result, label) {
   if (result.status !== 0 || result.error) {
     throw new Error(`${label} failed: ${String(result.stderr || result.error?.message || result.status)}`);

package/src/native/callback_bridge.h

@@ -0,0 +1,11 @@
+#pragma once
+
+#include <Python.h>
+#include <cstdint>
+
+namespace pynect {
+
+/** Create a Python callable backed by a registered JavaScript callback. */
+PyObject* createPythonCallback(uint32_t callbackId);
+
+} // namespace pynect

package/src/native/native-addon-loader.ts

@@ -18,15 +18,24 @@ export interface NativeAddonBuildOptions {
 export function loadOrBuildNativeAddon(options: NativeAddonBuildOptions): NativeAddon {
   let initialError: unknown = new Error('Native rebuild explicitly requested.');
   if (process.env['PYNECT_FORCE_BUILD'] !== '1') {
+    if (process.env['PYNECT_PREFER_LOCAL'] === '1') {
+      try {
+        return loadMatchingLocalAddon(options);
+      } catch (error) {
+        initialError = error;
+      }
+    }
     try {
       return loadMatchingPrebuild(options);
     } catch (error) {
       initialError = error;
     }
-    try {
-      return loadMatchingLocalAddon(options);
-    } catch (error) {
-      initialError = new AggregateError([initialError, error], 'No compatible native addon loaded.');
+    if (process.env['PYNECT_PREFER_LOCAL'] !== '1') {
+      try {
+        return loadMatchingLocalAddon(options);
+      } catch (error) {
+        initialError = new AggregateError([initialError, error], 'No compatible native addon loaded.');
+      }
     }
   }