update docker image

alexcheng1982 · alexcheng1982 · commit e518433e94ad · 2025-12-17T22:15:26.000+13:00
diff --git a/container-image-generator/container-images/java/base-21/Dockerfile b/container-image-generator/container-images/java/base-21/Dockerfile
@@ -5,9 +5,12 @@ ADD ./app/Main.java /app/src/main/java/Main.java
 
 WORKDIR /app
 
-RUN mvn -Dexec.mainClass=Main compile exec:java
+RUN mvn compile exec:java
 
 FROM maven:3.9.9-eclipse-temurin-21
+
+LABEL "com.javaaidev.llm-code-executor.description"="Java 21 with libraries: com.google.guava:guava:33.5.0-jre, org.apache.commons:commons-lang3:3.20.0, com.fasterxml.jackson.core:jackson-databind:2.20.1, com.squareup.okhttp3:okhttp:5.3.2"
+
 COPY --from=build /root/.m2 /root/.m2
 
 WORKDIR /app
diff --git a/container-image-generator/container-images/java/base-21/app/pom.xml b/container-image-generator/container-images/java/base-21/app/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
+         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>
 
   <groupId>com.javaaidev.llmcodeexecutor</groupId>
@@ -16,31 +16,31 @@
   </properties>
 
   <dependencies>
-
+    
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>33.4.6-jre</version>
+      <version>33.5.0-jre</version>
     </dependency>
-
+    
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
-      <version>3.17.0</version>
+      <version>3.20.0</version>
     </dependency>
-
+    
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>2.18.3</version>
+      <version>2.20.1</version>
     </dependency>
-
+    
     <dependency>
       <groupId>com.squareup.okhttp3</groupId>
       <artifactId>okhttp</artifactId>
-      <version>4.12.0</version>
+      <version>5.3.2</version>
     </dependency>
-
+    
   </dependencies>
 
   <build>
@@ -56,6 +56,9 @@
             </goals>
           </execution>
         </executions>
+        <configuration>
+          <mainClass>Main</mainClass>
+        </configuration>
       </plugin>
     </plugins>
   </build>
diff --git a/container-image-generator/container-images/python/base-3.12/Dockerfile b/container-image-generator/container-images/python/base-3.12/Dockerfile
@@ -1,5 +1,7 @@
 FROM ghcr.io/astral-sh/uv:python3.12-bookworm-slim
 
+LABEL "com.javaaidev.llm-code-executor.description"="Python 3.12 with libraries: numpy, pandas, seaborn, tabulate, sympy"
+
 ENV UV_COMPILE_BYTECODE=1
 
 ADD ./app /app
diff --git a/container-image-generator/container-images/python/base-3.12/app/pyproject.toml b/container-image-generator/container-images/python/base-3.12/app/pyproject.toml
@@ -3,10 +3,10 @@ name = "llm-code-executor"
 version = "0.2.0"
 requires-python = ">=3.12"
 dependencies = [
-    "numpy",
-    "pandas",
-    "seaborn",
-    "tabulate",
-    "sympy"
+"numpy",
+"pandas",
+"seaborn",
+"tabulate",
+"sympy"
 
 ]
diff --git a/container-image-generator/profiles/java/base-21.json b/container-image-generator/profiles/java/base-21.json
@@ -4,22 +4,22 @@
     {
       "groupId": "com.google.guava",
       "artifactId": "guava",
-      "artifactVersion": "33.4.6-jre"
+      "artifactVersion": "33.5.0-jre"
     },
     {
       "groupId": "org.apache.commons",
       "artifactId": "commons-lang3",
-      "artifactVersion": "3.17.0"
+      "artifactVersion": "3.20.0"
     },
     {
       "groupId": "com.fasterxml.jackson.core",
       "artifactId": "jackson-databind",
-      "artifactVersion": "2.18.3"
+      "artifactVersion": "2.20.1"
     },
     {
       "groupId": "com.squareup.okhttp3",
       "artifactId": "okhttp",
-      "artifactVersion": "4.12.0"
+      "artifactVersion": "5.3.2"
     }
   ]
 }
diff --git a/container-image-generator/src/main/kotlin/com/javaaidev/llmcodeexecutor/containerimagegenerator/java/JavaProfile.kt b/container-image-generator/src/main/kotlin/com/javaaidev/llmcodeexecutor/containerimagegenerator/java/JavaProfile.kt
@@ -1,9 +1,14 @@
 package com.javaaidev.llmcodeexecutor.containerimagegenerator.java
 
-data class JavaProfile(val javaVersion: String, val dependencies: List<MavenDependency>)
+data class JavaProfile(val javaVersion: String, val dependencies: List<MavenDependency>) {
+    val description: String
+        get() = "Java $javaVersion with libraries: ${dependencies.joinToString(", ") { it.coordinate() }}"
+}
 
 data class MavenDependency(
     val groupId: String,
     val artifactId: String,
     val artifactVersion: String
 )
+
+fun MavenDependency.coordinate() = "$groupId:$artifactId:$artifactVersion"
diff --git a/container-image-generator/src/main/kotlin/com/javaaidev/llmcodeexecutor/containerimagegenerator/python/PythonProfile.kt b/container-image-generator/src/main/kotlin/com/javaaidev/llmcodeexecutor/containerimagegenerator/python/PythonProfile.kt
@@ -3,4 +3,7 @@ package com.javaaidev.llmcodeexecutor.containerimagegenerator.python
 data class PythonProfile(
     val pythonVersion: String,
     val dependencies: List<String>,
-)
+) {
+    val description: String
+        get() = "Python $pythonVersion with libraries: ${dependencies.joinToString(", ")}"
+}
diff --git a/container-image-generator/src/main/resources/templates/java/Dockerfile.hbs b/container-image-generator/src/main/resources/templates/java/Dockerfile.hbs
@@ -8,6 +8,9 @@ WORKDIR /app
 RUN mvn compile exec:java
 
 FROM maven:3.9.9-eclipse-temurin-{{javaVersion}}
+
+LABEL "com.javaaidev.llm-code-executor.description"="{{description}}"
+
 COPY --from=build /root/.m2 /root/.m2
 
 WORKDIR /app
diff --git a/container-image-generator/src/main/resources/templates/python/Dockerfile.hbs b/container-image-generator/src/main/resources/templates/python/Dockerfile.hbs
@@ -1,5 +1,7 @@
 FROM ghcr.io/astral-sh/uv:python{{pythonVersion}}-bookworm-slim
 
+LABEL "com.javaaidev.llm-code-executor.description"="{{description}}"
+
 ENV UV_COMPILE_BYTECODE=1
 
 ADD ./app /app
diff --git a/justfile b/justfile
@@ -12,50 +12,3 @@ generatePythonContainerImages: build
 generateJavaContainerImages: build
     java -jar target/container-image-generator.jar java \
           profiles/java/base-21.json --output=container-images/java/base-21
-
-downloadCodeGeneratorCli:
-    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 \
-      --output=executor-model \
-      --model-files-only \
-      --parent-group-id=com.javaaidev.llmcodeexecutor \
-      --parent-artifact-id=llm-code-executor \
-      --parent-artifact-version=0.2.0 \
-      --group-id=com.javaaidev.llmcodeexecutor \
-      --artifact-id=code-executor-model --artifact-version=0.2.0 \
-      --package-name=com.javaaidev.llmcodeexecutor.executor \
-      llm-tool-spec/code-executor.json
-
-generateCodeExecutorJava: downloadCodeGeneratorCli
-    java -jar target/code-generator-cli.jar simple \
-      --output=tools/java \
-      --no-model-files \
-      --tool-id-prefix=java \
-      --parent-group-id=com.javaaidev.llmcodeexecutor \
-      --parent-artifact-id=tools \
-      --parent-artifact-version=0.2.0 \
-      --group-id=com.javaaidev.llmcodeexecutor \
-      --artifact-id=tool-java --artifact-version=0.2.0 \
-      --model-package-name=com.javaaidev.llmcodeexecutor.executor.model \
-      --package-name=com.javaaidev.llmcodeexecutor.executor.java \
-      --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

Original file line number	Diff line number	Diff line change
`@@ -4,22 +4,22 @@`
`4`	`4`	`{`
`5`	`5`	`"groupId": "com.google.guava",`
`6`	`6`	`"artifactId": "guava",`
`7`		`- "artifactVersion": "33.4.6-jre"`
	`7`	`+ "artifactVersion": "33.5.0-jre"`
`8`	`8`	`},`
`9`	`9`	`{`
`10`	`10`	`"groupId": "org.apache.commons",`
`11`	`11`	`"artifactId": "commons-lang3",`
`12`		`- "artifactVersion": "3.17.0"`
	`12`	`+ "artifactVersion": "3.20.0"`
`13`	`13`	`},`
`14`	`14`	`{`
`15`	`15`	`"groupId": "com.fasterxml.jackson.core",`
`16`	`16`	`"artifactId": "jackson-databind",`
`17`		`- "artifactVersion": "2.18.3"`
	`17`	`+ "artifactVersion": "2.20.1"`
`18`	`18`	`},`
`19`	`19`	`{`
`20`	`20`	`"groupId": "com.squareup.okhttp3",`
`21`	`21`	`"artifactId": "okhttp",`
`22`		`- "artifactVersion": "4.12.0"`
	`22`	`+ "artifactVersion": "5.3.2"`
`23`	`23`	`}`
`24`	`24`	`]`
`25`	`25`	`}`