cmdbox 0.6.3.1__py3-none-any.whl → 0.6.4__py3-none-any.whl

cmdbox/web/assets/cmdbox/agent.js

@@ -28,11 +28,16 @@ agent.format_agent_message = (container, messages, txt, message) => {
             if (!start || start.length < 0) {
                 // JSON開始部分が無い場合はそのまま表示
                 const msg = message.replace(/\n/g, '<br/>');
+                agent.say.say(msg);
                 txt.append(msg);
                 break;
             }
             start = message.substring(0, start.index);
-            if (start) txt.append(start.replace(/\n/g, '<br/>'));
+            if (start) {
+                const msg = start.replace(/\n/g, '<br/>');
+                agent.say.say(msg);
+                txt.append(msg);
+            }
             message = message.replace(start+regs_start.source, '');
 
             // JSON内容部分を探す
@@ -92,6 +97,83 @@ agent.recursive_json_parse = (jobj) => {
         }
     });
 };
+agent.say = {};
+agent.say.model = 'ずんだもんノーマル';
+agent.say.start = ()=> {
+    const opt = cmdbox.get_server_opt(false, $('#filer_form'));
+    opt['mode'] = 'tts';
+    opt['cmd'] = 'start';
+    opt['tts_engine'] = 'voicevox';
+    opt['voicevox_model'] = agent.say.model;
+    cmdbox.show_loading();
+    return cmdbox.sv_exec_cmd(opt).then(res => {
+        if (res && res['success']) res = [res];
+        cmdbox.hide_loading();
+        if (!res[0] || !res[0]['success']) {
+            if (res[0] && res[0]['warn']) throw res[0]['warn'];
+            else if (res['warn']) throw res['warn'];
+            throw res;
+        }
+        if (res[0]['success']['data']) return res[0]['success']['data'];
+        return res[0]['success'];
+    });
+};
+agent.say.stop = () => {
+    const opt = cmdbox.get_server_opt(false, $('#filer_form'));
+    opt['mode'] = 'tts';
+    opt['cmd'] = 'stop';
+    opt['tts_engine'] = 'voicevox';
+    opt['voicevox_model'] = agent.say.model;
+    cmdbox.show_loading();
+    return cmdbox.sv_exec_cmd(opt).then(res => {
+        if (res && res['success']) res = [res];
+        cmdbox.hide_loading();
+        if (!res[0] || !res[0]['success']) {
+            if (res[0] && res[0]['warn']) throw res[0]['warn'];
+            else if (res['warn']) throw res['warn'];
+            throw res;
+        }
+        if (res[0]['success']['data']) return res[0]['success']['data'];
+        return res[0]['success'];
+    });
+};
+agent.say.isStart = () => {
+    const btn_say = $('#btn_say');
+    return btn_say.hasClass('say_on')
+};
+agent.say.say = (tts_text) => {
+    if (!agent.say.isStart()) return;
+    const opt = cmdbox.get_server_opt(false, $('#filer_form'));
+    opt['mode'] = 'tts';
+    opt['cmd'] = 'say';
+    opt['tts_engine'] = 'voicevox';
+    opt['voicevox_model'] = agent.say.model;
+    opt['tts_text'] = tts_text;
+    cmdbox.show_loading();
+    return cmdbox.sv_exec_cmd(opt).then(async (res) => {
+        if (res && res['success']) res = [res];
+        cmdbox.hide_loading();
+        if (!res[0] || !res[0]['success']) {
+            if (res[0] && res[0]['warn']) throw res[0]['warn'];
+            throw res;
+        }
+        if (!res[0]['success']['data']) {
+            throw res[0]['success'];
+        }
+        // 音声データを再生
+        const binary_string = window.atob(res[0]['success']['data']);
+        const bytesArray  = new Uint8Array(binary_string.length);
+        for (let i = 0; i < binary_string.length; i++) {
+            bytesArray[i] = binary_string.charCodeAt(i);
+        }
+        const audioContext = new (window.AudioContext || window.webkitAudioContext)();
+        const audioBuffer = await audioContext.decodeAudioData(bytesArray.buffer);
+        const source = audioContext.createBufferSource();
+        source.buffer = audioBuffer;
+        source.connect(audioContext.destination);
+        source.start(0);
+    });
+};
 agent.init_form = async () => {
     const container = $('#message_container');
     const histories = $('#histories');
@@ -109,7 +191,9 @@ agent.init_form = async () => {
             clearInterval(agent.chat_callback_ping_handler);
         }
         messages.attr('data-session_id', session_id);
+        const btn_say = $('#btn_say');
         const btn_user_msg = $('#btn_user_msg');
+        const btn_rec = $('#btn_rec');
         const user_msg = $('#user_msg');
         let message_id = null;
         btn_user_msg.prop('disabled', true); // 初期状態で送信ボタンを無効化
@@ -134,6 +218,101 @@ agent.init_form = async () => {
             // メッセージ一覧を一番下までスクロール
             container.scrollTop(container.prop('scrollHeight'));
         });
+        // sayボタンのクリックイベント
+        btn_say.off('click').on('click', async () => {
+            if (agent.say.isStart()) {
+                agent.say.stop().then((msg) => {
+                    //cmdbox.message(msg);
+                    btn_say.removeClass('say_on');
+                    btn_say.find('use').attr('href', '#btn_megaphone');
+                }).catch((err) => {
+                    cmdbox.message(err);
+                    if (err.startsWith('VoiceVox model is not running:')) {
+                        btn_say.removeClass('say_on');
+                        btn_say.find('use').attr('href', '#btn_megaphone');
+                    }
+                });
+                return;
+            }
+            agent.say.start().then((msg) => {
+                //cmdbox.message(msg);
+                btn_say.addClass('say_on');
+                btn_say.find('use').attr('href', '#btn_megaphone_fill');
+            }).catch((err) => {
+                cmdbox.message(err);
+                if (err.startsWith('VoiceVox model is already running:')) {
+                    btn_say.addClass('say_on');
+                    btn_say.find('use').attr('href', '#btn_megaphone_fill');
+                }
+            });
+        });
+        // recボタンのクリックイベント
+        btn_rec.off('click').on('click', async () => {
+            // 録音を終了
+            if (btn_rec.hasClass('rec_on')) {
+                btn_rec.removeClass('rec_on');
+                btn_rec.find('use').attr('href', '#btn_mic');
+                // 録音中を停止
+                if (agent.recognition) {
+                    agent.recognition.stop();
+                }
+                return;
+            }
+            // 録音を開始
+            const SpeechRecognition = window.webkitSpeechRecognition || window.SpeechRecognition;
+            if (!SpeechRecognition) {
+                cmdbox.message({'error':'Speech Recognition API is not supported in this browser.'});
+                return;
+            }
+            btn_rec.addClass('rec_on');
+            btn_rec.find('use').attr('href', '#btn_mic_fill');
+            let finalTranscript = user_msg.val();
+            agent.recognition = new SpeechRecognition();
+            agent.recognition.lang = 'ja-JP'; // 言語設定
+            agent.recognition.interimResults = true; // 中間結果を取得する
+            agent.recognition.maxAlternatives = 1; // 最小の候補数
+            agent.recognition.continuous = false; // 連続認識を無効にする
+            agent.recognition.onresult = (event) => {
+                let interimTranscript = '';
+                for (let i = event.resultIndex; i < event.results.length; i++) {
+                    let transcript = event.results[i][0].transcript;
+                    console.log(`transcript: ${transcript}`);
+                    if (event.results[i].isFinal) {
+                        finalTranscript += transcript;
+                    } else {
+                        interimTranscript = transcript;
+                    }
+                }
+                user_msg.val(finalTranscript + interimTranscript);
+            };
+            agent.recognition.onerror = (event) => {
+                console.error(`Speech Recognition error: ${event.error}`);
+                if (event.error === 'no-speech') {
+                    agent.recognition.restart();
+                    return; // no-speechエラーは無視して再度認識を開始
+                }
+                btn_rec.removeClass('rec_on');
+                btn_rec.find('use').attr('href', '#btn_mic');
+                cmdbox.message({'error':`Speech Recognition error: ${event.error}`});
+            };
+            agent.recognition.onend = () => {
+                // 連続認識を無効にしているので、認識が終了したら再稼働させる。
+                console.log(`onend event triggered.`);
+                agent.recognition.restart();
+            };
+            agent.recognition.restart = () => {
+                if (btn_rec.hasClass('rec_on')) {
+                    setTimeout(() => {
+                        try {
+                            agent.recognition.start();
+                        } catch (error) {
+                            console.error(`Error restarting recognition: ${error}`);
+                        }
+                    }, 100);
+                }
+            };
+            agent.recognition.start();
+        });
         // ws接続
         const protocol = window.location.protocol.endsWith('s:') ? 'wss' : 'ws';
         const host = window.location.hostname;
@@ -164,7 +343,9 @@ agent.init_form = async () => {
                 ws.send('ping');
                 agent.chat_reconnect_count = 0; // pingが成功したら再接続回数をリセット
             };
+            btn_say.prop('disabled', false);
             btn_user_msg.prop('disabled', false);
+            btn_rec.prop('disabled', false);
             agent.chat_callback_ping_handler = setInterval(() => {ping();}, ping_interval);
         };
         ws.onerror = (e) => {

cmdbox/web/assets/cmdbox/common.js

@@ -1282,6 +1282,11 @@ cmdbox.add_form_func = (i, cmd_modal, row_content, row, next_elem, lcolsize=12,
     }
     else {
         // 選択肢がある場合
+        let select_html = '<select class="form-select row_content_template_select"></select>';
+        if (row.choice_edit){
+            select_html = `<input type="text" class="form-control row_content_key row_content_template_input">`;
+            select_html+= `<datalist class="row_content_template_select"></datalist>`;
+        }
         if(row.type=='dict') {
             if (Array.isArray(row.choice)) {
                 elem = $(`<div class="col-${lcolsize} mb-3">` // row_content_template_dict_choice
@@ -1289,7 +1294,7 @@ cmdbox.add_form_func = (i, cmd_modal, row_content, row, next_elem, lcolsize=12,
                         +'<label class="input-group-text row_content_template_title">title</label>'
                         +'<input type="text" class="form-control row_content_key row_content_template_input">'
                         +'<label class="input-group-text">=</label>'
-                        +'<select class="form-select row_content_template_select"></select>'
+                        + select_html
                         +'</div></div>');
             }
             else {
@@ -1298,14 +1303,14 @@ cmdbox.add_form_func = (i, cmd_modal, row_content, row, next_elem, lcolsize=12,
                         +'<label class="input-group-text row_content_template_title">title</label>'
                         +'<select class="form-select row_content_key row_content_template_select"></select>'
                         +'<label class="input-group-text">=</label>'
-                        +'<select class="form-select row_content_template_select"></select>'
+                        + select_html
                         +'</div></div>');
             }
         } else {
             elem = $(`<div class="col-${scolsize} mb-3">` // row_content_template_choice
                     +'<div class="input-group">'
                     +'<label class="input-group-text row_content_template_title">title</label>'
-                    +'<select class="form-select row_content_template_select"></select>'
+                    + select_html
                     +'</div></div>');
         }
         if (next_elem) next_elem.after(elem);
@@ -1386,6 +1391,14 @@ cmdbox.add_form_func = (i, cmd_modal, row_content, row, next_elem, lcolsize=12,
     if (row.web=='mask' || row.web=='readonly') {
         input_elem.attr('disabled', 'disabled');
     }
+    // 選択肢編集可能な場合はinputのIDを参考にdatalistのIDを設定
+    if (row.choice_edit) {
+        input_elem.each((i, e) => {
+            const elem = $(e), elem_id = elem.attr('id');
+            elem.next().attr('id', elem_id + '_options');
+            elem.attr('list', elem_id + '_options');
+        });
+    }
     // ファイルタイプの場合はファイラーモーダルを開くボタンを追加
     if(row.type=='file'){
         const btn = $('<button class="btn btn-secondary" type="button">file</button>');

cmdbox/web/assets/cmdbox/svgicon.js

@@ -118,5 +118,23 @@ init_svgicons = () => {
         `<symbol id="azure" viewBox="0 0 16 16">`
             +`<path d="M7.462 0H0v7.19h7.462zM16 0H8.538v7.19H16zM7.462 8.211H0V16h7.462zm8.538 0H8.538V16H16z"/>`
         +`</symbol>`);
+    svgicons.insertAdjacentHTML('beforeend',
+        `<symbol id="btn_megaphone" viewBox="0 0 16 16">`
+            +`<path d="M13 2.5a1.5 1.5 0 0 1 3 0v11a1.5 1.5 0 0 1-3 0v-.214c-2.162-1.241-4.49-1.843-6.912-2.083l.405 2.712A1 1 0 0 1 5.51 15.1h-.548a1 1 0 0 1-.916-.599l-1.85-3.49-.202-.003A2.014 2.014 0 0 1 0 9V7a2.02 2.02 0 0 1 1.992-2.013 75 75 0 0 0 2.483-.075c3.043-.154 6.148-.849 8.525-2.199zm1 0v11a.5.5 0 0 0 1 0v-11a.5.5 0 0 0-1 0m-1 1.35c-2.344 1.205-5.209 1.842-8 2.033v4.233q.27.015.537.036c2.568.189 5.093.744 7.463 1.993zm-9 6.215v-4.13a95 95 0 0 1-1.992.052A1.02 1.02 0 0 0 1 7v2c0 .55.448 1.002 1.006 1.009A61 61 0 0 1 4 10.065m-.657.975 1.609 3.037.01.024h.548l-.002-.014-.443-2.966a68 68 0 0 0-1.722-.082z"/>`
+        +`</symbol>`);
+    svgicons.insertAdjacentHTML('beforeend',
+        `<symbol id="btn_megaphone_fill" viewBox="0 0 16 16">`
+            +`<path d="M13 2.5a1.5 1.5 0 0 1 3 0v11a1.5 1.5 0 0 1-3 0zm-1 .724c-2.067.95-4.539 1.481-7 1.656v6.237a25 25 0 0 1 1.088.085c2.053.204 4.038.668 5.912 1.56zm-8 7.841V4.934c-.68.027-1.399.043-2.008.053A2.02 2.02 0 0 0 0 7v2c0 1.106.896 1.996 1.994 2.009l.496.008a64 64 0 0 1 1.51.048m1.39 1.081q.428.032.85.078l.253 1.69a1 1 0 0 1-.983 1.187h-.548a1 1 0 0 1-.916-.599l-1.314-2.48a66 66 0 0 1 1.692.064q.491.026.966.06"/>`
+        +`</symbol>`);
+    svgicons.insertAdjacentHTML('beforeend',
+        `<symbol id="btn_mic" viewBox="0 0 16 16">`
+            +`<path d="M3.5 6.5A.5.5 0 0 1 4 7v1a4 4 0 0 0 8 0V7a.5.5 0 0 1 1 0v1a5 5 0 0 1-4.5 4.975V15h3a.5.5 0 0 1 0 1h-7a.5.5 0 0 1 0-1h3v-2.025A5 5 0 0 1 3 8V7a.5.5 0 0 1 .5-.5"/>`
+            +`<path d="M10 8a2 2 0 1 1-4 0V3a2 2 0 1 1 4 0zM8 0a3 3 0 0 0-3 3v5a3 3 0 0 0 6 0V3a3 3 0 0 0-3-3"/>`
+        +`</symbol>`);
+    svgicons.insertAdjacentHTML('beforeend',
+        `<symbol id="btn_mic_fill" viewBox="0 0 16 16">`
+            +`<path d="M5 3a3 3 0 0 1 6 0v5a3 3 0 0 1-6 0z"/>`
+            +`<path d="M3.5 6.5A.5.5 0 0 1 4 7v1a4 4 0 0 0 8 0V7a.5.5 0 0 1 1 0v1a5 5 0 0 1-4.5 4.975V15h3a.5.5 0 0 1 0 1h-7a.5.5 0 0 1 0-1h3v-2.025A5 5 0 0 1 3 8V7a.5.5 0 0 1 .5-.5"/>`
+        +`</symbol>`);
 };
 init_svgicons();

{cmdbox-0.6.3.1.dist-info → cmdbox-0.6.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: cmdbox
-Version: 0.6.3.1
+Version: 0.6.4
 Summary: cmdbox: It is a command line application with a plugin mechanism.
 Home-page: https://github.com/hamacom2004jp/cmdbox
 Download-URL: https://github.com/hamacom2004jp/cmdbox
@@ -36,14 +36,31 @@ Requires-Dist: pyjwt
 Requires-Dist: pystray
 Requires-Dist: python-multipart
 Requires-Dist: pycryptodome
+Requires-Dist: pyyaml
 Requires-Dist: questionary
 Requires-Dist: redis
 Requires-Dist: requests
 Requires-Dist: rich
 Requires-Dist: six
 Requires-Dist: tabulate
-Requires-Dist: uvicorn[standard]
+Requires-Dist: uvicorn
+Requires-Dist: wsproto
 Requires-Dist: wheel
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: download-url
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: maintainer
+Dynamic: maintainer-email
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # cmdbox (Command Development Application)
 
@@ -182,8 +199,8 @@ class ClientTime(feature.Feature):
         ret = dict(success=dict(data=dt.strftime('%Y-%m-%d %H:%M:%S')))
         common.print_format(ret, args.format, tm, args.output_json, args.output_json_append, pf=pf)
         if 'success' not in ret:
-            return 1, ret, None
-        return 0, ret, None
+            return self.RESP_WARN, ret, None
+        return self.RESP_SUCCESS, ret, None
 
     def edgerun(self, opt, tool, logger, timeout, prevres = None):
         status, res = tool.exec_cmd(opt, logger, timeout, prevres)
@@ -252,8 +269,8 @@ class ServerTime(feature.Feature):
                                     retry_count=args.retry_count, retry_interval=args.retry_interval, timeout=args.timeout)
         common.print_format(ret, args.format, tm, args.output_json, args.output_json_append, pf=pf)
         if 'success' not in ret:
-            return 1, ret, None
-        return 0, ret, None
+            return self.RESP_WARN, ret, None
+        return self.RESP_SUCCESS, ret, None
 
     def is_cluster_redirect(self):
         return False
@@ -265,7 +282,7 @@ class ServerTime(feature.Feature):
         dt = datetime.datetime.now(tz)
         ret = dict(success=dict(data=dt.strftime('%Y-%m-%d %H:%M:%S')))
         redis_cli.rpush(msg[1], ret)
-        return self.RESP_SCCESS
+        return self.RESP_SUCCESS
 
     def edgerun(self, opt, tool, logger, timeout, prevres = None):
         status, res = tool.exec_cmd(opt, logger, timeout, prevres)
@@ -323,20 +340,11 @@ aliases:                                # Specify the alias for the specified co
 agentrule:                              # Specifies a list of rules that determine which commands the agent can execute.
   policy: deny                          # Specify the default policy for the rule. The value can be allow or deny.
   rules:                                # Specify the rules for the commands that the agent can execute according to the group to which the user belongs.
-  - mode: audit                         # Specify the "mode" as the condition for applying the rule.
-    cmds: [search, write]               # Specify the "cmd" to which the rule applies. Multiple items can be specified in a list.
+  - mode: cmd                           # Specify the "mode" as the condition for applying the rule.
+    cmds: [list, load]                  # Specify the "cmd" to which the rule applies. Multiple items can be specified in a list.
     rule: allow                         # Specifies whether the specified command is allowed or not. Values are allow or deny.
   - mode: client
-    cmds: [file_copy, file_download, file_list, file_mkdir, file_move, file_remove, file_rmdir, file_upload, server_info]
-    rule: allow
-  - mode: cmd
-    cmds: [list, load]
-    rule: allow
-  - mode: server
-    cmds: [list]
-    rule: allow
-  - mode: web
-    cmds: [gencert, genpass, group_list, user_list]
+    cmds: [http]
     rule: allow
 audit:
   enabled: true                         # Specify whether to enable the audit function.