@fettstorch/clai 0.1.4 → 0.1.6

package/README.md

@@ -33,9 +33,9 @@ clai "how tall can giraffes get?"
 clai how tall can giraffes get
 clai
 ```
-<img width="300" src="https://github.com/user-attachments/assets/f4a81e24-ef5b-42b7-bca7-188763d4e5cf" />
+<img width="400" src="https://github.com/user-attachments/assets/002b3e05-5c77-4f4d-8aa3-ecb7412e9538" />
 
-The clie expects either a URL or a search query or no argument at all.
+The cli expects either a URL or a search query or no argument at all.
 When passing a search query without quotes make sure not to use any special characters, that might confuse the CLI e.g. ?
 
 ### Programmatic API

package/dist/cli.js

@@ -67837,8 +67837,6 @@ async function getGoogleResults(query) {
     const urlLower = url.toLowerCase();
     return !urlLower.includes("www.google") && !urlLower.includes("gstatic.com") && !urlLower.includes("googleapis.com") && !urlLower.includes("googleadservices") && queryWords.some((word) => urlLower.includes(word));
   }));
-  console.log("queryWords", queryWords);
-  console.log("filteredUrls", filteredUrls);
   const results = [...filteredUrls].slice(0, 3);
   if (results.length === 0) {
     throw new Error("No search results found");
@@ -67861,6 +67859,19 @@ function extractDataFromHtml(html3) {
     url: cheerioDoc('link[rel="canonical"]').attr("href") || ""
   };
 }
+
+// node_modules/@fettstorch/jule/dist/esm/when.js
+function when(c) {
+  return (cases) => {
+    const elseHandler = cases.else;
+    const safeAccessor = c;
+    const handler = safeAccessor in cases ? cases[safeAccessor] : elseHandler;
+    if (typeof handler === "function") {
+      return handler(c);
+    }
+    return handler;
+  };
+}
 // node_modules/@fettstorch/jule/dist/esm/observable.js
 class Observable {
   listeners = new Set;
@@ -72840,7 +72851,7 @@ function truncateContent(content) {
   const maxChars = MAX_INPUT_TOKENS * 4;
   if (content.length <= maxChars)
     return content;
-  return content.slice(0, maxChars) + "... (content truncated)";
+  return content.slice(0, maxChars);
 }
 
 class OpenAIWrapper {
@@ -72862,8 +72873,8 @@ class OpenAIWrapper {
   async completeStructured(prompt2, options) {
     const truncatedPrompt = truncateContent(prompt2);
     const {
-      model = "gpt-3.5-turbo",
-      temperature = 0.6,
+      model = "gpt-4o-mini",
+      temperature = 1.6,
       functionName = "generate_response",
       responseSchema
     } = options;
@@ -72914,6 +72925,7 @@ async function summarizeWebPage(content, openAIApiKey) {
     - Step 2: Do that
     - Step 3: Done
    10. Mark proper nouns as bold e.g. **Harry Potter**
+   11. Mark headings (h1, h2, h3) as #, ##, ### respectively
   
   Don't just summarize, cite the key information.
   
@@ -72959,12 +72971,51 @@ async function clai(input, openAIKey) {
     sources: scrapedData.map((data2) => data2.url)
   };
 }
+// package.json
+var package_default = {
+  name: "@fettstorch/clai",
+  version: "0.1.6",
+  main: "dist/index.js",
+  bin: {
+    clai: "dist/cli.js"
+  },
+  repository: {
+    type: "git",
+    url: "git+https://github.com/schnullerpip/clai.git"
+  },
+  scripts: {
+    start: "bun run src/cli.ts",
+    build: "bun build ./src/index.ts --outdir dist --target node && bun build ./src/cli.ts --outdir dist --target node",
+    dev: "bun --watch src/cli.ts"
+  },
+  author: "schnullerpip (https://github.com/schnullerpip)",
+  license: "ISC",
+  description: "AI-powered webpage summarizer",
+  dependencies: {
+    "@fettstorch/jule": "^0.5.3",
+    chalk: "^5.3.0",
+    cheerio: "^1.0.0-rc.12",
+    commander: "^12.1.0",
+    inquirer: "^12.1.0",
+    openai: "^4.73.0",
+    ora: "^8.1.1",
+    googleapis: "^126.0.1"
+  },
+  devDependencies: {
+    "@types/inquirer": "^9.0.7",
+    "@types/node": "^20.11.19",
+    "bun-types": "latest"
+  },
+  publishConfig: {
+    access: "public"
+  }
+};
 
 // src/cli.ts
 var program2 = new Command;
 async function main2() {
   try {
-    program2.name("clai").description("AI-powered web scraping tool").version("1.0.0").argument("[input...]", "URL or search terms to analyze").action(async (inputs) => {
+    program2.name("clai").description("AI-powered web scraping tool").version(package_default.version).argument("[input...]", "URL or search terms to analyze").action(async (inputs) => {
       const openAIKey = process.env.OPENAI_API_KEY;
       if (!openAIKey) {
         console.error(source_default.red("\u274C OPENAI_API_KEY environment variable is not set"));
@@ -73019,15 +73070,22 @@ async function animateText(text3, delay = 25) {
   process.stdout.write("\n");
 }
 function formatMarkdownForTerminal(text3) {
-  return text3.replace(/\*\*(.*?)\*\*/g, (_3, content) => source_default.bold(content));
+  const headingHandled = text3.replace(/^(#{1,3})\s+(.*?)$/gm, (_3, hashes, content) => when(hashes.length)({
+    1: () => `\n${source_default.yellow.bold("\u2550\u2550\u2550 ")}${source_default.yellow.bold(content)}${source_default.yellow.bold(" \u2550\u2550\u2550")}`,
+    2: () => source_default.yellowBright.bold(content),
+    3: () => source_default.yellow(content),
+    else: () => content
+  }));
+  const boldHandled = headingHandled.replace(/\*\*(.*?)\*\*/g, (_3, content) => source_default.bold(content));
+  return boldHandled;
 }
 async function analyzeInput(input, openAIKey) {
-  const spinner = ora("Analyzing content...").start();
+  const spinner = ora("Thinking...").start();
   try {
     const result = await clai(input, openAIKey);
-    spinner.succeed("Analysis complete");
+    spinner.succeed("AHA!");
     console.log(source_default.green.bold(`
-\uD83D\uDCDD Summary:`));
+\uD83D\uDCDD \u2550\u2550\u2550 Summary \u2550\u2550\u2550 :`));
     const formattedContent = formatMarkdownForTerminal(result.summary);
     await animateText(formattedContent);
     const { selectedLink } = await esm_default12.prompt([

package/dist/index.js

@@ -41042,8 +41042,6 @@ async function getGoogleResults(query) {
     const urlLower = url.toLowerCase();
     return !urlLower.includes("www.google") && !urlLower.includes("gstatic.com") && !urlLower.includes("googleapis.com") && !urlLower.includes("googleadservices") && queryWords.some((word) => urlLower.includes(word));
   }));
-  console.log("queryWords", queryWords);
-  console.log("filteredUrls", filteredUrls);
   const results = [...filteredUrls].slice(0, 3);
   if (results.length === 0) {
     throw new Error("No search results found");
@@ -46045,7 +46043,7 @@ function truncateContent(content) {
   const maxChars = MAX_INPUT_TOKENS * 4;
   if (content.length <= maxChars)
     return content;
-  return content.slice(0, maxChars) + "... (content truncated)";
+  return content.slice(0, maxChars);
 }
 
 class OpenAIWrapper {
@@ -46067,8 +46065,8 @@ class OpenAIWrapper {
   async completeStructured(prompt, options) {
     const truncatedPrompt = truncateContent(prompt);
     const {
-      model = "gpt-3.5-turbo",
-      temperature = 0.6,
+      model = "gpt-4o-mini",
+      temperature = 1.6,
       functionName = "generate_response",
       responseSchema
     } = options;
@@ -46119,6 +46117,7 @@ async function summarizeWebPage(content, openAIApiKey) {
     - Step 2: Do that
     - Step 3: Done
    10. Mark proper nouns as bold e.g. **Harry Potter**
+   11. Mark headings (h1, h2, h3) as #, ##, ### respectively
   
   Don't just summarize, cite the key information.
   

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fettstorch/clai",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "main": "dist/index.js",
   "bin": {
     "clai": "dist/cli.js"

package/src/cli.ts

@@ -4,6 +4,8 @@ import inquirer from 'inquirer';
 import chalk from 'chalk';
 import ora from 'ora';
 import { clai } from './index';
+import { when } from '@fettstorch/jule';
+import pkg from '../package.json' assert { type: 'json' };
 
 const program = new Command();
 
@@ -12,7 +14,7 @@ async function main() {
     program
       .name('clai')
       .description('AI-powered web scraping tool')
-      .version('1.0.0')
+      .version(pkg.version)
       .argument('[input...]', 'URL or search terms to analyze')
       .action(async (inputs: string[]) => {
         const openAIKey = process.env.OPENAI_API_KEY;
@@ -88,17 +90,28 @@ async function animateText(text: string, delay = 25) {
 }
 
 function formatMarkdownForTerminal(text: string): string {
-  return text.replace(/\*\*(.*?)\*\*/g, (_, content) => chalk.bold(content));
+  // Handle headings first
+  const headingHandled = text.replace(/^(#{1,3})\s+(.*?)$/gm, (_, hashes, content) => when(hashes.length)({
+    1: () => `\n${chalk.yellow.bold('═══ ')}${chalk.yellow.bold(content)}${chalk.yellow.bold(' ═══')}`,
+    2: () => chalk.yellowBright.bold(content),
+    3: () => chalk.yellow(content),
+    else: () => content
+  }));
+  
+  // Handle regular bold text after headings
+  const boldHandled = headingHandled.replace(/\*\*(.*?)\*\*/g, (_, content) => chalk.bold(content));
+  
+  return boldHandled;
 }
 
 async function analyzeInput(input: string, openAIKey: string) {
-  const spinner = ora('Analyzing content...').start();
+  const spinner = ora('Thinking...').start();
   
   try {
     const result = await clai(input, openAIKey);
-    spinner.succeed('Analysis complete');
+    spinner.succeed('AHA!');
     
-    console.log(chalk.green.bold('\n📝 Summary:'));
+    console.log(chalk.green.bold('\n📝 ═══ Summary ═══ :'));
     const formattedContent = formatMarkdownForTerminal(result.summary);
     await animateText(formattedContent);
     

package/src/scraper.ts

@@ -79,9 +79,6 @@ async function getGoogleResults(query: string): Promise<string[]> {
     })
   );
 
-  console.log('queryWords', queryWords);
-  console.log('filteredUrls', filteredUrls);
-
   const results = [...filteredUrls].slice(0, 3);
   
   if (results.length === 0) {

package/src/summarizer.ts

@@ -41,6 +41,7 @@ export async function summarizeWebPage(content: string, openAIApiKey: string): P
     - Step 2: Do that
     - Step 3: Done
    10. Mark proper nouns as bold e.g. **Harry Potter**
+   11. Mark headings (h1, h2, h3) as #, ##, ### respectively
   
   Don't just summarize, cite the key information.
   

package/tsconfig.json

@@ -8,7 +8,8 @@
     "rootDir": "./src",
     "strict": true,
     "skipLibCheck": true,
-    "forceConsistentCasingInFileNames": true
+    "forceConsistentCasingInFileNames": true,
+    "resolveJsonModule": true
   },
   "include": ["src/**/*"]
 }