chore: wip

Author: eoinsha

.gitignore

@@ -29,8 +29,12 @@ const project = new awscdk.AwsCdkConstructLibrary({
   jestOptions: {
     extraCliOptions: ['--testTimeout=300000'],
   },
+  gitignore: [
+    ".vscode/",
+  ],
   eslint: false,
 });
+
 const biomeWorkflow = project.github?.addWorkflow('biome');
 biomeWorkflow?.on({
   pullRequest: {

.projenrc.ts

@@ -1,8 +1,9 @@
 ARG IMAGE_ARCH=arm64   # or x86_64 (not amd64 as per Docker platform)
 ARG UV_VERSION=0.5.27
 ARG PYTHON_VERSION=3.12
+ARG BUNDLING_IMAGE=public.ecr.aws/sam/build-python${PYTHON_VERSION}:latest-${IMAGE_ARCH}
 FROM ghcr.io/astral-sh/uv:${UV_VERSION} AS uv
-FROM public.ecr.aws/sam/build-python${PYTHON_VERSION}:latest-${IMAGE_ARCH}
+FROM ${BUNDLING_IMAGE}
 # FROM public.ecr.aws/lambda/python:3.12-$IMAGE_ARCH
 COPY --from=uv /uv /uvx /bin/
 COPY *.sh /root

resources/Dockerfile

@@ -12,12 +12,11 @@ rm -f $LOCK_FILE
 # Changing the default UV_LINK_MODE silences warnings about not being able to use hard links
 # since the cache and sync target may be on separate file systems.
 export UV_LINK_MODE=copy
-mkdir -p /src/uvbuild/uvcache
+mkdir -p /uvbuild/uvcache
 mkdir -p /root/.cache
-ln -sf /src/uvbuild/uvcache /root/.cache/uv
+ln -sf /uvbuild/uvcache /root/.cache/uv
 
 # Set up overlay filesystem
-#mkdir -p /src/uvbuild/overlay/upper /src/uvbuild/overlay/work /src/uvbuild/overlay/merged
 mkdir -p /tmp/overlay
 mount -t tmpfs tmpfs /tmp/overlay
 mkdir -p /tmp/overlay/{upper,work,merged}

resources/entrypoint.sh

@@ -17,16 +17,16 @@ then
 	exit 1
 fi
 
-opts=$(getopt --name "$NAME" --options hpo:vd --longoptions help,package,output:,verbose,debug -- "$@") || print_help
+opts=$(getopt --name "$NAME" --options hp:o:vd --longoptions help,package:,output:,verbose,debug -- "$@") || print_help
 eval set -- "$opts"
 
 declare package="" output="" verbose=0 debug=0
 while (($#))
 do
 	case $1 in
 		-h|--help)    print_help;;
-		-p|--package)    package=$2; shift;;
-		-o|--output)     output=$2; shift;;
+		-p|--package) package=$2; shift;;
+		-o|--output)  output=$2; shift;;
 		-v|--verbose) ((++verbose));;
 		-d|--debug)   debug=1;;
 		--)           shift; break;;

resources/export.sh

@@ -11,9 +11,9 @@ import { spawn, exec, spawnSync, execSync } from "node:child_process";
  */
 export function runDockerContainerAndWait(name: string, args: string[], logLine: string): string {
   // kill any old container that might be running from previous builds
-  // spawnSync("docker", ["rm", "-f", name])  TODO
+  spawnSync("docker", ["rm", "-f", name])
   // Start the container in detached mode
-  console.log("Spawning Docker container...", name, args);
+  console.log("Spawning Docker container...", name, args, logLine);
   const dockerRun = spawnSync("docker", args);
   if (dockerRun.error) {
     console.error(`Failed to start Docker process: ${dockerRun.error}`);
@@ -32,9 +32,10 @@ export function runDockerContainerAndWait(name: string, args: string[], logLine:
   // Wait for the container to be running
   console.log("Waiting for container to be ready...");
   waitForContainer(containerId);
-  console.log("Container is ready.  Waiting for log line...");
-  waitForLogLine(containerId, logLine);
-  console.log("Log line found.");
+  console.log("Container is ready");
+  // waitForLogLine(containerId, logLine);
+  // console.log("Log line found.");
+  // TODO - rm -f container if it didn't run successfully
   return containerId;
 }
 
@@ -48,6 +49,7 @@ function waitForContainer(containerId: string) {
     const stdout = execSync(`docker inspect -f '{{.State.Running}}' ${containerId}`)
     if (stdout.toString().trim() === "true") {
       console.log(`Container ${containerId} is running.`);
+      sleep(60000);
       return;
     }
     console.log(`Container ${containerId} is not yet running.`);
@@ -62,32 +64,33 @@ function waitForContainer(containerId: string) {
  * @param containerId - The container ID.
  * @param logLine - The line to wait for.
  */
-function waitForLogLine(containerId: string, logLine: string) {
-  let attempts = 60;
-  while (attempts > 0) {
-    const logProcess = spawnSync("docker", ["logs", containerId]);
-    if (logProcess.error) {
-      const message = `Failed to get container logs: ${containerId} ${logProcess.error}`;
-      console.error(message);
-      throw new Error(message);
-    }
-    if (logProcess.status !== 0) {
-      const message = `Docker process exited with code ${logProcess.status}, ${logProcess.stderr.toString()}`;
-      console.error(message);
-      throw new Error(message);
-    }
+// function waitForLogLine(containerId: string, logLine: string) {
+//   let attempts = 60;
+//   while (attempts > 0) {
+//     console.log(`Checking logs for ${containerId}... ${attempts} attempts remaining.`);
+//     const logProcess = spawnSync("docker", ["logs", containerId]);
+//     if (logProcess.error) {
+//       const message = `Failed to get container logs: ${containerId} ${logProcess.error}`;
+//       console.error(message);
+//       throw new Error(message);
+//     }
+//     if (logProcess.status !== 0) {
+//       const message = `Docker process exited with code ${logProcess.status}, ${logProcess.stderr.toString()}`;
+//       console.error(message);
+//       throw new Error(message);
+//     }
 
-    const logs = logProcess.stdout.toString();
-    console.log('LOGS', logs);
-    if (logs.includes(logLine)) {
-      return;
-    }
-    attempts--;
-    sleep(1000);
-  }
+//     const logs = logProcess.stdout.toString();
+//     console.log('LOGS', logs);
+//     if (logs.includes(logLine)) {
+//       return;
+//     }
+//     attempts--;
+//     sleep(1000);
+//   }
 
-  throw new Error(`Log line not found: ${logLine}`);
-}
+//   throw new Error(`Log line not found: ${logLine}`);
+// }
 
 /**
  * Stops the container.

src/build-container.ts

@@ -15,6 +15,7 @@ import {
   type Runtime,
 } from 'aws-cdk-lib/aws-lambda';
 import type { BundlingOptions } from './types';
+import { mkdirSync } from 'node:fs';
 
 export const HASHABLE_DEPENDENCIES_EXCLUDE = [
   '*.pyc',
@@ -93,8 +94,11 @@ export class Bundling {
       throw new Error("Bundling container not found");
     }
 
+    const hostFunctionOutputDir = `${process.env.CDK_OUTDIR}/${bundling.containerBuilderKey}/${bundling.functionOutDir}`;
+    // mkdirSync(hostFunctionOutputDir, { recursive: true });
+
     return Code.fromCustomCommand(
-      options.rootDir,
+      hostFunctionOutputDir,
       [
         "docker",
         "exec",
@@ -103,10 +107,10 @@ export class Bundling {
         "--package",
         options.workspacePackage ?? "uh-oh",  // TODO - add support for root package
         "--output",
-        bundling.functionOutDir,
+        `/uvbuild/${bundling.functionOutDir}/`,
       ],
       {
-        assetHashType: AssetHashType.OUTPUT,
+        assetHashType: AssetHashType.SOURCE,
         exclude: hashableAssetExclude,
         // bundling: new Bundling(bundlingOptions),
       });
@@ -185,29 +189,32 @@ export class Bundling {
 
     // Create a hash of the props to use as a key for the build container cache
     this.containerBuilderKey = `uv-bundling-${hash(hashableProperties)}`;
-    this.functionOutDir = `${this.containerBuilderKey}_${props.workspacePackage ?? "$$root"}`;
-
+    this.functionOutDir = props.workspacePackage ?? "";
     const existingBuilder = Bundling.containerBuilders[this.containerBuilderKey];
     if (!existingBuilder) {
       const buildImage = DockerImage.fromBuild(path.resolve(__dirname, '..', 'resources'), {
         buildArgs: {
           ...props.buildArgs,
           IMAGE: props.runtime.bundlingImage.image,
           IMAGE_ARCH: props.architecture === Architecture.X86_64 ? 'x86_64' : 'arm64',
+          PYTHON_VERSION: props.runtime.name.slice(6),
+          BUNDLING_IMAGE: props.runtime.bundlingImage.image,
         },
         platform: (props.architecture ?? Architecture.ARM_64).dockerPlatform,
       });
 
+      const hostUvBuildDir = `${process.env.CDK_OUTDIR}/${this.containerBuilderKey}`;
+      mkdirSync(hostUvBuildDir, { recursive: true });
+
       // Spawn a docker run process in -d daemon mode using buildImage.image
       const dockerArgs = [
         "run",
         "-d",
         "--cap-add=SYS_ADMIN",  // required for overlay fs
         "--name",
         this.containerBuilderKey,
-        "--rm",
         "-v",
-        `${process.env.CDK_OUTDIR}/${this.functionOutDir}:/uvbuild`,
+        `${hostUvBuildDir}:/uvbuild`,
         "-v",
         `${props.rootDir}:/src`,
         buildImage.image,

src/bundling.ts

@@ -1,4 +1,3 @@
-import * as fs from 'node:fs';
 import * as path from 'node:path';
 import { Stack } from 'aws-cdk-lib';
 import {
@@ -96,46 +95,7 @@ export class PythonFunction extends Function {
       code,
       handler: resolvedHandler,
     });
-
-    if (skip) {
-      return;
-    }
-
-    const assetPath = (this.node.defaultChild as CfnFunction).getMetadata(
-      'aws:asset:path',
-    );
-    if (!assetPath) {
-      return;
-    }
-
-    const codePath = path.join(process.env.CDK_OUTDIR as string, assetPath);
-    const pythonPaths = getPthFilePaths(codePath);
-
-    if (pythonPaths.length > 0) {
-      let pythonPathValue = environment.PYTHONPATH;
-      const addedPaths = pythonPaths.join(':');
-      pythonPathValue = pythonPathValue
-        ? `${pythonPathValue}:${addedPaths}`
-        : addedPaths;
-      this.addEnvironment('PYTHONPATH', pythonPathValue);
-    }
-  }
-}
-
-function getPthFilePaths(basePath: string): string[] {
-  const pthFiles = fs
-    .readdirSync(basePath)
-    .filter((file) => file.endsWith('.pth'));
-  const pythonPaths: string[] = [];
-  for (const pthFile of pthFiles) {
-    const filePath = path.join(basePath, pthFile);
-    const content = fs.readFileSync(filePath, 'utf-8');
-    const dirs = content.split('\n').filter((line) => line.trim() !== '');
-    pythonPaths.push(
-      ...dirs.map((dir) =>
-        path.join('/var/task', path.relative('/asset-output', dir)),
-      ),
-    );
+    const assetRelPath = path.relative(process.env.CDK_OUTDIR ?? "", code.path);
+    (this.node.defaultChild as CfnFunction).addMetadata('uv-python-lambda:asset-path', assetRelPath);
   }
-  return pythonPaths;
 }