npm - lwazi - Versions diffs - 1.8.3 → 1.8.4 - Mend

lwazi 1.8.3 → 1.8.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

package/package.json +1 -1
package/src/Console/BuildContentIndexCommand.php +84 -0
package/src/Installer/ProjectAnalyzer.php +15 -1
package/src/Providers/LwaziServiceProvider.php +2 -0
package/src/Services/ContentIndexer.php +30 -6
package/src/Services/KnowledgeBaseGenerator.php +16 -1
package/src/Services/LwaziService.php +75 -27
package/src/Services/NavigationTree.php +43 -5

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "lwazi",
-  "version": "1.8.3",
+  "version": "1.8.4",
   "description": "Lwazi is an AI assistant for Laravel. Install with one command to add an AI assistant to your Laravel app.",
   "main": "bin/lwazi.js",
   "bin": {

package/src/Console/BuildContentIndexCommand.php ADDED Viewed

@@ -0,0 +1,84 @@
+<?php
+namespace Lwazi\Core\Console;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\File;
+use Lwazi\Core\Services\ContentIndexer;
+class BuildContentIndexCommand extends Command
+{
+    protected $signature = 'lwazi:build-content-index';
+    protected $description = 'Build content index from blade files for website search';
+    public function handle(): int
+    {
+        $this->info('Building content index from blade files...');
+        $viewsPath = resource_path('views');
+        if (!is_dir($viewsPath)) {
+            $this->error('Views directory not found');
+            return Command::FAILURE;
+        }
+        $indexer = new ContentIndexer();
+        $this->indexBladeFiles($viewsPath, $indexer);
+        $docCount = $indexer->getDocumentCount();
+        $this->info('Indexed ' . $docCount . ' pages');
+        $data = $indexer->toArray();
+        $data['generated_at'] = now()->toIso8601String();
+        $path = storage_path('lwazi/content_index.json');
+        if (!is_dir(dirname($path))) {
+            mkdir(dirname($path), 0755, true);
+        }
+        file_put_contents($path, json_encode($data, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
+        $this->info("Content index saved to: {$path}");
+        return Command::SUCCESS;
+    }
+    protected function indexBladeFiles(string $path, ContentIndexer $indexer): void
+    {
+        $files = File::allFiles($path);
+        foreach ($files as $file) {
+            $ext = $file->getExtension();
+            if ($ext !== 'blade.php' && $ext !== 'php') {
+                continue;
+            }
+            $filePath = $file->getPathname();
+            $relativePath = str_replace($path . '/', '', $filePath);
+            if (str_contains($relativePath, 'admin/') || str_contains($relativePath, '/admin.')) {
+                continue;
+            }
+            $content = File::get($filePath);
+            $content = preg_replace('/@php.*?@endphp/s', '', $content);
+            $content = preg_replace('/@section.*?@endsection/s', '', $content);
+            $content = preg_replace('/@yield.*?(?=\s|$)/', '', $content);
+            $content = preg_replace('/\{\{.*?\}\}/', '', $content);
+            $content = preg_replace('/\{!!.*?!!\}/', '', $content);
+            $content = strip_tags($content);
+            $content = preg_replace('/\s+/', ' ', $content);
+            $content = trim($content);
+            if (strlen($content) < 20) {
+                continue;
+            }
+            $pathName = '/' . str_replace(['.blade.php', '.php', '/'], ['', '', '-'], $relativePath);
+            $pathName = preg_replace('/-+/', '-', $pathName);
+            $pathName = rtrim($pathName, '-') ?: '/';
+            $indexer->indexPage($pathName, '<html><body><p>' . $content . '</p></body></html>');
+        }
+    }
+}

package/src/Installer/ProjectAnalyzer.php CHANGED Viewed

@@ -338,8 +338,22 @@ class ProjectAnalyzer
         $pages = $this->knowledge['pages'] ?? [];
         $routes = $this->knowledge['routes'] ?? [];
+        $publicRoutes = array_filter($routes, function($r) {
+            $uri = $r['uri'] ?? '';
+            $name = $r['name'] ?? '';
+            if (str_starts_with($uri, '/admin') || str_starts_with($uri, '/api') || str_starts_with($uri, '/_')) {
+                return false;
+            }
+            if ($name && (str_starts_with($name, 'admin.') || str_starts_with($name, 'api.'))) {
+                return false;
+            }
+            return true;
+        });
         $tree->buildFromPages($pages);
-        $tree->buildFromRoutes($routes);
+        $tree->buildFromRoutes(array_values($publicRoutes));
         $this->knowledge['navigation_tree'] = $tree->toArray();

package/src/Providers/LwaziServiceProvider.php CHANGED Viewed

@@ -13,6 +13,7 @@ use Lwazi\Core\Services\LwaziAgent;
 use Lwazi\Core\Console\AnalyzeProjectCommand;
 use Lwazi\Core\Console\LwaziIngestCommand;
 use Lwazi\Core\Console\SetupCommand;
+use Lwazi\Core\Console\BuildContentIndexCommand;
 use Lwazi\Core\Http\Middleware\InjectLwaziChat;
 class LwaziServiceProvider extends ServiceProvider
@@ -36,6 +37,7 @@ class LwaziServiceProvider extends ServiceProvider
                 AnalyzeProjectCommand::class,
                 SetupCommand::class,
                 LwaziIngestCommand::class,
+                BuildContentIndexCommand::class,
             ]);
         }
     }

package/src/Services/ContentIndexer.php CHANGED Viewed

@@ -184,13 +184,31 @@ class ContentIndexer
     protected function generateSnippet(array $doc, array $terms): string
     {
-        $text = implode(' ', $doc['paragraphs'] ?? []);
+        if (!is_array($doc)) {
+            return '';
+        }
+        $paragraphs = $doc['paragraphs'] ?? null;
+        $text = '';
-        if (empty($text)) {
-            $text = implode(' ', $doc['lists'] ?? []);
+        if (is_array($paragraphs) && count($paragraphs) > 0) {
+            $first = $paragraphs[0];
+            if (is_string($first)) {
+                $text = implode(' ', $paragraphs);
+            }
         }
-        if (empty($text)) {
+        if ($text === '') {
+            $lists = $doc['lists'] ?? null;
+            if (is_array($lists) && count($lists) > 0) {
+                $first = $lists[0];
+                if (is_string($first)) {
+                    $text = implode(' ', $lists);
+                }
+            }
+        }
+        if ($text === '' || !is_string($text)) {
             return '';
         }
@@ -199,6 +217,7 @@ class ContentIndexer
         $bestLen = PHP_INT_MAX;
         foreach ($terms as $term) {
+            if (!is_string($term)) continue;
             $term = strtolower($term);
             $pos = strpos($text, $term);
             if ($pos !== false && $pos < $bestLen) {
@@ -218,9 +237,9 @@ class ContentIndexer
             $snippet = '...' . $snippet;
         }
-        $snippet = preg_replace('/\s+/', ' ', $snippet);
+        $snippet = preg_replace('/\s+/', ' ', $snippet ?? '');
-        return trim($snippet) . '...';
+        return (is_string($snippet) ? trim($snippet) : '') . '...';
     }
     public function toArray(): array
@@ -233,6 +252,11 @@ class ContentIndexer
         ];
     }
+    public function getDocumentCount(): int
+    {
+        return $this->totalDocuments;
+    }
     public static function fromArray(array $data): self
     {
         $indexer = new self();

package/src/Services/KnowledgeBaseGenerator.php CHANGED Viewed

@@ -50,8 +50,23 @@ class KnowledgeBaseGenerator
     protected function buildNavigationTree(array $pages, array $routes): array
     {
         $tree = new NavigationTree();
+        $publicRoutes = array_filter($routes, function($r) {
+            $uri = $r['uri'] ?? '';
+            $name = $r['name'] ?? '';
+            if (str_starts_with($uri, '/admin') || str_starts_with($uri, '/api') || str_starts_with($uri, '/_')) {
+                return false;
+            }
+            if ($name && (str_starts_with($name, 'admin.') || str_starts_with($name, 'api.'))) {
+                return false;
+            }
+            return true;
+        });
         $tree->buildFromPages($pages);
-        $tree->buildFromRoutes($routes);
+        $tree->buildFromRoutes(array_values($publicRoutes));
         return $tree->toArray();
     }

package/src/Services/LwaziService.php CHANGED Viewed

@@ -45,7 +45,7 @@ class LwaziService
         $this->conversationHistory[] = ['role' => 'user', 'content' => $message];
-        if ($this->looksLikeNavigationQuery($message)) {
+        if ($this->looksLikeNavigationQuery($message) && !$this->looksLikeDataQuery($message)) {
             error_log('Lwazi: looks like navigation query');
             $nav = $this->findNavigationAnswer($message);
             if ($nav) {
@@ -53,11 +53,10 @@ class LwaziService
                 $this->conversationHistory[] = ['role' => 'assistant', 'content' => $nav];
                 return $nav;
             }
-            $fallback = $this->navigationFallbackWithLLM($message);
-            if ($fallback) {
-                error_log('Lwazi: found fallback: ' . $fallback);
-                $this->conversationHistory[] = ['role' => 'assistant', 'content' => $fallback];
-                return $fallback;
+            $contentResponse = $this->searchContent($message);
+            if ($contentResponse) {
+                $this->conversationHistory[] = ['role' => 'assistant', 'content' => $contentResponse];
+                return $contentResponse;
             }
         }
@@ -70,27 +69,12 @@ class LwaziService
                 $this->conversationHistory[] = ['role' => 'assistant', 'content' => $nav];
                 return $nav;
             }
-            $fallback = $this->navigationFallbackWithLLM($message);
-            if ($fallback) {
-                $this->conversationHistory[] = ['role' => 'assistant', 'content' => $fallback];
-                return $fallback;
-            }
-        }
-        if ($intent === 'content' || $intent === 'navigation') {
             $contentResponse = $this->searchContent($message);
             if ($contentResponse) {
                 $this->conversationHistory[] = ['role' => 'assistant', 'content' => $contentResponse];
                 return $contentResponse;
             }
-        }
-        if ($intent === 'navigation') {
-            $nav = $this->navigationFallbackWithLLM($message);
-            if ($nav) {
-                $this->conversationHistory[] = ['role' => 'assistant', 'content' => $nav];
-                return $nav;
-            }
+            return "I couldn't find a page matching that. Could you try a different question?";
         }
         if ($intent === 'content') {
@@ -99,6 +83,7 @@ class LwaziService
                 $this->conversationHistory[] = ['role' => 'assistant', 'content' => $contentResponse];
                 return $contentResponse;
             }
+            return "I couldn't find information about that. Could you try a different question?";
         }
         if ($intent === 'data') {
@@ -107,6 +92,12 @@ class LwaziService
                 $this->conversationHistory[] = ['role' => 'assistant', 'content' => $dataResponse];
                 return $dataResponse;
             }
+            $contentResponse = $this->searchContent($message);
+            if ($contentResponse) {
+                $this->conversationHistory[] = ['role' => 'assistant', 'content' => $contentResponse];
+                return $contentResponse;
+            }
+            return "I couldn't find information about that. Could you try a different question?";
         }
         $prompt = $this->buildPrompt();
@@ -123,16 +114,26 @@ class LwaziService
     protected function selectIntentWithLLM(string $message): ?string
     {
-        if ($this->looksLikeNavigationQuery($message)) {
+        if ($this->looksLikeDataQuery($message)) {
+            return 'data';
+        }
+        if ($this->looksLikeNavigationQuery($message) && !$this->looksLikeContentQuery($message)) {
             return 'navigation';
         }
+        $msgLower = strtolower($message);
+        if (preg_match('/\b(is there|are there|do i have|can i find|show me|find|get|list|what.*contain|information about|info about)\b/i', $message)) {
+            return 'content';
+        }
         $prompt =
             "Classify the user's intent as one of: navigation, content, data, general. Return JSON: {\"intent\":\"navigation|content|data|general\"}.\n\n" .
-            "- navigation: user wants to find a page or link\n" .
-            "- content: user is asking for information that might be on a page (not data)\n" .
-            "- data: user wants to query database records\n" .
-            "- general: casual conversation\n\n" .
+            "- navigation: user wants to find a specific page or link (where, which page, how do i get to)\n" .
+            "- content: user is asking for information that might be on a webpage, NOT database data (is there, are there, show me, what does X contain)\n" .
+            "- data: user explicitly wants to query database records about their own data (my data, my records, my account)\n" .
+            "- general: casual conversation, greetings\n\n" .
             "QUESTION:\n" .
             $message;
@@ -155,6 +156,33 @@ class LwaziService
         return null;
     }
+    protected function looksLikeDataQuery(string $message): bool
+    {
+        $msgLower = strtolower($message);
+        $personalPatterns = [
+            '/\bmy\b/', '/\bme\b/', '/\bmine\b/', '/\bmy own\b/',
+            '/\bmy account\b/', '/\bmy profile\b/', '/\bmy data\b/',
+            '/\bmy records\b/', '/\bmy applications\b/', '/\bmy submissions\b/',
+        ];
+        foreach ($personalPatterns as $pattern) {
+            if (preg_match($pattern, $msgLower)) {
+                return true;
+            }
+        }
+        return false;
+    }
+    protected function looksLikeContentQuery(string $message): bool
+    {
+        return (bool) preg_match(
+            '/\b(is there|are there|can i find|show me|what.*contain|information about|passed|failed|grade|result|score|check if)\b/i',
+            $message
+        );
+    }
     public function looksLikeNavigationQuery(string $message): bool
     {
         return (bool) preg_match(
@@ -324,6 +352,20 @@ class LwaziService
     protected function findBestRouteWithTerms(array $routes, array $terms): ?string
     {
+        $filtered = array_filter($routes, function($r) {
+            $uri = $r['uri'] ?? '';
+            if (str_starts_with($uri, '/admin') || str_starts_with($uri, '/api') || str_starts_with($uri, '/_')) {
+                return false;
+            }
+            return true;
+        });
+        $routes = array_values($filtered);
+        if (empty($routes)) {
+            return null;
+        }
         $scored = [];
         $termSet = array_filter(array_map('strtolower', array_map('trim', $terms)), fn($t) => strlen($t) >= 3);
@@ -593,6 +635,12 @@ class LwaziService
     protected function fetchRelevantData(string $message): ?string
     {
+        if ($this->isPersonalQuery($message) && empty($this->currentContextId)) {
+            $context = $this->ragService->getContextConfig();
+            $contextParam = $context['param'] ?? config('lwazi.context_param', 'context_id');
+            return "I can look that up for you, but I need your {$contextParam} to access your personal information.";
+        }
         $fieldInfo = $this->selectFieldWithLLM($message) ?: $this->ragService->findFieldForQuery($message);
         if ($fieldInfo) {

package/src/Services/NavigationTree.php CHANGED Viewed

@@ -126,6 +126,10 @@ class NavigationTree
         $heading = $page['heading'] ?? '';
         $links = $page['links'] ?? [];
+        if (preg_match('#/admin/#', $file) || preg_match('#/admin\.blade\.php$#', $file)) {
+            return;
+        }
         $labels = array_filter([$title, $heading]);
         $primaryLabel = reset($labels) ?: basename($file, '.blade.php');
@@ -137,6 +141,10 @@ class NavigationTree
                 continue;
             }
+            if (str_starts_with($href, '/admin') || str_starts_with($href, '/api') || str_starts_with($href, '/_')) {
+                continue;
+            }
             $this->addPath($href, $text, $primaryLabel);
         }
     }
@@ -221,6 +229,11 @@ class NavigationTree
     {
         $queryNormalized = $this->normalizeText($query);
         $queryTokens = $this->tokenize($query);
+        if (count($queryTokens) === 0) {
+            return null;
+        }
         $expandedTokens = $this->expandWithSynonyms($queryTokens);
         $candidates = [];
@@ -238,7 +251,11 @@ class NavigationTree
         usort($candidates, fn($a, $b) => $b['score'] <=> $a['score']);
-        return $candidates[0] ?? null;
+        if (empty($candidates) || $candidates[0]['score'] < 15) {
+            return null;
+        }
+        return $candidates[0];
     }
     public function searchTree(string $query): ?array
@@ -326,16 +343,19 @@ class NavigationTree
         $labelNormalized = $entry['normalizedLabel'] ?? $this->normalizeText($entry['label'] ?? '');
         foreach ($queryTokens as $token) {
+            if (strlen($token) < 3) continue;
             if ($token === $labelNormalized) {
                 $score += 20;
-            } elseif (str_contains($labelNormalized, $token)) {
+            } elseif (strlen($token) >= 4 && str_contains($labelNormalized, $token)) {
                 $score += 10;
-            } elseif ($this->fuzzyMatch($labelNormalized, $token)) {
+            } elseif (strlen($token) >= 4 && $this->fuzzyMatch($labelNormalized, $token)) {
                 $score += 15;
             }
         }
         foreach ($expandedTokens as $token) {
+            if (strlen($token) < 4) continue;
             if (str_contains($labelNormalized, $token)) {
                 $score += 5;
             }
@@ -369,13 +389,27 @@ class NavigationTree
             return true;
         }
+        $commonPrefix = 0;
+        $minLen = min(strlen($a), strlen($b));
+        for ($i = 0; $i < $minLen; $i++) {
+            if ($a[$i] === $b[$i]) {
+                $commonPrefix++;
+            } else {
+                break;
+            }
+        }
+        if ($commonPrefix < 3) {
+            return false;
+        }
         $lev = levenshtein($a, $b);
         $maxLen = max(strlen($a), strlen($b));
         if ($maxLen === 0) {
             return false;
         }
-        return $lev / $maxLen < 0.3;
+        return $lev / $maxLen < 0.2;
     }
     protected function normalizeText(string $text): string
@@ -506,6 +540,10 @@ class NavigationTree
         $queryStems = $tokenizer->tokenizeAndStem($query);
         $queryStems = $tokenizer->removeStopWords($queryStems);
+        if (count($queryStems) === 0) {
+            return null;
+        }
         $candidates = [];
         foreach ($this->stemmedIndex as $path => $stems) {
@@ -525,7 +563,7 @@ class NavigationTree
             }
         }
-        if (empty($candidates)) {
+        if (empty($candidates) || $candidates[0]['score'] < 2) {
             return null;
         }