Merge pull request #80 from openchatai/release/v0.3.0

Release/v0.3.0

Author: gharbat

Makefile

@@ -26,8 +26,13 @@ install:
 	@sleep 20
 
 	@echo "$(COLOR_BOLD)=== Clearing backend server config cache ===$(COLOR_RESET)"
+	$(DOCKER_COMPOSE) exec backend-server php artisan cache:clear
 	$(DOCKER_COMPOSE) exec backend-server php artisan config:cache
 
+	@echo "$(COLOR_BOLD)=== Running backward compatibility scripts ===$(COLOR_RESET)"
+	$(DOCKER_COMPOSE) exec backend-server php artisan prompt:fill
+
+
 	@echo "$(COLOR_BOLD)=== Run backend server server migrations ===$(COLOR_RESET)"
 	$(DOCKER_COMPOSE) exec backend-server php artisan migrate --seed
 	$(DOCKER_COMPOSE) exec backend-server php artisan storage:link

backend-server/app/Console/Commands/FillInitialPromptCommand.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\Chatbot;
+use App\Models\User;
+use Illuminate\Console\Command;
+use Illuminate\Support\Str;
+
+class FillInitialPromptCommand extends Command
+{
+    protected $signature = 'prompt:fill';
+
+    protected $description = 'Fill initial prompt for all chatbots';
+
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    public function handle()
+    {
+        $initialPrompt = "You are a helpful AI customer support agent. Use the following pieces of context to answer the question at the end.
+If you don't know the answer, just say you don't know. DO NOT try to make up an answer.
+If the question is not related to the context, politely respond that you are tuned to only answer questions that are related to the context.
+
+{context}
+
+Question: {question}
+Helpful answer in markdown:";
+
+        $chatbots = Chatbot::where('prompt_message', null)->get();
+
+        foreach ($chatbots as $chatbot) {
+            $chatbot->setPromptMessage($initialPrompt);
+            $chatbot->save();
+
+            $this->info("Chatbot: " . $chatbot->getId() . " initial prompt got updated updated");
+        }
+    }
+}

backend-server/app/Http/Controllers/AuthController.php

@@ -13,9 +13,11 @@
 use App\Http\Responses\ChatbotResponse;
 use App\Http\Services\HandlePdfDataSource;
 use App\Models\Chatbot;
+use App\Models\ChatHistory;
 use App\Models\CodebaseDataSource;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\RedirectResponse;
+use Illuminate\Support\Facades\Cookie;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Str;
 use Ramsey\Uuid\Uuid;
@@ -137,6 +139,7 @@ public function sendMessage(SendChatMessageRequest $request, $token): JsonRespon
         $question = $request->getMessage();
         $history = $request->getHistory();
         $mode = $request->getMode();
+        $initialPrompt = $bot->getPromptMessage();
 
         // Remove null and empty values and empty arrays or objects from the history
         $history = array_filter($history, function ($value) {
@@ -148,7 +151,8 @@ public function sendMessage(SendChatMessageRequest $request, $token): JsonRespon
             'question' => $question,
             'history' => $history,
             'namespace' => $bot->getId()->toString(),
-            'mode' =>  $mode,
+            'mode' => $mode,
+            'initial_prompt' => $initialPrompt,
         ]);
 
         if ($response->failed()) {
@@ -160,6 +164,28 @@ public function sendMessage(SendChatMessageRequest $request, $token): JsonRespon
         // Create a ChatbotResponse instance from the API response
         $botResponse = new ChatbotResponse($response->json());
 
+
+        $sessionId = Cookie::get('chatbot_' . $bot->getId()->toString());
+
+        if (!is_null($sessionId)) {
+            $history = new ChatHistory();
+            $history->setId(Uuid::uuid4());
+            $history->setChatbotId($bot->getId());
+            $history->setFromUser();
+            $history->setMessage($question);
+            $history->setSessionId($sessionId);
+            $history->save();
+
+            $history = new ChatHistory();
+            $history->setId(Uuid::uuid4());
+            $history->setChatbotId($bot->getId());
+            $history->setFromBot();
+            $history->setMessage($botResponse->getBotReply());
+            $history->setSessionId($sessionId);
+            $history->save();
+        }
+
+
         // Return the response from the chatbot
         return response()->json([
             'botReply' => $botResponse->getBotReply(),
@@ -178,7 +204,13 @@ public function getChatView($token)
         // Find the chatbot by token
         $bot = Chatbot::where('token', $token)->firstOrFail();
 
-        // Render the chat view with the chatbot data
+        // initiate a cookie if it doesn't exist
+        $cookieName = 'chatbot_' . $bot->getId()->toString();
+        if (!Cookie::has($cookieName)) {
+            $cookieValue = Str::random(20);
+            Cookie::queue($cookieName, $cookieValue, 60 * 24 * 365);
+        }
+
         return view('chat', [
             'bot' => $bot,
         ]);
@@ -199,7 +231,6 @@ public function createViaCodebaseFlow(CreateChatbotViaCodebaseRequest $request):
         $datasource->setRepository($request->getRepoUrl());
         $datasource->save();
 
-
         event(new CodebaseDataSourceWasAdded(
                 $chatbot->getId(),
                 $datasource->getId())

backend-server/app/Http/Controllers/ChatbotController.php

@@ -2,16 +2,20 @@
 
 namespace App\Http\Controllers;
 
+use App\Http\Enums\ChatBotInitialPromptEnum;
 use App\Models\Chatbot;
+use App\Models\ChatHistory;
+use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Validation\ValidationException;
 
 class ChatbotSettingController extends Controller
 {
     /**
      * Display the general settings page for a chatbot.
      *
-     * @param  string  $id
+     * @param string $id
      * @return \Illuminate\View\View
      */
     public function generalSettings($id)
@@ -24,14 +28,16 @@ public function generalSettings($id)
         ]);
     }
 
+    public function deleteBot($id): RedirectResponse
+    {
+        $bot = Chatbot::where('id', $id)->firstOrFail();
+        $bot->delete();
+
+        return redirect()->route('index')->with('success', 'Bot deleted!');
+    }
+
     /**
-     * Update the general settings for a chatbot.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  string  $id
-     * @return \Illuminate\Http\RedirectResponse
-     *
-     * @throws \Illuminate\Validation\ValidationException
+     * @throws ValidationException
      */
     public function generalSettingsUpdate(Request $request, $id)
     {
@@ -45,18 +51,45 @@ public function generalSettingsUpdate(Request $request, $id)
 
         // Update the chatbot name
         $bot->setName($request->input('name'));
+        $bot->setPromptMessage($request->input('prompt_message', ChatBotInitialPromptEnum::AI_ASSISTANT_INITIAL_PROMPT));
         $bot->save();
 
         return redirect()->route('chatbot.settings', ['id' => $bot->getId()])->with('success', 'Settings updated!');
     }
 
-    /**
-     * Display the data settings page for a chatbot.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  string  $id
-     * @return \Illuminate\View\View
-     */
+    public function historySettings(Request $request, $id)
+    {
+        /** @var Chatbot $bot */
+        $bot = Chatbot::where('id', $id)->firstOrFail();
+
+        $chatHistory = ChatHistory::select('session_id', DB::raw('COUNT(*) as total_messages'))
+            ->selectRaw('MIN(created_at) as first_message')
+            ->where('chatbot_id', $bot->getId())
+            ->groupBy('session_id')
+            ->orderBy('first_message', 'desc')
+            ->get();
+
+        return view('settings-history', [
+            'bot' => $bot,
+            'chatHistory' => $chatHistory,
+        ]);
+    }
+
+    public function getHistoryBySessionId(Request $request, $id, $sessionId)
+    {
+        /** @var Chatbot $bot */
+        $bot = Chatbot::where('id', $id)->firstOrFail();
+
+        $chatHistory = ChatHistory::where('chatbot_id', $bot->getId())
+            ->where('session_id', $sessionId)
+            ->orderBy('created_at', 'asc')
+            ->get();
+
+        return view('widgets.chat-history', [
+            'chatHistory' => $chatHistory,
+        ]);
+    }
+
     public function dataSettings(Request $request, $id)
     {
         // Find the chatbot by ID
@@ -126,9 +159,11 @@ public function dataSourcesUpdates($id)
 
         // Get website data sources for the chatbot
         $dataSources = $bot->getWebsiteDataSources()->get();
+        $pdfDataSources = $bot->getPdfFilesDataSources()->get();
 
         return view('widgets.data-sources-updates', [
             'dataSources' => $dataSources,
+            'pdfDataSources' => $pdfDataSources,
         ]);
     }
 

backend-server/app/Http/Controllers/ChatbotSettingController.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Http\Enums;
+
+class ChatBotInitialPromptEnum
+{
+    public const AI_ASSISTANT_INITIAL_PROMPT = "You are a helpful AI customer support agent. Use the following pieces of context to answer the question at the end.
+If you don\'t know the answer, just say you don\'t know. DO NOT try to make up an answer.
+If the question is not related to the context, politely respond that you are tuned to only answer questions that are related to the context.
+
+{context}
+
+Question: {question}
+Helpful answer in markdown:";
+
+}
+