Spaces:
				
			
			
	
			
			
		Paused
		
	
	
	
			
			
	
	
	
	
		
		
		Paused
		
	Prepend domain filters in search query generation (#932)
Browse files
    	
        src/lib/server/websearch/runWebSearch.ts
    CHANGED
    
    | 
         @@ -76,18 +76,20 @@ export async function runWebSearch( 
     | 
|
| 76 | 
         
             
            			const searchProvider = getWebSearchProvider();
         
     | 
| 77 | 
         
             
            			appendUpdate(`Searching ${searchProvider}`, [webSearch.searchQuery]);
         
     | 
| 78 | 
         | 
| 
         | 
|
| 79 | 
         
             
            			if (ragSettings && ragSettings?.allowedDomains.length > 0) {
         
     | 
| 80 | 
         
             
            				appendUpdate("Filtering on specified domains");
         
     | 
| 81 | 
         
            -
            				 
     | 
| 82 | 
         
            -
            					" " + ragSettings.allowedDomains.map((item) => "site:" + item).join(" OR ");
         
     | 
| 83 | 
         
             
            			}
         
     | 
| 84 | 
         | 
| 85 | 
         
             
            			// handle the global lists
         
     | 
| 86 | 
         
            -
            			 
     | 
| 87 | 
         
             
            				allowList.map((item) => "site:" + item).join(" OR ") +
         
     | 
| 88 | 
         
             
            				" " +
         
     | 
| 89 | 
         
             
            				blockList.map((item) => "-site:" + item).join(" ");
         
     | 
| 90 | 
         | 
| 
         | 
|
| 
         | 
|
| 91 | 
         
             
            			const results = await searchWeb(webSearch.searchQuery);
         
     | 
| 92 | 
         
             
            			webSearch.results =
         
     | 
| 93 | 
         
             
            				(results.organic_results &&
         
     | 
| 
         | 
|
| 76 | 
         
             
            			const searchProvider = getWebSearchProvider();
         
     | 
| 77 | 
         
             
            			appendUpdate(`Searching ${searchProvider}`, [webSearch.searchQuery]);
         
     | 
| 78 | 
         | 
| 79 | 
         
            +
            			let filters = "";
         
     | 
| 80 | 
         
             
            			if (ragSettings && ragSettings?.allowedDomains.length > 0) {
         
     | 
| 81 | 
         
             
            				appendUpdate("Filtering on specified domains");
         
     | 
| 82 | 
         
            +
            				filters += ragSettings.allowedDomains.map((item) => "site:" + item).join(" OR ");
         
     | 
| 
         | 
|
| 83 | 
         
             
            			}
         
     | 
| 84 | 
         | 
| 85 | 
         
             
            			// handle the global lists
         
     | 
| 86 | 
         
            +
            			filters +=
         
     | 
| 87 | 
         
             
            				allowList.map((item) => "site:" + item).join(" OR ") +
         
     | 
| 88 | 
         
             
            				" " +
         
     | 
| 89 | 
         
             
            				blockList.map((item) => "-site:" + item).join(" ");
         
     | 
| 90 | 
         | 
| 91 | 
         
            +
            			webSearch.searchQuery = filters + " " + webSearch.searchQuery;
         
     | 
| 92 | 
         
            +
             
     | 
| 93 | 
         
             
            			const results = await searchWeb(webSearch.searchQuery);
         
     | 
| 94 | 
         
             
            			webSearch.results =
         
     | 
| 95 | 
         
             
            				(results.organic_results &&
         
     |