From 700b075b1121f772f1352adf963e919cef4b4e1f Mon Sep 17 00:00:00 2001
From: Anthony Campolo <12433465+ajcwebdev@users.noreply.github.com>
Date: Mon, 7 Oct 2024 17:13:28 -0500
Subject: [PATCH 1/5] format terminal logs and update setup script

---
 README.md                       |  2 --
 setup.sh                        | 20 ++++++++++++++------
 src/autoshow.ts                 |  4 ++--
 src/commands/processPlaylist.ts |  4 ++--
 src/commands/processRSS.ts      |  8 ++++----
 src/commands/processURLs.ts     |  6 +++---
 src/llms/llama.ts               | 10 +++++-----
 src/llms/ollama.ts              |  5 +++--
 src/models.ts                   |  4 ++++
 src/types.ts                    |  2 +-
 10 files changed, 38 insertions(+), 27 deletions(-)

diff --git a/README.md b/README.md
index 9547b95..144f9a1 100644
--- a/README.md
+++ b/README.md
@@ -48,8 +48,6 @@ See [`docs/roadmap.md`](/docs/roadmap.md) for details about current development
 cp .env.example .env
 ```
 
-This sets a default model for Llama.cpp which ensures `--llama` doesn't fail if you haven't downloaded a model yet. Before trying to run local LLM inference with Llama.cpp, `callLlama` checks for a model and downloads one if none is detected.
-
 ### Install Local Dependencies
 
 Install `yt-dlp`, `ffmpeg`, and run `npm i`.
diff --git a/setup.sh b/setup.sh
index aaaeeb4..a16fb50 100755
--- a/setup.sh
+++ b/setup.sh
@@ -1,13 +1,18 @@
 #!/bin/bash
 
-# Copy environment file
-cp .env.example .env
+# Check if .env file exists
+if [ -f ".env" ]; then
+    echo ".env file already exists. Skipping copy of .env.example."
+else
+    echo ".env file does not exist. Copying .env.example to .env."
+    cp .env.example .env
+fi
 
 # Check if yt-dlp is installed, if not, install it
 if ! command -v yt-dlp &> /dev/null
 then
-    echo "yt-dlp could not be found, installing now..."
-    brew install yt-dlp
+    echo "yt-dlp could not be found, refer to installation instructions for your OS of choice:"
+    echo "https://github.com/yt-dlp/yt-dlp/wiki/Installation"
 else
     echo "yt-dlp is already installed."
 fi
@@ -28,7 +33,10 @@ make -C whisper.cpp
 # Copy Dockerfile
 cp .github/whisper.Dockerfile whisper.cpp/Dockerfile
 
-# Download Llama model
-curl -L "https://huggingface.co/mradermacher/Llama-3.2-1B-i1-GGUF/resolve/main/Llama-3.2-1B.i1-Q6_K.gguf" -o "./src/llms/models/Llama-3.2-1B.i1-Q6_K.gguf"
+# Download Qwen 2.5 1.5B model for Llama.cpp
+curl -L "https://huggingface.co/Qwen/Qwen2.5-1.5B-Instruct-GGUF/resolve/main/qwen2.5-1.5b-instruct-q6_k.gguf" -o "./src/llms/models/qwen2.5-1.5b-instruct-q6_k.gguf"
+
+# Start Ollama server (allowing Ollama to run without the desktop application) and pull Llama 3.1 1B model
+ollama pull llama3.2:1b
 
 echo "Setup completed successfully!"
\ No newline at end of file
diff --git a/src/autoshow.ts b/src/autoshow.ts
index c4ae847..d374438 100644
--- a/src/autoshow.ts
+++ b/src/autoshow.ts
@@ -145,9 +145,9 @@ program.action(async (options: ProcessingOptions) => {
         llmServices,
         finalTranscriptServices
       )
-      log(final(`\n==================================================`))
+      log(final(`\n================================================================================================`))
       log(final(`  ${action} Processing Completed Successfully.`))
-      log(final(`==================================================\n`))
+      log(final(`================================================================================================\n`))
       exit(0)
     } catch (error) {
       console.error(`Error processing ${action}:`, (error as Error).message)
diff --git a/src/commands/processPlaylist.ts b/src/commands/processPlaylist.ts
index 807c6f6..755c530 100644
--- a/src/commands/processPlaylist.ts
+++ b/src/commands/processPlaylist.ts
@@ -67,9 +67,9 @@ export async function processPlaylist(
 
     // Process each video in the playlist
     for (const [index, url] of urls.entries()) {
-      log(opts(`\n==============================================================`))
+      log(opts(`\n================================================================================================`))
       log(opts(`  Processing video ${index + 1}/${urls.length}: ${url}`))
-      log(opts(`==============================================================\n`))
+      log(opts(`================================================================================================\n`))
       try {
         await processVideo(options, url, llmServices, transcriptServices)
       } catch (error) {
diff --git a/src/commands/processRSS.ts b/src/commands/processRSS.ts
index 1259aa7..d73d6d8 100644
--- a/src/commands/processRSS.ts
+++ b/src/commands/processRSS.ts
@@ -211,12 +211,12 @@ export async function processRSS(
     // Process each item in the feed
     for (const [index, item] of itemsToProcess.entries()) {
       log(opts(`\n========================================================================================`))
-      log(opts(`  Item ${index + 1}/${itemsToProcess.length} processing:\n\n${item.title}`))
+      log(opts(`  Item ${index + 1}/${itemsToProcess.length} processing: ${item.title}`))
       log(opts(`========================================================================================\n`))
       await processItem(options, item, llmServices, transcriptServices)
-      log(final(`\n========================================================================================`))
-      log(final(`  ${index + 1}/${itemsToProcess.length} item processing completed successfully`))
-      log(final(`========================================================================================\n`))
+      log(opts(`\n========================================================================================`))
+      log(opts(`  ${index + 1}/${itemsToProcess.length} item processing completed successfully`))
+      log(opts(`========================================================================================\n`))
     }
   } catch (error) {
     console.error(`Error processing RSS feed: ${(error as Error).message}`)
diff --git a/src/commands/processURLs.ts b/src/commands/processURLs.ts
index 33a80e3..a4898d9 100644
--- a/src/commands/processURLs.ts
+++ b/src/commands/processURLs.ts
@@ -36,7 +36,7 @@ export async function processURLs(
       console.error('Error: No URLs found in the file.')
       process.exit(1)
     }
-    log(opts(`\n===  Found ${urls.length} URLs in the file...  ===`))
+    log(opts(`\nFound ${urls.length} URLs in the file...`))
 
     // Extract metadata for all videos
     const metadataPromises = urls.map(extractVideoMetadata)
@@ -54,9 +54,9 @@ export async function processURLs(
 
     // Process each URL
     for (const [index, url] of urls.entries()) {
-      log(opts(`\n============================================================`))
+      log(opts(`\n================================================================================================`))
       log(opts(`  Processing URL ${index + 1}/${urls.length}: ${url}`))
-      log(opts(`============================================================\n`))
+      log(opts(`================================================================================================\n`))
       try {
         await processVideo(options, url, llmServices, transcriptServices)
       } catch (error) {
diff --git a/src/llms/llama.ts b/src/llms/llama.ts
index 6dd89b7..c1ea1ac 100644
--- a/src/llms/llama.ts
+++ b/src/llms/llama.ts
@@ -27,8 +27,8 @@ export const callLlama: LLMFunction = async (
   modelName?: string
 ) => {
   try {
-    // Get the model object from LLAMA_MODELS using the provided model name or default to QWEN_2_5_3B
-    const selectedModel = LLAMA_MODELS[modelName as LlamaModelType] || LLAMA_MODELS.QWEN_2_5_3B
+    // Get the model object from LLAMA_MODELS using the provided model name or default to QWEN_2_5_1B
+    const selectedModel = LLAMA_MODELS[modelName as LlamaModelType] || LLAMA_MODELS.QWEN_2_5_1B
     log(wait(`  - filename: ${selectedModel.filename}\n  - url: ${selectedModel.url}\n`))
 
     // If no valid model is found, throw an error
@@ -42,14 +42,14 @@ export const callLlama: LLMFunction = async (
 
     // Check if the model file already exists, if not, download it
     if (!existsSync(modelPath)) {
-      log(success(`\nDownloading ${selectedModel.filename}...`))
+      log(wait(`\n  No model detected, downloading ${selectedModel.filename}...`))
       try {
         const downloader = await createModelDownloader({
           modelUri: selectedModel.url,
           dirPath: modelDir
         })
         await downloader.download()
-        log(success('Download completed'))
+        log(success('  Download completed'))
       } catch (err) {
         console.error(`Download failed: ${err instanceof Error ? err.message : String(err)}`)
         throw new Error('Failed to download the model')
@@ -80,7 +80,7 @@ export const callLlama: LLMFunction = async (
     // Write the response to the temporary file
     await writeFile(tempPath, response)
 
-    log(success('LLM processing completed'))
+    log(wait('  \nLLM processing completed'))
   } catch (error) {
     console.error(`Error in callLlama: ${error instanceof Error ? (error as Error).message : String(error)}`)
     throw error
diff --git a/src/llms/ollama.ts b/src/llms/ollama.ts
index 74955e6..56431a0 100644
--- a/src/llms/ollama.ts
+++ b/src/llms/ollama.ts
@@ -23,7 +23,7 @@ export const callOllama: LLMFunction = async (promptAndTranscript: string, tempP
     const ollamaModelName = OLLAMA_MODELS[modelName as OllamaModelType] || 'llama3.2:1b'
     
     // Get host and port from environment variables or use defaults
-    const ollamaHost = env.OLLAMA_HOST || 'ollama'
+    const ollamaHost = env.OLLAMA_HOST || 'localhost'
     const ollamaPort = env.OLLAMA_PORT || '11434'
     log(wait(`  - Using Ollama model: ${ollamaModelName} at http://${ollamaHost}:${ollamaPort}`))
     
@@ -46,7 +46,8 @@ export const callOllama: LLMFunction = async (promptAndTranscript: string, tempP
     }
 
     // Type assertion to enforce the structure of the response
-    const data = (await response.json()) as OllamaResponse
+    // const data = await response.json() as any
+    const data = await response.json() as OllamaResponse
 
     // Extract the assistant's reply and write the response to the output file
     const assistantReply = data.message.content
diff --git a/src/models.ts b/src/models.ts
index 5f637fb..76b7492 100644
--- a/src/models.ts
+++ b/src/models.ts
@@ -105,6 +105,10 @@ export const OCTO_MODELS: Record<OctoModelType, string> = {
  * @type {Record<LlamaModelType, {filename: string, url: string}>}
  */
 export const LLAMA_MODELS: Record<LlamaModelType, {filename: string, url: string}> = {
+  QWEN_2_5_1B: {
+    filename: "qwen2.5-1.5b-instruct-q6_k.gguf",
+    url: "https://huggingface.co/Qwen/Qwen2.5-1.5B-Instruct-GGUF/resolve/main/qwen2.5-1.5b-instruct-q6_k.gguf"
+  },
   QWEN_2_5_3B: {
     filename: "qwen2.5-3b-instruct-q6_k.gguf",
     url: "https://huggingface.co/Qwen/Qwen2.5-3B-Instruct-GGUF/resolve/main/qwen2.5-3b-instruct-q6_k.gguf"
diff --git a/src/types.ts b/src/types.ts
index d101983..2136e4f 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -321,7 +321,7 @@ export type MistralModelType = 'MIXTRAL_8x7b' | 'MIXTRAL_8x22b' | 'MISTRAL_LARGE
 /** Define available OctoAI models. */
 export type OctoModelType = 'LLAMA_3_1_8B' | 'LLAMA_3_1_70B' | 'LLAMA_3_1_405B' | 'MISTRAL_7B' | 'MIXTRAL_8X_7B' | 'NOUS_HERMES_MIXTRAL_8X_7B' | 'WIZARD_2_8X_22B'
 /** Define local model configurations. */
-export type LlamaModelType = 'QWEN_2_5_3B' | 'PHI_3_5' | 'LLAMA_3_2_1B' | 'GEMMA_2_2B'
+export type LlamaModelType = 'QWEN_2_5_1B' | 'QWEN_2_5_3B' | 'PHI_3_5' | 'LLAMA_3_2_1B' | 'GEMMA_2_2B'
 /** Define local model with Ollama. */
 export type OllamaModelType = 'LLAMA_3_2_1B' | 'LLAMA_3_2_3B' | 'GEMMA_2_2B' | 'PHI_3_5' | 'QWEN_2_5_1B' | 'QWEN_2_5_3B'
 

From fd390de2611ffd337a978dec15f83d662d953004 Mon Sep 17 00:00:00 2001
From: Anthony Campolo <12433465+ajcwebdev@users.noreply.github.com>
Date: Tue, 8 Oct 2024 01:29:36 -0500
Subject: [PATCH 2/5] update setup script

---
 setup.sh | 51 ++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 46 insertions(+), 5 deletions(-)

diff --git a/setup.sh b/setup.sh
index a16fb50..ca61138 100755
--- a/setup.sh
+++ b/setup.sh
@@ -1,5 +1,10 @@
 #!/bin/bash
 
+# Function to check if a command exists
+command_exists() {
+    command -v "$1" >/dev/null 2>&1
+}
+
 # Check if .env file exists
 if [ -f ".env" ]; then
     echo ".env file already exists. Skipping copy of .env.example."
@@ -8,15 +13,51 @@ else
     cp .env.example .env
 fi
 
-# Check if yt-dlp is installed, if not, install it
-if ! command -v yt-dlp &> /dev/null
-then
-    echo "yt-dlp could not be found, refer to installation instructions for your OS of choice:"
+# Check if yt-dlp is installed, if not, provide installation instructions
+if ! command_exists yt-dlp; then
+    echo "yt-dlp could not be found, refer to installation instructions here:"
     echo "https://github.com/yt-dlp/yt-dlp/wiki/Installation"
 else
     echo "yt-dlp is already installed."
 fi
 
+# Check if Ollama is installed
+if ! command_exists ollama; then
+    echo "Ollama is not installed, refer to installation instructions here:"
+    echo "https://github.com/ollama/ollama"
+else
+    echo "Ollama is installed."
+fi
+
+# Check if Docker is running
+if ! docker info &>/dev/null; then
+    echo "Docker is not running. Checking for Colima..."
+    if command_exists colima; then
+        echo "Colima is installed. Attempting to start Colima..."
+        colima start &>/dev/null
+        if [ $? -eq 0 ]; then
+            echo "Colima started successfully."
+        else
+            echo "Failed to start Colima. Please start Docker manually or check your Docker installation."
+        fi
+    else
+        echo "Colima is not installed. Please start Docker manually or check your Docker installation."
+    fi
+else
+    echo "Docker is running."
+fi
+
+# Check if Ollama server is running
+if ! curl -s "http://127.0.0.1:11434" &> /dev/null; then
+    echo "Ollama server is not running. Starting Ollama server..."
+    ollama serve > ollama.log 2>&1 &
+    OLLAMA_PID=$!
+    echo "Ollama server started with PID $OLLAMA_PID"
+    sleep 5
+else
+    echo "Ollama server is already running."
+fi
+
 # Install npm dependencies
 npm i
 
@@ -36,7 +77,7 @@ cp .github/whisper.Dockerfile whisper.cpp/Dockerfile
 # Download Qwen 2.5 1.5B model for Llama.cpp
 curl -L "https://huggingface.co/Qwen/Qwen2.5-1.5B-Instruct-GGUF/resolve/main/qwen2.5-1.5b-instruct-q6_k.gguf" -o "./src/llms/models/qwen2.5-1.5b-instruct-q6_k.gguf"
 
-# Start Ollama server (allowing Ollama to run without the desktop application) and pull Llama 3.1 1B model
+# Pull Llama 3.1 1B model using Ollama
 ollama pull llama3.2:1b
 
 echo "Setup completed successfully!"
\ No newline at end of file

From 61267b635d3b61b049a37a77cd8454165784ea6c Mon Sep 17 00:00:00 2001
From: Anthony Campolo <12433465+ajcwebdev@users.noreply.github.com>
Date: Tue, 8 Oct 2024 03:46:24 -0500
Subject: [PATCH 3/5] migrate docker setup to ts

---
 Dockerfile           |  3 +++
 docker-compose.yml   | 36 ++++++++++++++++++------------------
 docker-entrypoint.sh |  2 +-
 package.json         | 43 +++++++++++++++++++++++--------------------
 4 files changed, 45 insertions(+), 39 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d2c7a8b..5bfc0dc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,6 +10,9 @@ WORKDIR /usr/src/app
 RUN curl -L https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp -o /usr/local/bin/yt-dlp \
     && chmod a+rx /usr/local/bin/yt-dlp
 
+# Install tsx globally
+RUN npm install -g tsx
+
 # Copy package.json, package-lock.json, and install dependencies
 COPY package*.json ./
 RUN npm ci
diff --git a/docker-compose.yml b/docker-compose.yml
index d365591..34b70f1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,10 +11,10 @@ services:
       - /var/run/docker.sock:/var/run/docker.sock
     depends_on:
       - whisper
-      - ollama
-    environment:
-      - OLLAMA_HOST=ollama
-      - OLLAMA_PORT=11434
+    #   - ollama
+    # environment:
+    #   - OLLAMA_HOST=ollama
+    #   - OLLAMA_PORT=11434
     networks:
       - autoshownet
   whisper:
@@ -29,20 +29,20 @@ services:
     stdin_open: true
     networks:
       - autoshownet
-  ollama:
-    image: ollama/ollama
-    command: ["ollama", "serve", "--address", "0.0.0.0"]  # Listen on all interfaces
-    ports:
-      - "11434:11434"
-    volumes:
-      - ./ollama:/root/.ollama
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:11434/healthz"]
-      interval: 10s
-      timeout: 5s
-      retries: 5
-    networks:
-      - autoshownet
+  # ollama:
+  #   image: ollama/ollama
+  #   command: ["ollama", "serve", "--address", "0.0.0.0"]  # Listen on all interfaces
+  #   ports:
+  #     - "11434:11434"
+  #   volumes:
+  #     - ./ollama:/root/.ollama
+  #   healthcheck:
+  #     test: ["CMD", "curl", "-f", "http://localhost:11434/healthz"]
+  #     interval: 10s
+  #     timeout: 5s
+  #     retries: 5
+  #   networks:
+  #     - autoshownet
 networks:
   autoshownet:
     driver: bridge
\ No newline at end of file
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 535cd2a..b1ecdc3 100644
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -2,4 +2,4 @@
 
 # docker-entrypoint.sh
 # Run the autoshow command with all arguments passed to the container
-exec node --env-file=.env --no-warnings src/autoshow.js "$@"
\ No newline at end of file
+exec tsx --env-file=.env --no-warnings src/autoshow.ts "$@"
\ No newline at end of file
diff --git a/package.json b/package.json
index b3a05cf..1988ca3 100644
--- a/package.json
+++ b/package.json
@@ -19,23 +19,25 @@
   },
   "scripts": {
     "setup": "bash ./setup.sh",
-    "build": "npx tsc",
-    "autoshow": "npm run build && node --env-file=.env --no-warnings dist/autoshow.js",
-    "as": "npm run build && node --env-file=.env --no-warnings dist/autoshow.js",
-    "bun-as": "npm run build && bun --env-file=.env --no-warnings dist/autoshow.js",
-    "deno-as": "npm run build && deno run --allow-sys --allow-read --allow-run --allow-write --allow-env dist/autoshow.js",
-    "v": "npm run build && node --env-file=.env --no-warnings dist/autoshow.js --whisper large-v2 --video",
-    "u": "npm run build && node --env-file=.env --no-warnings dist/autoshow.js --whisper large-v2 --urls",
-    "p": "npm run build && node --env-file=.env --no-warnings dist/autoshow.js --whisper large-v2 --playlist",
-    "f": "npm run build && node --env-file=.env --no-warnings dist/autoshow.js --whisper large-v2 --file",
-    "r": "npm run build && node --env-file=.env --no-warnings dist/autoshow.js --whisper large-v2 --rss",
-    "last3": "npm run build && node --env-file=.env --no-warnings dist/autoshow.js --whisper large-v2 --last 3 --rss",
-    "serve": "npm run build && node --env-file=.env --no-warnings --watch packages/server/index.js",
-    "fetch-local": "npm run build && node --env-file=.env --no-warnings packages/server/tests/fetch-local.js",
-    "fetch-all": "npm run build && node --env-file=.env --no-warnings packages/server/tests/fetch-all.js",
-    "t": "npm run build && node --test test/local.test.js",
-    "test-local": "npm run build && node --test test/local.test.js",
-    "test-all": "npm run build && node --test test/all.test.js"
+    "autoshow": "tsx --env-file=.env --no-warnings src/autoshow.ts",
+    "as": "tsx --env-file=.env --no-warnings src/autoshow.ts",
+    "docker": "docker compose run --remove-orphans autoshow",
+    "docker-up": "docker compose up --build -d --remove-orphans --no-start",
+    "ds": "docker compose images && docker compose ls",
+    "v": "node --env-file=.env --no-warnings src/autoshow.ts --whisper large-v2 --video",
+    "u": "node --env-file=.env --no-warnings src/autoshow.ts --whisper large-v2 --urls",
+    "p": "node --env-file=.env --no-warnings src/autoshow.ts --whisper large-v2 --playlist",
+    "f": "node --env-file=.env --no-warnings src/autoshow.ts --whisper large-v2 --file",
+    "r": "node --env-file=.env --no-warnings src/autoshow.ts --whisper large-v2 --rss",
+    "last3": "node --env-file=.env --no-warnings src/autoshow.ts --whisper large-v2 --last 3 --rss",
+    "serve": "node --env-file=.env --no-warnings --watch packages/server/index.ts",
+    "fetch-local": "node --env-file=.env --no-warnings packages/server/tests/fetch-local.ts",
+    "fetch-all": "node --env-file=.env --no-warnings packages/server/tests/fetch-all.ts",
+    "t": "npm run test-local",
+    "test-local": "node --test test/local.test.js",
+    "test-all": "node --test test/all.test.js",
+    "bun-as": "bun --env-file=.env --no-warnings src/autoshow.ts",
+    "deno-as": "deno run --allow-sys --allow-read --allow-run --allow-write --allow-env src/autoshow.ts"
   },
   "dependencies": {
     "@anthropic-ai/sdk": "^0.26.0",
@@ -44,7 +46,6 @@
     "@google/generative-ai": "^0.17.1",
     "@mistralai/mistralai": "^1.0.2",
     "@octoai/sdk": "^1.5.1",
-    "@types/inquirer": "^9.0.7",
     "assemblyai": "^4.6.1",
     "chalk": "^5.3.0",
     "cohere-ai": "^7.12.0",
@@ -56,10 +57,12 @@
     "inquirer": "^10.2.2",
     "node-llama-cpp": "^3.1.0",
     "ollama": "^0.5.9",
-    "openai": "^4.55.7",
-    "typescript": "^5.6.2"
+    "openai": "^4.55.7"
   },
   "devDependencies": {
+    "@types/inquirer": "^9.0.7",
+    "@types/node": "^22.7.5",
+    "tsx": "^4.19.1",
     "typescript": "^5.6.2"
   }
 }

From 6c4bec41343b63d45eca989df33303d5015fc807 Mon Sep 17 00:00:00 2001
From: Anthony Campolo <12433465+ajcwebdev@users.noreply.github.com>
Date: Tue, 8 Oct 2024 03:47:04 -0500
Subject: [PATCH 4/5] new compose commands and docs

---
 docs/examples.md | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/docs/examples.md b/docs/examples.md
index 1ed1195..cac96c9 100644
--- a/docs/examples.md
+++ b/docs/examples.md
@@ -388,13 +388,26 @@ npm run as -- --video "https://www.youtube.com/watch?v=MORMZXEaONk" --prompt tit
 
 ### Docker Compose
 
-This will run both `whisper.cpp` and the AutoShow Commander CLI in their own Docker containers.
+This will start both `whisper.cpp` and the AutoShow Commander CLI in their own Docker containers.
 
 ```bash
-docker compose run autoshow --video "https://www.youtube.com/watch?v=MORMZXEaONk" --whisperDocker base
+npm run docker-up
 ```
 
-Currently working on the `llama.cpp` Docker integration so the entire project can be encapsulated in one local Docker Compose file.
+Replace `as` with `docker` to run most other commands explained in this document.
+
+- Does not support all commands at this time, notably `--llama` and `--ollama`.
+- Currently working on the `llama.cpp` Docker integration so the entire project can be encapsulated in one local Docker Compose file.
+
+```bash
+npm run docker -- --video "https://www.youtube.com/watch?v=MORMZXEaONk" --whisperDocker base
+```
+
+To reset your Docker images and containers, run:
+
+```bash
+docker system prune -af --volumes
+```
 
 ### Bun
 

From 7dd3aa4e3ec40ab098f9c68ce347381c95883cf3 Mon Sep 17 00:00:00 2001
From: Anthony Campolo <12433465+ajcwebdev@users.noreply.github.com>
Date: Thu, 10 Oct 2024 19:37:48 -0500
Subject: [PATCH 5/5] colima setup script

---
 package.json                 |  2 +-
 scripts/setup-colima.sh      | 19 +++++++++++++++++++
 setup.sh => scripts/setup.sh | 18 ------------------
 3 files changed, 20 insertions(+), 19 deletions(-)
 create mode 100755 scripts/setup-colima.sh
 rename setup.sh => scripts/setup.sh (75%)

diff --git a/package.json b/package.json
index 1988ca3..f3abd1e 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
     "autoshow": "./dist/autoshow.js"
   },
   "scripts": {
-    "setup": "bash ./setup.sh",
+    "setup": "bash ./scripts/setup.sh",
     "autoshow": "tsx --env-file=.env --no-warnings src/autoshow.ts",
     "as": "tsx --env-file=.env --no-warnings src/autoshow.ts",
     "docker": "docker compose run --remove-orphans autoshow",
diff --git a/scripts/setup-colima.sh b/scripts/setup-colima.sh
new file mode 100755
index 0000000..6a424db
--- /dev/null
+++ b/scripts/setup-colima.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# Check if Docker is running
+if ! docker info &>/dev/null; then
+    echo "Docker is not running. Checking for Colima..."
+    if command_exists colima; then
+        echo "Colima is installed. Attempting to start Colima..."
+        colima start &>/dev/null
+        if [ $? -eq 0 ]; then
+            echo "Colima started successfully."
+        else
+            echo "Failed to start Colima. Please start Docker manually or check your Docker installation."
+        fi
+    else
+        echo "Colima is not installed. Please start Docker manually or check your Docker installation."
+    fi
+else
+    echo "Docker is running."
+fi
\ No newline at end of file
diff --git a/setup.sh b/scripts/setup.sh
similarity index 75%
rename from setup.sh
rename to scripts/setup.sh
index ca61138..55022b4 100755
--- a/setup.sh
+++ b/scripts/setup.sh
@@ -29,24 +29,6 @@ else
     echo "Ollama is installed."
 fi
 
-# Check if Docker is running
-if ! docker info &>/dev/null; then
-    echo "Docker is not running. Checking for Colima..."
-    if command_exists colima; then
-        echo "Colima is installed. Attempting to start Colima..."
-        colima start &>/dev/null
-        if [ $? -eq 0 ]; then
-            echo "Colima started successfully."
-        else
-            echo "Failed to start Colima. Please start Docker manually or check your Docker installation."
-        fi
-    else
-        echo "Colima is not installed. Please start Docker manually or check your Docker installation."
-    fi
-else
-    echo "Docker is running."
-fi
-
 # Check if Ollama server is running
 if ! curl -s "http://127.0.0.1:11434" &> /dev/null; then
     echo "Ollama server is not running. Starting Ollama server..."