Skip to content

Commit ff97475

Browse files
feat: add MODEL_PATH environment for tensorrt llm (#10921)
1 parent 9c28283 commit ff97475

File tree

2 files changed

+21
-5
lines changed

2 files changed

+21
-5
lines changed

agent/app/service/tensorrt_llm.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -163,12 +163,11 @@ func handleLLMParams(llm *model.TensorRTLLM, create request.TensorRTLLMCreate) e
163163

164164
delete(serviceValue, "environment")
165165
var environments []interface{}
166+
environments = append(environments, fmt.Sprintf("MODEL_PATH=%s", create.ModelDir))
166167
for _, e := range create.Environments {
167168
environments = append(environments, fmt.Sprintf("%s=%s", e.Key, e.Value))
168169
}
169-
if len(environments) > 0 {
170-
serviceValue["environment"] = environments
171-
}
170+
serviceValue["environment"] = environments
172171

173172
var volumes []interface{}
174173
var defaultVolumes = map[string]string{
@@ -255,7 +254,7 @@ func (t TensorRTLLMService) Create(create request.TensorRTLLMCreate) error {
255254
envMap := handleLLMEnv(tensorrtLLM, create)
256255
llmDir := path.Join(global.Dir.TensorRTLLMDir, create.Name)
257256
envPath := path.Join(llmDir, ".env")
258-
if err := env.Write(envMap, envPath); err != nil {
257+
if err := env.WriteWithOrder(envMap, envPath, []string{"MODEL_PATH", "COMMAND"}); err != nil {
259258
return err
260259
}
261260
dockerComposePath := path.Join(llmDir, "docker-compose.yml")
@@ -294,7 +293,7 @@ func (t TensorRTLLMService) Update(req request.TensorRTLLMUpdate) error {
294293
tensorrtLLM.Env = envStr
295294
llmDir := path.Join(global.Dir.TensorRTLLMDir, tensorrtLLM.Name)
296295
envPath := path.Join(llmDir, ".env")
297-
if err := env.Write(envMap, envPath); err != nil {
296+
if err := env.WriteWithOrder(envMap, envPath, []string{"MODEL_PATH", "COMMAND"}); err != nil {
298297
return err
299298
}
300299
dockerComposePath := path.Join(llmDir, "docker-compose.yml")

agent/utils/env/env.go

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,23 @@ func Marshal(envMap map[string]string) (string, error) {
4040
return strings.Join(lines, "\n"), nil
4141
}
4242

43+
func WriteWithOrder(envMap map[string]string, filename string, orders []string) error {
44+
content, err := MarshalWithOrder(envMap, orders)
45+
if err != nil {
46+
return err
47+
}
48+
file, err := os.Create(filename)
49+
if err != nil {
50+
return err
51+
}
52+
defer file.Close()
53+
_, err = file.WriteString(content + "\n")
54+
if err != nil {
55+
return err
56+
}
57+
return file.Sync()
58+
}
59+
4360
func MarshalWithOrder(envMap map[string]string, orders []string) (string, error) {
4461
lines := make([]string, 0, len(envMap))
4562
for _, k := range orders {

0 commit comments

Comments
 (0)