Merge pull request #119 from ajcwebdev/form

Refactor Astro Frontend

Author: ajcwebdev

docs/server.md

@@ -49,49 +49,13 @@ curl --json '{
 }' http://localhost:3000/process
 ```
 
-### Playlist Type
-
-```bash
-curl --json '{
-  "type": "playlist",
-  "url": "https://www.youtube.com/playlist?list=PLCVnrVv4KhXPz0SoAVu8Rc1emAdGPbSbr"
-}' http://localhost:3000/process
-```
-
-```bash
-curl --json '{
-  "type": "playlist",
-  "url": "https://www.youtube.com/playlist?list=PLCVnrVv4KhXPz0SoAVu8Rc1emAdGPbSbr",
-  "whisperModel": "tiny",
-  "llm": "ollama"
-}' http://localhost:3000/process
-```
-
-### URLs Type
-
 ```bash
 curl --json '{
-  "type": "urls",
-  "filePath": "content/example-urls.md"
-}' http://localhost:3000/process
-```
-
-```bash
-curl --json '{
-  "type": "urls",
-  "filePath": "content/example-urls.md",
-  "whisperModel": "tiny",
-  "llm": "ollama"
-}' http://localhost:3000/process
-```
-
-```bash
-curl --json '{
-  "type": "urls",
-  "filePath": "content/example-urls.md",
-  "prompts": ["titles", "mediumChapters"],
+  "type": "video",
+  "url": "https://www.youtube.com/watch?v=MORMZXEaONk",
   "whisperModel": "tiny",
-  "llm": "ollama"
+  "llm": "ollama",
+  "llmModel": "DEEPSEEK_R1_1_5B"
 }' http://localhost:3000/process
 ```
 
@@ -123,46 +87,6 @@ curl --json '{
 }' http://localhost:3000/process
 ```
 
-### RSS Type
-
-```bash
-curl --json '{
-  "type": "rss",
-  "url": "https://feeds.transistor.fm/fsjam-podcast/"
-}' http://localhost:3000/process
-```
-
-```bash
-curl --json '{
-  "type": "rss",
-  "url": "https://feeds.transistor.fm/fsjam-podcast/",
-  "whisperModel": "tiny",
-  "llm": "ollama",
-  "order": "newest",
-  "skip": 0
-}' http://localhost:3000/process
-```
-
-```bash
-curl --json '{
-  "type": "rss",
-  "url": "https://feeds.transistor.fm/fsjam-podcast/",
-  "order": "newest",
-  "skip": 94,
-  "whisperModel": "tiny"
-}' http://localhost:3000/process
-```
-
-```bash
-curl --json '{
-  "type": "rss",
-  "url": "https://feeds.transistor.fm/fsjam-podcast/",
-  "order": "oldest",
-  "skip": 94,
-  "whisperModel": "tiny"
-}' http://localhost:3000/process
-```
-
 ## Language Model (LLM) Options
 
 ### ChatGPT
@@ -357,81 +281,9 @@ curl --json '{
 }' http://localhost:3000/process
 ```
 
-```bash
-curl --json '{
-  "type": "playlist",
-  "url": "https://www.youtube.com/playlist?list=PLCVnrVv4KhXPz0SoAVu8Rc1emAdGPbSbr",
-  "prompts": ["titles", "mediumChapters"],
-  "whisperModel": "tiny",
-  "llm": "ollama"
-}' http://localhost:3000/process
-```
-
-```bash
-curl --json '{
-  "type": "playlist",
-  "url": "https://www.youtube.com/playlist?list=PLCVnrVv4KhXPz0SoAVu8Rc1emAdGPbSbr",
-  "prompts": ["titles", "mediumChapters"],
-  "whisperModel": "tiny",
-  "llm": "ollama"
-}' http://localhost:3000/process
-```
-
 ## Test Requests
 
 ```js
-const TEST_REQ_01 = {
-  "type": "playlist",
-  "url": "https://www.youtube.com/playlist?list=PLCVnrVv4KhXPz0SoAVu8Rc1emAdGPbSbr"
-}
-
-const TEST_REQ_02 = {
-  "type": "playlist",
-  "url": "https://www.youtube.com/playlist?list=PLCVnrVv4KhXPz0SoAVu8Rc1emAdGPbSbr",
-  "whisperModel": "tiny"
-}
-
-const TEST_REQ_03 = {
-  "type": "playlist",
-  "url": "https://www.youtube.com/playlist?list=PLCVnrVv4KhXPz0SoAVu8Rc1emAdGPbSbr",
-  "whisperModel": "tiny",
-  "llm": "ollama"
-}
-
-const TEST_REQ_04 = {
-  "type": "playlist",
-  "url": "https://www.youtube.com/playlist?list=PLCVnrVv4KhXPz0SoAVu8Rc1emAdGPbSbr",
-  "prompts": ["titles", "mediumChapters"],
-  "whisperModel": "tiny",
-  "llm": "ollama"
-}
-
-const TEST_REQ_05 = {
-  "type": "urls",
-  "filePath": "content/example-urls.md"
-}
-
-const TEST_REQ_06 = {
-  "type": "urls",
-  "filePath": "content/example-urls.md",
-  "whisperModel": "tiny"
-}
-
-const TEST_REQ_07 = {
-  "type": "urls",
-  "filePath": "content/example-urls.md",
-  "whisperModel": "tiny",
-  "llm": "ollama"
-}
-
-const TEST_REQ_08 = {
-  "type": "urls",
-  "filePath": "content/example-urls.md",
-  "prompts": ["titles", "mediumChapters"],
-  "whisperModel": "tiny",
-  "llm": "ollama"
-}
-
 const TEST_REQ_09 = {
   "type": "file",
   "filePath": "content/audio.mp3"
@@ -458,40 +310,6 @@ const TEST_REQ_12 = {
   "llm": "ollama"
 }
 
-const TEST_REQ_13 = {
-  "type": "rss",
-  "url": "https://feeds.transistor.fm/fsjam-podcast/"
-}
-
-const TEST_REQ_14 = {
-  "type": "rss",
-  "url": "https://feeds.transistor.fm/fsjam-podcast/",
-  "whisperModel": "tiny"
-}
-
-const TEST_REQ_15 = {
-  "type": "rss",
-  "url": "https://feeds.transistor.fm/fsjam-podcast/",
-  "whisperModel": "tiny",
-  "llm": "ollama"
-}
-
-const TEST_REQ_16 = {
-  "type": "rss",
-  "url": "https://feeds.transistor.fm/fsjam-podcast/",
-  "whisperModel": "tiny",
-  "order": "newest",
-  "skip": 94
-}
-
-const TEST_REQ_17 = {
-  "type": "rss",
-  "url": "https://feeds.transistor.fm/fsjam-podcast/",
-  "whisperModel": "tiny",
-  "order": "oldest",
-  "skip": 94
-}
-
 const TEST_REQ_18 = {
   "url": "https://www.youtube.com/watch?v=MORMZXEaONk"
 }

src/server/routes/process.ts

@@ -1,10 +1,6 @@
 // src/server/routes/process.ts
 
 import { processVideo } from '../../process-commands/video'
-import { processURLs } from '../../process-commands/urls'
-import { processRSS } from '../../process-commands/rss'
-import { processPlaylist } from '../../process-commands/playlist'
-import { processChannel } from '../../process-commands/channel'
 import { processFile } from '../../process-commands/file'
 import { validateRequest, validateServerProcessAction } from '../utils/validation'
 import { l, err } from '../../../src/utils/logging'
@@ -44,6 +40,11 @@ export const handleProcessRequest = async (
     // Map request data to processing options
     const { options, llmServices, transcriptServices } = validateRequest(requestData)
 
+    // Ensure the user-selected LLM model is passed through to the options object
+    if (llmServices && requestData['llmModel']) {
+      options[llmServices] = requestData['llmModel']
+    }
+
     // Process based on type
     switch (type) {
       case 'video': {
@@ -53,11 +54,7 @@ export const handleProcessRequest = async (
           return
         }
         options.video = url
-
-        // Grab the object that includes frontMatter, prompt, llmOutput, and transcript
         const result = await processVideo(options, url, llmServices, transcriptServices)
-
-        // Return the object, if there is no LLM output, it will be ''
         reply.send({
           frontMatter: result.frontMatter,
           prompt: result.prompt,
@@ -67,63 +64,20 @@ export const handleProcessRequest = async (
         break
       }
 
-      case 'channel': {
-        const { url } = requestData
-        if (!url) {
-          reply.status(400).send({ error: 'Channel URL is required' })
-          return
-        }
-        options.channel = url
-        const content = await processChannel(options, url, llmServices, transcriptServices)
-        reply.send({ content })
-        break
-      }
-
-      case 'urls': {
-        const { filePath } = requestData
-        if (!filePath) {
-          reply.status(400).send({ error: 'File path is required' })
-          return
-        }
-        options.urls = filePath
-        await processURLs(options, filePath, llmServices, transcriptServices)
-        reply.send({ message: 'URLs processed successfully.' })
-        break
-      }
-
-      case 'rss': {
-        const { url } = requestData
-        if (!url) {
-          reply.status(400).send({ error: 'RSS URL is required' })
-          return
-        }
-        options.rss = url
-        await processRSS(options, url, llmServices, transcriptServices)
-        reply.send({ message: 'RSS feed processed successfully.' })
-        break
-      }
-
-      case 'playlist': {
-        const { url } = requestData
-        if (!url) {
-          reply.status(400).send({ error: 'Playlist URL is required' })
-          return
-        }
-        options.playlist = url
-        await processPlaylist(options, url, llmServices, transcriptServices)
-        reply.send({ message: 'Playlist processed successfully.' })
-        break
-      }
-
       case 'file': {
         const { filePath } = requestData
         if (!filePath) {
           reply.status(400).send({ error: 'File path is required' })
           return
         }
         options.file = filePath
-        await processFile(options, filePath, llmServices, transcriptServices)
-        reply.send({ message: 'File processed successfully.' })
+        const result = await processFile(options, filePath, llmServices, transcriptServices)
+        reply.send({
+          frontMatter: result.frontMatter,
+          prompt: result.prompt,
+          llmOutput: result.llmOutput,
+          transcript: result.transcript,
+        })
         break
       }
     }