decision_agent 0.3.0 → 1.1.0

data/lib/decision_agent/web/dmn_editor.rb

@@ -15,6 +15,11 @@ module DecisionAgent
     # DMN Editor Backend
     # Provides API endpoints for visual DMN modeling
     class DmnEditor
+      require_relative "dmn_editor/serialization"
+      require_relative "dmn_editor/xml_builder"
+      include DmnEditor::Serialization
+      include DmnEditor::XmlBuilder
+
       attr_reader :storage
 
       def initialize(storage: nil)
@@ -249,8 +254,9 @@ module DecisionAgent
         model = retrieve_model(model_id)
         return nil unless model
 
-        exporter = Dmn::Exporter.new
-        exporter.export(model)
+        # Convert model to DMN XML directly using the model's to_xml method
+        # or generate XML from the model's structure
+        generate_dmn_xml(model)
       end
 
       # Import DMN model from XML
@@ -356,71 +362,6 @@ module DecisionAgent
         table.instance_variable_set(:@outputs, logic[:outputs]) if logic[:outputs]
         table.instance_variable_set(:@rules, logic[:rules]) if logic[:rules]
       end
-
-      def serialize_model(model)
-        {
-          id: model.id,
-          name: model.name,
-          namespace: model.namespace,
-          decisions: model.decisions.map { |d| serialize_decision(d) }
-        }
-      end
-
-      def serialize_decision(decision)
-        result = {
-          id: decision.id,
-          name: decision.name
-        }
-
-        if decision.decision_table
-          result[:decision_table] = serialize_decision_table(decision.decision_table)
-        elsif decision.decision_tree
-          result[:decision_tree] = decision.decision_tree.to_h
-        elsif decision.instance_variable_get(:@literal_expression)
-          result[:literal_expression] = decision.instance_variable_get(:@literal_expression)
-        end
-
-        result[:information_requirements] = decision.information_requirements if decision.information_requirements.any?
-
-        result
-      end
-
-      def serialize_decision_table(table)
-        {
-          id: table.id,
-          hit_policy: table.hit_policy,
-          inputs: table.inputs.map { |i| serialize_input(i) },
-          outputs: table.outputs.map { |o| serialize_output(o) },
-          rules: table.rules.map { |r| serialize_rule(r) }
-        }
-      end
-
-      def serialize_input(input)
-        {
-          id: input.id,
-          label: input.label,
-          type_ref: input.type_ref,
-          expression: input.expression
-        }
-      end
-
-      def serialize_output(output)
-        {
-          id: output.id,
-          label: output.label,
-          type_ref: output.type_ref,
-          name: output.name
-        }
-      end
-
-      def serialize_rule(rule)
-        {
-          id: rule.id,
-          input_entries: rule.input_entries,
-          output_entries: rule.output_entries,
-          description: rule.description
-        }
-      end
     end
   end
 end

data/lib/decision_agent/web/middleware/auth_middleware.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rack"
 
 module DecisionAgent

data/lib/decision_agent/web/middleware/permission_middleware.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rack"
 require "json"
 
@@ -58,7 +60,7 @@ module DecisionAgent
 
         def extract_resource_id(env)
           request = Rack::Request.new(env)
-          # Try params first (for query parameters and Sinatra path params)
+          # Try params first (for query parameters and path params)
           resource_id = request.params["id"] || request.params["rule_id"] || request.params["version_id"]
 
           # If not in params, try to extract from path (e.g., /api/rules/123 -> 123)

data/lib/decision_agent/web/public/app.js

@@ -84,6 +84,7 @@ class RuleBuilder {
 
         // Actions
         document.getElementById('validateBtn').addEventListener('click', () => this.validateRules());
+        document.getElementById('testRuleBtn').addEventListener('click', () => this.openTestRuleModal());
         document.getElementById('clearBtn').addEventListener('click', () => this.clearAll());
         document.getElementById('loadExampleBtn').addEventListener('click', () => this.loadExample());
 
@@ -101,6 +102,11 @@ class RuleBuilder {
         document.getElementById('closeCompareBtn').addEventListener('click', () => this.closeCompareModal());
         document.getElementById('closeCompareModalBtn').addEventListener('click', () => this.closeCompareModal());
 
+        // Test Rule
+        document.getElementById('runTestBtn').addEventListener('click', () => this.runTest());
+        document.getElementById('closeTestRuleBtn').addEventListener('click', () => this.closeTestRuleModal());
+        document.getElementById('closeTestRuleModalBtn').addEventListener('click', () => this.closeTestRuleModal());
+
         // Modal close on outside click
         document.getElementById('ruleModal').addEventListener('click', (e) => {
             if (e.target.id === 'ruleModal') {
@@ -307,20 +313,40 @@ class RuleBuilder {
             'between': '[min, max] or {"min": 0, "max": 100}',
             'modulo': '[divisor, remainder] or {"divisor": 2, "remainder": 0}',
 
-            // Mathematical functions
-            'sin': 'expected result (e.g., 0.0)',
-            'cos': 'expected result (e.g., 1.0)',
-            'tan': 'expected result (e.g., 0.0)',
-            'sqrt': 'expected result (e.g., 3.0)',
+            // Mathematical functions - Trigonometric
+            'sin': 'expected result (e.g., 0.0 for sin(0))',
+            'cos': 'expected result (e.g., 1.0 for cos(0))',
+            'tan': 'expected result (e.g., 0.0 for tan(0))',
+            'asin': 'expected result (e.g., 1.571 for asin(1))',
+            'acos': 'expected result (e.g., 0.0 for acos(1))',
+            'atan': 'expected result (e.g., 0.785 for atan(1))',
+            'atan2': '{"y": 1, "result": 0.785} or [1, 0.785]',
+            // Hyperbolic
+            'sinh': 'expected result (e.g., 0.0 for sinh(0))',
+            'cosh': 'expected result (e.g., 1.0 for cosh(0))',
+            'tanh': 'expected result (e.g., 0.0 for tanh(0))',
+            // Power and roots
+            'sqrt': 'expected result (e.g., 3.0 for sqrt(9))',
+            'cbrt': 'expected result (e.g., 2.0 for cbrt(8))',
             'power': '[exponent, result] or {"exponent": 2, "result": 4}',
-            'exp': 'expected result (e.g., 2.718)',
-            'log': 'expected result (e.g., 0.0)',
-            'round': 'expected rounded value (e.g., 3)',
-            'floor': 'expected floor value (e.g., 3)',
-            'ceil': 'expected ceiling value (e.g., 4)',
-            'abs': 'expected absolute value (e.g., 5)',
-            'min': 'expected minimum value (e.g., 1)',
-            'max': 'expected maximum value (e.g., 10)',
+            'exp': 'expected result (e.g., 2.718 for exp(1))',
+            // Logarithmic
+            'log': 'expected result (e.g., 0.0 for log(1))',
+            'log10': 'expected result (e.g., 2.0 for log10(100))',
+            'log2': 'expected result (e.g., 3.0 for log2(8))',
+            // Rounding
+            'round': 'expected rounded value (e.g., 3 for round(3.4))',
+            'floor': 'expected floor value (e.g., 3 for floor(3.9))',
+            'ceil': 'expected ceiling value (e.g., 4 for ceil(3.1))',
+            'truncate': 'expected truncated value (e.g., 3 for truncate(3.9))',
+            'abs': 'expected absolute value (e.g., 5 for abs(-5))',
+            // Advanced math
+            'factorial': 'expected result (e.g., 120 for factorial(5))',
+            'gcd': '{"other": 12, "result": 6} or [12, 6]',
+            'lcm': '{"other": 12, "result": 36} or [12, 36]',
+            // Statistical (these are for arrays)
+            'min': 'expected minimum value (e.g., 1 for min([3, 1, 5, 2]))',
+            'max': 'expected maximum value (e.g., 5 for max([3, 1, 5, 2]))',
 
             // Statistical aggregations
             'sum': 'expected sum (e.g., 100) or {"min": 50, "max": 150}',
@@ -440,19 +466,40 @@ class RuleBuilder {
             'day_of_week': 'Day name (monday) or number (0=Sunday, 1=Monday, ...)',
             'within_radius': 'JSON: {"center": {"lat": y, "lon": x}, "radius": km}',
             'in_polygon': 'Array of coordinates: [{"lat": y, "lon": x}, ...]',
-            'sin': 'Expected result of sin(field_value). Example: 0.0 for sin(0)',
-            'cos': 'Expected result of cos(field_value). Example: 1.0 for cos(0)',
-            'tan': 'Expected result of tan(field_value). Example: 0.0 for tan(0)',
-            'sqrt': 'Expected result of sqrt(field_value). Example: 3.0 for sqrt(9)',
-            'power': 'Power: [exponent, result] or {"exponent": 2, "result": 4}. Checks if field^exponent == result',
-            'exp': 'Expected result of exp(field_value) = e^field_value. Example: 2.718 for exp(1)',
-            'log': 'Expected result of log(field_value) = natural logarithm. Example: 0.0 for log(1)',
-            'round': 'Expected rounded value. Example: 3 for round(3.4)',
-            'floor': 'Expected floor value. Example: 3 for floor(3.9)',
-            'ceil': 'Expected ceiling value. Example: 4 for ceil(3.1)',
-            'abs': 'Expected absolute value. Example: 5 for abs(-5) or abs(5)',
-            'min': 'Expected minimum value from array. Example: 1 for min([3, 1, 5, 2])',
-            'max': 'Expected maximum value from array. Example: 5 for max([3, 1, 5, 2])'
+            // Trigonometric functions
+            'sin': 'Expected result of sin(field_value). Example: 0.0 for sin(0), 1.0 for sin(π/2)',
+            'cos': 'Expected result of cos(field_value). Example: 1.0 for cos(0), 0.0 for cos(π/2)',
+            'tan': 'Expected result of tan(field_value). Example: 0.0 for tan(0), 1.0 for tan(π/4)',
+            'asin': 'Expected result of asin(field_value). Input must be [-1, 1]. Example: 1.571 for asin(1) = π/2',
+            'acos': 'Expected result of acos(field_value). Input must be [-1, 1]. Example: 0.0 for acos(1)',
+            'atan': 'Expected result of atan(field_value). Example: 0.785 for atan(1) = π/4',
+            'atan2': 'atan2(field_value, y). Format: {"y": 1, "result": 0.785} or [1, 0.785]',
+            // Hyperbolic functions
+            'sinh': 'Expected result of sinh(field_value). Example: 0.0 for sinh(0), 1.175 for sinh(1)',
+            'cosh': 'Expected result of cosh(field_value). Example: 1.0 for cosh(0), 1.543 for cosh(1)',
+            'tanh': 'Expected result of tanh(field_value). Example: 0.0 for tanh(0), 0.762 for tanh(1)',
+            // Power and roots
+            'sqrt': 'Expected result of sqrt(field_value). Example: 3.0 for sqrt(9), 5.0 for sqrt(25)',
+            'cbrt': 'Expected result of cbrt(field_value) = cube root. Example: 2.0 for cbrt(8), -2.0 for cbrt(-8)',
+            'power': 'Power: Checks if field^exponent == result. Format: [exponent, result] or {"exponent": 2, "result": 4}. Example: [2, 4] means 2^2 == 4',
+            'exp': 'Expected result of exp(field_value) = e^field_value. Example: 2.718 for exp(1), 7.389 for exp(2)',
+            // Logarithmic functions
+            'log': 'Expected result of log(field_value) = natural logarithm (base e). Example: 0.0 for log(1), 2.303 for log(10)',
+            'log10': 'Expected result of log10(field_value) = base 10 logarithm. Example: 2.0 for log10(100), 3.0 for log10(1000)',
+            'log2': 'Expected result of log2(field_value) = base 2 logarithm. Example: 3.0 for log2(8), 4.0 for log2(16)',
+            // Rounding functions
+            'round': 'Expected rounded value to nearest integer. Example: 3 for round(3.4), 4 for round(3.6)',
+            'floor': 'Expected floor value (round down). Example: 3 for floor(3.9), -4 for floor(-3.1)',
+            'ceil': 'Expected ceiling value (round up). Example: 4 for ceil(3.1), -3 for ceil(-3.9)',
+            'truncate': 'Expected truncated value (remove decimal part). Example: 3 for truncate(3.9), -3 for truncate(-3.9)',
+            'abs': 'Expected absolute value. Example: 5 for abs(-5) or abs(5), 3.14 for abs(-3.14)',
+            // Advanced mathematical functions
+            'factorial': 'Expected result of factorial(field_value). Input must be non-negative integer. Example: 120 for factorial(5), 720 for factorial(6)',
+            'gcd': 'Greatest Common Divisor: gcd(field_value, other) == result. Format: {"other": 12, "result": 6} or [12, 6]. Example: gcd(18, 12) == 6',
+            'lcm': 'Least Common Multiple: lcm(field_value, other) == result. Format: {"other": 12, "result": 36} or [12, 36]. Example: lcm(9, 12) == 36',
+            // Statistical aggregations (for arrays)
+            'min': 'Expected minimum value from array. Example: 1 for min([3, 1, 5, 2]), 0.5 for min([1.5, 2.0, 0.5])',
+            'max': 'Expected maximum value from array. Example: 5 for max([3, 1, 5, 2]), 100.0 for max([10.5, 100.0, 50.0])'
         };
 
         if (hints[operator]) {
@@ -1134,6 +1181,119 @@ class RuleBuilder {
         document.getElementById('compareVersionsModal').classList.add('hidden');
     }
 
+    getRulesJSON() {
+        const version = document.getElementById('rulesetVersion').value || '1.0';
+        const ruleset = document.getElementById('rulesetName').value || 'my_ruleset';
+        const rules = this.rules.map(rule => ({
+            id: rule.id,
+            if: rule.if,
+            then: rule.then
+        }));
+
+        return {
+            version: version,
+            ruleset: ruleset,
+            rules: rules
+        };
+    }
+
+    openTestRuleModal() {
+        document.getElementById('testRuleModal').classList.remove('hidden');
+        document.getElementById('testContext').value = '{}';
+        document.getElementById('testResults').classList.add('hidden');
+    }
+
+    closeTestRuleModal() {
+        document.getElementById('testRuleModal').classList.add('hidden');
+    }
+
+    async runTest() {
+        const contextText = document.getElementById('testContext').value.trim();
+
+        // Get current rules
+        const rules = this.getRulesJSON();
+
+        if (!rules || !rules.rules || rules.rules.length === 0) {
+            alert('Please add at least one rule before testing');
+            return;
+        }
+
+        let context;
+        try {
+            context = contextText ? JSON.parse(contextText) : {};
+        } catch (e) {
+            alert('Invalid JSON in context field: ' + e.message);
+            return;
+        }
+
+        try {
+            const response = await fetch(`${this.basePath}api/evaluate`, {
+                method: 'POST',
+                headers: this.getAuthHeaders(),
+                body: JSON.stringify({
+                    rules: rules,
+                    context: context
+                })
+            });
+
+            const data = await response.json();
+
+            if (!response.ok || !data.success) {
+                alert('Test failed: ' + (data.error || 'Unknown error'));
+                return;
+            }
+
+            // Display results
+            const resultsDiv = document.getElementById('testResults');
+            resultsDiv.classList.remove('hidden');
+
+            if (data.decision) {
+                document.getElementById('testDecisionValue').textContent = data.decision;
+                document.getElementById('testConfidenceValue').textContent = (data.confidence || 0).toFixed(3);
+                document.getElementById('testReasonValue').textContent = data.reason || 'N/A';
+
+                // Display explainability
+                const becauseList = document.getElementById('testBecauseList');
+                const failedList = document.getElementById('testFailedList');
+
+                if (data.because && data.because.length > 0) {
+                    becauseList.innerHTML = '';
+                    data.because.forEach(condition => {
+                        const li = document.createElement('li');
+                        li.textContent = condition;
+                        li.style.color = '#28a745';
+                        becauseList.appendChild(li);
+                    });
+                    document.getElementById('testBecause').style.display = 'block';
+                } else {
+                    document.getElementById('testBecause').style.display = 'none';
+                }
+
+                if (data.failed_conditions && data.failed_conditions.length > 0) {
+                    failedList.innerHTML = '';
+                    data.failed_conditions.forEach(condition => {
+                        const li = document.createElement('li');
+                        li.textContent = condition;
+                        li.style.color = '#dc3545';
+                        failedList.appendChild(li);
+                    });
+                    document.getElementById('testFailedConditions').style.display = 'block';
+                } else {
+                    document.getElementById('testFailedConditions').style.display = 'none';
+                }
+
+                document.getElementById('testExplainability').style.display = 'block';
+            } else {
+                document.getElementById('testDecisionValue').textContent = 'No match';
+                document.getElementById('testConfidenceValue').textContent = 'N/A';
+                document.getElementById('testReasonValue').textContent = data.message || 'No rules matched';
+                document.getElementById('testExplainability').style.display = 'none';
+            }
+        } catch (error) {
+            alert('Error running test: ' + error.message);
+        }
+    }
+
     async deleteVersion(versionId) {
         if (!confirm('Are you sure you want to delete this version? This action cannot be undone.')) {
             return;

data/lib/decision_agent/web/public/batch_testing.html

@@ -4,7 +4,7 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>DecisionAgent Batch Testing</title>
-    <link rel="stylesheet" href="styles.css">
+    <link rel="stylesheet" href="/styles.css">
     <style>
         .batch-testing-container {
             max-width: 1400px;
@@ -180,7 +180,11 @@
                 <h2>Upload Test Scenarios</h2>
             </div>
             <p>Upload a CSV or Excel file with your test scenarios. Required columns: <code>id</code>, context fields. Optional: <code>expected_decision</code>, <code>expected_confidence</code></p>
-            
+            <p style="margin-top: 10px;">
+                <strong>Not sure about the format?</strong> Download a sample file:
+                <a href="/sample_batch.csv" download style="color: #007bff; text-decoration: none; margin-left: 5px;">📥 Sample CSV</a>
+            </p>
+
             <div class="file-upload-area" id="uploadArea">
                 <p>📁 Drag and drop your CSV/Excel file here, or click to browse</p>
                 <input type="file" id="fileInput" accept=".csv,.xlsx,.xls" style="display: none;">
@@ -333,6 +337,13 @@
             return dirPath || '/';
         }
 
+        function getAuthHeaders() {
+            const token = localStorage.getItem('auth_token');
+            const headers = { 'Content-Type': 'application/json' };
+            if (token) headers['Authorization'] = `Bearer ${token}`;
+            return headers;
+        }
+
         const basePath = getBasePath();
         let currentTestId = null;
         let currentScenarios = null;
@@ -376,8 +387,13 @@
             progressFill.style.width = '0%';
             progressText.textContent = 'Uploading...';
 
+            const uploadHeaders = {};
+            const token = localStorage.getItem('auth_token');
+            if (token) uploadHeaders['Authorization'] = `Bearer ${token}`;
+
             fetch(`${basePath}api/testing/batch/import`, {
                 method: 'POST',
+                headers: uploadHeaders,
                 body: formData
             })
             .then(response => response.json())
@@ -393,6 +409,7 @@
                     uploadStatus.textContent = `Successfully imported ${data.scenarios_count} scenarios. Test ID: ${data.test_id}`;
                     uploadProgress.classList.add('hidden');
                     document.getElementById('runTestBtn').disabled = false;
+                    document.getElementById('resumeTestBtn').disabled = false;
                     
                     if (data.errors && data.errors.length > 0) {
                         uploadStatus.textContent += `\nWarnings: ${data.errors.join(', ')}`;
@@ -430,7 +447,7 @@
                 JSON.parse(rulesJson);
                 fetch(`${basePath}api/validate`, {
                     method: 'POST',
-                    headers: { 'Content-Type': 'application/json' },
+                    headers: getAuthHeaders(),
                     body: JSON.stringify(JSON.parse(rulesJson))
                 })
                 .then(response => response.json())
@@ -483,7 +500,7 @@
 
             fetch(`${basePath}api/testing/batch/run`, {
                 method: 'POST',
-                headers: { 'Content-Type': 'application/json' },
+                headers: getAuthHeaders(),
                 body: JSON.stringify({
                     test_id: currentTestId,
                     rules: JSON.parse(rulesJson),
@@ -510,9 +527,66 @@
             });
         });
 
+        // Resume test - re-run the previously imported test
+        document.getElementById('resumeTestBtn').addEventListener('click', () => {
+            if (!currentTestId) {
+                alert('No test to resume. Please import test data first.');
+                return;
+            }
+
+            const rulesJson = document.getElementById('rulesJson').value;
+            try {
+                JSON.parse(rulesJson);
+            } catch (e) {
+                alert('Invalid rules JSON: ' + e.message);
+                return;
+            }
+
+            const runStatus = document.getElementById('runStatus');
+            const runProgress = document.getElementById('runProgress');
+            const runProgressText = document.getElementById('runProgressText');
+
+            runStatus.classList.add('hidden');
+            runProgress.classList.remove('hidden');
+            runProgressText.textContent = 'Resuming...';
+
+            const options = {
+                parallel: document.getElementById('parallelExecution').checked,
+                thread_count: parseInt(document.getElementById('threadCount').value) || 4
+            };
+
+            fetch(`${basePath}api/testing/batch/run`, {
+                method: 'POST',
+                headers: getAuthHeaders(),
+                body: JSON.stringify({
+                    test_id: currentTestId,
+                    rules: JSON.parse(rulesJson),
+                    options: options
+                })
+            })
+            .then(response => response.json())
+            .then(data => {
+                if (data.error) {
+                    runStatus.className = 'error-message';
+                    runStatus.textContent = `Error: ${data.error}`;
+                    runProgress.classList.add('hidden');
+                } else {
+                    runStatus.className = 'success-message';
+                    runStatus.textContent = 'Test resumed and completed successfully!';
+                    runProgress.classList.add('hidden');
+                    loadResults(currentTestId);
+                }
+            })
+            .catch(error => {
+                runStatus.className = 'error-message';
+                runStatus.textContent = `Error: ${error.message}`;
+                runProgress.classList.add('hidden');
+            });
+        });
+
         // Load results
         function loadResults(testId) {
-            fetch(`${basePath}api/testing/batch/${testId}/results`)
+            fetch(`${basePath}api/testing/batch/${testId}/results`, { headers: getAuthHeaders() })
                 .then(response => response.json())
                 .then(data => {
                     if (data.error) {
@@ -600,7 +674,7 @@
 
         // Load coverage
         function loadCoverage(testId) {
-            fetch(`${basePath}api/testing/batch/${testId}/coverage`)
+            fetch(`${basePath}api/testing/batch/${testId}/coverage`, { headers: getAuthHeaders() })
                 .then(response => response.json())
                 .then(data => {
                     if (data.error) {

data/lib/decision_agent/web/public/dmn-editor.html

@@ -4,7 +4,7 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>DMN Editor - DecisionAgent</title>
-    <link rel="stylesheet" href="dmn-editor.css">
+    <link rel="stylesheet" href="/dmn-editor.css">
 </head>
 <body>
     <div class="container">
@@ -245,6 +245,6 @@
 
     <div id="notification" class="notification"></div>
 
-    <script src="dmn-editor.js"></script>
+    <script src="/dmn-editor.js"></script>
 </body>
 </html>