feat: Add internal search functionality

n4ze3m · Sep 6, 2024 · 7bdefc7 · 7bdefc7
1 parent c4daf3f
commit 7bdefc7
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 35 deletions.
diff --git a/app/ui/package.json b/app/ui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "app",
   "private": true,
-  "version": "1.10.1",
+  "version": "1.11.0",
   "type": "module",
   "scripts": {
     "dev": "vite",

diff --git a/app/ui/src/hooks/useSettings.tsx b/app/ui/src/hooks/useSettings.tsx
@@ -8,6 +8,7 @@ export const useSettings = () => {
       const response = await api.get("/user/info");
       return response.data as {
         isRegistrationAllowed: boolean;
+
       };
     },
     {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dialoqbase",
-  "version": "1.10.1",
+  "version": "1.11.0",
   "description": "Create chatbots with ease",
   "scripts": {
     "ui:dev": "pnpm run --filter ui dev",

diff --git a/server/prisma/migrations/q_14_7/migration.sql b/server/prisma/migrations/q_14_7/migration.sql
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "DialoqbaseSettings" ADD COLUMN     "internalSearchEnabled" BOOLEAN DEFAULT false;
diff --git a/server/prisma/schema.prisma b/server/prisma/schema.prisma
@@ -106,6 +106,7 @@ model DialoqbaseSettings {
   dynamicallyFetchOllamaModels Boolean? @default(false)
   hideDefaultModels            Boolean? @default(false)
   internetSearchEnabled        Boolean? @default(false)
+  internalSearchEnabled        Boolean? @default(false)
   defaultChatModel             String   @default("gpt-3.5-turbo-dbase")
   defaultEmbeddingModel        String   @default("dialoqbase_eb_text-embedding-ada-002")
   ollamaURL                    String?  @default("http://host.docker.internal:11434")

diff --git a/server/src/handlers/api/v1/bot/bot/get.handler.ts b/server/src/handlers/api/v1/bot/bot/get.handler.ts
@@ -3,15 +3,7 @@ import { FastifyReply, FastifyRequest } from "fastify";
 import { GetBotRequestById, GetDatasourceByBotId } from "./types";
 import { getSettings } from "../../../../../utils/common";
 import { getAllOllamaModels } from "../../../../../utils/ollama";
-const preprocessSearchTerms = (searchTerm: string) => {
-  const tsquerySpecialChars = /[()|&:*!]/g
-  const search =  searchTerm
-    .trim()
-    .replace(tsquerySpecialChars, ' ')
-    .split(/\s+/)
-    .join(' | ')
-    return search
-}
+
 export const getBotByIdEmbeddingsHandler = async (
   request: FastifyRequest<GetBotRequestById>,
   reply: FastifyReply
@@ -77,18 +69,7 @@ export const getDatasourceByBotId = async (
         OR: search
           ? [
             {
-              content: {
-                search:  preprocessSearchTerms(search),
-              },
-            },
-            {
-              document: {
-                some: {
-                  content: {
-                    search: preprocessSearchTerms(search),
-                  },
-                },
-              },
+              content: search,
             },
           ]
           : undefined,
@@ -111,18 +92,7 @@ export const getDatasourceByBotId = async (
         OR: search
           ? [
             {
-              content: {
-                search: preprocessSearchTerms(search),
-              },
-            },
-            {
-              document: {
-                some: {
-                  content: {
-                    search: preprocessSearchTerms(search),
-                  },
-                },
-              },
+              content: search,
             },
           ]
           : undefined,
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,6 +8,7 @@ export const useSettings = () => { @@
           const response = await api.get("/user/info");
           return response.data as {
             isRegistrationAllowed: boolean;
           };
         },
         {
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		-- AlterTable
		ALTER TABLE "DialoqbaseSettings" ADD COLUMN "internalSearchEnabled" BOOLEAN DEFAULT false;