cmdbox 0.6.0.3__py3-none-any.whl → 0.6.1__py3-none-any.whl

cmdbox/app/features/cli/cmdbox_web_gencert.py

@@ -51,6 +51,12 @@ class WebGencert(feature.UnsupportEdgeFeature):
                 dict(opt="output_cert_format", type=Options.T_STR, default="PEM", required=False, multi=False, hide=False, choice=["DER", "PEM"],
                      discription_ja="出力する自己署名証明書のファイルフォーマットを指定します。",
                      discription_en="Specifies the file format of the self-signed certificate to be output."),
+                dict(opt="output_pkey", type=Options.T_FILE, default=None, required=False, multi=False, hide=False, choice=None,
+                     discription_ja="出力する自己署名証明書の公開鍵のファイルを指定します。省略した場合は `webhostオプションに指定したホスト名` .pkey に出力されます。",
+                     discription_en="Specifies the public key file of the self-signed certificate to output. If omitted, the output will be in the `hostname specified in the `webhost option` .pkey."),
+                dict(opt="output_pkey_format", type=Options.T_STR, default="PEM", required=False, multi=False, hide=False, choice=["DER", "PEM"],
+                     discription_ja="出力する自己署名証明書の公開鍵のファイルフォーマットを指定します。",
+                     discription_en="Specifies the file format of the public key of the self-signed certificate to be output."),
                 dict(opt="output_key", type=Options.T_FILE, default=None, required=False, multi=False, hide=False, choice=None,
                      discription_ja="出力する自己署名証明書の秘密鍵ファイルを指定します。省略した場合は `webhostオプションに指定したホスト名` .key に出力されます。",
                      discription_en="Specifies the private key file of the self-signed certificate to be output.If omitted, the hostname specified in the `webhost option` .key will be output."),
@@ -91,22 +97,32 @@ class WebGencert(feature.UnsupportEdgeFeature):
             return 1, msg, None
         if args.output_cert is None:
             args.output_cert = f"{args.webhost}.crt"
+        if args.output_pkey is None:
+            args.output_pkey = f"{args.webhost}.pkey"
         if args.output_key is None:
             args.output_key = f"{args.webhost}.key"
         output_cert = Path(args.output_cert)
+        output_pkey = Path(args.output_pkey)
         output_key = Path(args.output_key)
         if not args.overwrite and output_cert.exists():
             msg = dict(warn=f"File already exists. {output_cert}")
             common.print_format(msg, args.format, tm, args.output_json, args.output_json_append, pf=pf)
             return 1, msg, None
+        if not args.overwrite and output_pkey.exists():
+            msg = dict(warn=f"File already exists. {output_pkey}")
+            common.print_format(msg, args.format, tm, args.output_json, args.output_json_append, pf=pf)
+            return 1, msg, None
         if not args.overwrite and output_key.exists():
             msg = dict(warn=f"File already exists. {output_key}")
             common.print_format(msg, args.format, tm, args.output_json, args.output_json_append, pf=pf)
             return 1, msg, None
 
         try:
-            self.gen_cert(logger, args.webhost, output_cert, output_key)
-            ret = dict(success=f"Generate certificate. {output_cert}, {output_key}")
+            self.gen_cert(logger, args.webhost,
+                          output_cert, args.output_cert_format,
+                          output_pkey, args.output_pkey_format,
+                          output_key, args.output_key_format)
+            ret = dict(success=f"Generate certificate. {output_cert}, {output_pkey}, {output_key}")
         except Exception as e:
             msg = dict(error=f"Failed to generate certificate. {e}")
             common.print_format(msg, args.format, tm, args.output_json, args.output_json_append, pf=pf)
@@ -115,6 +131,7 @@ class WebGencert(feature.UnsupportEdgeFeature):
 
     def gen_cert(self, logger:logging.Logger, webhost:str,
                  output_cert:Path, output_cert_format:str,
+                 output_pkey:Path, output_pkey_format:str,
                  output_key:Path, output_key_format:str) -> None:
         # 秘密鍵の作成
         private_key = rsa.generate_private_key(public_exponent=65537, key_size=2048)
@@ -151,6 +168,12 @@ class WebGencert(feature.UnsupportEdgeFeature):
             critical=False,
         ).sign(private_key, hashes.SHA256())
 
+        # 自己署名証明書の公開鍵の保存
+        with open(output_pkey, "wb") as f:
+            f.write(self_cert.public_key().public_bytes(serialization.Encoding.DER if output_pkey_format == "DER" else serialization.Encoding.PEM,
+                                                        format=serialization.PublicFormat.SubjectPublicKeyInfo))
+            logger.info(f"Save self-signed public key. {output_pkey}")
+
         # 自己署名証明書の保存
         with open(output_cert, "wb") as f:
             f.write(self_cert.public_bytes(serialization.Encoding.DER if output_cert_format == "DER" else serialization.Encoding.PEM))

cmdbox/app/features/cli/cmdbox_web_group_add.py

@@ -61,7 +61,7 @@ class WebGroupAdd(feature.UnsupportEdgeFeature):
                 dict(opt="group_parent", type=Options.T_STR, default=None, required=False, multi=False, hide=False, choice=None,
                      discription_ja="親グループ名を指定します。",
                      discription_en="Specifies the parent group name."),
-                dict(opt="signin_file", type=Options.T_FILE, default=None, required=True, multi=False, hide=False, choice=None,
+                dict(opt="signin_file", type=Options.T_FILE, default=f".{self.ver.__appid__}/user_list.yml", required=True, multi=False, hide=False, choice=None,
                      discription_ja="サインイン可能なユーザーとパスワードを記載したファイルを指定します。省略した時は認証を要求しません。",
                      discription_en="Specify a file containing users and passwords with which they can signin. If omitted, no authentication is required."),
                 dict(opt="stdout_log", type=Options.T_BOOL, default=True, required=False, multi=False, hide=True, choice=[True, False],

cmdbox/app/features/cli/cmdbox_web_group_del.py

@@ -55,7 +55,7 @@ class WebGroupDel(feature.UnsupportEdgeFeature):
                 dict(opt="group_id", type=Options.T_INT, default=None, required=True, multi=False, hide=False, choice=None,
                      discription_ja="グループIDを指定します。",
                      discription_en="Specify the group ID. Do not duplicate other groups."),
-                dict(opt="signin_file", type=Options.T_FILE, default=None, required=True, multi=False, hide=False, choice=None,
+                dict(opt="signin_file", type=Options.T_FILE, default=f".{self.ver.__appid__}/user_list.yml", required=True, multi=False, hide=False, choice=None,
                      discription_ja="サインイン可能なユーザーとパスワードを記載したファイルを指定します。省略した時は認証を要求しません。",
                      discription_en="Specify a file containing users and passwords with which they can signin. If omitted, no authentication is required."),
                 dict(opt="stdout_log", type=Options.T_BOOL, default=True, required=False, multi=False, hide=True, choice=[True, False],

cmdbox/app/features/cli/cmdbox_web_group_edit.py

@@ -61,7 +61,7 @@ class WebGroupEdit(feature.UnsupportEdgeFeature):
                 dict(opt="group_parent", type=Options.T_STR, default=None, required=False, multi=False, hide=False, choice=None,
                      discription_ja="親グループ名を指定します。",
                      discription_en="Specifies the parent group name."),
-                dict(opt="signin_file", type=Options.T_FILE, default=None, required=True, multi=False, hide=False, choice=None,
+                dict(opt="signin_file", type=Options.T_FILE, default=f".{self.ver.__appid__}/user_list.yml", required=True, multi=False, hide=False, choice=None,
                      discription_ja="サインイン可能なユーザーとパスワードを記載したファイルを指定します。省略した時は認証を要求しません。",
                      discription_en="Specify a file containing users and passwords with which they can signin. If omitted, no authentication is required."),
                 dict(opt="stdout_log", type=Options.T_BOOL, default=True, required=False, multi=False, hide=True, choice=[True, False],

cmdbox/app/features/cli/cmdbox_web_group_list.py

@@ -55,7 +55,7 @@ class WebGroupList(feature.OneshotResultEdgeFeature):
                 dict(opt="group_name", type=Options.T_STR, default=None, required=False, multi=False, hide=False, choice=None,
                      discription_ja="グループ名を指定して取得します。省略した時は全てのグループを取得します。",
                      discription_en="Retrieved by specifying a group name. If omitted, all groups are retrieved."),
-                dict(opt="signin_file", type=Options.T_FILE, default=None, required=True, multi=False, hide=False, choice=None,
+                dict(opt="signin_file", type=Options.T_FILE, default=f".{self.ver.__appid__}/user_list.yml", required=True, multi=False, hide=False, choice=None,
                      discription_ja="サインイン可能なユーザーとパスワードを記載したファイルを指定します。省略した時は認証を要求しません。",
                      discription_en="Specify a file containing users and passwords with which they can signin. If omitted, no authentication is required."),
                 dict(opt="stdout_log", type=Options.T_BOOL, default=True, required=False, multi=False, hide=True, choice=[True, False],

cmdbox/app/features/cli/cmdbox_web_start.py

@@ -157,32 +157,12 @@ class WebStart(feature.UnsupportEdgeFeature, agent_base.AgentBase):
         w = None
         try:
             args.gui_mode = False if not hasattr(args, 'gui_mode') or not args.gui_mode else args.gui_mode
-            ssl_cert = None if args.ssl_cert is None else Path(args.ssl_cert)
-            ssl_key = None if args.ssl_key is None else Path(args.ssl_key)
-            ssl_ca_certs = None if args.ssl_ca_certs is None else Path(args.ssl_ca_certs)
-            w = web.Web(logger, Path(args.data), appcls=self.appcls, ver=self.ver,
-                        redis_host=args.host, redis_port=args.port, redis_password=args.password, svname=args.svname,
-                        client_only=args.client_only, doc_root=args.doc_root, gui_html=args.gui_html, filer_html=args.filer_html,
-                         result_html=args.result_html, users_html=args.users_html,
-                        assets=args.assets, signin_html=args.signin_html, signin_file=args.signin_file, gui_mode=args.gui_mode)
-            agent_runner = None
-            mcp = None
-            logger.info(f"Agent={args.agent}")
-            if args.agent=='use':
-                if args.agent_session_store == 'sqlite':
-                    args.agent_session_dburl = "sqlite://" + pathname2url(str(w.agent_path / 'session.db'))
-                elif args.agent_session_store == 'postgresql':
-                    args.agent_session_dburl = f"postgresql+psycopg://{args.agent_pg_user}:{args.agent_pg_password}@{args.agent_pg_host}:{args.agent_pg_port}/{args.agent_pg_dbname}"
-                else:
-                    args.agent_session_dburl = None
-                agent_runner, mcp = self.init_agent_runner(logger, args)
-            w.start(allow_host=args.allow_host, listen_port=args.listen_port, ssl_listen_port=args.ssl_listen_port,
-                    ssl_cert=ssl_cert, ssl_key=ssl_key, ssl_keypass=args.ssl_keypass, ssl_ca_certs=ssl_ca_certs,
-                    session_domain=args.session_domain, session_path=args.session_path,
-                    session_secure=args.session_secure, session_timeout=args.session_timeout,
-                    outputs_key=args.outputs_key, guvicorn_workers=args.guvicorn_workers, guvicorn_timeout=args.guvicorn_timeout,
-                    agent_runner=agent_runner, mcp=mcp, mcp_listen_port=args.mcp_listen_port, mcp_ssl_listen_port=args.mcp_ssl_listen_port)
-
+            w = self.createWeb(logger, args)
+            agent_runner, mcp = self._init_agent_runner(w, logger, args)
+            args.ssl_cert = None if args.ssl_cert is None else Path(args.ssl_cert)
+            args.ssl_key = None if args.ssl_key is None else Path(args.ssl_key)
+            args.ssl_ca_certs = None if args.ssl_ca_certs is None else Path(args.ssl_ca_certs)
+            self.start(w, agent_runner, mcp, logger, args)
             msg = dict(success="web complate.")
             common.print_format(msg, args.format, tm, args.output_json, args.output_json_append, pf=pf)
             return 0, msg, w
@@ -191,3 +171,65 @@ class WebStart(feature.UnsupportEdgeFeature, agent_base.AgentBase):
             msg = dict(warn=f"Web server start error. {e}")
             common.print_format(msg, args.format, tm, args.output_json, args.output_json_append, pf=pf)
             return 1, msg, w
+
+    def createWeb(self, logger:logging.Logger, args:argparse.Namespace) -> web.Web:
+        """
+        Webオブジェクトを作成します
+
+        Args:
+            logger (logging.Logger): ロガー
+            args (argparse.Namespace): 引数
+
+        Returns:
+            web.Web: Webオブジェクト
+        """
+        w = web.Web(logger, Path(args.data), appcls=self.appcls, ver=self.ver,
+                    redis_host=args.host, redis_port=args.port, redis_password=args.password, svname=args.svname,
+                    client_only=args.client_only, doc_root=args.doc_root, gui_html=args.gui_html, filer_html=args.filer_html,
+                    result_html=args.result_html, users_html=args.users_html,
+                    assets=args.assets, signin_html=args.signin_html, signin_file=args.signin_file, gui_mode=args.gui_mode)
+        return w
+
+    def _init_agent_runner(self, w:web.Web, logger:logging.Logger, args:argparse.Namespace) -> Tuple[Any, Any]:
+        """
+        エージェントをセットアップします
+
+        Args:
+            w (web.Web): Webオブジェクト
+            logger (logging.Logger): ロガー
+            args (argparse.Namespace): 引数
+
+        Returns:
+            Tuple[agent_base.AgentBase, Any]: エージェントオブジェクト, MCPオブジェクト
+        """
+        logger.info(f"Agent={args.agent}")
+        if args.agent=='use':
+            if not hasattr(self, 'mcp'):
+                from cmdbox.app import mcp
+                self.mcp = mcp.Mcp(logger, args.data, w.signin, self.appcls, self.ver)
+            if args.agent_session_store == 'sqlite':
+                args.agent_session_dburl = "sqlite://" + pathname2url(str(w.agent_path / 'session.db'))
+            elif args.agent_session_store == 'postgresql':
+                args.agent_session_dburl = f"postgresql+psycopg://{args.agent_pg_user}:{args.agent_pg_password}@{args.agent_pg_host}:{args.agent_pg_port}/{args.agent_pg_dbname}"
+            else:
+                args.agent_session_dburl = None
+            return self.mcp.init_agent_runner(logger, args)
+        return None, None
+
+    def start(self, w:web.Web, agent_runner, mcp, logger:logging.Logger, args:argparse.Namespace) -> None:
+        """
+        Webモードを起動します
+
+        Args:
+            w (web.Web): Webオブジェクト
+            agent_runner: エージェントランナー
+            mcp: MCPオブジェクト
+            logger (logging.Logger): ロガー
+            args (argparse.Namespace): 引数
+        """
+        w.start(allow_host=args.allow_host, listen_port=args.listen_port, ssl_listen_port=args.ssl_listen_port,
+                ssl_cert=args.ssl_cert, ssl_key=args.ssl_key, ssl_keypass=args.ssl_keypass, ssl_ca_certs=args.ssl_ca_certs,
+                session_domain=args.session_domain, session_path=args.session_path,
+                session_secure=args.session_secure, session_timeout=args.session_timeout,
+                outputs_key=args.outputs_key, guvicorn_workers=args.guvicorn_workers, guvicorn_timeout=args.guvicorn_timeout,
+                agent_runner=agent_runner, mcp=mcp,)

cmdbox/app/features/cli/cmdbox_web_user_add.py

@@ -70,7 +70,7 @@ class WebUserAdd(feature.UnsupportEdgeFeature):
                 dict(opt="user_group", type=Options.T_STR, default=None, required=True, multi=True, hide=False, choice=None,
                      discription_ja="ユーザーが所属するグループを指定します。",
                      discription_en="Specifies the groups to which the user belongs."),
-                dict(opt="signin_file", type=Options.T_FILE, default=None, required=True, multi=False, hide=False, choice=None,
+                dict(opt="signin_file", type=Options.T_FILE, default=f".{self.ver.__appid__}/user_list.yml", required=True, multi=False, hide=False, choice=None,
                      discription_ja="サインイン可能なユーザーとパスワードを記載したファイルを指定します。省略した時は認証を要求しません。",
                      discription_en="Specify a file containing users and passwords with which they can signin. If omitted, no authentication is required."),
                 dict(opt="stdout_log", type=Options.T_BOOL, default=True, required=False, multi=False, hide=True, choice=[True, False],

cmdbox/app/features/cli/cmdbox_web_user_del.py

@@ -55,7 +55,7 @@ class WebUserDel(feature.UnsupportEdgeFeature):
                 dict(opt="user_id", type=Options.T_INT, default=None, required=True, multi=False, hide=False, choice=None,
                      discription_ja="ユーザーIDを指定します。",
                      discription_en="Specify the user ID."),
-                dict(opt="signin_file", type=Options.T_FILE, default=None, required=True, multi=False, hide=False, choice=None,
+                dict(opt="signin_file", type=Options.T_FILE, default=f".{self.ver.__appid__}/user_list.yml", required=True, multi=False, hide=False, choice=None,
                      discription_ja="サインイン可能なユーザーとパスワードを記載したファイルを指定します。省略した時は認証を要求しません。",
                      discription_en="Specify a file containing users and passwords with which they can signin. If omitted, no authentication is required."),
                 dict(opt="stdout_log", type=Options.T_BOOL, default=True, required=False, multi=False, hide=True, choice=[True, False],

cmdbox/app/features/cli/cmdbox_web_user_edit.py

@@ -70,7 +70,7 @@ class WebUserEdit(feature.UnsupportEdgeFeature):
                 dict(opt="user_group", type=Options.T_STR, default=None, required=True, multi=True, hide=False, choice=None,
                      discription_ja="ユーザーが所属するグループを指定します。",
                      discription_en="Specifies the groups to which the user belongs."),
-                dict(opt="signin_file", type=Options.T_FILE, default=None, required=True, multi=False, hide=False, choice=None,
+                dict(opt="signin_file", type=Options.T_FILE, default=f".{self.ver.__appid__}/user_list.yml", required=True, multi=False, hide=False, choice=None,
                      discription_ja="サインイン可能なユーザーとパスワードを記載したファイルを指定します。省略した時は認証を要求しません。",
                      discription_en="Specify a file containing users and passwords with which they can signin. If omitted, no authentication is required."),
                 dict(opt="stdout_log", type=Options.T_BOOL, default=True, required=False, multi=False, hide=True, choice=[True, False],

cmdbox/app/features/cli/cmdbox_web_user_list.py

@@ -55,7 +55,7 @@ class WebUserList(feature.OneshotResultEdgeFeature):
                 dict(opt="user_name", type=Options.T_STR, default=None, required=False, multi=False, hide=False, choice=None,
                      discription_ja="ユーザー名を指定して取得します。省略した時は全てのユーザーを取得します。",
                      discription_en="Retrieved by specifying a user name. If omitted, all users are retrieved."),
-                dict(opt="signin_file", type=Options.T_FILE, default=None, required=True, multi=False, hide=False, choice=None,
+                dict(opt="signin_file", type=Options.T_FILE, default=f".{self.ver.__appid__}/user_list.yml", required=True, multi=False, hide=False, choice=None,
                      discription_ja="サインイン可能なユーザーとパスワードを記載したファイルを指定します。省略した時は認証を要求しません。",
                      discription_en="Specify a file containing users and passwords with which they can signin. If omitted, no authentication is required."),
                 dict(opt="stdout_log", type=Options.T_BOOL, default=True, required=False, multi=False, hide=True, choice=[True, False],

cmdbox/app/features/web/cmdbox_web_agent.py

@@ -60,7 +60,7 @@ class Agent(feature.WebFeature):
             session_id = form.get('session_id', None)
             sessions = await web.list_agent_sessions(web.agent_runner.session_service, user_id, session_id=session_id)
             data = [dict(id=s.id, app_name=s.app_name, user_id=s.user_id, last_update_time=s.last_update_time,
-                         events=[dict(author=ev.author,text=ev.content.parts[0].text) for ev in s.events if ev.content and ev.content.parts]) for s in sessions]
+                         events=[dict(author=ev.author,text=ev.content.parts[0].text) for ev in s.events if ev.content and ev.content.parts]) for s in sessions if s]
             data.reverse()  # 最新のセッションを先頭にする
             return dict(success=data)
 
@@ -204,14 +204,20 @@ class Agent(feature.WebFeature):
                         outputs = dict()
                         if event.turn_complete:
                             outputs['turn_complete'] = True
-                            yield json.dumps(outputs, default=common.default_json_enc)
+                            yield common.to_str(outputs)
                         if event.interrupted:
                             outputs['interrupted'] = True
-                            yield json.dumps(outputs, default=common.default_json_enc)
+                            yield common.to_str(outputs)
                         #if event.is_final_response():
                         msg = None
                         if event.content and event.content.parts:
                             msg = "\n".join([p.text for p in event.content.parts if p and p.text])
+                            calls = event.get_function_calls()
+                            if calls:
+                                msg += '\n```json{"function_calls":'+common.to_str([dict(fn=c.name,args=c.args) for c in calls])+'}```'
+                            responses = event.get_function_responses()
+                            if responses:
+                                msg += '\n```json{"function_responses":'+common.to_str([dict(fn=r.name, res=r.response) for r in responses])+'}```'
                         elif event.actions and event.actions.escalate:
                             msg = f"Agent escalated: {event.error_message or 'No specific message.'}"
                         if msg:
@@ -219,7 +225,7 @@ class Agent(feature.WebFeature):
 
                             outputs['message'] = msg
                             web.options.audit_exec(sock, web, body=dict(agent_session=agent_session.id, result=msg))
-                            yield json.dumps(outputs, default=common.default_json_enc)
+                            yield common.to_str(outputs)
                             if event.is_final_response():
                                 break
                 except WebSocketDisconnect:

cmdbox/app/features/web/cmdbox_web_signin.py

@@ -16,7 +16,7 @@ class Signin(feature.WebFeature):
             web (Web): Webオブジェクト
             app (FastAPI): FastAPIオブジェクト
         """
-        web.signin.signin_file_data = web.signin.load_signin_file(web.signin_file, web.signin.get_data())
+        web.signin.signin_file_data = web.signin.load_signin_file(web.signin_file, web.signin.get_data(), self=self)
         if web.signin_html is not None:
             if not web.signin_html.is_file():
                 raise HTTPException(status_code=500, detail=f'signin_html is not found. ({web.signin_html})')