refactor java executor code

Author: alexcheng1982

container-image-generator/pom.xml

@@ -10,6 +10,7 @@
   </parent>
 
   <artifactId>container-image-generator</artifactId>
+  <name>LLM Code Executor :: Container Image Generator</name>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

core/pom.xml

@@ -10,6 +10,7 @@
   </parent>
 
   <artifactId>core</artifactId>
+  <name>LLM Code Executor :: Core</name>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

core/src/main/kotlin/com/javaaidev/llmcodeexecutor/core/LLMCodeExecutor.kt

@@ -4,6 +4,7 @@ import com.github.dockerjava.api.async.ResultCallback
 import com.github.dockerjava.api.exception.NotModifiedException
 import com.github.dockerjava.api.model.*
 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 org.slf4j.LoggerFactory
@@ -61,45 +62,27 @@ data class CodeExecutionResponse(
     val copiedFiles: List<CopiedFile>? = null,
 )
 
-class LLMCodeExecutor(private val config: CodeExecutorConfig) {
+/**
+ * Execute code for LLM
+ */
+class LLMCodeExecutor(
+    private val config: CodeExecutorConfig,
+    customDockerClientConfig: DockerClientConfig? = null
+) {
     private val logger = LoggerFactory.getLogger(LLMCodeExecutor::class.java)
-    private val dockerClientConfig = DefaultDockerClientConfig.createDefaultConfigBuilder().build()
+    private val dockerClientConfig =
+        customDockerClientConfig ?: DefaultDockerClientConfig.createDefaultConfigBuilder().build()
     private val httpClient = ApacheDockerHttpClient.Builder()
         .dockerHost(dockerClientConfig.dockerHost)
         .sslConfig(dockerClientConfig.sslConfig)
         .maxConnections(100)
         .connectionTimeout(Duration.ofSeconds(30))
         .responseTimeout(Duration.ofSeconds(45))
         .build()
-    private val dockerClient = DockerClientImpl.getInstance(dockerClientConfig, httpClient)
+    private val dockerClient = DockerClientImpl.getInstance(customDockerClientConfig, httpClient)
 
     fun execute(request: CodeExecutionRequest): CodeExecutionResponse {
-        val pullImageCountDownLatch = CountDownLatch(1)
-        dockerClient.pullImageCmd(config.containerImage)
-            .exec(object : ResultCallback<PullResponseItem> {
-                override fun close() {
-
-                }
-
-                override fun onStart(closeable: Closeable?) {
-
-                }
-
-                override fun onError(throwable: Throwable?) {
-                    logger.error("Failed to pull image", throwable)
-                }
-
-                override fun onComplete() {
-                    pullImageCountDownLatch.countDown()
-                }
-
-                override fun onNext(`object`: PullResponseItem?) {
-
-                }
-
-            })
-        pullImageCountDownLatch.await(1, TimeUnit.MINUTES)
-        logger.info("Image pulled successfully")
+        pullImage()
 
         val cmd = dockerClient.createContainerCmd(config.containerImage)
         config.volumes?.let { volumes ->
@@ -214,12 +197,41 @@ class LLMCodeExecutor(private val config: CodeExecutorConfig) {
             }
         }
 
-//        dockerClient.removeContainerCmd(containerId).exec()
+        dockerClient.removeContainerCmd(containerId).exec()
         return CodeExecutionResponse(
             outputBuilder.toString(),
             errorBuilder.toString(),
             loadedFiles,
             copiedFiles
         )
     }
+
+    private fun pullImage() {
+        val pullImageCountDownLatch = CountDownLatch(1)
+        dockerClient.pullImageCmd(config.containerImage)
+            .exec(object : ResultCallback<PullResponseItem> {
+                override fun close() {
+
+                }
+
+                override fun onStart(closeable: Closeable?) {
+
+                }
+
+                override fun onError(throwable: Throwable?) {
+                    logger.error("Failed to pull image", throwable)
+                }
+
+                override fun onComplete() {
+                    pullImageCountDownLatch.countDown()
+                }
+
+                override fun onNext(`object`: PullResponseItem?) {
+
+                }
+
+            })
+        pullImageCountDownLatch.await(1, TimeUnit.MINUTES)
+        logger.info("Image pulled successfully")
+    }
 }

core/src/test/kotlin/com/javaaidev/llmcodeexecutor/core/Manual.java

@@ -10,6 +10,7 @@
   </parent>
 
   <artifactId>executor-java</artifactId>
+  <name>LLM Code Executor :: Executor :: Java</name>
 
   <build>
     <sourceDirectory>src/main/kotlin</sourceDirectory>

executors/java/pom.xml

@@ -42,24 +42,4 @@ object JavaCodeExecutor {
             )
         )
     }
-}
-
-fun main() {
-    println(
-        JavaCodeExecutor.execute(
-            CodeExecutionRequest(
-                """
-        public class Main {
-            public static void main(String[] args) {
-                System.out.println("hello");
-            }
-        }
-    """.trimIndent(),
-                OutputFileCollectionConfig(
-                    copyFiles = true,
-                    copiedFilesPath = "./target"
-                )
-            )
-        )
-    )
 }

executors/java/src/main/kotlin/com/javaaidev/llmcodeexecutor/executor/java/JavaCodeExecutor.kt

@@ -0,0 +1,24 @@
+package com.javaaidev.llmcodeexecutor.executor.java
+
+import com.javaaidev.llmcodeexecutor.core.CodeExecutionRequest
+import org.junit.jupiter.api.Test
+import kotlin.test.Ignore
+
+class JavaCodeExecutorTest {
+    @Test
+    @Ignore
+    fun basic() {
+        val result = JavaCodeExecutor.execute(
+            CodeExecutionRequest(
+                """
+        public class Main {
+            public static void main(String[] args) {
+                System.out.println("hello");
+            }
+        }
+    """.trimIndent()
+            )
+        )
+        kotlin.test.assertEquals("Hello", result.output.trim())
+    }
+}

executors/java/src/test/kotlin/com/javaaidev/llmcodeexecutor/executor/java/JavaCodeExecutorTest.kt

@@ -10,6 +10,7 @@
   </parent>
 
   <artifactId>executors</artifactId>
+  <name>LLM Code Executor :: Executors</name>
   <packaging>pom</packaging>
   <modules>
     <module>python</module>
@@ -22,13 +23,6 @@
     <kotlin.compiler.jvmTarget>1.8</kotlin.compiler.jvmTarget>
   </properties>
 
-  <repositories>
-    <repository>
-      <id>mavenCentral</id>
-      <url>https://repo1.maven.org/maven2/</url>
-    </repository>
-  </repositories>
-
   <build>
     <sourceDirectory>src/main/kotlin</sourceDirectory>
     <testSourceDirectory>src/test/kotlin</testSourceDirectory>

executors/pom.xml

@@ -10,6 +10,7 @@
   </parent>
 
   <artifactId>executor-python</artifactId>
+  <name>LLM Code Executor :: Executor :: Python</name>
 
   <build>
     <sourceDirectory>src/main/kotlin</sourceDirectory>
@@ -72,14 +73,6 @@
       <artifactId>kotlin-stdlib</artifactId>
       <version>2.1.10</version>
     </dependency>
-    <dependency>
-      <groupId>com.javaaidev.llmcodeexecutor</groupId>
-      <artifactId>core</artifactId>
-      <version>${project.version}</version>
-      <classifier>tests</classifier>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
 </project>

executors/python/pom.xml

@@ -6,6 +6,7 @@
 
   <groupId>com.javaaidev.llmcodeexecutor</groupId>
   <artifactId>parent</artifactId>
+  <name>LLM Code Executor</name>
   <version>0.1.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <modules>