cmdbox 0.5.0.8__py3-none-any.whl → 0.5.1__py3-none-any.whl

cmdbox/app/features/web/cmdbox_web_filer_upload.py

@@ -19,7 +19,7 @@ class FilerUpload(cmdbox_web_exec_cmd.ExecCmd):
         """
         @app.post('/filer/upload', response_class=PlainTextResponse)
         async def filer_upload(req:Request, res:Response):
-            signin = web.check_signin(req, res)
+            signin = web.signin.check_signin(req, res)
             if signin is not None:
                 raise HTTPException(status_code=401, detail=self.DEFAULT_401_MESSAGE)
             return await self.filer_upload(web, req, res)

cmdbox/app/features/web/cmdbox_web_get_cmd_choices.py

@@ -14,7 +14,7 @@ class GetCmdChoices(feature.WebFeature):
         """
         @app.post('/gui/get_cmd_choices')
         async def get_cmd_choices(req:Request, res:Response):
-            signin = web.check_signin(req, res)
+            signin = web.signin.check_signin(req, res)
             if signin is not None:
                 raise HTTPException(status_code=401, detail=self.DEFAULT_401_MESSAGE)
             form = await req.form()

cmdbox/app/features/web/cmdbox_web_get_cmds.py

@@ -16,11 +16,11 @@ class GetCmds(feature.WebFeature):
         """
         @app.post('/gui/get_cmds', response_class=PlainTextResponse)
         async def get_cmds(req:Request, res:Response):
-            signin = web.check_signin(req, res)
+            signin = web.signin.check_signin(req, res)
             if signin is not None:
                 raise HTTPException(status_code=401, detail=self.DEFAULT_401_MESSAGE)
             form = await req.form()
             mode = form.get('mode')
             #ret = web.options.get_cmds(mode)
-            ret = web.get_enable_cmds(mode, req, res)
+            ret = web.signin.get_enable_cmds(mode, req, res)
             return json.dumps(ret, default=common.default_json_enc)

cmdbox/app/features/web/cmdbox_web_get_modes.py

@@ -16,9 +16,9 @@ class GetModes(feature.WebFeature):
         """
         @app.get('/gui/get_modes', response_class=PlainTextResponse)
         async def get_modes(req:Request, res:Response):
-            signin = web.check_signin(req, res)
+            signin = web.signin.check_signin(req, res)
             if signin is not None:
                 raise HTTPException(status_code=401, detail=self.DEFAULT_401_MESSAGE)
-            ret = web.get_enable_modes(req, res)
+            ret = web.signin.get_enable_modes(req, res)
             return json.dumps(ret, default=common.default_json_enc)
 

cmdbox/app/features/web/cmdbox_web_get_server_opt.py

@@ -15,7 +15,7 @@ class GetServerOpt(feature.WebFeature):
         """
         @app.get('/get_server_opt')
         async def get_server_opt(req:Request, res:Response):
-            signin = web.check_signin(req, res)
+            signin = web.signin.check_signin(req, res)
             if signin is not None:
                 raise HTTPException(status_code=401, detail=self.DEFAULT_401_MESSAGE)
             opt = dict(host=web.redis_host, port=web.redis_port, password=web.redis_password, svname=web.svname,

cmdbox/app/features/web/cmdbox_web_gui.py

@@ -35,7 +35,7 @@ class Gui(feature.WebFeature):
         @app.get('/gui', response_class=HTMLResponse)
         @app.post('/gui', response_class=HTMLResponse)
         async def gui(req:Request, res:Response):
-            signin = web.check_signin(req, res)
+            signin = web.signin.check_signin(req, res)
             if signin is not None:
                 return signin
             res.headers['Access-Control-Allow-Origin'] = '*'
@@ -73,7 +73,7 @@ class Gui(feature.WebFeature):
         async def toolmenu(req:Request, res:Response):
             ret = dict()
             for k, v in web.toolmenu.items():
-                path_jadge = web.check_path(req, v['href'])
+                path_jadge = web.signin.check_path(req, v['href'])
                 if path_jadge is not None:
                     continue
                 ret[k] = v

cmdbox/app/features/web/cmdbox_web_list_cmd.py

@@ -17,13 +17,13 @@ class ListCmd(feature.WebFeature):
         """
         @app.post('/gui/list_cmd')
         async def list_cmd(req:Request, res:Response):
-            signin = web.check_signin(req, res)
+            signin = web.signin.check_signin(req, res)
             if signin is not None:
                 raise HTTPException(status_code=401, detail=self.DEFAULT_401_MESSAGE)
             form = await req.form()
             kwd = form.get('kwd')
             ret = self.list_cmd(web, kwd)
-            ret = [r for r in ret if web.check_cmd(req, res, r['mode'], r['cmd'])]
+            ret = [r for r in ret if web.signin.check_cmd(req, res, r['mode'], r['cmd'])]
             return ret
 
     def list_cmd(self, web:Web, kwd:str) -> List[Dict[str, Any]]:

cmdbox/app/features/web/cmdbox_web_list_pipe.py

@@ -17,7 +17,7 @@ class ListPipe(feature.WebFeature):
         """
         @app.post('/gui/list_pipe')
         async def list_pipe(req:Request, res:Response):
-            signin = web.check_signin(req, res)
+            signin = web.signin.check_signin(req, res)
             if signin is not None:
                 raise HTTPException(status_code=401, detail=self.DEFAULT_401_MESSAGE)
             form = await req.form()
@@ -57,4 +57,4 @@ class ListPipe(feature.WebFeature):
         opt = common.loadopt(web.cmds_path / f'cmd-{title}.json', True)
         if 'mode' not in opt or 'cmd' not in opt:
             return False
-        return web.check_cmd(req, res, opt['mode'], opt['cmd'])
+        return web.signin.check_cmd(req, res, opt['mode'], opt['cmd'])

cmdbox/app/features/web/cmdbox_web_load_cmd.py

@@ -17,7 +17,7 @@ class LoadCmd(cmdbox_web_gui.Gui):
         """
         @app.post('/gui/load_cmd')
         async def load_cmd(req:Request, res:Response):
-            signin = web.check_signin(req, res)
+            signin = web.signin.check_signin(req, res)
             if signin is not None:
                 raise HTTPException(status_code=401, detail=self.DEFAULT_401_MESSAGE)
             form = await req.form()

cmdbox/app/features/web/cmdbox_web_load_pin.py

@@ -1,8 +1,6 @@
-from cmdbox.app import common, feature
+from cmdbox.app import feature
 from cmdbox.app.web import Web
 from fastapi import FastAPI, Request, Response, HTTPException
-from typing import Dict, Any
-import json
 
 
 class LoadPin(feature.WebFeature):
@@ -16,7 +14,7 @@ class LoadPin(feature.WebFeature):
         """
         @app.post('/gui/load_cmd_pin')
         async def load_cmd_pin(req:Request, res:Response):
-            signin = web.check_signin(req, res)
+            signin = web.signin.check_signin(req, res)
             if signin is not None:
                 raise HTTPException(status_code=401, detail=self.DEFAULT_401_MESSAGE)
             if 'signin' not in req.session or req.session['signin'] is None:
@@ -31,7 +29,7 @@ class LoadPin(feature.WebFeature):
 
         @app.post('/gui/load_pipe_pin')
         async def load_pipe_pin(req:Request, res:Response):
-            signin = web.check_signin(req, res)
+            signin = web.signin.check_signin(req, res)
             if signin is not None:
                 raise HTTPException(status_code=401, detail=self.DEFAULT_401_MESSAGE)
             if 'signin' not in req.session or req.session['signin'] is None:

cmdbox/app/features/web/cmdbox_web_load_pipe.py

@@ -17,7 +17,7 @@ class LoadPipe(feature.WebFeature):
         """
         @app.post('/gui/load_pipe')
         async def load_pipe(req:Request, res:Response):
-            signin = web.check_signin(req, res)
+            signin = web.signin.check_signin(req, res)
             if signin is not None:
                 raise HTTPException(status_code=401, detail=self.DEFAULT_401_MESSAGE)
             form = await req.form()

cmdbox/app/features/web/cmdbox_web_raw_cmd.py

@@ -18,7 +18,7 @@ class RawCmd(cmdbox_web_gui.Gui):
         """
         @app.post('/gui/raw_cmd')
         async def raw_cmd(req:Request, res:Response):
-            signin = web.check_signin(req, res)
+            signin = web.signin.check_signin(req, res)
             if signin is not None:
                 raise HTTPException(status_code=401, detail=self.DEFAULT_401_MESSAGE)
             form = await req.form()

cmdbox/app/features/web/cmdbox_web_raw_pipe.py

@@ -18,7 +18,7 @@ class RawPipe(cmdbox_web_raw_cmd.RawCmd, cmdbox_web_load_cmd.LoadCmd):
         """
         @app.post('/gui/raw_pipe')
         async def raw_pipe(req:Request, res:Response):
-            signin = web.check_signin(req, res)
+            signin = web.signin.check_signin(req, res)
             if signin is not None:
                 raise HTTPException(status_code=401, detail=self.DEFAULT_401_MESSAGE)
             form = await req.form()

cmdbox/app/features/web/cmdbox_web_result.py

@@ -23,7 +23,7 @@ class Result(feature.WebFeature):
 
         @app.post('/result/pub')
         async def result(req:Request, res:Response):
-            signin = web.check_signin(req, res)
+            signin = web.signin.check_signin(req, res)
             if signin is not None:
                 return signin
             form = await req.form()
@@ -39,7 +39,7 @@ class Result(feature.WebFeature):
         @app.post('/result', response_class=HTMLResponse)
         @app.get('/result', response_class=HTMLResponse)
         async def result_html(req:Request, res:Response):
-            signin = web.check_signin(req, res)
+            signin = web.signin.check_signin(req, res)
             if signin is not None:
                 return signin
             res.headers['Access-Control-Allow-Origin'] = '*'

cmdbox/app/features/web/cmdbox_web_save_cmd.py

@@ -16,7 +16,7 @@ class SaveCmd(feature.WebFeature):
         """
         @app.post('/gui/save_cmd')
         async def save_cmd(req:Request, res:Response):
-            signin = web.check_signin(req, res)
+            signin = web.signin.check_signin(req, res)
             if signin is not None:
                 raise HTTPException(status_code=401, detail=self.DEFAULT_401_MESSAGE)
             form = await req.form()

cmdbox/app/features/web/cmdbox_web_save_pin.py

@@ -15,7 +15,7 @@ class SavePin(feature.WebFeature):
         """
         @app.post('/gui/save_cmd_pin')
         async def save_cmd_pin(req:Request, res:Response):
-            signin = web.check_signin(req, res)
+            signin = web.signin.check_signin(req, res)
             if signin is not None:
                 raise HTTPException(status_code=401, detail=self.DEFAULT_401_MESSAGE)
             if 'signin' not in req.session or req.session['signin'] is None:
@@ -29,7 +29,7 @@ class SavePin(feature.WebFeature):
 
         @app.post('/gui/save_pipe_pin')
         async def save_pipe_pin(req:Request, res:Response):
-            signin = web.check_signin(req, res)
+            signin = web.signin.check_signin(req, res)
             if signin is not None:
                 raise HTTPException(status_code=401, detail=self.DEFAULT_401_MESSAGE)
             if 'signin' not in req.session or req.session['signin'] is None:

cmdbox/app/features/web/cmdbox_web_save_pipe.py

@@ -16,7 +16,7 @@ class SavePipe(feature.WebFeature):
         """
         @app.post('/gui/save_pipe')
         async def save_pipe(req:Request, res:Response):
-            signin = web.check_signin(req, res)
+            signin = web.signin.check_signin(req, res)
             if signin is not None:
                 raise HTTPException(status_code=401, detail=self.DEFAULT_401_MESSAGE)
             form = await req.form()

cmdbox/app/features/web/cmdbox_web_signin.py

@@ -15,7 +15,7 @@ class Signin(feature.WebFeature):
             web (Web): Webオブジェクト
             app (FastAPI): FastAPIオブジェクト
         """
-        web.load_signin_file()
+        web.signin.signin_file_data = web.signin.load_signin_file(web.signin_file, web.signin.get_data())
         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})')
@@ -24,8 +24,8 @@ class Signin(feature.WebFeature):
 
         @app.get('/signin/{next}', response_class=HTMLResponse)
         @app.post('/signin/{next}', response_class=HTMLResponse)
-        async def signin(next:str, req:Request, res:Response):
-            web.enable_cors(req, res)
+        async def _signin(next:str, req:Request, res:Response):
+            web.signin.enable_cors(req, res)
             res.headers['Access-Control-Allow-Origin'] = '*'
             return web.signin_html_data
 
@@ -34,7 +34,7 @@ class Signin(feature.WebFeature):
         async def oauth2_google(next:str, req:Request, res:Response):
             if web.signin_html_data is None:
                 return RedirectResponse(url=f'../../{next}') # nginxのリバプロ対応のための相対パス
-            conf = web.signin_file_data['oauth2']['providers']['google']
+            conf = web.signin.get_data()['oauth2']['providers']['google']
             data = {'scope': ' '.join(conf['scope']),
                     'access_type': 'offline',
                     'response_type': 'code',
@@ -49,7 +49,7 @@ class Signin(feature.WebFeature):
         async def oauth2_github(next:str, req:Request, res:Response):
             if web.signin_html_data is None:
                 return RedirectResponse(url=f'../../{next}') # nginxのリバプロ対応のための相対パス
-            conf = web.signin_file_data['oauth2']['providers']['github']
+            conf = web.signin.get_data()['oauth2']['providers']['github']
             data = {'scope': ' '.join(conf['scope']),
                     'access_type': 'offline',
                     'response_type': 'code',
@@ -59,9 +59,27 @@ class Signin(feature.WebFeature):
             query = '&'.join([f'{k}={urllib.parse.quote(v)}' for k, v in data.items()])
             return RedirectResponse(url=f'https://github.com/login/oauth/authorize?{query}')
 
+        # https://learn.microsoft.com/ja-jp/entra/identity-platform/v2-oauth2-auth-code-flow
+        @app.get('/oauth2/azure/{next}')
+        async def oauth2_azure(next:str, req:Request, res:Response):
+            if web.signin_html_data is None:
+                return RedirectResponse(url=f'../../{next}') # nginxのリバプロ対応のための相対パス
+            conf = web.signin.get_data()['oauth2']['providers']['azure']
+            data = {'scope': ' '.join(conf['scope']),
+                    'access_type': 'offline',
+                    'response_type': 'code',
+                    'redirect_uri': conf['redirect_uri'],
+                    'client_id': conf['client_id'],
+                    'response_mode': 'query',
+                    'state': next}
+            query = '&'.join([f'{k}={urllib.parse.quote(v)}' for k, v in data.items()])
+            return RedirectResponse(url=f'https://login.microsoftonline.com/{conf["tenant_id"]}/oauth2/v2.0/authorize?{query}')
+
         @app.get('/oauth2/enabled')
         async def oauth2_enabled(req:Request, res:Response):
             if web.signin_html_data is None:
-                return dict(google=False, github=False)
-            return dict(google=web.signin_file_data['oauth2']['providers']['google']['enabled'],
-                        github=web.signin_file_data['oauth2']['providers']['github']['enabled'])
+                return dict(google=False, github=False, azure=False)
+            signin_data = web.signin.get_data()
+            return dict(google=signin_data['oauth2']['providers']['google']['enabled'],
+                        github=signin_data['oauth2']['providers']['github']['enabled'],
+                        azure=signin_data['oauth2']['providers']['azure']['enabled'],)

cmdbox/app/features/web/cmdbox_web_users.py

@@ -1,10 +1,8 @@
-from cmdbox import version
-from cmdbox.app import common, feature
+from cmdbox.app import feature
 from cmdbox.app.web import Web
-from fastapi import FastAPI, Request, Response, HTTPException
-from fastapi.responses import HTMLResponse, PlainTextResponse, RedirectResponse
+from fastapi import FastAPI, Request, Response
+from fastapi.responses import HTMLResponse
 from typing import Dict, Any
-import logging
 
 
 class Users(feature.WebFeature):
@@ -26,7 +24,7 @@ class Users(feature.WebFeature):
         @app.get('/users', response_class=HTMLResponse)
         @app.post('/users', response_class=HTMLResponse)
         async def users(req:Request, res:Response):
-            signin = web.check_signin(req, res)
+            signin = web.signin.check_signin(req, res)
             if signin is not None:
                 return signin
             res.headers['Access-Control-Allow-Origin'] = '*'
@@ -34,19 +32,19 @@ class Users(feature.WebFeature):
 
         @app.get('/users/list')
         async def users_list(req:Request, res:Response):
-            signin = web.check_signin(req, res)
+            signin = web.signin.check_signin(req, res)
             if signin is not None:
                 return signin
-            if web.signin_file_data is None:
+            if web.signin.get_data() is None:
                 return dict(error='signin_file_data is None.')
             return web.user_list(None)
 
         @app.post('/users/add')
         async def users_add(req:Request, res:Response):
-            signin = web.check_signin(req, res)
+            signin = web.signin.check_signin(req, res)
             if signin is not None:
                 return signin
-            if web.signin_file_data is None:
+            if web.signin.get_data() is None:
                 return dict(error='signin_file_data is None.')
             form = await req.json()
             try:
@@ -57,10 +55,10 @@ class Users(feature.WebFeature):
 
         @app.post('/users/edit')
         async def users_edit(req:Request, res:Response):
-            signin = web.check_signin(req, res)
+            signin = web.signin.check_signin(req, res)
             if signin is not None:
                 return signin
-            if web.signin_file_data is None:
+            if web.signin.get_data() is None:
                 return dict(error='signin_file_data is None.')
             form = await req.json()
             try:
@@ -71,10 +69,10 @@ class Users(feature.WebFeature):
 
         @app.post('/users/del')
         async def users_del(req:Request, res:Response):
-            signin = web.check_signin(req, res)
+            signin = web.signin.check_signin(req, res)
             if signin is not None:
                 return signin
-            if web.signin_file_data is None:
+            if web.signin.get_data() is None:
                 return dict(error='signin_file_data is None.')
             form = await req.json()
             try:
@@ -87,10 +85,10 @@ class Users(feature.WebFeature):
 
         @app.post('/users/apikey/add')
         async def users_apikey_add(req:Request, res:Response):
-            signin = web.check_signin(req, res)
+            signin = web.signin.check_signin(req, res)
             if signin is not None:
                 return signin
-            if web.signin_file_data is None:
+            if web.signin.get_data() is None:
                 return dict(error='signin_file_data is None.')
             form = await req.json()
             try:
@@ -101,10 +99,10 @@ class Users(feature.WebFeature):
 
         @app.post('/users/apikey/del')
         async def users_apikey_del(req:Request, res:Response):
-            signin = web.check_signin(req, res)
+            signin = web.signin.check_signin(req, res)
             if signin is not None:
                 return signin
-            if web.signin_file_data is None:
+            if web.signin.get_data() is None:
                 return dict(error='signin_file_data is None.')
             form = await req.json()
             try:
@@ -115,10 +113,10 @@ class Users(feature.WebFeature):
 
         @app.get('/groups/list')
         async def groups_list(req:Request, res:Response):
-            signin = web.check_signin(req, res)
+            signin = web.signin.check_signin(req, res)
             if signin is not None:
                 return signin
-            if web.signin_file_data is None:
+            if web.signin.get_data() is None:
                 return dict(error='signin_file_data is None.')
             try:
                 return web.group_list(None)
@@ -127,10 +125,10 @@ class Users(feature.WebFeature):
 
         @app.post('/groups/add')
         async def groups_add(req:Request, res:Response):
-            signin = web.check_signin(req, res)
+            signin = web.signin.check_signin(req, res)
             if signin is not None:
                 return signin
-            if web.signin_file_data is None:
+            if web.signin.get_data() is None:
                 return dict(error='signin_file_data is None.')
             form = await req.json()
             try:
@@ -141,10 +139,10 @@ class Users(feature.WebFeature):
 
         @app.post('/groups/edit')
         async def groups_edit(req:Request, res:Response):
-            signin = web.check_signin(req, res)
+            signin = web.signin.check_signin(req, res)
             if signin is not None:
                 return signin
-            if web.signin_file_data is None:
+            if web.signin.get_data() is None:
                 return dict(error='signin_file_data is None.')
             form = await req.json()
             try:
@@ -155,10 +153,10 @@ class Users(feature.WebFeature):
 
         @app.post('/groups/del')
         async def groups_del(req:Request, res:Response):
-            signin = web.check_signin(req, res)
+            signin = web.signin.check_signin(req, res)
             if signin is not None:
                 return signin
-            if web.signin_file_data is None:
+            if web.signin.get_data() is None:
                 return dict(error='signin_file_data is None.')
             form = await req.json()
             try:
@@ -171,46 +169,46 @@ class Users(feature.WebFeature):
 
         @app.get('/cmdrules/list')
         async def cmdrules_list(req:Request, res:Response):
-            signin = web.check_signin(req, res)
+            signin = web.signin.check_signin(req, res)
             if signin is not None:
                 return signin
-            if web.signin_file_data is None:
+            if web.signin.get_data() is None:
                 return dict(error='signin_file_data is None.')
             try:
-                return web.signin_file_data['cmdrule']
+                return web.signin.get_data()['cmdrule']
             except Exception as e:
                 return dict(error=str(e))
 
         @app.get('/pathrules/list')
         async def pathrules_list(req:Request, res:Response):
-            signin = web.check_signin(req, res)
+            signin = web.signin.check_signin(req, res)
             if signin is not None:
                 return signin
-            if web.signin_file_data is None:
+            if web.signin.get_data() is None:
                 return dict(error='signin_file_data is None.')
             try:
-                return web.signin_file_data['pathrule']
+                return web.signin.get_data()['pathrule']
             except Exception as e:
                 return dict(error=str(e))
 
         @app.get('/passsetting/list')
         async def passsetting_list(req:Request, res:Response):
-            signin = web.check_signin(req, res)
+            signin = web.signin.check_signin(req, res)
             if signin is not None:
                 return signin
-            if web.signin_file_data is None:
+            if web.signin.get_data() is None:
                 return dict(error='signin_file_data is None.')
             try:
-                return web.signin_file_data['password']
+                return web.signin.get_data()['password']
             except Exception as e:
                 return dict(error=str(e))
 
         @app.post('/password/change')
         async def password_change(req:Request, res:Response):
-            signin = web.check_signin(req, res)
+            signin = web.signin.check_signin(req, res)
             if signin is not None:
                 return signin
-            if web.signin_file_data is None:
+            if web.signin.get_data() is None:
                 return dict(error='signin_file_data is None.')
             form = await req.json()
             try:

cmdbox/app/features/web/cmdbox_web_versions_cmdbox.py

@@ -15,7 +15,7 @@ class VersionsCmdbox(feature.WebFeature):
         """
         @app.get('/versions_cmdbox')
         async def versions_cmdbox(req:Request, res:Response):
-            signin = web.check_signin(req, res)
+            signin = web.signin.check_signin(req, res)
             if signin is not None:
                 raise HTTPException(status_code=401, detail=self.DEFAULT_401_MESSAGE)
             logo = [version.__logo__]

cmdbox/app/features/web/cmdbox_web_versions_used.py

@@ -16,7 +16,7 @@ class VersionsUsed(feature.WebFeature):
         """
         @app.get('/versions_used')
         async def versions_used(req:Request, res:Response):
-            signin = web.check_signin(req, res)
+            signin = web.signin.check_signin(req, res)
             if signin is not None:
                 raise HTTPException(status_code=401, detail=self.DEFAULT_401_MESSAGE)
 

cmdbox/app/options.py

@@ -274,18 +274,16 @@ class Options:
             discription_ja="コマンドを指定します。",
             discription_en="Specify the command.",
             choice=[])
-        self._options["output_json"] = dict(
-            short="o", type=Options.T_FILE, default=None, required=False, multi=False, hide=True, choice=None, fileio="out",
-            discription_ja="処理結果jsonの保存先ファイルを指定。",
-            discription_en="Specify the destination file for saving the processing result json.")
-        self._options["output_json_append"] = dict(
-            short="a", type=Options.T_BOOL, default=False, required=False, multi=False, hide=True, choice=[True, False],
-            discription_ja="処理結果jsonファイルを追記保存します。",
-            discription_en="Save the processing result json file by appending.")
+        self._options["tag"] = dict(
+            short="t", type=Options.T_STR, default=None, required=False, multi=True, hide=True,
+            discription_ja="このコマンドのタグを指定します。",
+            discription_en="Specify the tag for this command.",
+            choice=None)
 
     def init_debugoption(self):
         # デバックオプションを追加
         self._options["debug"]["opt"] = "debug"
+        self._options["tag"]["opt"] = "tag"
         for key, mode in self._options["cmd"].items():
             if type(mode) is not dict:
                 continue
@@ -296,6 +294,8 @@ class Options:
                 c["opt"] = k
                 if "debug" not in [_o['opt'] for _o in c["choice"]]:
                     c["choice"].append(self._options["debug"])
+                if "tag" not in [_o['opt'] for _o in c["choice"]]:
+                    c["choice"].append(self._options["tag"])
                 if c["opt"] not in [_o['opt'] for _o in self._options["cmd"]["choice"]]:
                     self._options["cmd"]["choice"] += [c]
             self._options["mode"][key] = mode