update app_web_windows

app_chatgpt/models/ai_robot.py

@@ -7,7 +7,6 @@ import base64
 
 from odoo import api, fields, models, modules, tools, _
 from odoo.exceptions import UserError
-from .lib.WordsSearch import WordsSearch
 
 import logging
 _logger = logging.getLogger(__name__)
@@ -411,16 +410,3 @@ GPT-3	A set of models that can understand and generate natural language
             self.ai_model = self.set_ai_model
         else:
             self.ai_model = None
-            
-    def filter_sensitive_words(self, data):
-        if self.is_filtering:
-            search = WordsSearch()
-            s = self.sensitive_words
-            if s:
-                search.SetKeywords(s.split('\n'))
-            else:
-                search.SetKeywords([])
-            data = search.Replace(text=data)
-            return data
-        else:
-            return data

app_chatgpt/models/lib/WordsSearch.py

@@ -1,296 +0,0 @@
-#!/usr/bin/env python
-# -*- coding:utf-8 -*-
-# ToolGood.Words.WordsSearch.py
-# 2020, Lin Zhijun, https://github.com/toolgood/ToolGood.Words
-# Licensed under the Apache License 2.0
-# 更新日志
-# 2020.04.06 第一次提交
-# 2020.05.16 修改，支持大于0xffff的字符
-
-import os
-
-__all__ = ['WordsSearch']
-__author__ = 'Lin Zhijun'
-__date__ = '2020.05.16'
-
-
-class TrieNode():
-    def __init__(self):
-        self.Index = 0
-        self.Index = 0
-        self.Layer = 0
-        self.End = False
-        self.Char = ''
-        self.Results = []
-        self.m_values = {}
-        self.Failure = None
-        self.Parent = None
-
-    def Add(self, c):
-        if c in self.m_values:
-            return self.m_values[c]
-        node = TrieNode()
-        node.Parent = self
-        node.Char = c
-        self.m_values[c] = node
-        return node
-
-    def SetResults(self, index):
-        if (self.End == False):
-            self.End = True
-        self.Results.append(index)
-
-
-class TrieNode2():
-    def __init__(self):
-        self.End = False
-        self.Results = []
-        self.m_values = {}
-        self.minflag = 0xffff
-        self.maxflag = 0
-
-    def Add(self, c, node3):
-        if (self.minflag > c):
-            self.minflag = c
-        if (self.maxflag < c):
-            self.maxflag = c
-        self.m_values[c] = node3
-
-    def SetResults(self, index):
-        if (self.End == False):
-            self.End = True
-        if (index in self.Results) == False:
-            self.Results.append(index)
-
-    def HasKey(self, c):
-        return c in self.m_values
-
-    def TryGetValue(self, c):
-        if (self.minflag <= c and self.maxflag >= c):
-            if c in self.m_values:
-                return self.m_values[c]
-        return None
-
-
-class WordsSearch():
-    def __init__(self):
-        self._first = {}
-        self._keywords = []
-        self._indexs = []
-
-    def SetKeywords(self, keywords):
-        keyword_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'sensi_words.txt')
-        s = open(keyword_path, 'r+', encoding='utf-8').read().split('\n')
-        keywords += s
-        self._keywords = keywords
-        self._indexs = []
-        for i in range(len(keywords)):
-            self._indexs.append(i)
-
-        root = TrieNode()
-        allNodeLayer = {}
-
-        for i in range(len(self._keywords)):  # for (i = 0; i < _keywords.length; i++)
-            p = self._keywords[i]
-            nd = root
-            for j in range(len(p)):  # for (j = 0; j < p.length; j++)
-                nd = nd.Add(ord(p[j]))
-                if (nd.Layer == 0):
-                    nd.Layer = j + 1
-                    if nd.Layer in allNodeLayer:
-                        allNodeLayer[nd.Layer].append(nd)
-                    else:
-                        allNodeLayer[nd.Layer] = []
-                        allNodeLayer[nd.Layer].append(nd)
-            nd.SetResults(i)
-
-        allNode = []
-        allNode.append(root)
-        for key in allNodeLayer.keys():
-            for nd in allNodeLayer[key]:
-                allNode.append(nd)
-        allNodeLayer = None
-
-        for i in range(len(allNode)):  # for (i = 0; i < allNode.length; i++)
-            if i == 0:
-                continue
-            nd = allNode[i]
-            nd.Index = i
-            r = nd.Parent.Failure
-            c = nd.Char
-            while (r != None and (c in r.m_values) == False):
-                r = r.Failure
-            if (r == None):
-                nd.Failure = root
-            else:
-                nd.Failure = r.m_values[c]
-                for key2 in nd.Failure.Results:
-                    nd.SetResults(key2)
-        root.Failure = root
-
-        allNode2 = []
-        for i in range(len(allNode)):  # for (i = 0; i < allNode.length; i++)
-            allNode2.append(TrieNode2())
-
-        for i in range(len(allNode2)):  # for (i = 0; i < allNode2.length; i++)
-            oldNode = allNode[i]
-            newNode = allNode2[i]
-
-            for key in oldNode.m_values:
-                index = oldNode.m_values[key].Index
-                newNode.Add(key, allNode2[index])
-
-            for index in range(len(oldNode.Results)):  # for (index = 0; index < oldNode.Results.length; index++)
-                item = oldNode.Results[index]
-                newNode.SetResults(item)
-
-            oldNode = oldNode.Failure
-            while oldNode != root:
-                for key in oldNode.m_values:
-                    if (newNode.HasKey(key) == False):
-                        index = oldNode.m_values[key].Index
-                        newNode.Add(key, allNode2[index])
-                for index in range(len(oldNode.Results)):
-                    item = oldNode.Results[index]
-                    newNode.SetResults(item)
-                oldNode = oldNode.Failure
-        allNode = None
-        root = None
-
-        # first = []
-        # for index in range(65535):# for (index = 0; index < 0xffff; index++)
-        #     first.append(None)
-
-        # for key in allNode2[0].m_values :
-        #     first[key] = allNode2[0].m_values[key]
-
-        self._first = allNode2[0]
-
-    def FindFirst(self, text):
-        ptr = None
-        for index in range(len(text)):  # for (index = 0; index < text.length; index++)
-            t = ord(text[index])  # text.charCodeAt(index)
-            tn = None
-            if (ptr == None):
-                tn = self._first.TryGetValue(t)
-            else:
-                tn = ptr.TryGetValue(t)
-                if (tn == None):
-                    tn = self._first.TryGetValue(t)
-
-            if (tn != None):
-                if (tn.End):
-                    item = tn.Results[0]
-                    keyword = self._keywords[item]
-                    return {"Keyword": keyword, "Success": True, "End": index, "Start": index + 1 - len(keyword), "Index": self._indexs[item]}
-            ptr = tn
-        return None
-
-    def FindAll(self, text):
-        ptr = None
-        list = []
-
-        for index in range(len(text)):  # for (index = 0; index < text.length; index++)
-            t = ord(text[index])  # text.charCodeAt(index)
-            tn = None
-            if (ptr == None):
-                tn = self._first.TryGetValue(t)
-            else:
-                tn = ptr.TryGetValue(t)
-                if (tn == None):
-                    tn = self._first.TryGetValue(t)
-
-            if (tn != None):
-                if (tn.End):
-                    for j in range(len(tn.Results)):  # for (j = 0; j < tn.Results.length; j++)
-                        item = tn.Results[j]
-                        keyword = self._keywords[item]
-                        list.append({"Keyword": keyword, "Success": True, "End": index, "Start": index + 1 - len(keyword), "Index": self._indexs[item]})
-            ptr = tn
-        return list
-
-    def ContainsAny(self, text):
-        ptr = None
-        for index in range(len(text)):  # for (index = 0; index < text.length; index++)
-            t = ord(text[index])  # text.charCodeAt(index)
-            tn = None
-            if (ptr == None):
-                tn = self._first.TryGetValue(t)
-            else:
-                tn = ptr.TryGetValue(t)
-                if (tn == None):
-                    tn = self._first.TryGetValue(t)
-
-            if (tn != None):
-                if (tn.End):
-                    return True
-            ptr = tn
-        return False
-
-    def Replace(self, text, replaceChar='*'):
-        result = list(text)
-
-        ptr = None
-        for i in range(len(text)):  # for (i = 0; i < text.length; i++)
-            t = ord(text[i])  # text.charCodeAt(index)
-            tn = None
-            if (ptr == None):
-                tn = self._first.TryGetValue(t)
-            else:
-                tn = ptr.TryGetValue(t)
-                if (tn == None):
-                    tn = self._first.TryGetValue(t)
-
-            if (tn != None):
-                if (tn.End):
-                    maxLength = len(self._keywords[tn.Results[0]])
-                    start = i + 1 - maxLength
-                    for j in range(start, i + 1):  # for (j = start; j <= i; j++)
-                        result[j] = replaceChar
-            ptr = tn
-        return ''.join(result)
-
-
-if __name__ == "__main__":
-    s = "中国|国人|zg人|乾清宫"
-    test = "我是中国人"
-
-    search = WordsSearch()
-    search.SetKeywords(s.split('|'))
-
-    print("-----------------------------------  WordsSearch  -----------------------------------")
-
-    print("WordsSearch FindFirst is run.")
-    f = search.FindFirst(test)
-    if f["Keyword"] != "中国":
-        print("WordsSearch FindFirst is error.............................")
-
-    print("WordsSearch FindFirst is run.")
-    all = search.FindAll("乾清宫")
-    if all[0]["Keyword"] != "乾清宫":
-        print("WordsSearch FindFirst is error.............................")
-
-    print("WordsSearch FindAll is run.")
-    all = search.FindAll(test)
-    if all[0]["Keyword"] != "中国":
-        print("WordsSearch FindAll is error.............................")
-    if all[1]["Keyword"] != "国人":
-        print("WordsSearch FindAll is error.............................")
-    if all[0]["Start"] != 2:
-        print("WordsSearch FindAll is error.............................")
-    if all[0]["End"] != 3:
-        print("WordsSearch FindAll is error.............................")
-    if len(all) != 2:
-        print("WordsSearch FindAll is error.............................")
-
-    print("WordsSearch ContainsAny is run.")
-    b = search.ContainsAny(test)
-    if b == False:
-        print("WordsSearch ContainsAny is error.............................")
-
-    print("WordsSearch Replace  is run.")
-    txt = search.Replace(test)
-    if (txt != "我是***"):
-        print("WordsSearch Replace  is error.............................")
-
-    print("-----------------------------------  Test End  -----------------------------------")

app_chatgpt/models/mail_channel.py

@@ -25,7 +25,7 @@ class Channel(models.Model):
                                     help="Main Ai is the robot help you default.")
     ext_ai_partner_id = fields.Many2one(comodel_name="res.partner", string="Secondary Ai",
                                         domain=[('gpt_id', '!=', None), ('is_chat_private', '=', True)])
-    description = fields.Char('Ai Character', help="Ai would help you act as the Character set.")
+    description = fields.Text('Ai Character', help="Ai would help you act as the Character set.")
     set_max_tokens = fields.Selection([
         ('300', 'Short'),
         ('600', 'Standard'),

app_odoo_customize/views/app_theme_config_settings_views.xml

@@ -7,7 +7,7 @@
 			<field name="priority">20</field>
 			<field name="inherit_id" ref="base.res_config_settings_view_form"/>
 			<field name="arch" type="xml">
-				<xpath expr="//div[@data-key='general_settings']" position="after">
+				<xpath expr="//div[@data-key='general_settings']" position="before">
 					<div class="app_settings_block ml8" data-string="app_odoo_customize" string="OEM &amp; Boost" data-key="app_odoo_customize">
 						<div class="row app_settings_header my-0 ms-0 mw-100 bg-warning bg-opacity-25" name="app_settings_header">
 							<div class="col-lg-12 col-md-12 ms-0 o_setting_box">