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

inc/js/classes/BxDolCmts.js

@@ -349,7 +349,10 @@ BxDolCmts.prototype.cmtRemove = function(e, iCmtId) {
 	            	if(oData && oData.id != undefined) {
                             $(e).parents('.bx-popup-applied:first:visible').dolPopupHide();
 
-                            $('#cmt' + oData.id).bx_anim('hide', $this._sAnimationEffect, $this._iAnimationSpeed, function() {
+                            var fDelete = function() {
+                                var sCmtSel = '#cmt' + oData.id;
+
+                                $(sCmtSel).bx_anim('hide', $this._sAnimationEffect, $this._iAnimationSpeed, function() {
                                     //--- Update counter
                                     if(oData && oData.count != undefined && parseInt(oData.count) >= 0) {
                                         var oSource = $(this);
@@ -369,7 +372,14 @@ BxDolCmts.prototype.cmtRemove = function(e, iCmtId) {
                                     }
 
                                     $(this).remove();
-                            });
+
+                                    var oCmt = $(sCmtSel);
+                                    if(oCmt && oCmt.length > 0)
+                                        fDelete();
+                                });
+                            };
+
+                            fDelete();
                         }
 	            };
 
@@ -934,14 +944,21 @@ BxDolCmts.prototype._getCmt = function (e, iCmtId)
                 //--- Some number of comments already loaded ---//
                 if($(this).children('li.cmt').length) {
                     var oAdded = null;
-                    switch($this._sPostFormPosition) {
-                        case 'top':
-                            oAdded = $(this).children('li.cmt:first').before($(oData.content).hide()).prevAll('li.cmt:hidden');
-                            break;
-
-                        case 'bottom':
-                            oAdded = $(this).children('li.cmt:last').after($(oData.content).hide()).nextAll('li.cmt:hidden');
-                            break;
+                    if($('#cmt' + iCmtId).length) {
+                        $('#cmt' + iCmtId).replaceWith($(oData.content).hide());
+
+                        oAdded = $('#cmt' + iCmtId);
+                    }
+                    else {
+                        switch($this._sPostFormPosition) {
+                            case 'top':
+                                oAdded = $(this).children('li.cmt:first').before($(oData.content).hide()).prevAll('li.cmt:hidden');
+                                break;
+
+                            case 'bottom':
+                                oAdded = $(this).children('li.cmt:last').after($(oData.content).hide()).nextAll('li.cmt:hidden');
+                                break;
+                        }
                     }
 
                     oAdded.each(function() {

modules/boonex/english/data/langs/system/en.xml

@@ -2279,6 +2279,7 @@
     <string name="_sys_agents_assistants_chats_field_description"><![CDATA[Description]]></string>
     <string name="_sys_agents_assistants_chats_popup_add"><![CDATA[Add chat]]></string>
     <string name="_sys_agents_assistants_chats_popup_edit"><![CDATA[Edit chat]]></string>
+    <string name="_sys_agents_assistants_chats_err_no_response"><![CDATA[Cannot get response]]></string>
     <string name="_sys_agents_assistants_files_txt_name"><![CDATA[Name]]></string>
     <string name="_sys_agents_assistants_files_txt_size"><![CDATA[Size]]></string>
     <string name="_sys_agents_assistants_files_txt_status"><![CDATA[Status]]></string>

modules/boonex/russian/data/langs/system/ru.xml

@@ -2255,6 +2255,7 @@
         <string name="_sys_agents_assistants_chats_field_description"><![CDATA[Описание]]></string>
         <string name="_sys_agents_assistants_chats_popup_add"><![CDATA[Добавить чат]]></string>
         <string name="_sys_agents_assistants_chats_popup_edit"><![CDATA[Редактировать чат]]></string>
+        <string name="_sys_agents_assistants_chats_err_no_response"><![CDATA[Невозможно получить ответ]]></string>
         <string name="_sys_agents_assistants_files_txt_name"><![CDATA[Название]]></string>
         <string name="_sys_agents_assistants_files_txt_size"><![CDATA[Размер]]></string>
         <string name="_sys_agents_assistants_files_txt_status"><![CDATA[Статус]]></string>

studio/classes/BxDolStudioAgentsAsstChatsCmts.php

@@ -9,6 +9,8 @@
 
 class BxDolStudioAgentsAsstChatsCmts extends BxTemplCmts
 {
+    protected static $_sPrefixLoad = '#-#';
+    protected static $_sPrefixRetrieve = '|-|';
     protected static $_sParamAllowDelete = 'allow_delete';
 
     protected $_oQueryAgents;
@@ -99,6 +101,31 @@ class BxDolStudioAgentsAsstChatsCmts extends BxTemplCmts
         return $aComments['content'];
     }
 
+    public function getComment($mixedCmt, $aBp = [], $aDp = [])
+    {
+        $aCmt = !is_array($mixedCmt) ? $this->getCommentRow((int)$mixedCmt) : $mixedCmt;
+        if(!$aCmt)
+            return '';
+
+        $iCmt = (int)$aCmt['cmt_id'];
+        if($this->_isShowAnswerLoad($aCmt))
+            $this->_oQuery->updateComments(['cmt_text' => str_replace(self::$_sPrefixLoad, self::$_sPrefixRetrieve, $aCmt['cmt_text'])], ['cmt_id' => $iCmt]);
+        else if($this->_isShowAnswerRetrieve($aCmt) && ($mixedAiData = $this->_getAiData()) !== false) {
+            $aCmtRequest = $this->getCommentRow((int)str_replace(self::$_sPrefixRetrieve, '', $aCmt['cmt_text']));
+
+            list($iModelId, $sAssistantId, $sThreadId) = $mixedAiData;
+
+            $oAIModel = $this->_oAI->getModelObject($iModelId);
+            if(($sResponse = $oAIModel->getResponse(BX_DOL_AI_ASSISTANT, $aCmtRequest['cmt_text'], ['thread_id' => $sThreadId, 'assistant_id' => $sAssistantId])) !== false) {
+                $this->_oQuery->updateComments(['cmt_text' => $sResponse], ['cmt_id' => $iCmt]);
+
+                $aCmt['cmt_text'] = $sResponse;
+            }
+        }
+
+        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]);
@@ -145,24 +172,19 @@ class BxDolStudioAgentsAsstChatsCmts extends BxTemplCmts
             return $mixedResult;
 
         $iObjId = (int)$this->getId();
-        $aChat = $this->_oAI->getAssistantChatById($iObjId);
-        if(empty($aChat) || !is_array($aChat))
-            return $mixedResult;
 
-        $aAssistant = $this->_oAI->getAssistantById($aChat['assistant_id']);
-        if(empty($aAssistant) || !is_array($aAssistant))
+        $mixedAiData = $this->_getAiData();
+        if($mixedAiData === false)
             return $mixedResult;
 
+        list($iModelId, $sAssistantId, $sThreadId) = $mixedAiData;
+
         $aComment = $this->_oQuery->getCommentSimple($iObjId, $iCmtId);
         if(empty($aComment) || !is_array($aComment))
             return $mixedResult;
-        
-        $sMessage = $aComment['cmt_text'];
-        $sAssistantId = $aAssistant['ai_asst_id'];
-        $sThreadId = $aChat['ai_thread_id'];
 
-        $oAIModel = $this->_oAI->getModelObject($aAssistant['model_id']);
-        if(empty($sThreadId) && ($aResponseInit = $oAIModel->getResponseInit(BX_DOL_AI_ASSISTANT, $sMessage, ['assistant_id' => $sAssistantId])) !== false) {
+        $oAIModel = $this->_oAI->getModelObject($iModelId);
+        if(empty($sThreadId) && ($aResponseInit = $oAIModel->getResponseInit(BX_DOL_AI_ASSISTANT, $aComment['cmt_text'], ['assistant_id' => $sAssistantId])) !== false) {
             $sThreadId = $aResponseInit['params']['thread_id'];
 
             $this->_oAI->updateAssistantChatById($iObjId, [
@@ -172,16 +194,14 @@ class BxDolStudioAgentsAsstChatsCmts extends BxTemplCmts
         if(empty($sThreadId))
             return $mixedResult;
 
-        if(($sResponse = $oAIModel->getResponse(BX_DOL_AI_ASSISTANT, $sMessage, ['thread_id' => $sThreadId, 'assistant_id' => $sAssistantId])) !== false) {
-            $mixedResultAuto = $this->addAuto([
-                'cmt_author_id' => $this->_iProfileIdAi,
-                'cmt_parent_id' => 0,
-                'cmt_text' => $sResponse
-            ], true);
+        $mixedResultAuto = $this->addAuto([
+            'cmt_author_id' => $this->_iProfileIdAi,
+            'cmt_parent_id' => 0,
+            'cmt_text' => self::$_sPrefixLoad . $iCmtId
+        ], true);
 
-            if($mixedResultAuto !== false)
-                $mixedResult['id'] .= ',' . $mixedResultAuto['id'];
-        }
+        if($mixedResultAuto !== false)
+            $mixedResult['id'] .= ',' . $mixedResultAuto['id'];
 
         return $mixedResult;
     }
@@ -220,9 +240,49 @@ class BxDolStudioAgentsAsstChatsCmts extends BxTemplCmts
         return $oForm;
     }
 
-    protected function _prepareTextForOutput($s, $iCmtId = 0)
+    protected function _getTmplVarsText($aCmt)
+    {
+        $bLoad = $this->_isShowAnswerLoad($aCmt);
+        $bRetrieve = $this->_isShowAnswerRetrieve($aCmt);
+
+        $iId = (int)$aCmt['cmt_id'];
+        $sText = $aCmt['cmt_text'];
+        if(!$bLoad && !$bRetrieve)
+            $sText = nl2br($this->_prepareTextForOutput($sText, $iId));
+
+        if($bLoad)
+            $sText = _t('_sys_loading') . $this->_oTemplate->_wrapInTagJsCode($this->getJsObjectName() . "._getCmt('#cmt" . $iId . "', " . $iId . ");");
+        
+        if($bRetrieve)
+            $sText = _t('_sys_agents_assistants_chats_err_no_response');
+
+        return [
+            'style_prefix' => $this->_sStylePrefix,
+            'text' => $sText
+        ];
+    }
+
+    protected function _getAiData()
+    {
+        $aChat = $this->_oAI->getAssistantChatById((int)$this->getId());
+        if(empty($aChat) || !is_array($aChat))
+            return false;
+
+        $aAssistant = $this->_oAI->getAssistantById($aChat['assistant_id']);
+        if(empty($aAssistant) || !is_array($aAssistant))
+            return false;
+
+        return [$aAssistant['model_id'], $aAssistant['ai_asst_id'], $aChat['ai_thread_id']];
+    }
+
+    protected function _isShowAnswerLoad($aCmt)
+    {
+        return $aCmt['cmt_author_id'] == $this->_iProfileIdAi && strpos($aCmt['cmt_text'], self::$_sPrefixLoad) !== false;
+    }
+    
+    protected function _isShowAnswerRetrieve($aCmt)
     {
-        return nl2br(parent::_prepareTextForOutput($s, $iCmtId));
+        return $aCmt['cmt_author_id'] == $this->_iProfileIdAi && strpos($aCmt['cmt_text'], self::$_sPrefixRetrieve) !== false;
     }
 }