cnhkmcp 2.3.4__py3-none-any.whl → 2.3.6__py3-none-any.whl

cnhkmcp/untracked/APP/static/decoder.js

@@ -91,18 +91,116 @@ function decodeTemplates() {
         return decodedExpression;
     });
     
-    // Store all expressions globally
-    allDecodedExpressions = decodedExpressions;
-    
-    // Display results (limit to MAX_DISPLAY_RESULTS)
-    displayDecodedResults(decodedExpressions.slice(0, MAX_DISPLAY_RESULTS), decodedExpressions.length);
-    
-    // Clear errors and show success
-    errorsDiv.innerHTML = `<div class="success-message">
-        ✓ Successfully decoded ${decodedExpressions.length} expressions using full list approach
-        ${decodedExpressions.length > MAX_DISPLAY_RESULTS ? 
-            `<br>⚠️ Showing first ${MAX_DISPLAY_RESULTS} results. Use search to find specific expressions.` : ''}
-    </div>`;
+    // Validate and display
+    validateAndDisplay(decodedExpressions, decodedExpressions.length, false);
+}
+
+// Validate and display expressions using backend validator
+async function validateAndDisplay(expressions, totalCount = null, isRandom = false) {
+    const errorsDiv = document.getElementById('grammarErrors');
+    errorsDiv.innerHTML = '<div class="info-message">Validating expressions...</div>';
+    
+    // Batch processing to prevent timeout
+    const BATCH_SIZE = 1000;
+    const totalExpressions = expressions.length;
+    let allResults = [];
+    let validCount = 0;
+    let invalidCount = 0;
+
+    try {
+        for (let i = 0; i < totalExpressions; i += BATCH_SIZE) {
+            const batch = expressions.slice(i, i + BATCH_SIZE);
+            
+            // Update progress
+            errorsDiv.innerHTML = `<div class="info-message">Validating expressions... (${Math.min(i + BATCH_SIZE, totalExpressions)}/${totalExpressions})</div>`;
+            
+            const response = await fetch('/api/validate_expressions', {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json'
+                },
+                body: JSON.stringify({ expressions: batch })
+            });
+
+            if (!response.ok) {
+                 throw new Error(`HTTP error! status: ${response.status}`);
+            }
+            
+            const data = await response.json();
+            
+            if (data.error) {
+                throw new Error(data.error);
+            }
+            
+            // Aggregate results
+            if (data.results) {
+                 allResults = allResults.concat(data.results);
+                 if (data.summary) {
+                     validCount += data.summary.valid;
+                     invalidCount += data.summary.invalid;
+                 }
+            }
+        }
+        
+        // Final processing after all batches
+        const results = allResults;
+        const validExpressions = results.filter(r => r.valid).map(r => r.expression);
+        const invalidResults = results.filter(r => !r.valid);
+        
+        // Store displayed expressions globally (valid ones)
+        allDecodedExpressions = validExpressions;
+        
+        // Prepare validation stats
+        let validationStats = {
+            validCount: validCount,
+            invalidCount: invalidCount,
+            totalCount: totalExpressions,
+            errorCounts: null
+        };
+
+        let sortedErrors = [];
+        if (invalidCount > 0) {
+            // Group errors
+            const errorCounts = {};
+            invalidResults.forEach(r => {
+                const err = r.errors ? r.errors.join('; ') : 'Unknown error';
+                errorCounts[err] = (errorCounts[err] || 0) + 1;
+            });
+            validationStats.errorCounts = errorCounts;
+            
+            // Sort by count for local display
+            sortedErrors = Object.entries(errorCounts).sort((a, b) => b[1] - a[1]);
+        }
+
+        // Display results with validation stats
+        displayDecodedResults(validExpressions.slice(0, MAX_DISPLAY_RESULTS), totalCount || validExpressions.length, isRandom, validationStats);
+        
+        // Show summary in errorsDiv (for Editor page)
+        let summaryHtml = `
+            <div class="${validExpressions.length > 0 ? 'success-message' : 'error-item'}">
+                <strong>Validation Complete:</strong><br>
+                Valid: ${validCount} / ${totalExpressions}<br>
+                Invalid: ${invalidCount}
+        `;
+        
+        if (invalidCount > 0) {
+            summaryHtml += `<br><br><strong>Top Invalid Reasons:</strong><ul style="max-height: 200px; overflow-y: auto;">`;
+            sortedErrors.slice(0, 50).forEach(([err, count]) => {
+                summaryHtml += `<li>${err} (${count} occurrences)</li>`;
+            });
+            if (sortedErrors.length > 50) {
+                summaryHtml += `<li>... (showing top 50 error types)</li>`;
+            }
+            summaryHtml += `</ul>`;
+        }
+        
+        summaryHtml += `</div>`;
+        errorsDiv.innerHTML = summaryHtml;
+        
+    } catch (error) {
+        console.error(error);
+        errorsDiv.innerHTML = `<div class="error-item"><strong>Network Error:</strong> ${error.message}</div>`;
+    }
 }
 
 // Generate all combinations (Cartesian product) of template values
@@ -133,11 +231,50 @@ function generateCombinations(templateValues) {
 }
 
 // Display decoded results
-function displayDecodedResults(expressions, totalCount = null, isRandom = false) {
+function displayDecodedResults(expressions, totalCount = null, isRandom = false, validationStats = null) {
     const resultsList = document.getElementById('resultsList');
     
     // Clear previous results
     resultsList.innerHTML = '';
+
+    // Add validation summary if available
+    if (validationStats) {
+        const validationDiv = document.createElement('div');
+        validationDiv.className = validationStats.invalidCount > 0 ? 'validation-summary error-item' : 'validation-summary success-message';
+        validationDiv.style.marginBottom = '20px';
+        validationDiv.style.padding = '15px';
+        validationDiv.style.border = validationStats.invalidCount > 0 ? '1px solid #fbd5d5' : '1px solid #def7ec';
+        
+        let summaryHtml = `
+            <strong>Validation Summary:</strong><br>
+            <div style="display: flex; gap: 20px; margin-top: 5px;">
+                <span style="color: green">✓ Valid: ${validationStats.validCount.toLocaleString()}</span>
+                <span style="color: ${validationStats.invalidCount > 0 ? 'red' : 'gray'}">
+                    ${validationStats.invalidCount > 0 ? '❌' : '✓'} Invalid: ${validationStats.invalidCount.toLocaleString()}
+                </span>
+                <span style="color: gray">Total: ${validationStats.totalCount.toLocaleString()}</span>
+            </div>
+        `;
+        
+        if (validationStats.invalidCount > 0 && validationStats.errorCounts) {
+            summaryHtml += `<div style="margin-top: 10px; border-top: 1px solid #eee; padding-top: 10px;">
+                <strong>Top Invalid Reasons:</strong>
+                <ul style="max-height: 150px; overflow-y: auto; margin: 5px 0 0 20px; padding: 0;">`;
+            
+            const sortedErrors = Object.entries(validationStats.errorCounts).sort((a, b) => b[1] - a[1]);
+            
+            sortedErrors.slice(0, 10).forEach(([err, count]) => {
+                summaryHtml += `<li>${err} (${count} occurrences)</li>`;
+            });
+            if (sortedErrors.length > 10) {
+                summaryHtml += `<li>... (showing top 10 error types)</li>`;
+            }
+            summaryHtml += `</ul></div>`;
+        }
+        
+        validationDiv.innerHTML = summaryHtml;
+        resultsList.appendChild(validationDiv);
+    }
     
     // Add search box if there are more results than displayed (only for full iteration)
     if (!isRandom && totalCount && totalCount > MAX_DISPLAY_RESULTS) {
@@ -463,32 +600,24 @@ function randomIteration() {
         });
     }
     
-    // Store ALL selected expressions globally for download (not limited by display)
-    allDecodedExpressions = selectedExpressions;
-    
-    // For display, limit to MAX_DISPLAY_RESULTS but keep full set for download
-    const displayExpressions = selectedExpressions.slice(0, MAX_DISPLAY_RESULTS);
-    
-    // Display results (limited for display, but full count for download)
-    displayDecodedResults(displayExpressions, allExpressions.length, true);
-    
-    // Clear errors and show success with clear indication about display vs download
-    if (selectedExpressions.length > MAX_DISPLAY_RESULTS) {
-        errorsDiv.innerHTML = `<div class="success-message">
-            ✓ Randomly selected ${selectedExpressions.length} expressions from ${allExpressions.length} total combinations<br>
-            📺 Displaying first ${MAX_DISPLAY_RESULTS} results. Download will include all ${selectedExpressions.length} expressions.
-        </div>`;
-    } else {
-        errorsDiv.innerHTML = `<div class="success-message">
-            ✓ Randomly selected ${selectedExpressions.length} expressions from ${allExpressions.length} total combinations
-        </div>`;
-    }
+    // Validate and display
+    validateAndDisplay(selectedExpressions, allExpressions.length, true);
 }
 
 // Open settings modal for Next Move
 function openSettingsModal() {
     const modal = document.getElementById('settingsModal');
     modal.style.display = 'block';
+
+    // Make nanHandling and maxTrade support multi-selection (like neutralization)
+    // by converting them into checkbox groups.
+    // This enables generating iterations across ON/OFF without forcing users to type CSV
+    // or rely on Ctrl+click multi-select behavior.
+    convertInputToCheckboxGroup('nanHandling', { placeholder: '' });
+    setCheckboxGroupOptions('nanHandling', ['OFF', 'ON']);
+    convertInputToCheckboxGroup('maxTrade', { placeholder: '' });
+    // Preserve the UI's existing default (ON selected in HTML) by ordering ON first.
+    setCheckboxGroupOptions('maxTrade', ['ON', 'OFF']);
     
     // Check if we have simulation options and update UI
     if (typeof simulationOptions !== 'undefined' && Object.keys(simulationOptions).length > 0) {
@@ -1501,11 +1630,8 @@ function handleGeneratedExpressionsFileSelect(event) {
                  return;
             }
 
-            // Set global variable
-            allDecodedExpressions = expressions;
-            
-            // Display results
-            displayDecodedResults(allDecodedExpressions.slice(0, MAX_DISPLAY_RESULTS), allDecodedExpressions.length);
+            // Validate and display results
+            validateAndDisplay(expressions);
             
             // Switch to results tab
             const resultsTab = document.querySelector('[data-page="results"]');

cnhkmcp/untracked/APP/static/simulator.js

@@ -216,7 +216,7 @@ async function testConnection() {
     const password = document.getElementById('password').value;
     
     if (!username || !password) {
-        updateStatus('Please enter username and password first', 'error');
+        updateStatus('请先输入用户名和密码', 'error');
         return;
     }
     
@@ -224,7 +224,7 @@ async function testConnection() {
     testBtn.disabled = true;
     testBtn.textContent = '🔄 Testing...';
     
-    updateStatus('Testing BRAIN API connection...', 'running');
+    updateStatus('正在测试 BRAIN API 连接...', 'running');
     
     try {
         const response = await fetch('/api/simulator/test-connection', {
@@ -241,7 +241,7 @@ async function testConnection() {
         const data = await response.json();
         
         if (data.success) {
-            updateStatus('✅ Connection successful! Ready to run simulation.', 'success');
+            updateStatus('✅ 连接成功! 准备开始回测.', 'success');
             saveSimulatorDefaults();
         } else {
             updateStatus(`❌ Connection failed: ${data.error}`, 'error');
@@ -259,7 +259,7 @@ async function testConnection() {
  */
 async function runSimulator() {
     if (isSimulationRunning) {
-        updateStatus('Simulation is already running', 'error');
+        updateStatus('回测正在进行中', 'error');
         return;
     }
     
@@ -272,7 +272,7 @@ async function runSimulator() {
     
     const jsonFile = document.getElementById('jsonFile').files[0];
     if (!jsonFile) {
-        updateStatus('Please select a JSON file', 'error');
+        updateStatus('请选择一个 JSON 文件', 'error');
         return;
     }
     
@@ -293,10 +293,10 @@ async function runSimulator() {
     const stopBtn = document.getElementById('stopBtn');
     
     runBtn.disabled = true;
-    runBtn.textContent = '🔄 Running...';
+    runBtn.textContent = '🔄 运行中...';
     stopBtn.style.display = 'inline-block';
     
-    updateStatus('Starting simulation...', 'running');
+    updateStatus('正在启动回测...', 'running');
     showProgress(true);
     
     // Create abort controller for stopping simulation
@@ -314,7 +314,7 @@ async function runSimulator() {
         const data = await response.json();
         
         if (data.success) {
-            updateStatus('✅ Simulator launched in new terminal回测器启动成功! Check the terminal window for progress.请检查新唤起的python程序', 'success');
+            updateStatus('✅ 回测器已在终端启动! 请查看终端窗口了解进度。', 'success');
             
             // Show launch information
             if (data.parameters) {
@@ -329,18 +329,18 @@ async function runSimulator() {
                 refreshLogFiles();
             }, 3000);
         } else {
-            updateStatus(`❌ Failed to launch simulator: ${data.error}`, 'error');
+            updateStatus(`❌ 启动回测器失败: ${data.error}`, 'error');
         }
     } catch (error) {
         if (error.name === 'AbortError') {
-            updateStatus('⏹️ Simulation stopped by user', 'idle');
+            updateStatus('⏹️ 回测已被用户停止', 'idle');
         } else {
-            updateStatus(`❌ Simulation error: ${error.message}`, 'error');
+            updateStatus(`❌ 回测错误: ${error.message}`, 'error');
         }
     } finally {
         isSimulationRunning = false;
         runBtn.disabled = false;
-        runBtn.textContent = '🚀 Start Simulation';
+        runBtn.textContent = '🚀 开始回测';
         stopBtn.style.display = 'none';
         simulationAbortController = null;
         showProgress(false);
@@ -361,7 +361,7 @@ async function stopSimulation() {
         console.error('Error stopping simulation:', error);
     }
     
-    updateStatus('Stopping simulation...', 'idle');
+    updateStatus('正在停止回测...', 'idle');
 }
 
 /**
@@ -578,10 +578,10 @@ function copyAlphaIds() {
     if (window.lastSimulationResults && window.lastSimulationResults.alphaIds) {
         const alphaIds = window.lastSimulationResults.alphaIds.join('\n');
         navigator.clipboard.writeText(alphaIds).then(() => {
-            updateStatus('✅ Alpha IDs copied to clipboard!', 'success');
+            updateStatus('✅ Alpha IDs 已复制到剪贴板!', 'success');
         }).catch(err => {
             console.error('Failed to copy: ', err);
-            updateStatus('❌ Failed to copy Alpha IDs', 'error');
+            updateStatus('❌ 复制 Alpha IDs 失败', 'error');
         });
     }
 }