Skip to content

Commit 1d18737

Browse files
lesebVaishnaviHire
authored andcommitted
chore: use the new CLI to run the server (llamastack#171)
0.3.0 with llamastack/llama-stack#3625 forces us to use "llama stack run" and the server module doesn't execute the server anymore. Signed-off-by: Sébastien Han <seb@redhat.com> (cherry picked from commit 90365e7)
1 parent acea5ea commit 1d18737

File tree

1 file changed

+27
-18
lines changed

1 file changed

+27
-18
lines changed

controllers/resource_helper.go

Lines changed: 27 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -53,30 +53,39 @@ var validConfigMapKeyRegex = regexp.MustCompile(`^[a-zA-Z0-9]([a-zA-Z0-9\-_.]*[a
5353
var startupScript = `
5454
set -e
5555
56-
if python -c "
56+
# Determine which CLI to use based on llama-stack version
57+
VERSION_CODE=$(python -c "
5758
import sys
59+
from importlib.metadata import version
60+
from packaging import version as pkg_version
5861
5962
try:
60-
from importlib.metadata import version
61-
from packaging import version as pkg_version
62-
6363
llama_version = version('llama_stack')
64-
print(f'Determined llama-stack version {llama_version}')
65-
if pkg_version.parse(llama_version) < pkg_version.parse('0.2.17'):
66-
print('llama-stack version is less than 0.2.17 usin old module path llama_stack.distribution.server.server to start the server')
67-
sys.exit(0)
64+
print(f'Detected llama-stack version: {llama_version}', file=sys.stderr)
65+
66+
v = pkg_version.parse(llama_version)
67+
68+
if v < pkg_version.parse('0.2.17'):
69+
print('Using legacy module path (llama_stack.distribution.server.server)', file=sys.stderr)
70+
print(0)
71+
elif v < pkg_version.parse('0.3.0'):
72+
print('Using core module path (llama_stack.core.server.server)', file=sys.stderr)
73+
print(1)
6874
else:
69-
print('llama-stack version is greater than or equal to 0.2.17 using new module path llama_stack.core.server.server to start the server')
70-
sys.exit(1)
75+
print('Using new CLI command (llama stack run)', file=sys.stderr)
76+
print(2)
7177
except Exception as e:
72-
print(f'Failed to determine version: assume newer version if we cannot determine using new module path llama_stack.core.server.server to start the server: {e}')
73-
sys.exit(1)
74-
75-
"; then
76-
python3 -m llama_stack.distribution.server.server --config /etc/llama-stack/run.yaml
77-
else
78-
python3 -m llama_stack.core.server.server /etc/llama-stack/run.yaml
79-
fi`
78+
print(f'Version detection failed, defaulting to new CLI: {e}', file=sys.stderr)
79+
print(2)
80+
")
81+
82+
# Execute the appropriate CLI based on version
83+
case $VERSION_CODE in
84+
0) python3 -m llama_stack.distribution.server.server --config /etc/llama-stack/run.yaml ;;
85+
1) python3 -m llama_stack.core.server.server /etc/llama-stack/run.yaml ;;
86+
2) llama stack run /etc/llama-stack/run.yaml ;;
87+
*) echo "Invalid version code: $VERSION_CODE, using new CLI"; llama stack run /etc/llama-stack/run.yaml ;;
88+
esac`
8089

8190
// validateConfigMapKeys validates that all ConfigMap keys contain only safe characters.
8291
// Note: This function validates key names only. PEM content validation is performed

0 commit comments

Comments
 (0)