cmdbox 0.5.3.1__py3-none-any.whl → 0.6.0__py3-none-any.whl

cmdbox/logconf_gui.yml

@@ -4,14 +4,21 @@ formatters:
     fmt:
         format: '%(levelname)s[%(asctime)s] - %(message)s'
         class: logging.Formatter
+    fmt_rich:
+        format: '%(message)s'
+        class: logging.Formatter
 handlers:
     std:
-        class: cmdbox.app.commons.loghandler.ColorfulStreamHandler
+        class: rich.logging.RichHandler
         level: INFO
-        formatter: fmt
-        stream: ext://sys.stdout
+        formatter: fmt_rich
+        show_path: false
+        omit_repeated_times: false
+        tracebacks_word_wrap: false
+        log_time_format: '[%Y-%m-%d %H:%M]'
+        #stream: ext://sys.stdout
     gui:
-        class: cmdbox.app.commons.loghandler.TimedRotatingFileHandler
+        class: logging.handlers.TimedRotatingFileHandler
         level: INFO
         formatter: fmt
         backupCount: 5
@@ -24,7 +31,8 @@ loggers:
         handlers: [gui, std]
         level: INFO
         qualname: gui
- 
+        propagate: false
+
 #root:
 #    handlers: [std]
 #    level: NOTSET

cmdbox/logconf_server.yml

@@ -4,14 +4,21 @@ formatters:
     fmt:
         format: '%(levelname)s[%(asctime)s] - %(message)s'
         class: logging.Formatter
+    fmt_rich:
+        format: '%(message)s'
+        class: logging.Formatter
 handlers:
     std:
-        class: cmdbox.app.commons.loghandler.ColorfulStreamHandler
+        class: rich.logging.RichHandler
         level: INFO
-        formatter: fmt
-        stream: ext://sys.stdout
+        formatter: fmt_rich
+        show_path: false
+        omit_repeated_times: false
+        tracebacks_word_wrap: false
+        log_time_format: '[%Y-%m-%d %H:%M]'
+        #stream: ext://sys.stdout
     server:
-        class: cmdbox.app.commons.loghandler.TimedRotatingFileHandler
+        class: logging.handlers.TimedRotatingFileHandler
         level: INFO
         formatter: fmt
         backupCount: 5
@@ -24,7 +31,8 @@ loggers:
         handlers: [server, std]
         level: INFO
         qualname: server
- 
+        propagate: false
+
 #root:
 #    handlers: [std]
 #    level: NOTSET

cmdbox/logconf_web.yml

@@ -4,14 +4,21 @@ formatters:
     fmt:
         format: '%(levelname)s[%(asctime)s] - %(message)s'
         class: logging.Formatter
+    fmt_rich:
+        format: '%(message)s'
+        class: logging.Formatter
 handlers:
     std:
-        class: cmdbox.app.commons.loghandler.ColorfulStreamHandler
+        class: rich.logging.RichHandler
         level: INFO
-        formatter: fmt
-        stream: ext://sys.stdout
+        formatter: fmt_rich
+        show_path: false
+        omit_repeated_times: false
+        tracebacks_word_wrap: false
+        log_time_format: '[%Y-%m-%d %H:%M]'
+        #stream: ext://sys.stdout
     web:
-        class: cmdbox.app.commons.loghandler.TimedRotatingFileHandler
+        class: logging.handlers.TimedRotatingFileHandler
         level: INFO
         formatter: fmt
         backupCount: 5
@@ -24,7 +31,8 @@ loggers:
         handlers: [web, std]
         level: INFO
         qualname: web
- 
+        propagate: false
+
 #root:
 #    handlers: [std]
 #    level: NOTSET

cmdbox/version.py

@@ -1,9 +1,9 @@
 import datetime
 
-dt_now = datetime.datetime(2025, 4, 18)
+dt_now = datetime.datetime(2025, 5, 30)
 __appid__ = 'cmdbox'
 __title__ = 'cmdbox (Command Development Application)'
-__version__ = '0.5.3.1'
+__version__ = '0.6.0'
 __copyright__ = f'Copyright © 2023-{dt_now.strftime("%Y")} hamacom2004jp'
 __pypiurl__ = 'https://pypi.org/project/cmdbox/'
 __srcurl__ = 'https://github.com/hamacom2004jp/cmdbox'
@@ -18,6 +18,7 @@ __logo__ = '''
  ╚═════╝╚═╝     ╚═╝╚═════╝ ╚═════╝  ╚═════╝ ╚═╝  ╚═╝'''
 __description__ = f'{__title__} {__version__}\n\n' + \
                   f'{__copyright__}\n' + \
+                  f'build: {dt_now.strftime("%Y-%m-%d")}\n' + \
                   f'Web Site: PyPi <{__pypiurl__}>\n' + \
                   f'Web Site: SorceCode <{__srcurl__}>\n' + \
                   f'Web Site: Document <{__docurl__}>\n' + \

cmdbox/web/agent.html

@@ -0,0 +1,263 @@
+<html>
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <style type="text/css">
+    .card-hover:hover {
+        box-shadow: 0 0 8px gray;
+    }
+    .filer-pane-divider {
+        border: 1px solid var(--bs-border-color-translucent) !important;
+        /**background-color: #F0F0F0 !important;*/
+        border-radius: 1px;
+        /*left: 50%;*/
+    }
+    .chat-container {
+        overflow-y: auto;
+        background-color: var(--bs-body-bg);
+    }
+    .message {
+        padding: 10px;
+        /**border: 1px solid var(--bs-border-color-translucent);*/
+        margin-bottom: 10px;
+        border-radius: 5px;
+        clear: both;
+    }
+    .user-message {
+        background-color: var(--bs-tertiary-bg);
+        color: var(--bs-body-color);
+        /**float: right;*/
+        border-bottom-left-radius: 24px;
+        border-bottom-right-radius: 24px;
+        border-top-left-radius: 24px;
+        border-top-right-radius: 4px;
+    }
+    .bot-message {
+        background-color: var(--bs-body-bg);
+        color: var(--bs-body-color);
+        float: left;
+    }
+    .chat-input {
+        border-radius: 16px;
+        border: 1px solid var(--bs-border-color);
+    }
+    :root {
+        --cmdbox-width: 800px;
+    }
+    pre {
+        width: var(--cmdbox-width);
+        overflow-wrap: break-all;
+    }
+    .btn_hover {
+        border-radius: 24px !important;
+    }
+    .btn_hover:hover {
+        background-color: var(--bs-tertiary-bg) !important;
+    }
+    </style>
+</head>
+<body lang="ja" class="overflow-hidden p-2" style="background-color:rgb(33, 37, 41)">
+    <svg xmlns="http://www.w3.org/2000/svg" style="display: none;">
+        <symbol id="svg_signin_ico" viewBox="0 0 16 16">
+            <path d="M11 6a3 3 0 1 1-6 0 3 3 0 0 1 6 0z"></path>
+            <path fill-rule="evenodd" d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8zm8-7a7 7 0 0 0-5.468 11.37C3.242 11.226 4.805 10 8 10s4.757 1.225 5.468 2.37A7 7 0 0 0 8 1z"></path>
+        </symbol>
+        <symbol id="svg_window_stack" viewBox="0 0 16 16">
+            <path d="M4.5 6a.5.5 0 1 0 0-1 .5.5 0 0 0 0 1ZM6 6a.5.5 0 1 0 0-1 .5.5 0 0 0 0 1Zm2-.5a.5.5 0 1 1-1 0 .5.5 0 0 1 1 0Z"/>
+            <path d="M12 1a2 2 0 0 1 2 2 2 2 0 0 1 2 2v8a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2 2 2 0 0 1-2-2V3a2 2 0 0 1 2-2h10ZM2 12V5a2 2 0 0 1 2-2h9a1 1 0 0 0-1-1H2a1 1 0 0 0-1 1v8a1 1 0 0 0 1 1Zm1-4v5a1 1 0 0 0 1 1h10a1 1 0 0 0 1-1V8H3Zm12-1V5a1 1 0 0 0-1-1H4a1 1 0 0 0-1 1v2h12Z"/>
+        </symbol>
+        <symbol id="svg_window" viewBox="0 0 16 16">
+            <path d="M2.5 4a.5.5 0 1 0 0-1 .5.5 0 0 0 0 1zm2-.5a.5.5 0 1 1-1 0 .5.5 0 0 1 1 0zm1 .5a.5.5 0 1 0 0-1 .5.5 0 0 0 0 1z"/>
+            <path d="M2 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2H2zm13 2v2H1V3a1 1 0 0 1 1-1h12a1 1 0 0 1 1 1zM2 14a1 1 0 0 1-1-1V6h14v7a1 1 0 0 1-1 1H2z"/>
+        </symbol>
+        <symbol id="btn_x" viewBox="0 0 16 16">
+            <path d="M4.646 4.646a.5.5 0 0 1 .708 0L8 7.293l2.646-2.647a.5.5 0 0 1 .708.708L8.707 8l2.647 2.646a.5.5 0 0 1-.708.708L8 8.707l-2.646 2.647a.5.5 0 0 1-.708-.708L7.293 8 4.646 5.354a.5.5 0 0 1 0-.708"/>
+        </symbol>
+        <symbol id="btn_chat_text" viewBox="0 0 16 16">
+            <path d="M2.678 11.894a1 1 0 0 1 .287.801 11 11 0 0 1-.398 2c1.395-.323 2.247-.697 2.634-.893a1 1 0 0 1 .71-.074A8 8 0 0 0 8 14c3.996 0 7-2.807 7-6s-3.004-6-7-6-7 2.808-7 6c0 1.468.617 2.83 1.678 3.894m-.493 3.905a22 22 0 0 1-.713.129c-.2.032-.352-.176-.273-.362a10 10 0 0 0 .244-.637l.003-.01c.248-.72.45-1.548.524-2.319C.743 11.37 0 9.76 0 8c0-3.866 3.582-7 8-7s8 3.134 8 7-3.582 7-8 7a9 9 0 0 1-2.347-.306c-.52.263-1.639.742-3.468 1.105"/>
+            <path d="M4 5.5a.5.5 0 0 1 .5-.5h7a.5.5 0 0 1 0 1h-7a.5.5 0 0 1-.5-.5M4 8a.5.5 0 0 1 .5-.5h7a.5.5 0 0 1 0 1h-7A.5.5 0 0 1 4 8m0 2.5a.5.5 0 0 1 .5-.5h4a.5.5 0 0 1 0 1h-4a.5.5 0 0 1-.5-.5"/>
+        </symbol>
+        <symbol id="btn_plus" viewBox="0 0 16 16">
+            <path d="M8 4a.5.5 0 0 1 .5.5v3h3a.5.5 0 0 1 0 1h-3v3a.5.5 0 0 1-1 0v-3h-3a.5.5 0 0 1 0-1h3v-3A.5.5 0 0 1 8 4z"/>
+        </symbol>
+        <symbol id="btn_send" viewBox="0 0 16 16">
+            <path d="M15.854.146a.5.5 0 0 1 .11.54l-5.819 14.547a.75.75 0 0 1-1.329.124l-3.178-4.995L.643 7.184a.75.75 0 0 1 .124-1.33L15.314.037a.5.5 0 0 1 .54.11ZM6.636 10.07l2.761 4.338L14.13 2.576zm6.787-8.201L1.591 6.602l4.339 2.76z"/>
+        </symbol>
+        <symbol id="svg_justify_left" viewBox="0 0 16 16">
+            <path fill-rule="evenodd" d="M2 12.5a.5.5 0 0 1 .5-.5h7a.5.5 0 0 1 0 1h-7a.5.5 0 0 1-.5-.5m0-3a.5.5 0 0 1 .5-.5h11a.5.5 0 0 1 0 1h-11a.5.5 0 0 1-.5-.5m0-3a.5.5 0 0 1 .5-.5h11a.5.5 0 0 1 0 1h-11a.5.5 0 0 1-.5-.5m0-3a.5.5 0 0 1 .5-.5h11a.5.5 0 0 1 0 1h-11a.5.5 0 0 1-.5-.5"/>
+        </symbol>
+        <symbol id="btn_three_dots_vertical" viewBox="0 0 16 16">
+            <path d="M9.5 13a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0m0-5a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0m0-5a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0"/>
+        </symbol>
+    </svg>
+    <!-- ナビゲーションバー -->
+    <nav class="navbar navbar-expand-sm fixed-top p-2">
+        <div class="container-fluid">
+            <a class="navbar-brand" href="#">cmdbox</a>
+            <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
+                <span class="navbar-toggler-icon"></span>
+            </button>
+            <div class="collapse navbar-collapse" id="navbarNavDropdown">
+                <ul class="navbar-nav me-auto">
+                    <li class="nav-item dropdown">
+                        <a class="nav-link dropdown-toggle" href="#" id="viewMenuLink" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+                            View
+                        </a>
+                        <ul class="dropdown-menu viewmenu">
+                            <li class="nav-item dropdown">
+                                <span class="dropdown-item">
+                                    Change Dark Mode
+                                    <select class="d-inline-block change_color_mode" onchange="cmdbox.change_color_mode($(this).val());">
+                                        <option value="dark" selected>Dark</option>
+                                        <option value="midnight">midnight</option>
+                                        <option value="deepsea">deepsea</option>
+                                        <option value="verdant">verdant</option>
+                                        <option value="bumblebee">bumblebee</option>
+                                        <option value="crimson">crimson</option>
+                                        <option value="light">light</option>
+                                    </select>
+                                </span>
+                            </li>
+                        </ul>
+                    </li>
+                    <li class="nav-item dropdown">
+                        <a class="nav-link dropdown-toggle" href="#" id="aboutMenuLink" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+                            About
+                        </a>
+                        <ul class="dropdown-menu aboutmenu" aria-labelledby="aboutMenuLink">
+                            <li><a class="dropdown-item" href="#" onclick="$(`#versions_modal`).modal(`show`);">Versions</a></li>
+                        </ul>
+                    </li>
+                </ul>
+                <div class="d-none dropdown user_info">
+                    <a href="#" class="d-block link-body-emphasis text-decoration-none dropdown-toggle show" data-bs-toggle="dropdown" aria-expanded="true" style="fill:gray;">
+                        <svg class="m-1" width="24" height="24" viewBox="0 0 16 16">
+                            <use href="#svg_signin_ico"></use>
+                        </svg>
+                        <span class="username">UserName</span>
+                    </a>
+                    <ul class="dropdown-menu text-small shadow" style="position: absolute; inset: 0px 0px auto auto; margin: 0px; transform: translate(0px, 34px);" data-popper-placement="bottom-end">
+                        <div class="user_info_note ps-3 pe-3"></div>
+                        <li><hr class="dropdown-divider"></li>
+                    </ul>
+                </div>
+            </div>
+        </div>
+    </nav>
+    <!-- メインコンテナ -->
+    <div id="main_container" class="container-fluid overflow-auto split-pane fixed-left" style="margin-top:66px;height:calc(100vh - 120px);">
+        <!-- 履歴側ペイン -->
+        <div id="left_container" class="split-pane-component filer-pane-left" style="width:15%;">
+            <div id="newchat_container" class="w-100 d-flex justify-content-center">
+                <button id="btn_newchat" class="btn_hover btn me-3 p-2" type="button" style="border:0px;">
+                    <svg class="bi bi-plus" width="24" height="24" fill="currentColor"><use href="#btn_plus"></use></svg>
+                    <span class="btn_text">New Chat&nbsp;</span>
+                </button>
+            </div>
+            <h6 style="float:left;">
+                Histories
+            </h6>
+            <div id="history_container" class="w-100 d-flex justify-content-center" style="height:calc(100% - 80px);overflow-y:auto;">
+                <div id="histories" class="w-100 p-2">
+                </div>
+            </div>
+        </div>
+        <!-- 左右のスプリッター -->
+        <div class="split-pane-divider filer-pane-divider" style="left:15%;"></div>
+        <!-- チャット側ペイン -->
+        <div id="right_container" class="split-pane-component chat-container " style="left:15%;">
+            <div id="message_container" class="w-100 d-flex justify-content-center" style="height:calc(100% - 80px);overflow-y:auto;">
+                <div id="messages" class="ps-2 pe-2" style="width:var(--cmdbox-width);">
+                </div>
+            </div>
+            <div class="w-100 d-flex justify-content-center">
+                <div class="chat-input mt-2" style="width:800px;">
+                    <div class="chat-group w-100 p-2">
+                        <textarea id="user_msg" class="form-control d-inline-block align-middle" rows="1" style="width:calc(100% - 60px);border:0px;box-shadow:none;resize:none;field-sizing:content;"></textarea>
+                        <button id="btn_user_msg" class="btn btn_hover" type="button" style="border:0px;" disabled="disabled">
+                            <svg class="bi bi-send" width="24" height="24" fill="currentColor"><use href="#btn_send"></use></svg>
+                        </button>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <form id="filter_form" class="d-none filer_form">
+            <input name="filer_host" type="hidden" class="filer_host">
+            <input name="filer_port" type="hidden" class="filer_port">
+            <input name="filer_password" type="hidden" class="filer_password">
+            <input name="filer_svname" type="hidden" class="filer_svname">
+            <input name="filer_scope" type="hidden" class="filer_scope">
+            <input name="filer_client_data" type="hidden" class="filer_client_data">
+        </form>
+    </div>
+    <!-- versionsモーダル -->
+    <div id="versions_modal" class="modal" tabindex="-1">
+        <div class="modal-dialog modal-lg">
+            <form id="version_form" class="modal-content novalidate">
+                <div class="modal-header">
+                    <h5 class="modal-title">
+                        Versions
+                    </h5>
+                    <button type="button" class="btn btn_window_stack">
+                        <svg width="16" height="16" fill="currentColor" class="bi bi-window-stack">
+                            <use href="#svg_window_stack"></use>
+                        </svg>
+                    </button>
+                    <button type="button" class="btn btn_window">
+                        <svg width="16" height="16" fill="currentColor" class="bi bi-window">
+                            <use href="#svg_window"></use>
+                        </svg>
+                    </button>
+                    <button type="button" class="btn btn_close p-0 m-0" data-bs-dismiss="modal" aria-label="Close" style="margin-left: 0px;">
+                        <svg class="bi bi-x" width="24" height="24" fill="currentColor"><use href="#btn_x"></use></svg>
+                    </button>
+                </div>
+                <div class="modal-body">
+                    <ul class="nav nav-tabs version-tabs" role="tablist"></ul>
+                    <div class="tab-content version-content"></div>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
+                </div>
+            </form>
+        </div>
+    </div>
+    <!-- ローディングマスク -->
+    <div id="loading" class="position-absolute top-0 start-0 w-100 h-100 d-none" style="background:rgba(0, 0, 0, 0.3);z-index:10000;">
+        <div class="text-center position-absolute top-50 start-50 w-100 translate-middle">
+            <div class="spinner-border text-light" role="status">
+                <span class="sr-only"></span>
+            </div>
+            <div>
+                <button type="button" class="btn btn-outline-danger mt-3 bbforce">Back by force</button>
+            </div>
+        </div>
+    </div>
+    <!-- フッター -->
+    <footer class="fixed-bottom text-center p-2 copyright"></footer>
+</body>
+<script type="text/javascript">
+    // jqueryの読込み完了までbodyの背景色を設定
+    document.querySelector(`body`).style.setProperty(`--bs-body-bg`, `#212529`);
+    document.querySelector(`body`).style.setProperty(`--bs-tertiary-bg`, `#2b3035`);
+    document.querySelector(`body`).style.setProperty(`--bs-tertiary-bg-rgb`, `43,48,53`);
+    document.querySelector(`body`).style.setProperty(`--bs-secondary-bg`, `#343a40`);
+    document.addEventListener('DOMContentLoaded', () => {
+        document.querySelector(`body`).style.setProperty(`--bs-body-bg`, null);
+        document.querySelector(`body`).style.setProperty(`--bs-tertiary-bg`, null);
+        document.querySelector(`body`).style.setProperty(`--bs-tertiary-bg-rgb`, null);
+        document.querySelector(`body`).style.setProperty(`--bs-secondary-bg`, null);
+    });
+</script>
+<link rel="stylesheet" href="assets/bootstrap/bootstrap.min.5.3.0.css">
+<link rel="stylesheet" href="assets/cmdbox/color_mode.css">
+<link rel="stylesheet" href="assets/split-pane/split-pane.css">
+<script type="text/javascript" src="assets/bootstrap/bootstrap.bundle.min.5.3.0.js"></script>
+<script type="text/javascript" src="assets/jquery/jquery.min.3.2.0.js"></script>
+<script type="text/javascript" src="assets/jquery-ui/jquery-ui.min.js"></script>
+<script type="text/javascript" src="assets/jquery-resizable/jquery-resizable.min.js"></script>
+<script type="text/javascript" src="assets/split-pane/split-pane.js"></script>
+<script type="text/javascript" src="assets/cmdbox/common.js"></script>
+<script type="text/javascript" src="assets/cmdbox/view_result.js"></script>
+<script type="text/javascript" src="assets/cmdbox/agent.js"></script>
+</html>