Ticket #4770 - Usage of assistants in Live Search and Studio Help.

unacms · Aug 21, 2024 · 69342da · 69342da
1 parent b0f4e14
commit 69342da
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 23 deletions.
diff --git a/inc/classes/BxDolAI.php b/inc/classes/BxDolAI.php
@@ -16,8 +16,6 @@
 define('BX_DOL_AI_AUTOMATOR_STATUS_MANUAL', 'manual');
 define('BX_DOL_AI_AUTOMATOR_STATUS_READY', 'ready');
 
-define('BX_DOL_AI_ASST_ID_UNA', 1);
-
 class BxDolAI extends BxDolFactory implements iBxDolSingleton
 {
     protected $_oDb;
@@ -99,12 +97,12 @@ public static function getDefaultModel()
 
     public static function getAssistantForStudio()
     {
-        return ($iId = (int)getParam('sys_agents_studio_assistant')) != 0 ? $iId : BX_DOL_AI_ASST_ID_UNA;
+        return ($iId = (int)getParam('sys_agents_studio_assistant')) != 0 ? $iId : 0;
     }
 
     public static function getAssistantForLiveSearch()
     {
-        return ($iId = (int)getParam('sys_agents_live_search_assistant')) != 0 ? $iId : BX_DOL_AI_ASST_ID_UNA;
+        return ($iId = (int)getParam('sys_agents_live_search_assistant')) != 0 ? $iId : 0;
     }
 
     public function getProfileId()

diff --git a/install/sql/system.sql b/install/sql/system.sql
@@ -6421,11 +6421,8 @@ CREATE TABLE IF NOT EXISTS `sys_agents_models` (
 );
 
 INSERT INTO `sys_agents_models`(`name`, `title`, `key`, `params`, `for_asst`, `active`, `hidden`, `class_name`, `class_file`) VALUES
-('gpt-3.5-turbo', 'GPT-3.5-TURBO', '', '{"call":{"temperature":0.1}}', 0, 1, 0, 'BxDolAIModelGpt35', '');
-
-INSERT INTO `sys_agents_models`(`name`, `title`, `key`, `params`, `for_asst`, `active`, `hidden`, `class_name`, `class_file`) VALUES
+('gpt-3.5-turbo', 'GPT-3.5-TURBO', '', '{"call":{"temperature":0.1}}', 0, 1, 0, 'BxDolAIModelGpt35', ''),
 ('gpt-4o', 'GPT-4.O', '', '{"call":{},"assistants":{"event_init":"asst_HcEyaghqWZefkAyoEML40joY","event":"asst_wqaXtKjcsBKceMtJ2NxID2LT","scheduler_init":"asst_kEbDH1hUy2Y45nOKk9jaSTB8","scheduler":"asst_M6zOv4osQwZmRItaiYptjjOS","webhook_init":"asst_sSkOblPyXmYovS5IiEiVW17n","webhook":"asst_w7F3RiylJfdDEb9Eaa4RvO1q"}}', 1, 1, 0, 'BxDolAIModelGpt40', '');
-SET @iModelId = LAST_INSERT_ID();
 
 CREATE TABLE IF NOT EXISTS `sys_agents_automators` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
@@ -6574,9 +6571,6 @@ CREATE TABLE IF NOT EXISTS `sys_agents_assistants` (
   UNIQUE KEY `name`(`name`)
 );
 
-INSERT INTO `sys_agents_assistants`(`name`, `model_id`, `profile_id`, `description`, `prompt`, `ai_vs_id`, `ai_asst_id`, `added`, `active`, `hidden`) VALUES
-('UNA-Help', @iModelId, 0, 'UNA Help', '', 'vs_Rp3wwQWAeTIq711tsqkqFft6', 'asst_SbNl1hHkHGUmDdhNPvr8lwQN', 0, 1, 1);
-
 CREATE TABLE IF NOT EXISTS `sys_agents_assistants_files` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `name` varchar(128) NOT NULL DEFAULT '',

diff --git a/studio/classes/BxDolStudioAgentsAsstChatsCmts.php b/studio/classes/BxDolStudioAgentsAsstChatsCmts.php
@@ -136,18 +136,6 @@ public function getComment($mixedCmt, $aBp = [], $aDp = [])
         return parent::getComment($aCmt, $aBp, $aDp);
     }
 
-    public function getFormBoxPost($aBp = [], $aDp = [])
-    {
-        $aComments = $this->_oQuery->getCommentsBy(['type' => 'latest', 'object_id' => (int)$this->getId(), 'start' => 0, 'per_page' => 1]);
-        if(!empty($aComments) && is_array($aComments)) {
-            $aLast = current($aComments);
-            if($aLast['cmt_author_id'] != $this->_iProfileIdAi)
-                return '';
-        }
-
-        return parent::getFormBoxPost($aBp, $aDp);
-    }
-
     public function isAttachImageEnabled()
     {
         return false;