add python code executor

Author: alexcheng1982

executor-model/src/main/java/com/javaaidev/llmcodeexecutor/executor/model/CopiedFile.java

@@ -5,7 +5,7 @@
 public class CopiedFile {
 
     /**
-     * Path of a copied file
+     * Path of a copied file in the host machine
      * 
      */
     private String path;
@@ -20,7 +20,7 @@ public CopiedFile() {
     /**
      * 
      * @param path
-     *     Path of a copied file.
+     *     Path of a copied file in the host machine.
      */
     public CopiedFile(String path) {
         super();
@@ -32,15 +32,15 @@ public static CopiedFile.CopiedFileBuilderBase builder() {
     }
 
     /**
-     * Path of a copied file
+     * Path of a copied file in the host machine
      * 
      */
     public String getPath() {
         return path;
     }
 
     /**
-     * Path of a copied file
+     * Path of a copied file in the host machine
      * 
      */
     public void setPath(String path) {

executor-model/src/main/java/com/javaaidev/llmcodeexecutor/executor/model/OutputFileCollectionConfig.java

@@ -10,17 +10,17 @@
 public class OutputFileCollectionConfig {
 
     /**
-     * Should output files be loaded as string
+     * Should output files created in the container be loaded as string
      * 
      */
     private Boolean loadFiles;
     /**
-     * Should output files be copied to a directory
+     * Should output files created in the container be copied to a directory
      * 
      */
     private Boolean copyFiles;
     /**
-     * Directory to copy output files
+     * Target directory of the host machine to copy output files
      * 
      */
     private String copiedFilesPath;
@@ -42,11 +42,11 @@ public OutputFileCollectionConfig() {
      * @param includedFilePattern
      *     Glob patterns to include files for loading or copying.
      * @param copyFiles
-     *     Should output files be copied to a directory.
+     *     Should output files created in the container be copied to a directory.
      * @param copiedFilesPath
-     *     Directory to copy output files.
+     *     Target directory of the host machine to copy output files.
      * @param loadFiles
-     *     Should output files be loaded as string.
+     *     Should output files created in the container be loaded as string.
      */
     public OutputFileCollectionConfig(Boolean loadFiles, Boolean copyFiles, String copiedFilesPath, String includedFilePattern) {
         super();
@@ -61,47 +61,47 @@ public static OutputFileCollectionConfig.OutputFileCollectionConfigBuilderBase b
     }
 
     /**
-     * Should output files be loaded as string
+     * Should output files created in the container be loaded as string
      * 
      */
     public Boolean getLoadFiles() {
         return loadFiles;
     }
 
     /**
-     * Should output files be loaded as string
+     * Should output files created in the container be loaded as string
      * 
      */
     public void setLoadFiles(Boolean loadFiles) {
         this.loadFiles = loadFiles;
     }
 
     /**
-     * Should output files be copied to a directory
+     * Should output files created in the container be copied to a directory
      * 
      */
     public Boolean getCopyFiles() {
         return copyFiles;
     }
 
     /**
-     * Should output files be copied to a directory
+     * Should output files created in the container be copied to a directory
      * 
      */
     public void setCopyFiles(Boolean copyFiles) {
         this.copyFiles = copyFiles;
     }
 
     /**
-     * Directory to copy output files
+     * Target directory of the host machine to copy output files
      * 
      */
     public String getCopiedFilesPath() {
         return copiedFilesPath;
     }
 
     /**
-     * Directory to copy output files
+     * Target directory of the host machine to copy output files
      * 
      */
     public void setCopiedFilesPath(String copiedFilesPath) {

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

@@ -2,6 +2,8 @@ package com.javaaidev.llmcodeexecutor.executor.java
 
 import com.javaaidev.llmcodeexecutor.executor.model.ExecuteCodeParameters
 import org.junit.jupiter.api.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
 
 class JavaCodeExecutorTest {
     @Test
@@ -17,6 +19,30 @@ class JavaCodeExecutorTest {
     """.trimIndent()
             )
         )
-        kotlin.test.assertEquals("Hello", result.output.trim())
+        assertEquals("Hello", result.output.trim())
+    }
+
+    @Test
+    fun codeFileName() {
+        val result = JavaCodeExecutor().execute(
+            ExecuteCodeParameters(
+                """
+        import java.time.LocalDateTime;
+        import java.time.format.DateTimeFormatter;
+        
+        public class CurrentTime {
+            public static void main(String[] args) {
+                DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+                LocalDateTime now = LocalDateTime.now();
+                System.out.println("Current time: " + now.format(formatter));
+            }
+        }
+    """.trimIndent(),
+                "CurrentTime.java",
+                null
+            )
+        )
+        assertNotNull(result.output)
+        assertEquals("", result.error)
     }
 }

executors/python/src/main/kotlin/com/javaaidev/llmcodeexecutor/executor/python/PythonCodeExecutor.kt

@@ -16,7 +16,7 @@ class PythonCodeExecutor(private val config: ExecuteCodeConfiguration? = null) {
         request: ExecuteCodeParameters
     ): ExecuteCodeReturnType {
         val codeDir = Files.createTempDirectory("code_executor")
-        val codeFile = "app.py"
+        val codeFile = (request.codeFileName ?: "").ifBlank { "app.py" }
         Files.writeString(codeDir.resolve(codeFile), request.code)
         val codeExecutor = LLMCodeExecutor(
             CodeExecutorConfig(

justfile

@@ -14,7 +14,7 @@ generateJavaContainerImages: build
           profiles/java/base-21.json --output=container-images/java/base-21
 
 downloadCodeGeneratorCli:
-    mvn dependency:copy -Dartifact=com.javaaidev.easyllmtools:code-generator-cli:0.1.8 -DoutputDirectory=target -Dmdep.stripVersion=true
+    mvn dependency:copy -Dartifact=com.javaaidev.easyllmtools:code-generator-cli:0.1.9 -DoutputDirectory=target -Dmdep.stripVersion=true
 
 generateCodeExecutorModel: downloadCodeGeneratorCli
     java -jar target/code-generator-cli.jar simple \
@@ -40,5 +40,22 @@ generateCodeExecutorJava: downloadCodeGeneratorCli
       --artifact-id=tool-java --artifact-version=0.2.0 \
       --model-package-name=com.javaaidev.llmcodeexecutor.executor.model \
       --package-name=com.javaaidev.llmcodeexecutor.executor.java \
-      --tool-description="Execute Java code with following libraries: guava, commons-lang3, jackson, okhttp" \
+      --llm-tool-name="ExecuteJavaCode" \
+      --tool-description="Execute Java code with following libraries: guava, commons-lang3, jackson, okhttp. Code is executed in a container. Always write files to the current directory." \
+      llm-tool-spec/code-executor.json
+
+generateCodeExecutorPython: downloadCodeGeneratorCli
+    java -jar target/code-generator-cli.jar simple \
+      --output=tools/python \
+      --no-model-files \
+      --tool-id-prefix=python \
+      --parent-group-id=com.javaaidev.llmcodeexecutor \
+      --parent-artifact-id=tools \
+      --parent-artifact-version=0.2.0 \
+      --group-id=com.javaaidev.llmcodeexecutor \
+      --artifact-id=tool-python --artifact-version=0.2.0 \
+      --model-package-name=com.javaaidev.llmcodeexecutor.executor.model \
+      --package-name=com.javaaidev.llmcodeexecutor.executor.python \
+      --llm-tool-name="ExecutePythonCode" \
+      --tool-description="Execute Python code with following libraries: numpy, pandas, seaborn, tabulate, sympy. Code is executed in a container. Always write files to the current directory." \
       llm-tool-spec/code-executor.json

llm-tool-spec/code-executor.json

@@ -19,15 +19,15 @@
           "properties": {
             "loadFiles": {
               "type": "boolean",
-              "description": "Should output files be loaded as string"
+              "description": "Should output files created in the container be loaded as string"
             },
             "copyFiles": {
               "type": "boolean",
-              "description": "Should output files be copied to a directory"
+              "description": "Should output files created in the container be copied to a directory"
             },
             "copiedFilesPath": {
               "type": "string",
-              "description": "Directory to copy output files"
+              "description": "Target directory of the host machine to copy output files"
             },
             "includedFilePattern": {
               "type": "string",
@@ -75,7 +75,7 @@
             "properties": {
               "path": {
                 "type": "string",
-                "description": "Path of a copied file"
+                "description": "Path of a copied file in the host machine"
               }
             }
           }

tools/java/pom.xml

@@ -30,7 +30,7 @@
     <dependency>
       <groupId>com.javaaidev.easyllmtools</groupId>
       <artifactId>llm-tool-spec</artifactId>
-      <version>0.1.8</version>
+      <version>0.1.9</version>
     </dependency>
     <dependency>
       <groupId>com.javaaidev.llmcodeexecutor</groupId>

tools/java/src/main/java/com/javaaidev/llmcodeexecutor/executor/java/AbstractExecuteCode.java

@@ -20,7 +20,7 @@ public String getId() {
 
     @Override
     public String getName() {
-        return "ExecuteCode";
+        return "ExecuteJavaCode";
     }
 
     @Override

tools/pom.xml

@@ -16,5 +16,6 @@
 
   <modules>
     <module>java</module>
+    <module>python</module>
   </modules>
 </project>

tools/python/pom.xml

@@ -0,0 +1,62 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+
+  <parent>
+    <groupId>com.javaaidev.llmcodeexecutor</groupId>
+    <artifactId>tools</artifactId>
+    <version>0.2.0</version>
+  </parent>
+
+
+  <groupId>com.javaaidev.llmcodeexecutor</groupId>
+  <artifactId>tool-python</artifactId>
+  <version>0.2.0</version>
+  <packaging>jar</packaging>
+
+  <name>ExecutePythonCode</name>
+  <description>Execute Python code with following libraries: numpy, pandas, seaborn, tabulate,
+    sympy
+  </description>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.javaaidev.easyllmtools</groupId>
+      <artifactId>llm-tool-spec</artifactId>
+      <version>0.1.9</version>
+    </dependency>
+    <dependency>
+      <groupId>com.javaaidev.llmcodeexecutor</groupId>
+      <artifactId>code-executor-model</artifactId>
+      <version>0.2.0</version>
+    </dependency>
+    <dependency>
+      <groupId>com.javaaidev.llmcodeexecutor</groupId>
+      <artifactId>executor-python</artifactId>
+      <version>0.2.0</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <sourceDirectory>src/main/java</sourceDirectory>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.11.0</version>
+        <configuration>
+          <source>${maven.compiler.source}</source>
+          <target>${maven.compiler.target}</target>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>