CLI: add .env configuration file (#670)

LangStream · Oct 31, 2023 · fde166d · fde166d
1 parent c2208a2
commit fde166d
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 11 deletions.
diff --git a/langstream-cli/pom.xml b/langstream-cli/pom.xml
@@ -175,6 +175,7 @@
             <platform>windows</platform>
             <platform>unix</platform>
           </platforms>
+          <environmentSetupFileName>langstream.env</environmentSetupFileName>
           <programs>
             <program>
               <mainClass>ai.langstream.cli.LangStreamCLI</mainClass>

diff --git a/langstream-cli/src/main/java/ai/langstream/cli/commands/docker/LocalRunApplicationCmd.java b/langstream-cli/src/main/java/ai/langstream/cli/commands/docker/LocalRunApplicationCmd.java
@@ -23,7 +23,6 @@
 import ai.langstream.cli.LangStreamCLI;
 import ai.langstream.cli.NamedProfile;
 import ai.langstream.cli.api.model.Gateways;
-import ai.langstream.cli.commands.VersionProvider;
 import ai.langstream.cli.commands.applications.MermaidAppDiagramGenerator;
 import ai.langstream.cli.commands.applications.UIAppCmd;
 import ai.langstream.cli.util.DockerImageUtils;
@@ -143,12 +142,14 @@ public class LocalRunApplicationCmd extends BaseDockerCmd {
 
     @CommandLine.Option(
             names = {"--langstream-runtime-version"},
-            description = "Version of the LangStream runtime to use")
-    private String dockerImageVersion = VersionProvider.getMavenVersion();
+            description = "Version of the LangStream runtime to use",
+            defaultValue = "${env:LANGSTREAM_RUNTIME_DOCKER_IMAGE_VERSION}")
+    private String dockerImageVersion;
 
     @CommandLine.Option(
             names = {"--langstream-runtime-docker-image"},
-            description = "Docker image of the LangStream runtime to use")
+            description = "Docker image of the LangStream runtime to use",
+            defaultValue = "${env:LANGSTREAM_RUNTIME_DOCKER_IMAGE}")
     private String dockerImageName;
 
     @CommandLine.Option(

diff --git a/...stream-cli/src/main/java/ai/langstream/cli/commands/python/LoadPythonDependenciesCmd.java b/...stream-cli/src/main/java/ai/langstream/cli/commands/python/LoadPythonDependenciesCmd.java
@@ -15,7 +15,6 @@
  */
 package ai.langstream.cli.commands.python;
 
-import ai.langstream.cli.commands.VersionProvider;
 import ai.langstream.cli.util.DockerImageUtils;
 import java.io.File;
 import java.nio.file.Files;
@@ -56,12 +55,14 @@ public class LoadPythonDependenciesCmd extends BasePythonCmd {
 
     @CommandLine.Option(
             names = {"--langstream-runtime-version"},
-            description = "Version of the LangStream runtime to use")
-    private String dockerImageVersion = VersionProvider.getMavenVersion();
+            description = "Version of the LangStream runtime to use",
+            defaultValue = "${env:LANGSTREAM_RUNTIME_DOCKER_IMAGE_VERSION}")
+    private String dockerImageVersion;
 
     @CommandLine.Option(
             names = {"--langstream-runtime-docker-image"},
-            description = "Docker image of the LangStream runtime to use")
+            description = "Docker image of the LangStream runtime to use",
+            defaultValue = "${env:LANGSTREAM_RUNTIME_DOCKER_IMAGE}")
     private String dockerImageName;
 
     @Override

diff --git a/langstream-cli/src/main/java/ai/langstream/cli/util/DockerImageUtils.java b/langstream-cli/src/main/java/ai/langstream/cli/util/DockerImageUtils.java
@@ -15,16 +15,20 @@
  */
 package ai.langstream.cli.util;
 
+import ai.langstream.cli.commands.VersionProvider;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 public class DockerImageUtils {
 
     public static DockerImage computeDockerImage(
             String dockerImageVersion, String dockerImageName) {
-        if (dockerImageVersion != null && dockerImageVersion.endsWith("-SNAPSHOT")) {
-            // built-from-sources, not a release
-            dockerImageVersion = "latest-dev";
+        if (dockerImageVersion == null) {
+            dockerImageVersion = VersionProvider.getMavenVersion();
+            if (dockerImageVersion != null && dockerImageVersion.endsWith("-SNAPSHOT")) {
+                // built-from-sources, not a release
+                dockerImageVersion = "latest-dev";
+            }
         }
 
         if (dockerImageName == null) {