Fixing zendesk bugs (#68)

* Fixing zendesk bugs

Signed-off-by: Denis Jannot <denis.jannot@solo.io>

* Updating version

Signed-off-by: Denis Jannot <denis.jannot@solo.io>

---------

Signed-off-by: Denis Jannot <denis.jannot@solo.io>

Author: djannot

doc2vec.ts

@@ -1298,7 +1298,11 @@ export class Doc2Vec {
         // Get the last run date from the database
         const startDate = config.start_date || `${new Date().getFullYear()}-01-01`;
         const lastRunDate = await DatabaseManager.getLastRunDate(dbConnection, `zendesk_tickets_${config.zendesk_subdomain}`, `${startDate}T00:00:00Z`, logger);
-        
+
+        // Status filter applied client-side (includes 'closed' by default so tickets
+        // transitioning to closed get updated rather than left stale)
+        const statusFilter = new Set(config.ticket_status || ['new', 'open', 'pending', 'hold', 'solved', 'closed']);
+
         const fetchWithRetry = async (url: string, retries = 3): Promise<any> => {
             for (let attempt = 0; attempt < retries; attempt++) {
                 try {
@@ -1308,16 +1312,19 @@ export class Doc2Vec {
                             'Content-Type': 'application/json',
                         },
                     });
-                    
-                    if (response.status === 429) {
-                        const retryAfter = parseInt(response.headers['retry-after'] || '60');
-                        logger.warn(`Rate limited, waiting ${retryAfter}s before retry`);
+                    return response.data;
+                } catch (error: any) {
+                    // 403 is a permissions error — retrying won't help
+                    if (error.response?.status === 403) throw error;
+
+                    if (error.response?.status === 429) {
+                        const retryAfter = parseInt(error.response.headers?.['retry-after'] || '60', 10);
+                        logger.warn(`Rate limited by Zendesk, waiting ${retryAfter}s before retry`);
                         await new Promise(res => setTimeout(res, retryAfter * 1000));
+                        attempt--; // Don't burn a retry on rate-limit waits
                         continue;
                     }
-                    
-                    return response.data;
-                } catch (error: any) {
+
                     logger.error(`Zendesk API error (attempt ${attempt + 1}):`, error.message);
                     if (attempt === retries - 1) throw error;
                     await new Promise(res => setTimeout(res, 2000 * (attempt + 1)));
@@ -1367,118 +1374,96 @@ export class Doc2Vec {
         const processTicket = async (ticket: any): Promise<void> => {
             const ticketId = ticket.id;
             const url = `https://${config.zendesk_subdomain}.zendesk.com/agent/tickets/${ticketId}`;
-            
+
+            // Deleted tickets — remove their chunks and stop
+            if (ticket.status === 'deleted') {
+                logger.info(`Ticket #${ticketId} was deleted in Zendesk — removing its chunks`);
+                if (dbConnection.type === 'sqlite') {
+                    DatabaseManager.removeChunksByUrlSQLite(dbConnection.db, url, logger);
+                } else {
+                    await DatabaseManager.removeChunksByUrlQdrant(dbConnection, url, logger);
+                }
+                return;
+            }
+
+            // Skip tickets whose status is outside the configured filter
+            if (!statusFilter.has(ticket.status)) {
+                logger.debug(`Ticket #${ticketId} has status '${ticket.status}' outside configured filter — skipping`);
+                return;
+            }
+
             logger.info(`Processing ticket #${ticketId}`);
-            
+
             // Fetch ticket comments
             const commentsUrl = `${baseUrl}/tickets/${ticketId}/comments.json`;
             const commentsData = await fetchWithRetry(commentsUrl);
             const comments = commentsData?.comments || [];
-            
+
             // Generate markdown for the ticket
             const markdown = generateMarkdownForTicket(ticket, comments);
-            
+
             // Chunk the markdown content
             const ticketConfig = {
                 ...config,
                 product_name: config.product_name || `zendesk_${config.zendesk_subdomain}`,
                 max_size: config.max_size || Infinity
             };
-            
+
             const chunks = await this.contentProcessor.chunkMarkdown(markdown, ticketConfig, url);
             logger.info(`Ticket #${ticketId}: Created ${chunks.length} chunks`);
-            
-            // Process and store each chunk
-            for (const chunk of chunks) {
-                const chunkHash = Utils.generateHash(chunk.content);
-                const chunkId = chunk.metadata.chunk_id.substring(0, 8) + '...';
-                
-                if (dbConnection.type === 'sqlite') {
-                    const { checkHashStmt } = DatabaseManager.prepareSQLiteStatements(dbConnection.db);
-                    const existing = checkHashStmt.get(chunk.metadata.chunk_id) as { hash: string } | undefined;
-                    
-                    if (existing && existing.hash === chunkHash) {
-                        logger.info(`Skipping unchanged chunk: ${chunkId}`);
-                        continue;
-                    }
 
-                    const embeddings = await this.createEmbeddings([chunk.content]);
-                    if (embeddings.length) {
-                        DatabaseManager.insertVectorsSQLite(dbConnection.db, chunk, embeddings[0], logger, chunkHash);
-                        logger.debug(`Stored chunk ${chunkId} in SQLite`);
-                    } else {
-                        logger.error(`Embedding failed for chunk: ${chunkId}`);
-                    }
-                } else if (dbConnection.type === 'qdrant') {
-                    try {
-                        let pointId: string;
-                        try {
-                            pointId = chunk.metadata.chunk_id;
-                            if (!Utils.isValidUuid(pointId)) {
-                                pointId = Utils.hashToUuid(chunk.metadata.chunk_id);
-                            }
-                        } catch (e) {
-                            pointId = crypto.randomUUID();
-                        }
-
-                        const existingPoints = await dbConnection.client.retrieve(dbConnection.collectionName, {
-                            ids: [pointId],
-                            with_payload: true,
-                            with_vector: false,
-                        });
-
-                        if (existingPoints.length > 0 && existingPoints[0].payload && existingPoints[0].payload.hash === chunkHash) {
-                            logger.info(`Skipping unchanged chunk: ${chunkId}`);
-                            continue;
-                        }
-                        
-                        const embeddings = await this.createEmbeddings([chunk.content]);
-                        if (embeddings.length) {
-                            await DatabaseManager.storeChunkInQdrant(dbConnection, chunk, embeddings[0], chunkHash);
-                            logger.debug(`Stored chunk ${chunkId} in Qdrant (${dbConnection.collectionName})`);
-                        } else {
-                            logger.error(`Embedding failed for chunk: ${chunkId}`);
-                        }
-                    } catch (error) {
-                        logger.error(`Error processing chunk in Qdrant:`, error);
-                    }
-                }
-            }
+            // Use processChunksForUrl which performs a URL-level diff:
+            // deletes all existing chunks for this URL before reinserting,
+            // so stale chunks from previous versions are never left behind.
+            await this.processChunksForUrl(chunks, url, dbConnection, logger);
         };
 
         logger.info(`Fetching Zendesk tickets updated since ${lastRunDate}`);
-        
-        // Build query parameters
-        const statusFilter = config.ticket_status || ['new', 'open', 'pending', 'hold', 'solved'];
-        const query = `updated>${lastRunDate.split('T')[0]} status:${statusFilter.join(',status:')}`;
-        
-        let nextPage = `${baseUrl}/search.json?query=${encodeURIComponent(query)}&sort_by=updated_at&sort_order=asc`;
+
+        // Build query parameters — use the status filter for the search query
+        const statusList = Array.from(statusFilter);
+        const query = `updated>${lastRunDate.split('T')[0]} status:${statusList.join(',status:')}`;
+
+        let nextPage: string | null = `${baseUrl}/search.json?query=${encodeURIComponent(query)}&sort_by=updated_at&sort_order=asc`;
         let totalTickets = 0;
-        
+        let failedTickets = 0;
+
         while (nextPage) {
             const data = await fetchWithRetry(nextPage);
             const tickets = data.results || [];
-            
+
             logger.info(`Processing batch of ${tickets.length} tickets`);
-            
+
             for (const ticket of tickets) {
-                await processTicket(ticket);
-                totalTickets++;
+                try {
+                    await processTicket(ticket);
+                    totalTickets++;
+                } catch (error: any) {
+                    failedTickets++;
+                    logger.error(`Failed to process ticket #${ticket.id}, will retry next run: ${error.message}`);
+                }
             }
-            
-            nextPage = data.next_page;
-            
+
+            nextPage = data.next_page || null;
+
             if (nextPage) {
                 logger.debug(`Fetching next page: ${nextPage}`);
                 // Rate limiting: wait between requests
                 await new Promise(res => setTimeout(res, 1000));
             }
         }
 
-        // Update the last run date in the database
-        await DatabaseManager.updateLastRunDate(dbConnection, `zendesk_tickets_${config.zendesk_subdomain}`, logger, this.embeddingDimension, syncStartDate);
-
-        logger.info(`Successfully processed ${totalTickets} tickets`);
+        // Only advance the watermark when all tickets succeeded
+        if (failedTickets === 0) {
+            await DatabaseManager.updateLastRunDate(dbConnection, `zendesk_tickets_${config.zendesk_subdomain}`, logger, this.embeddingDimension, syncStartDate);
+            logger.info(`Successfully processed ${totalTickets} tickets`);
+        } else {
+            logger.warn(
+                `Run completed with ${failedTickets} ticket failure(s). ` +
+                `Watermark NOT advanced — failed tickets will be retried next run. ` +
+                `Successfully processed: ${totalTickets}.`
+            );
+        }
     }
 
     private async fetchAndProcessZendeskArticles(config: ZendeskSourceConfig, dbConnection: DatabaseConnection, logger: Logger): Promise<void> {

package.json

@@ -1,6 +1,6 @@
 {
     "name": "doc2vec",
-    "version": "2.7.0",
+    "version": "2.8.0",
     "type": "commonjs",
     "description": "",
     "main": "dist/doc2vec.js",