zapi

Author: steveseguin

.github/scripts/enhance-commits.js

@@ -2,13 +2,16 @@ const { exec } = require('child_process');
 const fs = require('fs').promises;
 const path = require('path');
 const axios = require('axios');
-const { GoogleGenerativeAI } = require('@google/generative-ai');
 
 // Configuration
 const MAX_DIFF_SIZE = 20000; // Characters - truncate if larger
 const MAX_FILES_TO_SAMPLE = 5; // Maximum number of files to include in the diff
 const SAMPLE_LINES_PER_FILE = 200; // Maximum lines to include per file
 
+// Z.AI GLM API Configuration
+const ZAI_API_ENDPOINT = 'https://api.z.ai/api/coding/paas/v4/chat/completions';
+const ZAI_MODEL = 'glm-4.7';
+
 // --- Error Handling ---
 class ScriptError extends Error {
   constructor(message, context = {}) {
@@ -25,18 +28,39 @@ function log(level, message, context = {}) {
   console.log(`[${timestamp}] [${level.toUpperCase()}] ${message}`, context);
 }
 
-// Initialize Gemini API
-let model;
-try {
-  if (!process.env.GEMINI_API_KEY) {
-    throw new Error('GEMINI_API_KEY environment variable is not set.');
-  }
-  const genAI = new GoogleGenerativeAI(process.env.GEMINI_API_KEY);
-  model = genAI.getGenerativeModel({ model: 'gemini-3-flash-preview' }); // Change to a version now supported.
-  log('info', 'Gemini API initialized successfully.');
-} catch (error) {
-  log('error', 'Failed to initialize Gemini API', { error: error.message });
-  process.exit(1); // Exit if API key is missing or init fails
+// Validate Z.AI API key
+if (!process.env.ZAI_API_KEY) {
+  log('error', 'ZAI_API_KEY environment variable is not set.');
+  process.exit(1);
+}
+log('info', 'Z.AI API configuration loaded successfully.');
+
+/**
+ * Calls the Z.AI GLM API with system and user prompts.
+ * @param {string} systemPrompt - The system instructions.
+ * @param {string} userPrompt - The user message/data.
+ * @returns {Promise<string|null>} - The API response content or null if failed.
+ */
+async function callZaiApi(systemPrompt, userPrompt) {
+  const requestBody = {
+    model: ZAI_MODEL,
+    messages: [
+      { role: 'system', content: systemPrompt },
+      { role: 'user', content: userPrompt }
+    ],
+    temperature: 0.7,
+    stream: false
+  };
+
+  const response = await axios.post(ZAI_API_ENDPOINT, requestBody, {
+    headers: {
+      'Content-Type': 'application/json',
+      'Authorization': `Bearer ${process.env.ZAI_API_KEY}`
+    },
+    timeout: 60000
+  });
+
+  return response.data?.choices?.[0]?.message?.content?.trim() || null;
 }
 
 // --- Git Operations ---
@@ -361,7 +385,7 @@ async function getRecentBranchCommits(branchName) {
 // --- AI Enhancement ---
 
 /**
- * Enhances the commit message using the Gemini API.
+ * Enhances the commit message using the Z.AI API.
  * @param {string} originalMessage - The original commit message.
  * @param {string} diff - The summarized code diff.
  * @param {string} branchName - The current Git branch name.
@@ -376,8 +400,7 @@ async function enhanceCommitMessage(originalMessage, diff, branchName, dirSummar
      ? `* **Recent Steps on Branch (${branchName}):**\n${recentCommits.map(s => `        * ${s}`).join('\n')}`
      : `* **Recent Steps on Branch (${branchName}):** (This appears to be the first commit on this branch since merging from the base branch)`;
 
-  const prompt = `
-You are an expert developer assistant tasked with refining Git commit messages for the "Raspberry Ninja" project. Your goal is to create a message that follows Conventional Commits format (e.g., "feat:", "fix:", "chore:", "refactor:", "style:", "test:", "docs:", "build:", "ci:") and provides clear, concise, and informative context about the changes.
+  const systemPrompt = `You are an expert developer assistant tasked with refining Git commit messages for the "Raspberry Ninja" project. Your goal is to create a message that follows Conventional Commits format (e.g., "feat:", "fix:", "chore:", "refactor:", "style:", "test:", "docs:", "build:", "ci:") and provides clear, concise, and informative context about the changes.
 
 **Project Context: Raspberry Ninja**
 
@@ -386,9 +409,7 @@ You are an expert developer assistant tasked with refining Git commit messages f
 * **Key Components:** \`publish.py\` (main RTMP/video publishing script), platform-specific directories (\`raspberry_pi/\`, \`nvidia_jetson/\`, \`orangepi/\`, etc.), installation scripts, system service configurations, hardware-specific optimizations.
 * **Technology Stack:** Python, Bash scripting, GStreamer, FFmpeg, system services (systemd), hardware video encoders (H.264/H.265), WebRTC (via VDO.Ninja integration).
 
-**Task:**
-
-Analyze the provided information (original message, code diff, branch context, directory summary, recent commits) and generate an improved commit message adhering to the following guidelines:
+**Guidelines:**
 
 1.  **Format:** Use the Conventional Commits specification (<type>[optional scope]: <description>). Choose the most appropriate type (feat, fix, chore, refactor, style, test, docs, build, ci). The scope (e.g., \`feat(api)\`, \`fix(twitch)\`, \`chore(deps)\`) is optional but encouraged if the change primarily affects a specific component.
 2.  **Subject Line:**
@@ -399,12 +420,12 @@ Analyze the provided information (original message, code diff, branch context, d
     * Separate the subject from the body with a blank line.
     * Explain the *what* and *why* of the change in more detail.
     * Use bullet points (-) for distinct changes if applicable.
-    * Reference specific files, components (e.g., \`dock.html\`, TTS module, GitHub Actions), or features affected.
+    * Reference specific files, components (e.g., \`publish.py\`, platform directories, GitHub Actions), or features affected.
     * Incorporate context from the branch name, directory summary, and recent commits if relevant (e.g., "Continues work on feature X from previous commits").
 4.  **Tone:** Professional and clear.
-5.  **Focus:** The message should *only* contain the commit message itself, starting directly with the type/scope. Do not add introductions like "Here is the enhanced commit message:". Crucially, do not include bracketed tags like '[skip ci]', '[auto-enhanced]', '[skip pages]', etc., in your generated message text.
+5.  **Focus:** The message should *only* contain the commit message itself, starting directly with the type/scope. Do not add introductions like "Here is the enhanced commit message:". Crucially, do not include bracketed tags like '[skip ci]', '[auto-enhanced]', '[skip pages]', etc., in your generated message text.`;
 
-**Input Data:**
+  const userPrompt = `Analyze the provided information and generate an improved commit message:
 
 * **Original Commit Message:**
     \`\`\`
@@ -418,32 +439,26 @@ ${recentCommitLines}
     ${diff}
     \`\`\`
 
-**Generate the improved commit message now:**
-`;
+**Generate the improved commit message now:**`;
 
   try {
-    log('debug', 'Sending prompt to Gemini API.');
-    if (!model) {
-        throw new Error('Gemini model is not initialized.');
-    }
-    const result = await model.generateContent(prompt);
-    if (!result || !result.response || typeof result.response.text !== 'function') {
-        log('error', 'Invalid response structure received from Gemini API.', { response: result });
-        throw new Error('Invalid response structure from Gemini API.');
+    log('debug', 'Sending prompt to Z.AI API.');
+    const enhancedMessage = await callZaiApi(systemPrompt, userPrompt);
+    if (!enhancedMessage) {
+        throw new Error('Empty response from Z.AI API.');
     }
-    const enhancedMessage = result.response.text().trim();
-    log('info', 'Successfully received enhanced commit message from Gemini API.');
-    log('debug', 'Enhanced Message:', { message: enhancedMessage }); 
+    log('info', 'Successfully received enhanced commit message from Z.AI API.');
+    log('debug', 'Enhanced Message:', { message: enhancedMessage });
     if (!/^(feat|fix|chore|refactor|style|test|docs|build|ci)/.test(enhancedMessage)) {
         log('warn', 'Generated message does not strictly follow Conventional Commit format.', { message: enhancedMessage });
     }
     return enhancedMessage;
   } catch (error) {
-    log('error', 'Error calling Gemini API', { errorMessage: error.message, promptLength: prompt.length });
+    log('error', 'Error calling Z.AI API', { errorMessage: error.message });
     if (error.response) {
-        log('error', 'Gemini API Error Response:', { data: error.response.data });
+        log('error', 'Z.AI API Error Response:', { data: error.response.data });
     }
-    return null; 
+    return null;
   }
 }
 
@@ -550,28 +565,23 @@ async function updatePRDescription() {
 
     log('info', `Generating enhanced PR description (diff size: ${diffSnippet.length} chars)...`);
 
-    // Generate enhanced description using Gemini
-    const prompt = `
-You are an expert developer assistant helping refine a Pull Request description for the "Social Stream Ninja" project.
+    // Generate enhanced description using Z.AI
+    const systemPrompt = `You are an expert developer assistant helping refine a Pull Request description for the "Raspberry Ninja" project.
 
 **Project Context:** (Same as commit message context - wireless HDMI capture, RTMP/WebRTC streaming, multi-platform SBC support, etc.)
 
-**Task:**
-
-Review the existing PR information (title, original description, code diff) and generate an improved, comprehensive PR description. The goal is to clearly explain the PR's purpose, changes, and potential impact.
-
 **Guidelines:**
 
 1.  **Structure:** Organize the description logically (e.g., Purpose, Changes, How to Test, Considerations). Use Markdown formatting (headings, lists).
 2.  **Purpose:** Clearly state the main goal of the PR. What problem does it solve or what feature does it add?
-3.  **Key Changes:** Summarize the main modifications using bullet points. Mention affected components or features (e.g., "Updated Twitch integration", "Refactored API error handling", "Improved \`dock.html\` layout").
+3.  **Key Changes:** Summarize the main modifications using bullet points. Mention affected components or features (e.g., "Updated publish.py", "Refactored platform support", "Improved installation scripts").
 4.  **Context/Why:** Briefly explain the reasoning behind the changes if not obvious.
 5.  **Testing:** (Optional but helpful) Suggest how reviewers can test the changes.
 6.  **Relate to Diff:** Ensure the description accurately reflects the code changes shown in the diff summary.
 7.  **Tone:** Professional and informative.
-8.  **Output:** Provide *only* the enhanced PR description text in Markdown format. Do not include introductory phrases like "Here's the updated description:". If the original description is good, you can refine it or even state that no major changes are needed (though usually, adding structure is beneficial).
+8.  **Output:** Provide *only* the enhanced PR description text in Markdown format. Do not include introductory phrases like "Here's the updated description:". If the original description is good, you can refine it or even state that no major changes are needed (though usually, adding structure is beneficial).`;
 
-**Input Data:**
+    const userPrompt = `Review the existing PR information and generate an improved, comprehensive PR description:
 
 * **PR Title:** ${prTitle}
 * **Target Branch:** ${prTargetBranch}
@@ -585,14 +595,12 @@ Review the existing PR information (title, original description, code diff) and
     ${diffSnippet}
     \`\`\`
 
-**Generate the improved PR description now:**
-`;
+**Generate the improved PR description now:**`;
 
-    const enhancedDescriptionResult = await model.generateContent(prompt);
-    if (!enhancedDescriptionResult || !enhancedDescriptionResult.response || typeof enhancedDescriptionResult.response.text !== 'function') {
-        throw new Error('Invalid response structure from Gemini API for PR description.');
+    const enhancedDescription = await callZaiApi(systemPrompt, userPrompt);
+    if (!enhancedDescription) {
+        throw new Error('Empty response from Z.AI API for PR description.');
     }
-    const enhancedDescription = enhancedDescriptionResult.response.text().trim();
 
     // Update PR description via GitHub API
     const [owner, repo] = repoFullName.split('/');
@@ -691,7 +699,7 @@ async function main() {
     // Check if enhancement was successful (API returned something)
     // REMOVED: || enhancedMessage.toLowerCase().includes("error")
     if (!enhancedMessage || enhancedMessage.trim() === '') {
-      log('error', 'Failed to generate a valid enhanced commit message from Gemini API (empty response). Aborting update.');
+      log('error', 'Failed to generate a valid enhanced commit message from Z.AI API (empty response). Aborting update.');
       process.exit(1); // Exit with error if enhancement failed critically
     }
 

.github/workflows/enhance-commits.yml

@@ -27,7 +27,7 @@ jobs:
           node-version: '18'
 
       - name: Install dependencies
-        run: npm install @google/generative-ai axios
+        run: npm install axios
 
       - name: Configure Git
         run: |
@@ -37,6 +37,6 @@ jobs:
       - name: Enhance commit messages
         id: enhance
         env:
-          GEMINI_API_KEY: ${{ secrets.GEMINI_API_KEY }}
+          ZAI_API_KEY: ${{ secrets.ZAI_API_KEY }}
           GITHUB_TOKEN: ${{ secrets.COMMIT_ENHANCER_PAT }} # This is used by the script for PR updates
         run: node .github/scripts/enhance-commits.js