fix(controller): fix multiple same env on console (#3014)

star-whale · Nov 22, 2023 · 314934e · 314934e
1 parent 34d2018
commit 314934e
Showing 1 changed file with 16 additions and 2 deletions.
diff --git a/server/controller/src/main/java/ai/starwhale/mlops/domain/ft/FineTuneAppService.java b/server/controller/src/main/java/ai/starwhale/mlops/domain/ft/FineTuneAppService.java
@@ -237,8 +237,22 @@ private String rewriteSpecEnvForRequest(
                 if (null == env) {
                     env = new ArrayList<>();
                 }
-                env.addAll(envSupplier.get());
-                s.setEnv(env);
+                Map<String, String> envMap = env.stream().collect(Collectors.toMap(Env::getName, Env::getValue));
+                //if ENV vars in user's step spec conflicts with controller's, use controller's ENV
+                List<Env> controllerEnvs = envSupplier.get();
+                if (null != controllerEnvs) {
+                    envMap.putAll(
+                            controllerEnvs.stream()
+                                    .filter(e -> null != e.getValue())
+                                    .collect(Collectors.toMap(Env::getName, Env::getValue))
+                    );
+                }
+                s.setEnv(
+                        envMap.entrySet()
+                                .stream()
+                                .map(entry -> new Env(entry.getKey(), entry.getValue()))
+                                .collect(Collectors.toList())
+                );
                 s.verifyStepSpecArgs();
             }
             stepSpecOverWrites = Constants.yamlMapper.writeValueAsString(steps);