From 1fb61137ad5c746200c5a82f6421ce42f67d6383 Mon Sep 17 00:00:00 2001
From: Ashwin Bharambe <ashwin.bharambe@gmail.com>
Date: Mon, 18 Nov 2024 16:08:03 -0800
Subject: [PATCH] Add conda_env

---
 llama_stack/templates/fireworks/run.yaml                      | 2 +-
 llama_stack/templates/meta-reference-gpu/run-with-safety.yaml | 2 +-
 llama_stack/templates/meta-reference-gpu/run.yaml             | 2 +-
 llama_stack/templates/ollama/run-with-safety.yaml             | 2 +-
 llama_stack/templates/ollama/run.yaml                         | 2 +-
 llama_stack/templates/remote-vllm/run-with-safety.yaml        | 2 +-
 llama_stack/templates/remote-vllm/run.yaml                    | 2 +-
 llama_stack/templates/template.py                             | 1 +
 llama_stack/templates/tgi/run-with-safety.yaml                | 2 +-
 llama_stack/templates/tgi/run.yaml                            | 2 +-
 llama_stack/templates/together/run.yaml                       | 2 +-
 11 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/llama_stack/templates/fireworks/run.yaml b/llama_stack/templates/fireworks/run.yaml
index 8d3316257..7472e77ff 100644
--- a/llama_stack/templates/fireworks/run.yaml
+++ b/llama_stack/templates/fireworks/run.yaml
@@ -1,7 +1,7 @@
 version: '2'
 image_name: fireworks
 docker_image: null
-conda_env: null
+conda_env: fireworks
 apis:
 - agents
 - inference
diff --git a/llama_stack/templates/meta-reference-gpu/run-with-safety.yaml b/llama_stack/templates/meta-reference-gpu/run-with-safety.yaml
index 7d01159df..f82e0c938 100644
--- a/llama_stack/templates/meta-reference-gpu/run-with-safety.yaml
+++ b/llama_stack/templates/meta-reference-gpu/run-with-safety.yaml
@@ -1,7 +1,7 @@
 version: '2'
 image_name: meta-reference-gpu
 docker_image: null
-conda_env: null
+conda_env: meta-reference-gpu
 apis:
 - agents
 - inference
diff --git a/llama_stack/templates/meta-reference-gpu/run.yaml b/llama_stack/templates/meta-reference-gpu/run.yaml
index c67ba60cd..b125169a3 100644
--- a/llama_stack/templates/meta-reference-gpu/run.yaml
+++ b/llama_stack/templates/meta-reference-gpu/run.yaml
@@ -1,7 +1,7 @@
 version: '2'
 image_name: meta-reference-gpu
 docker_image: null
-conda_env: null
+conda_env: meta-reference-gpu
 apis:
 - agents
 - inference
diff --git a/llama_stack/templates/ollama/run-with-safety.yaml b/llama_stack/templates/ollama/run-with-safety.yaml
index d0f657377..6c86677b3 100644
--- a/llama_stack/templates/ollama/run-with-safety.yaml
+++ b/llama_stack/templates/ollama/run-with-safety.yaml
@@ -1,7 +1,7 @@
 version: '2'
 image_name: ollama
 docker_image: null
-conda_env: null
+conda_env: ollama
 apis:
 - agents
 - inference
diff --git a/llama_stack/templates/ollama/run.yaml b/llama_stack/templates/ollama/run.yaml
index c4003006b..b2d6f2c18 100644
--- a/llama_stack/templates/ollama/run.yaml
+++ b/llama_stack/templates/ollama/run.yaml
@@ -1,7 +1,7 @@
 version: '2'
 image_name: ollama
 docker_image: null
-conda_env: null
+conda_env: ollama
 apis:
 - agents
 - inference
diff --git a/llama_stack/templates/remote-vllm/run-with-safety.yaml b/llama_stack/templates/remote-vllm/run-with-safety.yaml
index 075cd793f..c0849e2d0 100644
--- a/llama_stack/templates/remote-vllm/run-with-safety.yaml
+++ b/llama_stack/templates/remote-vllm/run-with-safety.yaml
@@ -1,7 +1,7 @@
 version: '2'
 image_name: remote-vllm
 docker_image: null
-conda_env: null
+conda_env: remote-vllm
 apis:
 - agents
 - inference
diff --git a/llama_stack/templates/remote-vllm/run.yaml b/llama_stack/templates/remote-vllm/run.yaml
index da45acee2..3457afdd6 100644
--- a/llama_stack/templates/remote-vllm/run.yaml
+++ b/llama_stack/templates/remote-vllm/run.yaml
@@ -1,7 +1,7 @@
 version: '2'
 image_name: remote-vllm
 docker_image: null
-conda_env: null
+conda_env: remote-vllm
 apis:
 - agents
 - inference
diff --git a/llama_stack/templates/template.py b/llama_stack/templates/template.py
index 3048889a9..fd37016f8 100644
--- a/llama_stack/templates/template.py
+++ b/llama_stack/templates/template.py
@@ -80,6 +80,7 @@ class RunConfigSettings(BaseModel):
         return StackRunConfig(
             image_name=name,
             docker_image=docker_image,
+            conda_env=name,
             apis=apis,
             providers=provider_configs,
             metadata_store=SqliteKVStoreConfig.sample_run_config(
diff --git a/llama_stack/templates/tgi/run-with-safety.yaml b/llama_stack/templates/tgi/run-with-safety.yaml
index b1f12cc88..b988c28e1 100644
--- a/llama_stack/templates/tgi/run-with-safety.yaml
+++ b/llama_stack/templates/tgi/run-with-safety.yaml
@@ -1,7 +1,7 @@
 version: '2'
 image_name: tgi
 docker_image: llamastack/distribution-tgi:test-0.0.52rc3
-conda_env: null
+conda_env: tgi
 apis:
 - agents
 - inference
diff --git a/llama_stack/templates/tgi/run.yaml b/llama_stack/templates/tgi/run.yaml
index 5571beabd..485c02ad8 100644
--- a/llama_stack/templates/tgi/run.yaml
+++ b/llama_stack/templates/tgi/run.yaml
@@ -1,7 +1,7 @@
 version: '2'
 image_name: tgi
 docker_image: llamastack/distribution-tgi:test-0.0.52rc3
-conda_env: null
+conda_env: tgi
 apis:
 - agents
 - inference
diff --git a/llama_stack/templates/together/run.yaml b/llama_stack/templates/together/run.yaml
index cc3c890f4..a2082c691 100644
--- a/llama_stack/templates/together/run.yaml
+++ b/llama_stack/templates/together/run.yaml
@@ -1,7 +1,7 @@
 version: '2'
 image_name: together
 docker_image: null
-conda_env: null
+conda_env: together
 apis:
 - agents
 - inference