cmdbox 0.8.0__tar.gz → 0.8.0.2__tar.gz

{cmdbox-0.8.0/cmdbox.egg-info → cmdbox-0.8.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cmdbox
-Version: 0.8.0
+Version: 0.8.0.2
 Summary: cmdbox: It is a command line application with a plugin mechanism.
 Author-email: hamacom2004jp <hamacom2004jp@gmail.com>
 License: MIT

{cmdbox-0.8.0 → cmdbox-0.8.0.2}/cmdbox/app/a2a.py

@@ -15,13 +15,8 @@ from typing import Callable, List, Dict, Any, Tuple
 from starlette.applications import Starlette
 from starlette.middleware.sessions import SessionMiddleware
 import argparse
-import glob
 import logging
-import locale
-import json
 import time
-import re
-import os
 
 
 class A2a(mcp.Mcp):

{cmdbox-0.8.0 → cmdbox-0.8.0.2}/cmdbox/app/features/cli/cmdbox_agent_runner_list.py

@@ -65,8 +65,12 @@ class AgentRunnerList(feature.OneshotResultEdgeFeature, validator.Validator):
         return self.RESP_SUCCESS, ret, cl
 
     def output_schema(self) -> type:
+        class RunnerInfo(pydantic.BaseModel):
+            name: str = pydantic.Field(description="ランナー名")
+            path: str = pydantic.Field(description="設定ファイルパス")
+            runner_priority: Union[int, None] = pydantic.Field(default=None, description="ランナー優先度")
         class Data(resdata.Data):
-            data: List[resdata.NamePath] = pydantic.Field(default_factory=list, description="処理結果のデータ")
+            data: List[RunnerInfo] = pydantic.Field(default_factory=list, description="処理結果のデータ")
         class Result(resdata.Result):
             success: Union[Data, None] = pydantic.Field(default=None, description="成功した場合の結果")
         return Result
@@ -100,7 +104,15 @@ class AgentRunnerList(feature.OneshotResultEdgeFeature, validator.Validator):
                     name = p.name
                     if not name.startswith('runner-') or not name.endswith('.json'):
                         continue
-                    results.append(dict(name=name[7:-5], path=str(p)))
+                    runner_info = dict(name=name[7:-5], path=str(p))
+                    try:
+                        with p.open('r', encoding='utf-8') as f:
+                            data = json.load(f)
+                            runner_info['runner_priority'] = data.get('runner_priority', 9999)
+                    except Exception as e:
+                        logger.warning(f"Failed to read runner_priority from {p}: {e}")
+                        runner_info['runner_priority'] = None
+                    results.append(runner_info)
 
             msg = dict(success=results)
             redis_cli.rpush(reskey, msg)

{cmdbox-0.8.0 → cmdbox-0.8.0.2}/cmdbox/app/features/cli/cmdbox_agent_runner_load.py

@@ -75,6 +75,7 @@ class AgentRunnerLoad(feature.OneshotResultEdgeFeature, validator.Validator):
             tts_engine: Union[str, None] = pydantic.Field(default=None, description="TTSエンジン名")
             rag: Union[List[str], None] = pydantic.Field(default=None, description="RAG設定リスト")
             voicevox_model: Union[str, None] = pydantic.Field(default=None, description="VOICEVOXモデル")
+            runner_priority: Union[int, None] = pydantic.Field(default=None, description="ランナー優先度")
         class Result(resdata.Result):
             success: Union[Data, None] = pydantic.Field(default=None, description="成功した場合の結果")
         return Result

{cmdbox-0.8.0 → cmdbox-0.8.0.2}/cmdbox/app/features/cli/cmdbox_agent_runner_save.py

@@ -25,22 +25,6 @@ class AgentRunnerSave(feature.OneshotResultEdgeFeature, validator.Validator, lim
         return 'runner_save'
 
     def get_option(self) -> Dict[str, Any]:
-        is_japan = common.is_japan(language=self.language)
-        description = f"{self.ver.__appid__}に登録されているコマンド提供"
-        description = description if is_japan else f"Provides commands registered in {self.ver.__appid__}"
-        instruction = f"あなたはコマンドの意味を熟知しているエキスパートです。" + \
-                      f"ユーザーがコマンドを実行したいとき、あなたは以下の手順に従ってコマンドを確実に実行してください。\n" + \
-                      f"1. ユーザーのクエリからが実行したいコマンドを特定します。\n" + \
-                      f"2. コマンド実行に必要なパラメータのなかで、ユーザーのクエリから取得できないものは、コマンド定義にあるデフォルト値を指定して実行してください。\n" + \
-                      f"3. もしエラーが発生した場合は、ユーザーにコマンド名とパラメータとエラー内容を提示してください。\n" \
-                      f"4. コマンドの実行結果は、json文字列で出力するようにしてください。この時json文字列は「```json」と「```」で囲んだ文字列にしてください。\n"
-        instruction = instruction if is_japan else \
-                      f"You are the expert who knows what the commands mean." + \
-                      f"When a user wants to execute a command, you follow these steps to ensure that the command is executed.\n" + \
-                      f"1. Identify the command you want to execute from the user's query.\n" + \
-                      f"2. Any parameters required to execute the command that cannot be obtained from the user's query should be executed with the default values provided in the command definition.\n" + \
-                      f"3. If an error occurs, provide the user with the command name, parameters, and error description.\n" \
-                      f"4. The result of the command execution should be output as a json string. The json string should be a string enclosed in '```json' and '```'."
         return dict(
             use_redis=self.USE_REDIS_TRUE, nouse_webmode=False, use_agent=False,
             description_ja="Runner 設定を保存します。",
@@ -78,6 +62,9 @@ class AgentRunnerSave(feature.OneshotResultEdgeFeature, validator.Validator, lim
                     choice_fn=self.choice_ds,
                     description_ja="セッションの保存先データソースを指定します。",
                     description_en="Specify the data source where sessions will be saved."),
+                dict(opt="runner_priority", type=Options.T_INT, default=9999, required=True, multi=False, hide=False, choice=None,
+                     description_ja="Runnerを使用するときの優先度を指定します。小さい値ほど優先されます。",
+                     description_en="Specifies the priority when using the runner. Lower values indicate higher priority."),
                 dict(opt="tts_engine", type=Options.T_STR, default="voicevox", required=True, multi=False, hide=False,
                      choice=["", "voicevox"],
                      choice_show=dict(voicevox=["voicevox_ver", "voicevox_whl"]),
@@ -147,6 +134,7 @@ class AgentRunnerSave(feature.OneshotResultEdgeFeature, validator.Validator, lim
             voicevox_model=args.voicevox_model if hasattr(args, 'voicevox_model') else None,
             rag=list(set(args.rag)) if hasattr(args, 'rag') and args.rag is not None else None,
             session_datasource=args.session_datasource if hasattr(args, 'session_datasource') else None,
+            runner_priority=args.runner_priority if hasattr(args, 'runner_priority') else 1,
         )
 
         payload_b64 = convert.str2b64str(common.to_str(configure))

{cmdbox-0.8.0 → cmdbox-0.8.0.2}/cmdbox/app/features/cli/cmdbox_llm_translation.py

@@ -249,7 +249,7 @@ class LLMTranslation(cmdbox_llm_chat.LLMChat):
             )
             if st != self.RESP_SUCCESS:
                 return st, chat_result
-
+            content = ''
             try:
                 data = chat_result.get('success', {}).get('data', [])
                 if data:
@@ -265,7 +265,7 @@ class LLMTranslation(cmdbox_llm_chat.LLMChat):
                     if not nosave:
                         self._save_cache(data_dir, cache)
             except Exception as e:
-                logger.warning(f"Failed to parse LLM translation response: {e}", exc_info=True)
+                logger.warning(f"Failed to parse LLM translation response: {e}: {content}", exc_info=True)
                 # キャッシュ保存は失敗しても既キャッシュ分は返す
 
         result = {w: lang_cache.get(w, w) for w in words}

cmdbox-0.8.0.2/cmdbox/app/features/cli/cmdbox_url_add.py

@@ -0,0 +1,137 @@
+from cmdbox.app import common, feature
+from cmdbox.app.commons import resdata, validator
+from cmdbox.app.options import Options
+from pathlib import Path
+from typing import Dict, Any, Tuple, List, Union
+from datetime import datetime, timedelta
+import argparse
+import logging
+import json
+import pydantic
+import random
+import string
+
+
+class UrlAdd(feature.OneshotResultEdgeFeature, validator.Validator):
+    def __init__(self, appcls, ver, language=None):
+        super().__init__(appcls, ver, language)
+
+    def get_mode(self) -> Union[str, List[str]]:
+        """
+        この機能のモードを返します
+
+        Returns:
+            Union[str, List[str]]: モード
+        """
+        return 'url'
+
+    def get_cmd(self) -> str:
+        """
+        この機能のコマンドを返します
+
+        Returns:
+            str: コマンド
+        """
+        return 'add'
+    
+    def get_option(self) -> Dict[str, Any]:
+        """
+        この機能のオプションを返します
+
+        Returns:
+            Dict[str, Any]: オプション
+        """
+        return dict(
+            use_redis=self.USE_REDIS_FALSE, nouse_webmode=False, use_agent=False,
+            description_ja="短縮URLを追加します。target_urlとperiodを指定すると、url_idが生成され、.urlsフォルダにurl_id.jsonファイルが作成されます。",
+            description_en="Add a short URL. When target_url and period are specified, a url_id is generated and a url_id.json file is created in the .urls folder.",
+            choice=[
+                dict(opt="base_url", type=Options.T_STR, default=None, required=True, multi=False, hide=False, choice=None,
+                     description_ja="短縮URLのベースURLを指定します。",
+                     description_en="Specify the base URL for the short URL."),
+                dict(opt="target_url", type=Options.T_STR, default=None, required=True, multi=False, hide=False, choice=None,
+                     description_ja="短縮URLのリダイレクト先となるURLを指定します。",
+                     description_en="Specify the URL that the short URL will redirect to."),
+                dict(opt="period", type=Options.T_INT, default=3600*24*30, required=False, multi=False, hide=False, choice=None,
+                     description_ja="短縮URLの有効期限の秒数を指定します。デフォルトは1か月（2592000秒）です。",
+                     description_en="Specify the validity period in seconds. Default is 1 month (2592000 seconds)."),
+            ]
+        )
+
+    @validator.apprun_check
+    def apprun(self, logger: logging.Logger, args: argparse.Namespace, tm: float, pf: List[Dict[str, float]] = []) -> Tuple[int, Dict[str, Any], Any]:
+        """
+        この機能の実行を行います
+
+        Args:
+            logger (logging.Logger): ロガー
+            args (argparse.Namespace): 引数
+            tm (float): 実行開始時間
+            pf (List[Dict[str, float]]): 呼出元のパフォーマンス情報
+
+        Returns:
+            Tuple[int, Dict[str, Any], Any]: 終了コード, 結果, オブジェクト
+        """
+        try:
+            # url_idを生成（8文字の英数字）
+            url_id = common.random_string(size=8)
+            
+            # .urlsフォルダを作成
+            urls_dir = Path(self.default_data) / '.urls'
+            urls_dir.mkdir(parents=True, exist_ok=True)
+            
+            # JSONファイルのパスを指定
+            json_file = urls_dir / f"{url_id}.json"
+            
+            # 保存するデータを作成
+            saved_at = datetime.now()
+            period = args.period if hasattr(args, 'period') and args.period else 3600*24*30
+            period_dt = (saved_at + timedelta(seconds=period)).isoformat()
+            url_data = {
+                "url_id": url_id,
+                "short_url": f'{args.base_url.rstrip("/")}/ru/{url_id}',
+                "target_url": args.target_url,
+                "base_url": args.base_url,
+                "period": period,
+                "saved_at": saved_at.isoformat(),
+                "period_dt": period_dt
+            }
+            # JSONファイルを保存
+            common.save_file(json_file, lambda f: json.dump(url_data, f, default=common.default_json_enc), nolock=False)
+            # 結果を返す
+            msg = dict(success=dict(data=dict(
+                url_id=url_id,
+                short_url=url_data["short_url"],
+                target_url=args.target_url,
+                base_url=args.base_url,
+                period=url_data["period"],
+                saved_at=url_data["saved_at"],
+                period_dt=url_data["period_dt"],
+                file_path=str(json_file),
+                msg=f"Short URL added. url_id={url_id}"
+            )))
+            common.print_format(msg, args.format, tm, args.output_json, args.output_json_append, pf=pf)
+            return self.RESP_SUCCESS, msg, None
+        except Exception as e:
+            msg = dict(warn=f"{e}")
+            logger.error(f"Error in url_add: {e}", exc_info=True)
+            common.print_format(msg, args.format, tm, args.output_json, args.output_json_append, pf=pf)
+            return self.RESP_WARN, msg, None
+
+    def output_schema(self) -> type:
+
+        class UrlData(resdata.Base):
+            url_id: Union[str, None] = pydantic.Field(default=None, description="生成されたURL ID")
+            short_url: Union[str, None] = pydantic.Field(default=None, description="生成された短縮URL")
+            target_url: Union[str, None] = pydantic.Field(default=None, description="リダイレクト先URL")
+            base_url: Union[str, None] = pydantic.Field(default=None, description="短縮URLのベースURL")
+            period: Union[int, None] = pydantic.Field(default=None, description="有効期限の秒数")
+            saved_at: Union[str, None] = pydantic.Field(default=None, description="保存日時")
+            period_dt: Union[str, None] = pydantic.Field(default=None, description="期限切れ日時")
+            file_path: Union[str, None] = pydantic.Field(default=None, description="作成されたJSONファイルのパス")
+            msg: Union[str, None] = pydantic.Field(default=None, description="処理結果のメッセージ")
+        class Data(resdata.Data):
+            data: Union[UrlData, None] = pydantic.Field(default=None, description="URL情報")
+        class Result(resdata.Result):
+            success: Union[Data, None] = pydantic.Field(default=None, description="成功した場合の結果")
+        return Result

cmdbox-0.8.0.2/cmdbox/app/features/cli/cmdbox_url_del.py

@@ -0,0 +1,99 @@
+from cmdbox.app import common, feature
+from cmdbox.app.commons import resdata, validator
+from cmdbox.app.options import Options
+from pathlib import Path
+from typing import Dict, Any, Tuple, List, Union
+import argparse
+import logging
+import pydantic
+
+
+class UrlDel(feature.OneshotResultEdgeFeature, validator.Validator):
+    def __init__(self, appcls, ver, language=None):
+        super().__init__(appcls, ver, language)
+
+    def get_mode(self) -> Union[str, List[str]]:
+        """
+        この機能のモードを返します
+
+        Returns:
+            Union[str, List[str]]: モード
+        """
+        return 'url'
+
+    def get_cmd(self) -> str:
+        """
+        この機能のコマンドを返します
+
+        Returns:
+            str: コマンド
+        """
+        return 'del'
+    
+    def get_option(self) -> Dict[str, Any]:
+        """
+        この機能のオプションを返します
+
+        Returns:
+            Dict[str, Any]: オプション
+        """
+        return dict(
+            use_redis=self.USE_REDIS_FALSE, nouse_webmode=False, use_agent=False,
+            description_ja="短縮URLを削除します。指定されたurl_idのJSONファイルを削除します。",
+            description_en="Delete a short URL. Removes the JSON file for the specified url_id.",
+            choice=[
+                dict(opt="url_id", type=Options.T_STR, default=None, required=True, multi=False, hide=False, choice=None,
+                     description_ja="削除する短縮URLのurl_idを指定します。",
+                     description_en="Specify the url_id of the short URL to delete."),
+            ]
+        )
+
+    @validator.apprun_check
+    def apprun(self, logger: logging.Logger, args: argparse.Namespace, tm: float, pf: List[Dict[str, float]] = []) -> Tuple[int, Dict[str, Any], Any]:
+        """
+        この機能の実行を行います
+
+        Args:
+            logger (logging.Logger): ロガー
+            args (argparse.Namespace): 引数
+            tm (float): 実行開始時間
+            pf (List[Dict[str, float]]): 呼出元のパフォーマンス情報
+
+        Returns:
+            Tuple[int, Dict[str, Any], Any]: 終了コード, 結果, オブジェクト
+        """
+        try:
+            # JSONファイルのパスを指定
+            urls_dir = Path(self.default_data) / '.urls'
+            json_file = urls_dir / f"{args.url_id}.json"
+            
+            # ファイルが存在するか確認
+            if not json_file.exists():
+                msg = dict(warn=f"Short URL '{args.url_id}' not found at '{json_file}'.")
+                logger.warning(msg['warn'])
+                common.print_format(msg, args.format, tm, args.output_json, args.output_json_append, pf=pf)
+                return self.RESP_WARN, msg, None
+            
+            # ファイルを削除
+            json_file.unlink()
+            
+            # 結果を返す
+            msg = dict(success=dict(
+                url_id=args.url_id,
+                msg=f"Short URL '{args.url_id}' deleted."
+            ))
+            common.print_format(msg, args.format, tm, args.output_json, args.output_json_append, pf=pf)
+            return self.RESP_SUCCESS, msg, None
+        except Exception as e:
+            msg = dict(warn=f"{e}")
+            logger.error(f"Error in url_del: {e}", exc_info=True)
+            common.print_format(msg, args.format, tm, args.output_json, args.output_json_append, pf=pf)
+            return self.RESP_WARN, msg, None
+
+    def output_schema(self) -> type:
+        class Data(resdata.Data):
+            url_id: Union[str, None] = pydantic.Field(default=None, description="削除されたURL ID")
+            msg: Union[str, None] = pydantic.Field(default=None, description="処理結果のメッセージ")
+        class Result(resdata.Result):
+            success: Union[Data, None] = pydantic.Field(default=None, description="成功した場合の結果")
+        return Result

cmdbox-0.8.0.2/cmdbox/app/features/cli/cmdbox_url_list.py

@@ -0,0 +1,121 @@
+from cmdbox.app import common, feature
+from cmdbox.app.commons import cache, resdata, validator
+from cmdbox.app.options import Options
+from pathlib import Path
+from typing import Dict, Any, Tuple, List, Union
+import argparse
+import logging
+import json
+import pydantic
+
+
+class UrlList(feature.OneshotResultEdgeFeature, validator.Validator):
+    def __init__(self, appcls, ver, language=None):
+        super().__init__(appcls, ver, language)
+
+    def get_mode(self) -> Union[str, List[str]]:
+        """
+        この機能のモードを返します
+
+        Returns:
+            Union[str, List[str]]: モード
+        """
+        return 'url'
+
+    def get_cmd(self) -> str:
+        """
+        この機能のコマンドを返します
+
+        Returns:
+            str: コマンド
+        """
+        return 'list'
+    
+    def get_option(self) -> Dict[str, Any]:
+        """
+        この機能のオプションを返します
+
+        Returns:
+            Dict[str, Any]: オプション
+        """
+        return dict(
+            use_redis=self.USE_REDIS_FALSE, nouse_webmode=False, use_agent=False,
+            description_ja="登録済みの短縮URLを一覧表示します。",
+            description_en="Lists registered short URLs.",
+            choice=[
+                dict(opt="kwd", type=Options.T_STR, default=None, required=False, multi=False, hide=False, choice=None,
+                     description_ja="検索したいurl_idを指定します。中間マッチで検索します。",
+                     description_en="Specify the url_id to search for. Searches for partial matches."),
+            ]
+        )
+
+    @cache.apprun_cache(exclude_fn=lambda args: hasattr(args,'kwd') and args.kwd)
+    @validator.apprun_check
+    def apprun(self, logger: logging.Logger, args: argparse.Namespace, tm: float, pf: List[Dict[str, float]] = []) -> Tuple[int, Dict[str, Any], Any]:
+        """
+        この機能の実行を行います
+
+        Args:
+            logger (logging.Logger): ロガー
+            args (argparse.Namespace): 引数
+            tm (float): 実行開始時間
+            pf (List[Dict[str, float]]): 呼出元のパフォーマンス情報
+
+        Returns:
+            Tuple[int, Dict[str, Any], Any]: 終了コード, 結果, オブジェクト
+        """
+        try:
+            results: List[Dict[str, Any]] = []
+            
+            # .urlsフォルダを確認
+            urls_dir = Path(self.default_data) / '.urls'
+            if not urls_dir.exists():
+                msg = dict(success=dict(data=results, msg="No URLs found."))
+                common.print_format(msg, args.format, tm, args.output_json, args.output_json_append, pf=pf)
+                return self.RESP_SUCCESS, msg, None
+            
+            # キーワード検索の設定
+            kwd = args.kwd if hasattr(args, 'kwd') and args.kwd else '*'
+            
+            # JSONファイルを読み込み
+            for json_file in sorted(urls_dir.glob(f"{kwd}.json")):
+                try:
+                    with json_file.open('r', encoding='utf-8') as f:
+                        url_data = json.load(f)
+                    results.append(dict(
+                        url_id=url_data.get('url_id', json_file.stem),
+                        short_url=url_data.get('short_url', None),
+                        target_url=url_data.get('target_url', None),
+                        base_url=url_data.get('base_url', None),
+                        period=url_data.get('period', None),
+                        saved_at=url_data.get('saved_at', None),
+                        period_dt=url_data.get('period_dt', None),
+                    ))
+                except Exception as e:
+                    logger.warning(f"Error reading {json_file}: {e}")
+            
+            # 結果を返す
+            msg = dict(success=dict(data=results, msg=f"Found {len(results)} URL(s)."))
+            common.print_format(msg, args.format, tm, args.output_json, args.output_json_append, pf=pf)
+            return self.RESP_SUCCESS, msg, None
+        except Exception as e:
+            msg = dict(warn=f"{e}")
+            logger.error(f"Error in url_list: {e}", exc_info=True)
+            common.print_format(msg, args.format, tm, args.output_json, args.output_json_append, pf=pf)
+            return self.RESP_WARN, msg, None
+
+    def output_schema(self) -> type:
+        class UrlInfo(resdata.Base):
+            url_id: Union[str, None] = pydantic.Field(default=None, description="URL ID")
+            short_url: Union[str, None] = pydantic.Field(default=None, description="生成された短縮URL")
+            target_url: Union[str, None] = pydantic.Field(default=None, description="リダイレクト先URL")
+            base_url: Union[str, None] = pydantic.Field(default=None, description="短縮URLのベースURL")
+            period: Union[int, None] = pydantic.Field(default=None, description="有効期限の秒数")
+            saved_at: Union[str, None] = pydantic.Field(default=None, description="保存日時")
+            period_dt: Union[str, None] = pydantic.Field(default=None, description="期限切れ日時")
+        class Data(resdata.Data):
+            data: Union[List[UrlInfo], None] = pydantic.Field(default=None, description="URL情報のリスト")
+            msg: Union[str, None] = pydantic.Field(default=None, description="処理結果のメッセージ")
+        class Result(resdata.Result):
+            success: Union[Data, None] = pydantic.Field(default=None, description="成功した場合の結果")
+        return Result

cmdbox-0.8.0.2/cmdbox/app/features/cli/cmdbox_url_load.py

@@ -0,0 +1,118 @@
+from cmdbox.app import common, feature
+from cmdbox.app.commons import cache, resdata, validator
+from cmdbox.app.options import Options
+from pathlib import Path
+from typing import Dict, Any, Tuple, List, Union
+from datetime import datetime
+import argparse
+import logging
+import json
+import pydantic
+
+
+class UrlLoad(feature.OneshotResultEdgeFeature, validator.Validator):
+    def __init__(self, appcls, ver, language=None):
+        super().__init__(appcls, ver, language)
+
+    def get_mode(self) -> Union[str, List[str]]:
+        """
+        この機能のモードを返します
+
+        Returns:
+            Union[str, List[str]]: モード
+        """
+        return 'url'
+
+    def get_cmd(self) -> str:
+        """
+        この機能のコマンドを返します
+
+        Returns:
+            str: コマンド
+        """
+        return 'load'
+    
+    def get_option(self) -> Dict[str, Any]:
+        """
+        この機能のオプションを返します
+
+        Returns:
+            Dict[str, Any]: オプション
+        """
+        return dict(
+            use_redis=self.USE_REDIS_FALSE, nouse_webmode=False, use_agent=False,
+            description_ja="短縮URLを読み込みます。指定されたurl_idの情報を取得します。",
+            description_en="Load a short URL. Retrieves information for the specified url_id.",
+            choice=[
+                dict(opt="url_id", type=Options.T_STR, default=None, required=True, multi=False, hide=False, choice=None,
+                     description_ja="読み込む短縮URLのurl_idを指定します。",
+                     description_en="Specify the url_id of the short URL to load."),
+            ]
+        )
+
+    @cache.apprun_cache(args_key='url_id')
+    @validator.apprun_check
+    def apprun(self, logger: logging.Logger, args: argparse.Namespace, tm: float, pf: List[Dict[str, float]] = []) -> Tuple[int, Dict[str, Any], Any]:
+        """
+        この機能の実行を行います
+
+        Args:
+            logger (logging.Logger): ロガー
+            args (argparse.Namespace): 引数
+            tm (float): 実行開始時間
+            pf (List[Dict[str, float]]): 呼出元のパフォーマンス情報
+
+        Returns:
+            Tuple[int, Dict[str, Any], Any]: 終了コード, 結果, オブジェクト
+        """
+        try:
+            # JSONファイルのパスを指定
+            urls_dir = Path(self.default_data) / '.urls'
+            json_file = urls_dir / f"{args.url_id}.json"
+            
+            # ファイルが存在するか確認
+            if not json_file.exists():
+                msg = dict(warn=f"Short URL '{args.url_id}' not found at '{json_file}'.")
+                logger.warning(msg['warn'])
+                common.print_format(msg, args.format, tm, args.output_json, args.output_json_append, pf=pf)
+                return self.RESP_WARN, msg, None
+            
+            # ファイルを読み込み
+            with json_file.open('r', encoding='utf-8') as f:
+                url_data = json.load(f)
+            
+            # 期限切れをチェック
+            if 'period_dt' in url_data:
+                period_dt = datetime.fromisoformat(url_data['period_dt'])
+                if datetime.now() > period_dt:
+                    # 期限切れの場合、ファイルを削除
+                    json_file.unlink()
+                    msg = dict(warn=f"Short URL '{args.url_id}' not found at '{json_file}'.")
+                    logger.warning(msg['warn'])
+                    common.print_format(msg, args.format, tm, args.output_json, args.output_json_append, pf=pf)
+                    return self.RESP_WARN, msg, None
+            
+            # 結果を返す
+            msg = dict(success=dict(data=url_data))
+            common.print_format(msg, args.format, tm, args.output_json, args.output_json_append, pf=pf)
+            return self.RESP_SUCCESS, msg, None
+        except Exception as e:
+            msg = dict(warn=f"{e}")
+            logger.error(f"Error in url_load: {e}", exc_info=True)
+            common.print_format(msg, args.format, tm, args.output_json, args.output_json_append, pf=pf)
+            return self.RESP_WARN, msg, None
+
+    def output_schema(self) -> type:
+        class UrlData(resdata.Base):
+            url_id: Union[str, None] = pydantic.Field(default=None, description="URL ID")
+            short_url: Union[str, None] = pydantic.Field(default=None, description="生成された短縮URL")
+            target_url: Union[str, None] = pydantic.Field(default=None, description="リダイレクト先URL")
+            base_url: Union[str, None] = pydantic.Field(default=None, description="短縮URLのベースURL")
+            period: Union[int, None] = pydantic.Field(default=None, description="有効期限の秒数")
+            saved_at: Union[str, None] = pydantic.Field(default=None, description="保存日時")
+            period_dt: Union[str, None] = pydantic.Field(default=None, description="期限切れ日時")
+        class Data(resdata.Data):
+            data: Union[UrlData, None] = pydantic.Field(default=None, description="URL情報")
+        class Result(resdata.Result):
+            success: Union[Data, None] = pydantic.Field(default=None, description="成功した場合の結果")
+        return Result

{cmdbox-0.8.0 → cmdbox-0.8.0.2}/cmdbox/app/features/web/cmdbox_web_do_signin.py

@@ -29,11 +29,11 @@ class DoSignin(cmdbox_web_signin.Signin):
         @app.post('/dosignin/', response_class=HTMLResponse, responses=feature.WebFeature.DEFAULT_RESPONCE_STATES)
         async def do_signin(req:Request, res:Response):
             return await do_signin_token(None, '', req, res)
-        @app.post('/dosignin/{next}', response_class=HTMLResponse, responses=feature.WebFeature.DEFAULT_RESPONCE_STATES)
+        @app.post('/dosignin/{next:path}', response_class=HTMLResponse, responses=feature.WebFeature.DEFAULT_RESPONCE_STATES)
         async def do_signin(next:str, req:Request, res:Response):
             return await do_signin_token(None, next, req, res)
 
-        @app.get('/dosignin_token/{token}/{next}', response_class=HTMLResponse, responses=feature.WebFeature.DEFAULT_RESPONCE_STATES)
+        @app.get('/dosignin_token/{token}/{next:path}', response_class=HTMLResponse, responses=feature.WebFeature.DEFAULT_RESPONCE_STATES)
         async def do_signin_token(token:str, next:str, req:Request, res:Response):
             form = await req.form()
             name = form.get('name')
@@ -143,6 +143,7 @@ class DoSignin(cmdbox_web_signin.Signin):
             # セッションに保存
             _set_session(req, dict(uid=uid, name=name, apikeys=user.get('apikeys', None), home=user.get('home', None)),
                          email, passwd, None, group_names, group_homes, group_sps, gids)
+            next = f"../{next}" if next.find('/') >= 0 else next
             next = f"../{next}" if token_ok else next
             if notify_passchange:
                 web.options.audit_exec(req, res, web, body=dict(msg='Signin succeeded. However, you should change your password.'), audit_type='auth', user=name)
@@ -258,7 +259,7 @@ class DoSignin(cmdbox_web_signin.Signin):
                 web.logger.warning(f'Failed to get token. {e}', exc_info=True)
                 raise HTTPException(status_code=400, detail=f'Failed to get token. {e}')
 
-        @app.get('/oauth2/google/session/{access_token}/{next}', responses=feature.WebFeature.DEFAULT_RESPONCE_STATES)
+        @app.get('/oauth2/google/session/{access_token}/{next:path}', responses=feature.WebFeature.DEFAULT_RESPONCE_STATES)
         async def oauth2_google_session(access_token:str, next:str, req:Request, res:Response):
             return await oauth2_login_session(self.google_signin, access_token, next, req, res)
 
@@ -275,7 +276,7 @@ class DoSignin(cmdbox_web_signin.Signin):
                 web.logger.warning(f'Failed to get token. {e}', exc_info=True)
                 raise HTTPException(status_code=400, detail=f'Failed to get token. {e}')
 
-        @app.get('/oauth2/github/session/{access_token}/{next}', responses=feature.WebFeature.DEFAULT_RESPONCE_STATES)
+        @app.get('/oauth2/github/session/{access_token}/{next:path}', responses=feature.WebFeature.DEFAULT_RESPONCE_STATES)
         async def oauth2_github_session(access_token:str, next:str, req:Request, res:Response):
             return await oauth2_login_session(self.github_signin, access_token, next, req, res)
 
@@ -292,7 +293,7 @@ class DoSignin(cmdbox_web_signin.Signin):
                 web.logger.warning(f'Failed to get token. {e}', exc_info=True)
                 raise HTTPException(status_code=400, detail=f'Failed to get token. {e}')
 
-        @app.get('/oauth2/azure/session/{access_token}/{next}', responses=feature.WebFeature.DEFAULT_RESPONCE_STATES)
+        @app.get('/oauth2/azure/session/{access_token}/{next:path}', responses=feature.WebFeature.DEFAULT_RESPONCE_STATES)
         async def oauth2_azure_session(access_token:str, next:str, req:Request, res:Response):
             return await oauth2_login_session(self.azure_signin, access_token, next, req, res)
 
@@ -326,7 +327,7 @@ class DoSignin(cmdbox_web_signin.Signin):
             form = await req.form()
             return await saml_login_callback('azure', self.azure_saml_signin, form, None, req, res)
 
-        @app.get('/saml/azure/session/{saml_token}/{next}', responses=feature.WebFeature.DEFAULT_RESPONCE_STATES)
+        @app.get('/saml/azure/session/{saml_token}/{next:path}', responses=feature.WebFeature.DEFAULT_RESPONCE_STATES)
         async def saml_azure_session(saml_token:str, next:str, req:Request, res:Response):
             form = json.loads(convert.b64str2str(saml_token))
             return await saml_login_callback('azure', self.azure_saml_signin, form, next, req, res)