@adhd/apigen-python-env 0.1.5 → 0.2.1

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.2.1 (2026-07-27)
+
+
+### 🩹 Fixes
+
+- **apigen-python-env:** ship the `apigen_python` sources into `dist/python/` via a vite `writeBundle` copy plugin and resolve them co-located-first, so `py-grpc`/`py-flask` work for consumers installing from npm outside the monorepo (BUG-015). `project.json` `build.options.assets` was a no-op under `@nx/vite:build`.
+
+
 ## 0.1.5 (2026-07-25)
 
 

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 n in t)if(n!=="default"){const o=Object.getOwnPropertyDescriptor(t,n);Object.defineProperty(e,n,o.get?o:{enumerable:!0,get:()=>t[n]})}}return e.default=t,Object.freeze(e)}const r=P(D),b=P(I),i=P(q);function k(t){const e=t??__dirname,n=i.resolve(e,"..","..","..","python");if(r.existsSync(i.join(n,"apigen_python")))return n;let o=e;for(let u=0;u<20;u++){const c=i.join(o,"packages","apigen","python");if(r.existsSync(i.join(c,"apigen_python")))return c;const a=i.dirname(o);if(a===o)break;o=a}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,o]=e.stdout.trim().split(".").map(Number);if(!(!Number.isFinite(n)||!Number.isFinite(o)))return[n,o]}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"?i.join(t,"Scripts","python.exe"):i.join(t,"bin","python3")}function G(t){const e=r.readFileSync(i.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 o=Date.now()+e;for(;;)try{r.mkdirSync(t,{recursive:!1});break}catch{if(Date.now()>o){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 o=[...new Set(t.extras??[])].sort(),u=t.envHome??process.env.APIGEN_PYENV_HOME??i.join(b.homedir(),".adhd","apigen"),c=i.join(u,"pyvenv"),a=i.join(c,".apigen-stamp"),d=G(e),p=Y(c),l=()=>{if(!r.existsSync(p))return!1;const s=O(a);return!s||s.pyprojectHash!==d?!1:o.every(y=>s.extras.includes(y))};if(l())return{python:p,venvDir:c,pythonPkgDir:e};r.mkdirSync(u,{recursive:!0});const v=i.join(u,"pyvenv.lock"),w=t.lockTimeoutMs??3e5;return B(v,w,()=>{if(l())return{python:p,venvDir:c,pythonPkgDir:e};const s=O(a),y=[...new Set([...(s==null?void 0:s.extras)??[],...o])].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=i.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(i.join(e,f),{recursive:!0,force:!0});const S=r.mkdtempSync(i.join(b.tmpdir(),"apigen-python-wheel-"));try{const f=h.spawnSync(p,["-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 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}):
 ${f.stderr}
 stdout:
-${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 $=i.join(S,E[0]),N=y.length?`${$}[${y.join(",")}]`:$,g=h.spawnSync(p,["-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=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}):
 ${g.stderr}
 stdout:
-${g.stdout}`)}finally{r.rmSync(S,{recursive:!0,force:!0})}const T={pyprojectHash:d,extras:y};return r.writeFileSync(a,JSON.stringify(T)),{python:p,venvDir:c,pythonPkgDir:e}})}function W(t,e,n,o,u){return new Promise((c,a)=>{var v,w;const d=h.spawn(t,["-m","apigen_python.extractor",n,"--namespace",o,"--emit-json"],{cwd:e,env:{...process.env,PYTHONPATH:e},stdio:["ignore","pipe","pipe"]});let p="",l="";(v=d.stdout)==null||v.on("data",s=>{p+=s.toString("utf8")}),(w=d.stderr)==null||w.on("data",s=>{l+=s.toString("utf8")}),d.on("error",a),d.on("exit",s=>{if(s!==0){a(new Error(`${u}: extractor --emit-json exited with code ${s}:
-${l}`));return}try{c(JSON.parse(p))}catch(y){a(new Error(`${u}: extractor --emit-json produced invalid JSON (${y.message}):
-${p}`))}})})}exports.ensurePythonEnv=V;exports.resolvePythonPkgDir=k;exports.runExtractorEmitJson=W;
+${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}:
+${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,20 +4,23 @@ 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.resolve(t, "..", "..", "..", "python");
+  const t = e ?? __dirname, o = r.join(t, "python");
   if (n.existsSync(r.join(o, "apigen_python")))
     return o;
-  let i = t;
-  for (let u = 0; u < 20; u++) {
-    const c = r.join(i, "packages", "apigen", "python");
-    if (n.existsSync(r.join(c, "apigen_python")))
-      return c;
-    const a = r.dirname(i);
-    if (a === i)
+  const s = r.resolve(t, "..", "..", "..", "python");
+  if (n.existsSync(r.join(s, "apigen_python")))
+    return s;
+  let a = t;
+  for (let c = 0; c < 20; c++) {
+    const p = r.join(a, "packages", "apigen", "python");
+    if (n.existsSync(r.join(p, "apigen_python")))
+      return p;
+    const u = r.dirname(a);
+    if (u === a)
       break;
-    i = a;
+    a = u;
   }
-  return o;
+  return s;
 }
 const _ = ["python3.13", "python3.12", "python3.11", "python3"], m = [3, 11];
 function D(e) {
@@ -27,9 +30,9 @@ function D(e) {
   });
   if (t.status !== 0 || !t.stdout)
     return;
-  const [o, i] = t.stdout.trim().split(".").map(Number);
-  if (!(!Number.isFinite(o) || !Number.isFinite(i)))
-    return [o, i];
+  const [o, s] = t.stdout.trim().split(".").map(Number);
+  if (!(!Number.isFinite(o) || !Number.isFinite(s)))
+    return [o, s];
 }
 function F() {
   for (const e of _) {
@@ -57,13 +60,13 @@ function k(e) {
   }
 }
 function G(e, t, o) {
-  const i = Date.now() + t;
+  const s = Date.now() + t;
   for (; ; )
     try {
       n.mkdirSync(e, { recursive: !1 });
       break;
     } catch {
-      if (Date.now() > i) {
+      if (Date.now() > s) {
         try {
           n.rmdirSync(e);
         } catch {
@@ -88,20 +91,20 @@ function V(e = {}) {
       throw new Error(`apigen-python-env: APIGEN_PYTHON points to a missing file: ${o}`);
     return { python: o, venvDir: "", pythonPkgDir: t };
   }
-  const i = [...new Set(e.extras ?? [])].sort(), u = e.envHome ?? process.env.APIGEN_PYENV_HOME ?? r.join(H.homedir(), ".adhd", "apigen"), c = r.join(u, "pyvenv"), a = r.join(c, ".apigen-stamp"), d = J(t), p = Y(c), h = () => {
-    if (!n.existsSync(p))
+  const s = [...new Set(e.extras ?? [])].sort(), a = e.envHome ?? process.env.APIGEN_PYENV_HOME ?? r.join(H.homedir(), ".adhd", "apigen"), c = r.join(a, "pyvenv"), p = r.join(c, ".apigen-stamp"), u = J(t), d = Y(c), h = () => {
+    if (!n.existsSync(d))
       return !1;
-    const s = k(a);
-    return !s || s.pyprojectHash !== d ? !1 : i.every((f) => s.extras.includes(f));
+    const i = k(p);
+    return !i || i.pyprojectHash !== u ? !1 : s.every((y) => i.extras.includes(y));
   };
   if (h())
-    return { python: p, venvDir: c, pythonPkgDir: t };
-  n.mkdirSync(u, { recursive: !0 });
-  const v = r.join(u, "pyvenv.lock"), w = e.lockTimeoutMs ?? 3e5;
+    return { python: d, venvDir: c, pythonPkgDir: t };
+  n.mkdirSync(a, { recursive: !0 });
+  const v = r.join(a, "pyvenv.lock"), w = e.lockTimeoutMs ?? 3e5;
   return G(v, w, () => {
     if (h())
-      return { python: p, venvDir: c, pythonPkgDir: t };
-    const s = k(a), f = [.../* @__PURE__ */ new Set([...(s == null ? void 0 : s.extras) ?? [], ...i])].sort();
+      return { python: d, venvDir: c, pythonPkgDir: t };
+    const i = k(p), y = [.../* @__PURE__ */ new Set([...(i == null ? void 0 : i.extras) ?? [], ...s])].sort();
     n.rmSync(c, { recursive: !0, force: !0 });
     const x = F(), j = l(x, ["-m", "venv", c], { encoding: "utf8", timeout: 12e4 });
     if (j.status !== 0)
@@ -111,27 +114,27 @@ ${j.stderr}`
       );
     const $ = r.join(t, "build");
     n.existsSync($) && n.rmSync($, { recursive: !0, force: !0 });
-    for (const y of n.readdirSync(t))
-      y.endsWith(".egg-info") && n.rmSync(r.join(t, y), { recursive: !0, force: !0 });
+    for (const f of n.readdirSync(t))
+      f.endsWith(".egg-info") && n.rmSync(r.join(t, f), { recursive: !0, force: !0 });
     const S = n.mkdtempSync(r.join(H.tmpdir(), "apigen-python-wheel-"));
     try {
-      const y = l(
-        p,
+      const f = l(
+        d,
         ["-m", "pip", "wheel", "--no-deps", "--wheel-dir", S, t],
         { encoding: "utf8", timeout: 6e5 }
       );
-      if (y.status !== 0)
+      if (f.status !== 0)
         throw new Error(
-          `apigen-python-env: pip wheel failed (exit ${y.status}):
-${y.stderr}
+          `apigen-python-env: pip wheel failed (exit ${f.status}):
+${f.stderr}
 stdout:
-${y.stdout}`
+${f.stdout}`
         );
       const P = n.readdirSync(S).filter((b) => b.endsWith(".whl"));
       if (P.length === 0)
         throw new Error("apigen-python-env: pip wheel produced no .whl file");
-      const E = r.join(S, P[0]), N = f.length ? `${E}[${f.join(",")}]` : E, g = l(
-        p,
+      const E = r.join(S, P[0]), N = y.length ? `${E}[${y.join(",")}]` : E, g = l(
+        d,
         ["-m", "pip", "install", "--quiet", "--disable-pip-version-check", N],
         { encoding: "utf8", timeout: 6e5 }
       );
@@ -145,40 +148,40 @@ ${g.stdout}`
     } finally {
       n.rmSync(S, { recursive: !0, force: !0 });
     }
-    const A = { pyprojectHash: d, extras: f };
-    return n.writeFileSync(a, JSON.stringify(A)), { python: p, venvDir: c, pythonPkgDir: t };
+    const A = { pyprojectHash: u, extras: y };
+    return n.writeFileSync(p, JSON.stringify(A)), { python: d, venvDir: c, pythonPkgDir: t };
   });
 }
-function q(e, t, o, i, u) {
-  return new Promise((c, a) => {
+function q(e, t, o, s, a) {
+  return new Promise((c, p) => {
     var v, w;
-    const d = I(
+    const u = I(
       e,
-      ["-m", "apigen_python.extractor", o, "--namespace", i, "--emit-json"],
+      ["-m", "apigen_python.extractor", o, "--namespace", s, "--emit-json"],
       {
         cwd: t,
         env: { ...process.env, PYTHONPATH: t },
         stdio: ["ignore", "pipe", "pipe"]
       }
     );
-    let p = "", h = "";
-    (v = d.stdout) == null || v.on("data", (s) => {
-      p += s.toString("utf8");
-    }), (w = d.stderr) == null || w.on("data", (s) => {
-      h += s.toString("utf8");
-    }), d.on("error", a), d.on("exit", (s) => {
-      if (s !== 0) {
-        a(new Error(`${u}: extractor --emit-json exited with code ${s}:
+    let d = "", h = "";
+    (v = u.stdout) == null || v.on("data", (i) => {
+      d += i.toString("utf8");
+    }), (w = u.stderr) == null || w.on("data", (i) => {
+      h += i.toString("utf8");
+    }), u.on("error", p), u.on("exit", (i) => {
+      if (i !== 0) {
+        p(new Error(`${a}: extractor --emit-json exited with code ${i}:
 ${h}`));
         return;
       }
       try {
-        c(JSON.parse(p));
-      } catch (f) {
-        a(
+        c(JSON.parse(d));
+      } catch (y) {
+        p(
           new Error(
-            `${u}: extractor --emit-json produced invalid JSON (${f.message}):
-${p}`
+            `${a}: extractor --emit-json produced invalid JSON (${y.message}):
+${d}`
           )
         );
       }

package/lib/python-env.d.ts

@@ -26,10 +26,20 @@ export interface IEnsurePythonEnvOptions {
 /**
  * Locate the directory containing the `apigen_python` package sources.
  *
- * Primary: `<this file>/../../../python` (source layout:
- * packages/apigen/python-env/src/lib → packages/apigen/python).
- * Fallback: walk up from __dirname looking for `packages/apigen/python`
- * (covers the vite-bundled CLI, where __dirname is the bundle output dir).
+ * 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.
+ *   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.)
  */
 export declare function resolvePythonPkgDir(fromDir?: string): string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhd/apigen-python-env",
-  "version": "0.1.5",
+  "version": "0.2.1",
   "main": "./index.js",
   "module": "./index.mjs",
   "types": "./index.d.ts",
@@ -12,7 +12,7 @@
     "provisioning"
   ],
   "dependencies": {
-    "@adhd/apigen-core-client": "^0.1.5"
+    "@adhd/apigen-core-client": "^0.2.1"
   },
   "publishConfig": {
     "access": "public"