various improvements

src/alpine.mts

@@ -217,4 +217,4 @@ notify(message) {
 
 export const methodsPrompt = getPromptFromFeatures(methods)
 
-export const alpine = '' // "# Alpine.js docs\n"+ attributesPrompt + propertiesPrompt + methodsPrompt
+export const alpine = "# Alpine.js docs\n"+ attributesPrompt // + propertiesPrompt + methodsPrompt

src/index.mts

@@ -14,7 +14,7 @@ const css = [
 .join("")
 
 const script = [
-  // "/js/alpinejs@3.12.2.js",
+  "/js/alpinejs@3.12.2.js",
   "/js/tailwindcss@3.3.2.js"
 ].map(item => `<script src="${item}"></script>`)
 .join("")
@@ -29,8 +29,9 @@ const llm = await AutoModelForCausalLM.from_pretrained$(
 const app = express()
 const port = 7860
 
-const timeoutInSec = 8 * 60
-console.log("timeout set to 8 minutes")
+const timeoutInSec = 60 * 60
+
+console.log("timeout set to 60 minutes")
 
 app.use(express.static("public"))
  
@@ -53,6 +54,17 @@ const endRequest = (id: string, reason: string) => {
   console.log(`request ${id} ended (${reason})`)
 }
 
+// we need to exit the open Python process or else it will keep running in the background
+process.on('SIGINT', () => {
+  try {
+    (python as any).exit()
+  } catch (err) {
+    // exiting Pythonia can get a bit messy: try/catch or not,
+    // you *will* see warnings and tracebacks in the console
+  }
+  process.exit(0)
+})
+
 app.get("/debug", (req, res) => {
   res.write(JSON.stringify({
     nbTotal: pending.total,
@@ -96,20 +108,24 @@ app.get("/", async (req, res) => {
 Generate a webpage written in English about: ${req.query.prompt}.
 # Documentation
 ${daisy}
-${alpine}
 # Guidelines
-- You use Tailwind CSS and DaisyUI!
+- Do not write a tutorial or repeat the instruction, but directly write the final code within a script tag
+- Use a color scheme consistent with the brief and theme
+- You need to use Tailwind CSS and DaisyUI for the UI, pure vanilla JS and AlpineJS for the JS.
+- You vanilla JS code will be written directly inside the page, using <script type="text/javascript">...</script>
 - You MUST use English, not Latin! (I repeat: do NOT write lorem ipsum!)
+- No need to write code comments, and try to make the code compact (short function names etc)
 - Use a central layout by wrapping everything in a \`<div class="flex flex-col justify-center">\`
 # Result output
 ${prefix}`
 
       
   try {
+    // be careful: if you input a prompt which is too large, you may experience a timeout
     const inputTokens = await llm.tokenize(finalPrompt)
     console.log("initializing the generator (may take 30s or more)")
     const generator = await llm.generate(inputTokens)
-
+    console.log("generator initialized, beginning token streaming..")
     for await (const token of generator) {
       if (!pending.queue.includes(id)) {
         break
@@ -119,9 +135,9 @@ ${prefix}`
       res.write(tmp)
     }
 
-    endRequest(id, `normal end of the llama stream for request ${id}`)
+    endRequest(id, `normal end of the LLM stream for request ${id}`)
   } catch (e) {
-    endRequest(id, `premature end of the llama stream for request ${id} (${e})`)
+    endRequest(id, `premature end of the LLM stream for request ${id} (${e})`)
   } 
 
   try {