add llm tools to execute code

Author: alexcheng1982

LICENSE

@@ -175,17 +175,6 @@
 
    END OF TERMS AND CONDITIONS
 
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
    Copyright 2025 Fu Cheng
 
    Licensed under the Apache License, Version 2.0 (the "License");

container-image-generator/container-images/java/base-21/Dockerfile

@@ -5,7 +5,7 @@ ADD ./app/Main.java /app/src/main/java/Main.java
 
 WORKDIR /app
 
-RUN mvn compile exec:java
+RUN mvn -Dexec.mainClass=Main compile exec:java
 
 FROM maven:3.9.9-eclipse-temurin-21
 COPY --from=build /root/.m2 /root/.m2

container-image-generator/container-images/java/base-21/app/pom.xml

@@ -6,7 +6,7 @@
 
   <groupId>com.javaaidev.llmcodeexecutor</groupId>
   <artifactId>generate-app</artifactId>
-  <version>0.1.0</version>
+  <version>0.2.0</version>
 
   <properties>
     <java.version>21</java.version>
@@ -56,9 +56,6 @@
             </goals>
           </execution>
         </executions>
-        <configuration>
-          <mainClass>Main</mainClass>
-        </configuration>
       </plugin>
     </plugins>
   </build>

container-image-generator/container-images/python/base-3.12/app/pyproject.toml

@@ -1,12 +1,12 @@
 [project]
 name = "llm-code-executor"
-version = "0.1.0"
+version = "0.2.0"
 requires-python = ">=3.12"
 dependencies = [
-"numpy",
-"pandas",
-"seaborn",
-"tabulate",
-"sympy"
+    "numpy",
+    "pandas",
+    "seaborn",
+    "tabulate",
+    "sympy"
 
 ]

container-image-generator/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.javaaidev.llmcodeexecutor</groupId>
     <artifactId>llm-code-executor</artifactId>
-    <version>0.1.0</version>
+    <version>0.2.0</version>
   </parent>
 
   <artifactId>container-image-generator</artifactId>

container-image-generator/src/main/kotlin/com/javaaidev/llmcodeexecutor/containerimagegenerator/ContainerImageGeneratorCli.kt

@@ -23,7 +23,7 @@ class ReusableOptions {
 @Command(
     name = "llm-code-executor",
     mixinStandardHelpOptions = true,
-    version = ["0.1.0"],
+    version = ["0.2.0"],
     description = ["Generate container image for LLM code execution"],
     scope = CommandLine.ScopeType.INHERIT,
     subcommands = [

container-image-generator/src/main/resources/templates/java/pom.xml.hbs

@@ -6,7 +6,7 @@
 
   <groupId>com.javaaidev.llmcodeexecutor</groupId>
   <artifactId>generate-app</artifactId>
-  <version>0.1.0</version>
+  <version>0.2.0</version>
 
   <properties>
     <java.version>{{javaVersion}}</java.version>

container-image-generator/src/main/resources/templates/python/pyproject.toml.hbs

@@ -1,6 +1,6 @@
 [project]
 name = "llm-code-executor"
-version = "0.1.0"
+version = "0.2.0"
 requires-python = ">={{pythonVersion}}"
 dependencies = [
 {{#each dependencies}}"{{.}}"{{#unless @last}},{{/unless}}

core/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.javaaidev.llmcodeexecutor</groupId>
     <artifactId>llm-code-executor</artifactId>
-    <version>0.1.0</version>
+    <version>0.2.0</version>
   </parent>
 
   <artifactId>core</artifactId>
@@ -35,6 +35,11 @@
   </build>
 
   <dependencies>
+    <dependency>
+      <groupId>com.javaaidev.llmcodeexecutor</groupId>
+      <artifactId>code-executor-model</artifactId>
+      <version>0.2.0</version>
+    </dependency>
     <dependency>
       <groupId>com.github.docker-java</groupId>
       <artifactId>docker-java-core</artifactId>

core/src/main/kotlin/com/javaaidev/llmcodeexecutor/core/LLMCodeExecutor.kt renamed to core/src/main/kotlin/com/javaaidev/llmcodeexecutor/executor/core/LLMCodeExecutor.kt

@@ -1,4 +1,4 @@
-package com.javaaidev.llmcodeexecutor.core
+package com.javaaidev.llmcodeexecutor.executor.core
 
 import com.github.dockerjava.api.async.ResultCallback
 import com.github.dockerjava.api.exception.NotModifiedException
@@ -7,6 +7,10 @@ import com.github.dockerjava.core.DefaultDockerClientConfig
 import com.github.dockerjava.core.DockerClientConfig
 import com.github.dockerjava.core.DockerClientImpl
 import com.github.dockerjava.httpclient5.ApacheDockerHttpClient
+import com.javaaidev.llmcodeexecutor.executor.model.CopiedFile
+import com.javaaidev.llmcodeexecutor.executor.model.ExecuteCodeParameters
+import com.javaaidev.llmcodeexecutor.executor.model.ExecuteCodeReturnType
+import com.javaaidev.llmcodeexecutor.executor.model.LoadedFile
 import org.slf4j.LoggerFactory
 import java.io.Closeable
 import java.nio.file.Files
@@ -34,33 +38,14 @@ data class CodeExecutorConfig(
     val containerOutputDirectory: String? = null,
 )
 
-data class CodeExecutionRequest(
-    val code: String,
-    val outputFileCollectionConfig: OutputFileCollectionConfig? = null,
-)
-
-data class OutputFileCollectionConfig(
-    val loadFiles: Boolean? = false,
-    val copyFiles: Boolean? = false,
-    val copiedFilesPath: String? = null,
-    val includedFilePattern: String? = null,
-)
-
-data class OutputFileContent(
-    val mimeType: String,
-    val data: String,
-)
-
-data class CopiedFile(
-    val path: String,
-)
+fun ExecuteCodeParameters.withDefaultIncludedFilePattern(includedFilePattern: String?) {
+    this.outputFileCollectionConfig?.let { config ->
+        if (config.includedFilePattern == null) {
+            config.includedFilePattern = includedFilePattern
+        }
+    }
+}
 
-data class CodeExecutionResponse(
-    val output: String,
-    val error: String? = null,
-    val loadedFiles: List<OutputFileContent>? = null,
-    val copiedFiles: List<CopiedFile>? = null,
-)
 
 /**
  * Execute code for LLM
@@ -81,9 +66,13 @@ class LLMCodeExecutor(
         .build()
     private val dockerClient = DockerClientImpl.getInstance(dockerClientConfig, httpClient)
 
-    fun execute(request: CodeExecutionRequest): CodeExecutionResponse {
-        pullImage()
+    init {
+        logger.info("Use docker client connecting to {}", dockerClientConfig.dockerHost)
+    }
 
+    fun execute(request: ExecuteCodeParameters): ExecuteCodeReturnType {
+        logger.info("Starting to run code: {}", request)
+        pullImage()
         val cmd = dockerClient.createContainerCmd(config.containerImage)
         config.volumes?.let { volumes ->
             cmd.withVolumes(volumes.map { Volume(it) })
@@ -155,7 +144,7 @@ class LLMCodeExecutor(
             // ignore
         }
         val copiedFiles = mutableListOf<CopiedFile>()
-        val loadedFiles = mutableListOf<OutputFileContent>()
+        val loadedFiles = mutableListOf<LoadedFile>()
         request.outputFileCollectionConfig?.let { collectionConfig ->
             if (config.containerOutputDirectory != null && (collectionConfig.loadFiles == true || collectionConfig.copyFiles == true)) {
                 val response = dockerClient.inspectContainerCmd(containerId).exec()
@@ -179,14 +168,14 @@ class LLMCodeExecutor(
                                 val mimeType = Files.probeContentType(path)
                                 if (mimeType.startsWith("text/")) {
                                     loadedFiles.add(
-                                        OutputFileContent(
+                                        LoadedFile(
                                             mimeType,
                                             Files.readString(path)
                                         )
                                     )
                                 } else {
                                     loadedFiles.add(
-                                        OutputFileContent(
+                                        LoadedFile(
                                             mimeType,
                                             Base64.getMimeEncoder()
                                                 .encodeToString(Files.readAllBytes(path))
@@ -201,15 +190,21 @@ class LLMCodeExecutor(
 
         dockerClient.removeContainerCmd(containerId).exec()
         logger.info("Container removed {}", containerId)
-        return CodeExecutionResponse(
+        return ExecuteCodeReturnType(
             outputBuilder.toString(),
             errorBuilder.toString(),
             loadedFiles,
             copiedFiles
-        )
+        ).also { logger.info("Code execution result: {}", it) }
     }
 
     private fun pullImage() {
+        val existingImages =
+            dockerClient.listImagesCmd().withReferenceFilter(config.containerImage).exec()
+        if (existingImages.isNotEmpty()) {
+            logger.info("Image exists, skip pulling")
+            return
+        }
         logger.info("Start pulling image {}", config.containerImage)
         val pullImageCountDownLatch = CountDownLatch(1)
         dockerClient.pullImageCmd(config.containerImage)