@far-world-labs/verblets 0.1.4 → 0.1.7

package/.github/workflows/ci.yml

@@ -72,50 +72,11 @@ jobs:
           echo "✅ ESLint checks completed"
           echo "✅ Library is ready for deployment"
 
-  # Version bump for PRs - creates commit in PR branch
-  version-bump:
-    name: 📦 Version Bump
-    runs-on: ubuntu-latest
-    needs: build
-    if: github.event_name == 'pull_request'
-    permissions:
-      contents: write
-      pull-requests: write
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          token: ${{ secrets.GITHUB_TOKEN }}
-          ref: ${{ github.head_ref }}
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 20.x
-          cache: 'npm'
-      - run: npm ci
-      
-      - name: Configure Git
-        run: |
-          git config --global user.name "github-actions[bot]"
-          git config --global user.email "github-actions[bot]@users.noreply.github.com"
-      
-      - name: Version Bump (No Publish)
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          # Ensure we're on the correct branch
-          git checkout ${{ github.head_ref }}
-          
-          # Use release-it to bump version and create tag, but skip npm publish
-          npx release-it --ci --no-npm.publish --no-github.release
-          
-          # Push the version bump back to the PR branch
-          git push origin ${{ github.head_ref }}
-
   # Required status check that gates merge operations
   pr-ready-to-merge:
     name: ✅ PR Ready to Merge
     runs-on: ubuntu-latest
-    needs: [lint, test, build, version-bump]
+    needs: [lint, test, build]
     if: github.event_name == 'pull_request'
     steps:
       - name: All checks passed
@@ -124,11 +85,11 @@ jobs:
           echo "✅ Linting: Passed"
           echo "✅ Tests: Passed on all LTS Node versions"
           echo "✅ Build: Successful"
-          echo "✅ Version: Bumped and ready"
+          echo "ℹ️ Version: Will be checked on merge (publish only if bumped)"
           echo ""
           echo "This PR is now ready for squash and merge."
 
-  # Publish the already-bumped version on merge to main
+  # Publish to NPM and create git tag - only if version was bumped
   release:
     name: 🚀 Publish to NPM
     runs-on: ubuntu-latest
@@ -149,14 +110,42 @@ jobs:
           cache: 'npm'
       - run: npm ci
       
+      - name: Check if version was bumped
+        id: version-check
+        run: |
+          CURRENT_VERSION=$(node -p "require('./package.json').version")
+          PUBLISHED_VERSION=$(npm view @far-world-labs/verblets version 2>/dev/null || echo "0.0.0")
+          
+          echo "📦 Current version in package.json: $CURRENT_VERSION"
+          echo "📦 Published version on npm: $PUBLISHED_VERSION"
+          
+          if [ "$CURRENT_VERSION" = "$PUBLISHED_VERSION" ]; then
+            echo "should-publish=false" >> $GITHUB_OUTPUT
+            echo "ℹ️ No version bump detected - skipping publish"
+          else
+            echo "should-publish=true" >> $GITHUB_OUTPUT
+            echo "✅ Version bump detected: $PUBLISHED_VERSION → $CURRENT_VERSION - will publish"
+          fi
+      
+      - name: Create Git Tag
+        if: steps.version-check.outputs.should-publish == 'true'
+        run: |
+          VERSION=$(node -p "require('./package.json').version")
+          git config --global user.name "github-actions[bot]"
+          git config --global user.email "github-actions[bot]@users.noreply.github.com"
+          git tag -a "v$VERSION" -m "Release v$VERSION"
+          git push origin "v$VERSION"
+      
       - name: Publish to NPM
+        if: steps.version-check.outputs.should-publish == 'true'
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
         run: |
-          # Simple publish - version is already bumped in package.json from PR
+          # Version was manually bumped and validated in PR
           npm publish --access public
           
       - name: Create GitHub Release
+        if: steps.version-check.outputs.should-publish == 'true'
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
@@ -168,3 +157,9 @@ jobs:
             --title "Release v$VERSION" \
             --notes "Automated release of version $VERSION" \
             --latest
+      
+      - name: Skip publish
+        if: steps.version-check.outputs.should-publish == 'false'
+        run: |
+          echo "ℹ️ No version bump detected - publish skipped"
+          echo "This merge completed without triggering a release"

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@far-world-labs/verblets",
-  "version": "0.1.4",
-  "description": "OpenAI Client",
+  "version": "0.1.7",
+  "description": "Verblets is a collection of tools for building LLM-powered applications.",
   "main": "src/index.js",
   "type": "module",
   "repository": {
@@ -23,12 +23,9 @@
     "husky:install": "husky install",
     "husky:uninstall": "husky uninstall",
     "prepare": "npx husky install",
-    "version:patch": "node scripts/version-bump.js patch",
-    "version:minor": "node scripts/version-bump.js minor",
-    "version:major": "node scripts/version-bump.js major",
-    "release:patch": "node scripts/version-bump.js patch",
-    "release:minor": "node scripts/version-bump.js minor",
-    "release:major": "node scripts/version-bump.js major"
+    "version:patch": "npm version patch",
+    "version:minor": "npm version minor",
+    "version:major": "npm version major"
   },
   "config": {
     "gen-script": "./scripts/run.sh gen-$1"

package/src/chains/themes/index.js

@@ -11,7 +11,7 @@ export default async function themes(text, config = {}) {
   const { chunkSize = 5, topN, llm, ...options } = config;
   const pieces = splitText(text);
   const reducePrompt =
-    'Update the accumulator with short themes from this text. Avoid duplicates. Return a comma-separated list of themes.';
+    'Update the accumulator with short themes from this text. Avoid duplicates. Return ONLY a comma-separated list of themes with no explanation or additional text.';
   const firstPass = await bulkReduce(shuffle(pieces), reducePrompt, { chunkSize, llm, ...options });
   const rawThemes = firstPass
     .split(',')
@@ -19,7 +19,7 @@ export default async function themes(text, config = {}) {
     .filter(Boolean);
 
   const limitText = topN ? `Limit to the top ${topN} themes.` : 'Return all meaningful themes.';
-  const refinePrompt = `Refine the accumulator by merging similar themes. ${limitText} Return a comma-separated list.`;
+  const refinePrompt = `Refine the accumulator by merging similar themes. ${limitText} Return ONLY a comma-separated list with no explanation or additional text.`;
   const final = await bulkReduce(rawThemes, refinePrompt, { chunkSize, llm, ...options });
   return final
     .split(',')

package/src/constants/models.js

@@ -1,9 +1,10 @@
-// Importing dotenv config to load environment variables from .env file
-// eslint-disable-next-line no-unused-vars
-import dotenv from 'dotenv/config';
+// Environment variables loaded in index.js
 
 const _models = {};
 
+// Function to get API key at runtime
+const getOpenAIKey = () => process.env.OPENAI_API_KEY;
+
 const systemPrompt = `You are a superintelligent processing unit, answering prompts with precise instructions.
 You are a small but critical component in a complex system, so your role in giving quality outputs to your given inputs and instructions is critical. 
 You must obey those instructions to the letter at all costs--do not deviate or add your own interpretation or flair. Stick to the instructions. 
@@ -45,7 +46,9 @@ _models.fastCheapMulti = {
   maxContextWindow: 128_000,
   maxOutputTokens: 16_384,
   requestTimeout: 20_000,
-  apiKey: process.env.OPENAI_API_KEY ?? 'undefined',
+  get apiKey() {
+    return getOpenAIKey();
+  },
   apiUrl: 'https://api.openai.com/',
   systemPrompt,
 };
@@ -59,7 +62,9 @@ _models.goodMulti = {
   maxContextWindow: 128_000,
   maxOutputTokens: 16_384,
   requestTimeout: 20_000,
-  apiKey: process.env.OPENAI_API_KEY ?? 'undefined',
+  get apiKey() {
+    return getOpenAIKey();
+  },
   apiUrl: 'https://api.openai.com/',
   systemPrompt,
 };
@@ -73,7 +78,9 @@ _models.fastCheapReasoningMulti = {
   maxContextWindow: 128_000,
   maxOutputTokens: 16_384,
   requestTimeout: 40_000,
-  apiKey: process.env.OPENAI_API_KEY ?? 'undefined',
+  get apiKey() {
+    return getOpenAIKey();
+  },
   apiUrl: 'https://api.openai.com/',
   systemPrompt,
 };
@@ -87,7 +94,9 @@ _models.reasoningNoImage = {
   maxContextWindow: 200_000,
   maxOutputTokens: 100_000,
   requestTimeout: 120_000,
-  apiKey: process.env.OPENAI_API_KEY ?? 'undefined',
+  get apiKey() {
+    return getOpenAIKey();
+  },
   apiUrl: 'https://api.openai.com/',
   systemPrompt,
 };
@@ -132,7 +141,9 @@ _models.privacy = {
   apiUrl: (process.env.OPENWEBUI_API_URL ?? '').endsWith('/')
     ? process.env.OPENWEBUI_API_URL
     : `${process.env.OPENWEBUI_API_URL}/`,
-  apiKey: process.env.OPENWEBUI_API_KEY ?? 'undefined',
+  get apiKey() {
+    return process.env.OPENWEBUI_API_KEY;
+  },
   systemPrompt,
   modelOptions: {
     stop: ['</s>'],

package/src/index.js

@@ -1,6 +1,6 @@
-// Importing dotenv config to load environment variables from .env file
-// eslint-disable-next-line no-unused-vars
-import dotenv from 'dotenv/config';
+// Load environment variables from .env file FIRST
+import dotenv from 'dotenv';
+dotenv.config();
 
 import chatGPT from './lib/chatgpt/index.js';
 

package/scripts/version-bump.js

@@ -1,33 +0,0 @@
-#!/usr/bin/env node
-
-import { execSync } from 'child_process';
-import { readFileSync } from 'fs';
-
-const args = process.argv.slice(2);
-const bumpType = args[0] || 'patch'; // patch, minor, major
-
-if (!['patch', 'minor', 'major'].includes(bumpType)) {
-  console.error('Usage: node scripts/version-bump.js [patch|minor|major]');
-  process.exit(1);
-}
-
-try {
-  console.log(`🔄 Bumping ${bumpType} version...`);
-  
-  // Use release-it to bump version and create tag (no publish, no GitHub release)
-  execSync(`npx release-it ${bumpType} --ci --no-npm.publish --no-github.release`, {
-    stdio: 'inherit'
-  });
-  
-  // Get the new version
-  const pkg = JSON.parse(readFileSync('package.json', 'utf8'));
-  const newVersion = pkg.version;
-  
-  console.log(`✅ Version bumped to ${newVersion}`);
-  console.log('📝 Commit and push this change in your PR');
-  console.log('🚀 Publishing will happen automatically when PR is merged');
-  
-} catch (error) {
-  console.error('❌ Version bump failed:', error.message);
-  process.exit(1);
-}