@adhd/apigen-python-env 0.2.3 → 0.2.5

package/CHANGELOG.md

@@ -1,3 +1,19 @@
+## 0.2.5 (2026-09-24)
+
+This was a version bump only for apigen-python-env to align it with other projects, there were no code changes.
+
+## 0.2.4 (2026-08-08)
+
+
+### 🩹 Fixes
+
+- **apigen-python-env:** probe monorepo-live python source before co-located dist copy (DEBT-APIGEN-010)
+
+
+### ❤️  Thank You
+
+- pseudosky
+
 ## 0.2.3 (2026-08-07)
 
 

package/index.js

@@ -1,10 +1,10 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const D=require("node:fs"),I=require("node:os"),q=require("node:path"),F=require("node:crypto"),h=require("node:child_process");function P(t){const e=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(t){for(const r in t)if(r!=="default"){const i=Object.getOwnPropertyDescriptor(t,r);Object.defineProperty(e,r,i.get?i:{enumerable:!0,get:()=>t[r]})}}return e.default=t,Object.freeze(e)}const n=P(D),b=P(I),o=P(q);function k(t){const e=t??__dirname,r=o.join(e,"python");if(n.existsSync(o.join(r,"apigen_python")))return r;const i=o.resolve(e,"..","..","..","python");if(n.existsSync(o.join(i,"apigen_python")))return i;let a=e;for(let c=0;c<20;c++){const p=o.join(a,"packages","apigen","python");if(n.existsSync(o.join(p,"apigen_python")))return p;const u=o.dirname(a);if(u===a)break;a=u}return i}const H=["python3.13","python3.12","python3.11","python3"],m=[3,11];function J(t){const e=h.spawnSync(t,["-c",'import sys; print(f"{sys.version_info[0]}.{sys.version_info[1]}")'],{encoding:"utf8",timeout:15e3});if(e.status!==0||!e.stdout)return;const[r,i]=e.stdout.trim().split(".").map(Number);if(!(!Number.isFinite(r)||!Number.isFinite(i)))return[r,i]}function M(){for(const t of H){const e=J(t);if(e&&(e[0]>m[0]||e[0]===m[0]&&e[1]>=m[1]))return t}throw new Error(`apigen-python-env: no Python >= ${m.join(".")} found on PATH (tried: ${H.join(", ")}). Install Python ${m.join(".")}+ or set APIGEN_PYTHON to a provisioned interpreter.`)}function Y(t){return process.platform==="win32"?o.join(t,"Scripts","python.exe"):o.join(t,"bin","python3")}function G(t){const e=n.readFileSync(o.join(t,"pyproject.toml"));return F.createHash("sha256").update(e).digest("hex")}function O(t){try{const e=JSON.parse(n.readFileSync(t,"utf8"));if(typeof e.pyprojectHash=="string"&&Array.isArray(e.extras))return e}catch{}}function B(t,e,r){const i=Date.now()+e;for(;;)try{n.mkdirSync(t,{recursive:!1});break}catch{if(Date.now()>i){try{n.rmdirSync(t)}catch{}continue}h.spawnSync(process.execPath,["-e","setTimeout(()=>{}, 250)"],{timeout:5e3})}try{return r()}finally{try{n.rmdirSync(t)}catch{}}}function V(t={}){const e=k(),r=process.env.APIGEN_PYTHON;if(r){if(!n.existsSync(r))throw new Error(`apigen-python-env: APIGEN_PYTHON points to a missing file: ${r}`);return{python:r,venvDir:"",pythonPkgDir:e}}const i=[...new Set(t.extras??[])].sort(),a=t.envHome??process.env.APIGEN_PYENV_HOME??o.join(b.homedir(),".adhd","apigen"),c=o.join(a,"pyvenv"),p=o.join(c,".apigen-stamp"),u=G(e),y=Y(c),l=()=>{if(!n.existsSync(y))return!1;const s=O(p);return!s||s.pyprojectHash!==u?!1:i.every(d=>s.extras.includes(d))};if(l())return{python:y,venvDir:c,pythonPkgDir:e};n.mkdirSync(a,{recursive:!0});const v=o.join(a,"pyvenv.lock"),w=t.lockTimeoutMs??3e5;return B(v,w,()=>{if(l())return{python:y,venvDir:c,pythonPkgDir:e};const s=O(p),d=[...new Set([...(s==null?void 0:s.extras)??[],...i])].sort();n.rmSync(c,{recursive:!0,force:!0});const _=M(),j=h.spawnSync(_,["-m","venv",c],{encoding:"utf8",timeout:12e4});if(j.status!==0)throw new Error(`apigen-python-env: "${_} -m venv" failed (exit ${j.status}):
-${j.stderr}`);const x=o.join(e,"build");n.existsSync(x)&&n.rmSync(x,{recursive:!0,force:!0});for(const f of n.readdirSync(e))f.endsWith(".egg-info")&&n.rmSync(o.join(e,f),{recursive:!0,force:!0});const S=n.mkdtempSync(o.join(b.tmpdir(),"apigen-python-wheel-"));try{const f=h.spawnSync(y,["-m","pip","wheel","--no-deps","--wheel-dir",S,e],{encoding:"utf8",timeout:6e5});if(f.status!==0)throw new Error(`apigen-python-env: pip wheel failed (exit ${f.status}):
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const D=require("node:fs"),I=require("node:os"),q=require("node:path"),F=require("node:crypto"),h=require("node:child_process");function P(t){const e=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(t){for(const n in t)if(n!=="default"){const i=Object.getOwnPropertyDescriptor(t,n);Object.defineProperty(e,n,i.get?i:{enumerable:!0,get:()=>t[n]})}}return e.default=t,Object.freeze(e)}const r=P(D),b=P(I),o=P(q);function k(t){const e=t??__dirname,n=o.resolve(e,"..","..","..","python");if(r.existsSync(o.join(n,"apigen_python")))return n;const i=o.join(e,"python");if(r.existsSync(o.join(i,"apigen_python")))return i;let a=e;for(let c=0;c<20;c++){const p=o.join(a,"packages","apigen","python");if(r.existsSync(o.join(p,"apigen_python")))return p;const u=o.dirname(a);if(u===a)break;a=u}return n}const H=["python3.13","python3.12","python3.11","python3"],m=[3,11];function J(t){const e=h.spawnSync(t,["-c",'import sys; print(f"{sys.version_info[0]}.{sys.version_info[1]}")'],{encoding:"utf8",timeout:15e3});if(e.status!==0||!e.stdout)return;const[n,i]=e.stdout.trim().split(".").map(Number);if(!(!Number.isFinite(n)||!Number.isFinite(i)))return[n,i]}function M(){for(const t of H){const e=J(t);if(e&&(e[0]>m[0]||e[0]===m[0]&&e[1]>=m[1]))return t}throw new Error(`apigen-python-env: no Python >= ${m.join(".")} found on PATH (tried: ${H.join(", ")}). Install Python ${m.join(".")}+ or set APIGEN_PYTHON to a provisioned interpreter.`)}function Y(t){return process.platform==="win32"?o.join(t,"Scripts","python.exe"):o.join(t,"bin","python3")}function G(t){const e=r.readFileSync(o.join(t,"pyproject.toml"));return F.createHash("sha256").update(e).digest("hex")}function O(t){try{const e=JSON.parse(r.readFileSync(t,"utf8"));if(typeof e.pyprojectHash=="string"&&Array.isArray(e.extras))return e}catch{}}function B(t,e,n){const i=Date.now()+e;for(;;)try{r.mkdirSync(t,{recursive:!1});break}catch{if(Date.now()>i){try{r.rmdirSync(t)}catch{}continue}h.spawnSync(process.execPath,["-e","setTimeout(()=>{}, 250)"],{timeout:5e3})}try{return n()}finally{try{r.rmdirSync(t)}catch{}}}function V(t={}){const e=k(),n=process.env.APIGEN_PYTHON;if(n){if(!r.existsSync(n))throw new Error(`apigen-python-env: APIGEN_PYTHON points to a missing file: ${n}`);return{python:n,venvDir:"",pythonPkgDir:e}}const i=[...new Set(t.extras??[])].sort(),a=t.envHome??process.env.APIGEN_PYENV_HOME??o.join(b.homedir(),".adhd","apigen"),c=o.join(a,"pyvenv"),p=o.join(c,".apigen-stamp"),u=G(e),y=Y(c),l=()=>{if(!r.existsSync(y))return!1;const s=O(p);return!s||s.pyprojectHash!==u?!1:i.every(d=>s.extras.includes(d))};if(l())return{python:y,venvDir:c,pythonPkgDir:e};r.mkdirSync(a,{recursive:!0});const v=o.join(a,"pyvenv.lock"),w=t.lockTimeoutMs??3e5;return B(v,w,()=>{if(l())return{python:y,venvDir:c,pythonPkgDir:e};const s=O(p),d=[...new Set([...(s==null?void 0:s.extras)??[],...i])].sort();r.rmSync(c,{recursive:!0,force:!0});const _=M(),j=h.spawnSync(_,["-m","venv",c],{encoding:"utf8",timeout:12e4});if(j.status!==0)throw new Error(`apigen-python-env: "${_} -m venv" failed (exit ${j.status}):
+${j.stderr}`);const x=o.join(e,"build");r.existsSync(x)&&r.rmSync(x,{recursive:!0,force:!0});for(const f of r.readdirSync(e))f.endsWith(".egg-info")&&r.rmSync(o.join(e,f),{recursive:!0,force:!0});const S=r.mkdtempSync(o.join(b.tmpdir(),"apigen-python-wheel-"));try{const f=h.spawnSync(y,["-m","pip","wheel","--no-deps","--wheel-dir",S,e],{encoding:"utf8",timeout:6e5});if(f.status!==0)throw new Error(`apigen-python-env: pip wheel failed (exit ${f.status}):
 ${f.stderr}
 stdout:
-${f.stdout}`);const E=n.readdirSync(S).filter(A=>A.endsWith(".whl"));if(E.length===0)throw new Error("apigen-python-env: pip wheel produced no .whl file");const $=o.join(S,E[0]),N=d.length?`${$}[${d.join(",")}]`:$,g=h.spawnSync(y,["-m","pip","install","--quiet","--disable-pip-version-check",N],{encoding:"utf8",timeout:6e5});if(g.status!==0)throw new Error(`apigen-python-env: pip install "${N}" failed (exit ${g.status}):
+${f.stdout}`);const E=r.readdirSync(S).filter(A=>A.endsWith(".whl"));if(E.length===0)throw new Error("apigen-python-env: pip wheel produced no .whl file");const $=o.join(S,E[0]),N=d.length?`${$}[${d.join(",")}]`:$,g=h.spawnSync(y,["-m","pip","install","--quiet","--disable-pip-version-check",N],{encoding:"utf8",timeout:6e5});if(g.status!==0)throw new Error(`apigen-python-env: pip install "${N}" failed (exit ${g.status}):
 ${g.stderr}
 stdout:
-${g.stdout}`)}finally{n.rmSync(S,{recursive:!0,force:!0})}const T={pyprojectHash:u,extras:d};return n.writeFileSync(p,JSON.stringify(T)),{python:y,venvDir:c,pythonPkgDir:e}})}function L(t,e,r,i,a){return new Promise((c,p)=>{var v,w;const u=h.spawn(t,["-m","apigen_python.extractor",r,"--namespace",i,"--emit-json"],{cwd:e,env:{...process.env,PYTHONPATH:e},stdio:["ignore","pipe","pipe"]});let y="",l="";(v=u.stdout)==null||v.on("data",s=>{y+=s.toString("utf8")}),(w=u.stderr)==null||w.on("data",s=>{l+=s.toString("utf8")}),u.on("error",p),u.on("exit",s=>{if(s!==0){p(new Error(`${a}: extractor --emit-json exited with code ${s}:
+${g.stdout}`)}finally{r.rmSync(S,{recursive:!0,force:!0})}const T={pyprojectHash:u,extras:d};return r.writeFileSync(p,JSON.stringify(T)),{python:y,venvDir:c,pythonPkgDir:e}})}function L(t,e,n,i,a){return new Promise((c,p)=>{var v,w;const u=h.spawn(t,["-m","apigen_python.extractor",n,"--namespace",i,"--emit-json"],{cwd:e,env:{...process.env,PYTHONPATH:e},stdio:["ignore","pipe","pipe"]});let y="",l="";(v=u.stdout)==null||v.on("data",s=>{y+=s.toString("utf8")}),(w=u.stderr)==null||w.on("data",s=>{l+=s.toString("utf8")}),u.on("error",p),u.on("exit",s=>{if(s!==0){p(new Error(`${a}: extractor --emit-json exited with code ${s}:
 ${l}`));return}try{c(JSON.parse(y))}catch(d){p(new Error(`${a}: extractor --emit-json produced invalid JSON (${d.message}):
 ${y}`))}})})}exports.ensurePythonEnv=V;exports.resolvePythonPkgDir=k;exports.runExtractorEmitJson=L;

package/index.mjs

@@ -4,10 +4,10 @@ import * as r from "node:path";
 import { createHash as T } from "node:crypto";
 import { spawnSync as l, spawn as I } from "node:child_process";
 function O(e) {
-  const t = e ?? __dirname, o = r.join(t, "python");
+  const t = e ?? __dirname, o = r.resolve(t, "..", "..", "..", "python");
   if (n.existsSync(r.join(o, "apigen_python")))
     return o;
-  const s = r.resolve(t, "..", "..", "..", "python");
+  const s = r.join(t, "python");
   if (n.existsSync(r.join(s, "apigen_python")))
     return s;
   let a = t;
@@ -20,7 +20,7 @@ function O(e) {
       break;
     a = u;
   }
-  return s;
+  return o;
 }
 const _ = ["python3.13", "python3.12", "python3.11", "python3"], m = [3, 11];
 function D(e) {

package/lib/python-env.d.ts

@@ -27,17 +27,27 @@ export interface IEnsurePythonEnvOptions {
  * Locate the directory containing the `apigen_python` package sources.
  *
  * Probed in order:
- *   1. Co-located (SHIPPED) copy: `<this file's dir>/python`. This package's
- *      build copies `packages/apigen/python/apigen_python/**` into its own
- *      `dist/python/apigen_python/`, so for a consumer installed from npm
- *      OUTSIDE the monorepo (where __dirname is `node_modules/@adhd/
- *      apigen-python-env/dist`), the sources are bundled right next to the
- *      compiled code. This MUST be probed first so published consumers never
- *      fall through to a monorepo-only path that doesn't exist for them.
- *   2. Monorepo source (dev-time fallback): `<this file>/../../../python`
- *      (source layout: packages/apigen/python-env/src/lib → packages/apigen/
- *      python). Keeps vitest/ts-node runs resolving the LIVE source instead
- *      of the copied snapshot.
+ *   1. Monorepo source (LIVE, preferred when present): `<this file>/../../
+ *      ../python` (source layout: packages/apigen/python-env/src/lib →
+ *      packages/apigen/python; from a build, `dist/lib` → `packages/apigen/
+ *      python` by the same three-levels-up relationship). When both this
+ *      AND the co-located dist copy below exist — i.e. running inside the
+ *      monorepo, built or not — this MUST win. `dist/python` is a
+ *      point-in-time copy made by this package's build (vite.config.ts
+ *      `copyPythonPackagePlugin`); it goes stale the moment someone edits
+ *      `packages/apigen/python` without rebuilding, and code run outside
+ *      Nx's task graph (`npx vitest run` directly, bypassing the `test`
+ *      target's `dependsOn: ["build"]`) has no mechanism to refresh it. Prior
+ *      ordering probed the dist copy FIRST, so any monorepo dev/test
+ *      invocation that happened to have a `dist/python` lying around from a
+ *      previous build silently exercised stale Python source with no
+ *      indication the live edit was never observed — see
+ *      DEBT-APIGEN-010. Source must win whenever it's reachable.
+ *   2. Co-located (SHIPPED) copy: `<this file's dir>/python`. For a
+ *      consumer installed from npm OUTSIDE the monorepo (where __dirname is
+ *      `node_modules/@adhd/apigen-python-env/dist`), step 1's monorepo-
+ *      relative path doesn't exist, so this bundled-alongside-the-compiled-
+ *      code copy is the only candidate and is used.
  *   3. Walk up from __dirname looking for `packages/apigen/python` (covers
  *      the vite-bundled CLI, where __dirname is the bundle output dir).
  * (Shared by py-grpc / py-flask — previously duplicated in each plugin.)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhd/apigen-python-env",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "main": "./index.js",
   "module": "./index.mjs",
   "types": "./index.d.ts",
@@ -12,9 +12,19 @@
     "provisioning"
   ],
   "dependencies": {
-    "@adhd/apigen-core-client": "^0.3.0"
+    "@adhd/apigen-core-client": "^0.3.1"
   },
   "publishConfig": {
     "access": "public"
+  },
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/PseudoSky/adhd.git",
+    "directory": "packages/apigen/python-env"
+  },
+  "homepage": "https://github.com/PseudoSky/adhd/tree/main/packages/apigen/python-env#readme",
+  "bugs": {
+    "url": "https://github.com/PseudoSky/adhd/issues"
   }
 }

package/python/apigen_python/flask_server.py

@@ -434,11 +434,12 @@ def _resolve_batch_concurrency(mode: str, requested: Any, item_count: int) -> in
 def _dispatch_batch(
     state: _ServerState, body: dict[str, Any], envelope: dict[str, Any]
 ) -> list[dict[str, Any]]:
-    """Fan out `body['items']` to the real operation `body['operation']` —
-    the Python host's OWN executor against BATCH_0.0.1.md §5's wire contract
-    (LEFT column only; this function is never a call into the TS
-    `invokeBatch`). Implements the architect-reviewed design's binding fixes
-    (`tmp/apigen-batch-python-design.md` §3.5):
+    """Fan out `body['input']['items']` to the real operation
+    `body['input']['operation']` — the Python host's OWN executor against
+    BATCH_0.0.1.md §5's wire contract (LEFT column only; this function is
+    never a call into the TS `invokeBatch`). Implements the
+    architect-reviewed design's binding fixes (`tmp/apigen-batch-python-design.md`
+    §3.5):
 
     - F2: `mode` branching — `parallel` uses a bounded `ThreadPoolExecutor`;
       `serial`/`chained` use a plain sequential loop; `chained` additionally
@@ -455,13 +456,32 @@ def _dispatch_batch(
     - F5: every rejected result's `reason` is a real `ApiError(...).to_json()`
       using an existing `errors.py` taxonomy code.
 
+    BUG-APIGEN-CLI-002: every batch control-plane field (`operation`,
+    `items`, `concurrency`, `mode`, `onItemError`, `itemTimeoutMs`) now nests
+    under one top-level `input` object on the wire — `batch.ts`'s
+    `branchInputSchema` matches every other apigen-mounted operation's
+    single-JSON-blob convention. `@adhd/apigen-plugin-batch`'s
+    `parseBatchRequest` already unwraps this one extra level (its own doc
+    comment: "Unwrap that one extra level here — the only call site that
+    reads this shape."); this Python host is a SECOND call site reading the
+    same wire shape and must unwrap identically, never operate on the raw
+    top-level `body`.
+
     Raises:
-        ApiError: for whole-request-level rejections (bad `operation`,
-            unsupported `itemTimeoutMs`, malformed `items`/`mode`/
-            `onItemError`/`concurrency`) — the caller maps this to a real
-            HTTP 4xx via `_send_error`, the SAME mechanism every other route
-            on this server already uses.
+        ApiError: for whole-request-level rejections (missing/malformed
+            `input`, bad `operation`, unsupported `itemTimeoutMs`, malformed
+            `items`/`mode`/`onItemError`/`concurrency`) — the caller maps
+            this to a real HTTP 4xx via `_send_error`, the SAME mechanism
+            every other route on this server already uses.
     """
+    input_raw = body.get("input")
+    if not isinstance(input_raw, dict):
+        raise ApiError(
+            "invalid_argument",
+            '"input" must be an object containing {operation, items, ...}',
+        )
+    body = input_raw
+
     # F3 — reject the WHOLE batch upfront; never a silently-weaker
     # wait-only guarantee under the same field name TS uses for real
     # cancellation.