Remove Kiln from local courseware setup
This commit is contained in:
@@ -4,7 +4,7 @@ This project builds a student-friendly local lab environment for the courseware
|
|||||||
|
|
||||||
- `./deploy-courseware.sh` installs and configures the environment, then starts every managed service.
|
- `./deploy-courseware.sh` installs and configures the environment, then starts every managed service.
|
||||||
- `./destroy-courseware.sh` stops the managed services, uninstalls courseware-managed Ollama, and removes the project-owned lab state.
|
- `./destroy-courseware.sh` stops the managed services, uninstalls courseware-managed Ollama, and removes the project-owned lab state.
|
||||||
- `./labctl` provides day-two controls such as `assets lab2`, `ollama_models`, `update_wiki`, `start`, `stop`, `status`, `urls`, `logs`, and `open kiln`.
|
- `./labctl` provides day-two controls such as `assets lab2`, `ollama_models`, `update_wiki`, `start`, `stop`, `status`, `urls`, and `logs`.
|
||||||
|
|
||||||
## What It Installs
|
## What It Installs
|
||||||
|
|
||||||
@@ -16,7 +16,6 @@ This project builds a student-friendly local lab environment for the courseware
|
|||||||
- Embedding Atlas
|
- Embedding Atlas
|
||||||
- Promptfoo
|
- Promptfoo
|
||||||
- Unsloth Studio
|
- Unsloth Studio
|
||||||
- Kiln Desktop
|
|
||||||
- Course-specific support assets for lab 1, lab 2, and lab 4
|
- Course-specific support assets for lab 1, lab 2, and lab 4
|
||||||
|
|
||||||
## Lab 1 Defaults
|
## Lab 1 Defaults
|
||||||
@@ -138,7 +137,6 @@ The deployment will:
|
|||||||
- `./labctl update_wiki` hard-resets the managed wiki checkout to the remote latest, rebuilds it, and restarts only the managed wiki service on port `80`.
|
- `./labctl update_wiki` hard-resets the managed wiki checkout to the remote latest, rebuilds it, and restarts only the managed wiki service on port `80`.
|
||||||
- `./labctl start core` starts only `ollama` and `open-webui`.
|
- `./labctl start core` starts only `ollama` and `open-webui`.
|
||||||
- `./labctl start all` starts every managed web service.
|
- `./labctl start all` starts every managed web service.
|
||||||
- `./labctl open kiln` launches the Kiln desktop app installed into the project state.
|
|
||||||
- The scripted Promptfoo install drops a starter config at `state/lab6/promptfoo.yaml`.
|
- The scripted Promptfoo install drops a starter config at `state/lab6/promptfoo.yaml`.
|
||||||
- `labctl start all` includes Promptfoo via `promptfoo view` and the cloned wiki app.
|
- `labctl start all` includes Promptfoo via `promptfoo view` and the cloned wiki app.
|
||||||
- Lab 2 includes `state/lab2/download_whiterabbitneo-gguf.sh`, which uses `git` + `git lfs` to pull only the supported WhiteRabbitNeo quants. Add `--download-only` if you want the files without Ollama registration.
|
- Lab 2 includes `state/lab2/download_whiterabbitneo-gguf.sh`, which uses `git` + `git lfs` to pull only the supported WhiteRabbitNeo quants. Add `--download-only` if you want the files without Ollama registration.
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ courseware_venvs_dir: "{{ courseware_state_dir }}/venvs"
|
|||||||
courseware_models_dir: "{{ courseware_state_dir }}/models"
|
courseware_models_dir: "{{ courseware_state_dir }}/models"
|
||||||
courseware_datasets_dir: "{{ courseware_state_dir }}/datasets"
|
courseware_datasets_dir: "{{ courseware_state_dir }}/datasets"
|
||||||
courseware_tools_dir: "{{ courseware_state_dir }}/tools"
|
courseware_tools_dir: "{{ courseware_state_dir }}/tools"
|
||||||
courseware_apps_dir: "{{ courseware_state_dir }}/apps"
|
|
||||||
courseware_downloads_dir: "{{ courseware_state_dir }}/downloads"
|
courseware_downloads_dir: "{{ courseware_state_dir }}/downloads"
|
||||||
courseware_lab1_dir: "{{ courseware_state_dir }}/lab1"
|
courseware_lab1_dir: "{{ courseware_state_dir }}/lab1"
|
||||||
courseware_lab2_dir: "{{ courseware_state_dir }}/lab2"
|
courseware_lab2_dir: "{{ courseware_state_dir }}/lab2"
|
||||||
@@ -42,7 +41,6 @@ courseware_ollama_min_version: "0.12.11"
|
|||||||
courseware_llama_cpp_commit: "51fa458a92d6a3f305f8fd76fc8f702e3e87ddb5"
|
courseware_llama_cpp_commit: "51fa458a92d6a3f305f8fd76fc8f702e3e87ddb5"
|
||||||
courseware_chunkviz_commit: "a891eacafda1f28a12373ad3b00102e68f07c57f"
|
courseware_chunkviz_commit: "a891eacafda1f28a12373ad3b00102e68f07c57f"
|
||||||
courseware_promptfoo_version: "0.119.0"
|
courseware_promptfoo_version: "0.119.0"
|
||||||
courseware_kiln_release_tag: "v0.18.1"
|
|
||||||
courseware_node_runtime_version: "20.20.2"
|
courseware_node_runtime_version: "20.20.2"
|
||||||
courseware_wetty_spec: "wetty@2.5.0"
|
courseware_wetty_spec: "wetty@2.5.0"
|
||||||
courseware_wetty_base_path: "/wetty"
|
courseware_wetty_base_path: "/wetty"
|
||||||
|
|||||||
@@ -17,5 +17,4 @@
|
|||||||
- promptfoo
|
- promptfoo
|
||||||
- { role: ollama_models, tags: ["ollama_models"] }
|
- { role: ollama_models, tags: ["ollama_models"] }
|
||||||
- { role: wiki, tags: ["wiki"] }
|
- { role: wiki, tags: ["wiki"] }
|
||||||
- kiln
|
|
||||||
- unsloth
|
- unsloth
|
||||||
|
|||||||
@@ -13,7 +13,6 @@
|
|||||||
- "{{ courseware_models_dir }}"
|
- "{{ courseware_models_dir }}"
|
||||||
- "{{ courseware_datasets_dir }}"
|
- "{{ courseware_datasets_dir }}"
|
||||||
- "{{ courseware_tools_dir }}"
|
- "{{ courseware_tools_dir }}"
|
||||||
- "{{ courseware_apps_dir }}"
|
|
||||||
- "{{ courseware_downloads_dir }}"
|
- "{{ courseware_downloads_dir }}"
|
||||||
- "{{ courseware_lab1_dir }}"
|
- "{{ courseware_lab1_dir }}"
|
||||||
- "{{ courseware_lab2_dir }}"
|
- "{{ courseware_lab2_dir }}"
|
||||||
|
|||||||
@@ -1,25 +0,0 @@
|
|||||||
- name: Download Kiln Linux archive
|
|
||||||
get_url:
|
|
||||||
url: "https://github.com/Kiln-AI/Kiln/releases/download/{{ courseware_kiln_release_tag }}/Kiln.Linux.x64.zip"
|
|
||||||
dest: "{{ courseware_downloads_dir }}/Kiln.Linux.x64.zip"
|
|
||||||
mode: "0644"
|
|
||||||
|
|
||||||
- name: Create Kiln Linux directory
|
|
||||||
file:
|
|
||||||
path: "{{ courseware_apps_dir }}/kiln"
|
|
||||||
state: directory
|
|
||||||
mode: "0755"
|
|
||||||
|
|
||||||
- name: Unpack Kiln Linux binary
|
|
||||||
unarchive:
|
|
||||||
src: "{{ courseware_downloads_dir }}/Kiln.Linux.x64.zip"
|
|
||||||
dest: "{{ courseware_apps_dir }}/kiln"
|
|
||||||
remote_src: true
|
|
||||||
creates: "{{ courseware_apps_dir }}/kiln/Kiln"
|
|
||||||
|
|
||||||
- name: Ensure Kiln Linux binary is executable
|
|
||||||
file:
|
|
||||||
path: "{{ courseware_apps_dir }}/kiln/Kiln"
|
|
||||||
mode: "0755"
|
|
||||||
state: file
|
|
||||||
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
- name: Install Kiln on Linux
|
|
||||||
include_tasks: linux.yml
|
|
||||||
when: ansible_system == "Linux"
|
|
||||||
@@ -34,5 +34,3 @@ PROMPTFOO_BIN="{{ courseware_tools_dir }}/promptfoo/node_modules/.bin/promptfoo"
|
|||||||
WIKI_DIR="{{ courseware_wiki_repo_dir }}"
|
WIKI_DIR="{{ courseware_wiki_repo_dir }}"
|
||||||
WIKI_RUNTIME_CONFIG_PATH="{{ courseware_wiki_runtime_config_path }}"
|
WIKI_RUNTIME_CONFIG_PATH="{{ courseware_wiki_runtime_config_path }}"
|
||||||
LLAMA_CPP_BIN_DIR="{{ courseware_llama_cpp_bin_dir }}"
|
LLAMA_CPP_BIN_DIR="{{ courseware_llama_cpp_bin_dir }}"
|
||||||
KILN_LINUX_BIN="{{ courseware_apps_dir }}/kiln/Kiln"
|
|
||||||
KILN_LAUNCH_PATH="{{ courseware_apps_dir }}/kiln/Kiln"
|
|
||||||
|
|||||||
@@ -27,7 +27,6 @@ Usage:
|
|||||||
./labctl stop [all|service...]
|
./labctl stop [all|service...]
|
||||||
./labctl status [all|service...]
|
./labctl status [all|service...]
|
||||||
./labctl urls
|
./labctl urls
|
||||||
./labctl open kiln
|
|
||||||
./labctl logs <service>
|
./labctl logs <service>
|
||||||
EOF
|
EOF
|
||||||
}
|
}
|
||||||
@@ -82,7 +81,6 @@ WARNING: THIS SCRIPT WILL CONFIGURE YOUR ENVIRONMENT WILL THE FOLLOWING SOFTWARE
|
|||||||
- Embedding Atlas
|
- Embedding Atlas
|
||||||
- Promptfoo
|
- Promptfoo
|
||||||
- Unsloth Studio
|
- Unsloth Studio
|
||||||
- Kiln Desktop
|
|
||||||
- Course-specific support assets for lab 1, lab 2, and lab 4
|
- Course-specific support assets for lab 1, lab 2, and lab 4
|
||||||
- Pre-pulled Gemma 4 E2B Ollama models for Lab 1 and Lab 2
|
- Pre-pulled Gemma 4 E2B Ollama models for Lab 1 and Lab 2
|
||||||
- Lab 1 confidence support through Gemma 4 E2B Q4 (requires Ollama ${min_ollama}+)
|
- Lab 1 confidence support through Gemma 4 E2B Q4 (requires Ollama ${min_ollama}+)
|
||||||
@@ -107,7 +105,6 @@ WARNING: THIS SCRIPT WILL CONFIGURE YOUR ENVIRONMENT WILL THE FOLLOWING SOFTWARE
|
|||||||
- Embedding Atlas
|
- Embedding Atlas
|
||||||
- Promptfoo
|
- Promptfoo
|
||||||
- Unsloth Studio
|
- Unsloth Studio
|
||||||
- Kiln Desktop
|
|
||||||
- Course-specific support assets for lab 1, lab 2, and lab 4
|
- Course-specific support assets for lab 1, lab 2, and lab 4
|
||||||
- Pre-pulled Gemma 4 E2B Ollama models for Lab 1 and Lab 2
|
- Pre-pulled Gemma 4 E2B Ollama models for Lab 1 and Lab 2
|
||||||
- Lab 1 confidence support through Gemma 4 E2B Q4 (requires Ollama ${min_ollama}+)
|
- Lab 1 confidence support through Gemma 4 E2B Q4 (requires Ollama ${min_ollama}+)
|
||||||
@@ -576,7 +573,7 @@ main() {
|
|||||||
require_arg "$@"
|
require_arg "$@"
|
||||||
handle_assets_command "$@"
|
handle_assets_command "$@"
|
||||||
;;
|
;;
|
||||||
start|stop|status|urls|open|logs)
|
start|stop|status|urls|logs)
|
||||||
exec bash "$ROOT_DIR/scripts/service_manager.sh" "$cmd" "$@"
|
exec bash "$ROOT_DIR/scripts/service_manager.sh" "$cmd" "$@"
|
||||||
;;
|
;;
|
||||||
""|-h|--help|help)
|
""|-h|--help|help)
|
||||||
|
|||||||
@@ -362,21 +362,9 @@ Promptfoo CLI: $PROMPTFOO_BIN
|
|||||||
Promptfoo UI: $(service_url promptfoo)
|
Promptfoo UI: $(service_url promptfoo)
|
||||||
Wiki: $(service_url wiki)
|
Wiki: $(service_url wiki)
|
||||||
Lab 3 Terminal: $(service_url wetty)
|
Lab 3 Terminal: $(service_url wetty)
|
||||||
Kiln app: ${KILN_LAUNCH_PATH:-not installed}
|
|
||||||
EOF
|
EOF
|
||||||
}
|
}
|
||||||
|
|
||||||
open_kiln() {
|
|
||||||
if [ -x "$KILN_LINUX_BIN" ]; then
|
|
||||||
nohup "$KILN_LINUX_BIN" >/dev/null 2>&1 &
|
|
||||||
echo "started Kiln from $KILN_LINUX_BIN"
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "Kiln is not installed." >&2
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
|
|
||||||
show_logs() {
|
show_logs() {
|
||||||
local service=$1
|
local service=$1
|
||||||
local log_file
|
local log_file
|
||||||
@@ -418,13 +406,6 @@ main() {
|
|||||||
urls)
|
urls)
|
||||||
urls
|
urls
|
||||||
;;
|
;;
|
||||||
open)
|
|
||||||
if [ "${1:-}" != "kiln" ]; then
|
|
||||||
echo "Only 'open kiln' is supported." >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
open_kiln
|
|
||||||
;;
|
|
||||||
logs)
|
logs)
|
||||||
if [ $# -ne 1 ]; then
|
if [ $# -ne 1 ]; then
|
||||||
echo "Usage: ./labctl logs <service>" >&2
|
echo "Usage: ./labctl logs <service>" >&2
|
||||||
|
|||||||
Reference in New Issue
Block a user