cmdbox 0.8.0.2__tar.gz → 0.8.1__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cmdbox
-Version: 0.8.0.2
+Version: 0.8.1
 Summary: cmdbox: It is a command line application with a plugin mechanism.
 Author-email: hamacom2004jp <hamacom2004jp@gmail.com>
 License: MIT
@@ -45,6 +45,7 @@ Requires-Dist: redis
 Requires-Dist: requests
 Requires-Dist: rich
 Requires-Dist: six
+Requires-Dist: starsessions[redis]
 Requires-Dist: tabulate
 Requires-Dist: uvicorn
 Requires-Dist: wsproto
@@ -153,23 +154,7 @@ apt-get install -y pkg-config libxml2-dev libxmlsec1-dev libxmlsec1-openssl buil
 
 - When using agent mode, install the modules with dependencies.
 ```bash
-pip install cmdbox[agent_mcp]
-pip install cmdbox[agent_adk]
-pip install cmdbox[agent_mem]
-pip install cmdbox[rag]
-#pip install cmdbox[omni]
-#apt-get -y install ffmpeg
-```
-
-or..
-
-```bash
-pip install "pydantic>=2.0.0,<3.0.0" "fastmcp>=2.14.4" "mcp>=1.23.0,<2.0.0"
-pip install "google-adk>=1.23.0" "a2a-sdk>=0.3.4,<0.4.0" "litellm>=1.75.5,<1.80.17"
-pip install "sentence-transformers" "sqlite_vec" "transformers>=4.48.0" "torch"
-pip install "chunklet-py[document]" "langchain_community" "markdown" "pdfplumber"
-#pip install "accelerate>=1.12.0" "qwen-omni-utils>=0.0.9" "torchvision>=0.25.0"
-#apt-get -y install ffmpeg
+pip install cmdbox[app]
 ```
 
 # Run

{cmdbox-0.8.0.2 → cmdbox-0.8.1}/README.md

@@ -54,23 +54,7 @@ apt-get install -y pkg-config libxml2-dev libxmlsec1-dev libxmlsec1-openssl buil
 
 - When using agent mode, install the modules with dependencies.
 ```bash
-pip install cmdbox[agent_mcp]
-pip install cmdbox[agent_adk]
-pip install cmdbox[agent_mem]
-pip install cmdbox[rag]
-#pip install cmdbox[omni]
-#apt-get -y install ffmpeg
-```
-
-or..
-
-```bash
-pip install "pydantic>=2.0.0,<3.0.0" "fastmcp>=2.14.4" "mcp>=1.23.0,<2.0.0"
-pip install "google-adk>=1.23.0" "a2a-sdk>=0.3.4,<0.4.0" "litellm>=1.75.5,<1.80.17"
-pip install "sentence-transformers" "sqlite_vec" "transformers>=4.48.0" "torch"
-pip install "chunklet-py[document]" "langchain_community" "markdown" "pdfplumber"
-#pip install "accelerate>=1.12.0" "qwen-omni-utils>=0.0.9" "torchvision>=0.25.0"
-#apt-get -y install ffmpeg
+pip install cmdbox[app]
 ```
 
 # Run

{cmdbox-0.8.0.2 → cmdbox-0.8.1}/cmdbox/app/auth/signin.py

@@ -1,5 +1,5 @@
 from cmdbox.app import common, options
-from cmdbox.app.commons import redis_client
+from cmdbox.app.commons import convert, redis_client
 from cryptography import x509
 from cryptography.hazmat.primitives import serialization
 from cryptography.hazmat.backends import default_backend
@@ -10,6 +10,7 @@ from typing import Dict, Any, Tuple, List, Union
 import argparse
 import copy
 import contextvars
+import datetime
 import importlib
 import inspect
 import logging
@@ -1040,6 +1041,94 @@ class Signin(object):
         """
         return self.__class__.get_email(data)
 
+    def is_open_within_period(self, group_names:List[str]) -> bool:
+        """
+        limiterモードのplan_listコマンドを実行して、
+        現在設定されている利用可能期間内かどうかを判定する関数
+
+        Args:
+            group_names (List[str]): ユーザグループ名リスト
+        Returns:
+            bool: 期間内のプランが1つでも存在する場合はTrue、それ以外はFalse
+        """
+        # buildinグループが存在する場合は期間内とみなす
+        buildin = [g.get('buildin', False) for g in self.signin_file_data['groups'] if g['name'] in group_names]
+        if any(buildin):
+            return True # buildinグループが存在する場合は期間内とみなす
+
+        # plan_listコマンドの実行ペイロードを構築
+        payload = dict(kwd='*')
+        payload_b64 = convert.str2b64str(common.to_str(payload))
+        
+        # plan_listコマンドを実行
+        ret = self.redis_cli.send_cmd('limiter_plan_list', [payload_b64],
+                                        retry_count=3, retry_interval=5, timeout=60, nowait=False)
+        if 'success' not in ret or 'data' not in ret.get('success', {}):
+            return False # 成功レスポンスがない場合は期間外とみなす
+        plans = ret['success']['data']
+        if not plans:
+            return True  # プランが存在しない場合は期間内とみなす
+
+        # プラン一覧から期間内のプランを探す
+        now = datetime.datetime.now()
+        for plan in plans:
+            open_date = plan.get('open_date')
+            suspend_date = plan.get('suspend_date')
+            try:
+                start_dt = None
+                end_dt = None
+                if open_date:
+                    start_dt = datetime.datetime.fromisoformat(open_date)
+                if suspend_date:
+                    end_dt = datetime.datetime.fromisoformat(suspend_date)
+            except (ValueError, TypeError):
+                continue
+            if start_dt is None and end_dt is None:
+                continue # どちらも指定されていない場合は考慮しない
+            if start_dt is not None and end_dt is not None and start_dt <= now <= end_dt:
+                return True # 期間内のプランが見つかった場合はTrue
+            if start_dt is not None and end_dt is None and start_dt <= now:
+                return True # 期間内のプランが見つかった場合はTrue
+            if start_dt is None and end_dt is not None and now <= end_dt:
+                return True # 期間内のプランが見つかった場合はTrue
+        return False
+
+    def is_notice_expired(self) -> bool:
+        """
+        limiterモードのplan_listコマンドを実行して、
+        現在設定されている通知期限が過ぎたかどうかを判定する関数
+
+        Returns:
+            bool: 通知期限が過ぎている場合はTrue、それ以外はFalse
+        """
+        # plan_listコマンドの実行ペイロードを構築
+        payload = dict(kwd='*')
+        payload_b64 = convert.str2b64str(common.to_str(payload))
+        
+        # plan_listコマンドを実行
+        ret = self.redis_cli.send_cmd('limiter_plan_list', [payload_b64],
+                                        retry_count=3, retry_interval=5, timeout=60, nowait=False)
+        if 'success' not in ret or 'data' not in ret.get('success', {}):
+            return False # 成功レスポンスがない場合は期間外とみなす
+        plans = ret['success']['data']
+        if not plans:
+            return False  # プランが存在しない場合は期間外とみなす
+
+        # プラン一覧から期間内のプランを探す
+        now = datetime.datetime.now()
+        for plan in plans:
+            notice_date = plan.get('notice_date')
+            try:
+                notice_dt = None
+                if notice_date:
+                    notice_dt = datetime.datetime.fromisoformat(notice_date)
+            except (ValueError, TypeError):
+                continue
+            if notice_dt is None:
+                continue # 通知期限が指定されていない場合は考慮しない
+            if now >= notice_dt:
+                return True # 通知期限が過ぎている場合はTrue
+        return False
 
 request_scope = contextvars.ContextVar('request_scope', default=None)
 

{cmdbox-0.8.0.2 → cmdbox-0.8.1}/cmdbox/app/commons/limiter.py

@@ -676,11 +676,33 @@ return cjson.encode(c)
         # ファイルから読んだ場合、Redis にも同期しておく（Redis 再起動後の復元）
         if not load_history and self.redis_client is not None:
             try:
-                self.redis_client.hset(
-                    f"{self.redis_client.lmtname}_{self.REDIS_COUNTER_HASH}",
-                    limiter_name,
-                    json.dumps(counter)
-                )
+                redis_key = f"{self.redis_client.lmtname}_{self.REDIS_COUNTER_HASH}"
+                raw = self.redis_client.hget(redis_key, limiter_name)
+                if raw is None:
+                    # Redis にデータがない場合は、ファイルから読んだカウンタをそのまま保存する
+                    self.redis_client.hset(redis_key, limiter_name, json.dumps(counter))
+                else:
+                    # Redis にデータがある場合は、ファイルから読んだカウンタとマージして保存する
+                    text = raw.decode('utf-8') if isinstance(raw, bytes) else raw
+                    share_counter = json.loads(text)
+                    merged_counter = dict(counter)
+                    for k in self.COUNTER_VALKEYS:
+                        merged_counter[k] = max(counter.get(k, 0), share_counter.get(k, 0))
+                    # リセット日時と最終更新日時もマージする
+                    for ts_key in ('last_reset', 'last_update'):
+                        shared_ts = share_counter.get(ts_key)
+                        current_ts = counter.get(ts_key)
+                        if shared_ts and not current_ts:
+                            merged_counter[ts_key] = shared_ts
+                        elif shared_ts and current_ts:
+                            try:
+                                if datetime.fromisoformat(str(shared_ts)) > datetime.fromisoformat(str(current_ts)):
+                                    merged_counter[ts_key] = shared_ts
+                            except Exception:
+                                pass
+                    # Redis にマージしたカウンタを保存する
+                    counter = merged_counter
+                    self.redis_client.hset(redis_key, limiter_name, json.dumps(counter))
             except Exception:
                 pass
         return counter
@@ -1074,6 +1096,8 @@ return cjson.encode(c)
             if not self.matches(config, command_options):
                 continue
             counter = self.load_counter(data_dir, limiter_name)
+            if self.needs_reset(config, counter):
+                counter = self.reset_counter(limiter_name)
             # 実行可能期間チェック
             period_start = config.get('exec_period_start')
             if period_start:

{cmdbox-0.8.0.2 → cmdbox-0.8.1}/cmdbox/app/commons/validator.py

@@ -46,11 +46,11 @@ def apprun_check(func:Callable) -> Callable:
         # 結果のスキーマ検証
         cls = self.output_schema()
         try:
-            if issubclass(cls, pydantic.BaseModel):
+            if cls is not None and issubclass(cls, pydantic.BaseModel):
                 cls.model_validate(msg)
             return st, msg, obj
         except Exception as e:
-            if issubclass(cls, resdata.Base):
+            if cls is not None and issubclass(cls, resdata.Base):
                 info = cls.get_model_info()
                 msg = dict(warn=f"Invalid result format: {e}", output=msg, output_schema=info)
             else:

{cmdbox-0.8.0.2 → cmdbox-0.8.1}/cmdbox/app/features/cli/audit/audit_base.py

@@ -62,13 +62,30 @@ class AuditBase(feature.ResultEdgeFeature):
                 dict(opt="pg_password", type=Options.T_PASSWD, default='pgsql', required=False, multi=False, hide=True, choice=None, web="mask",
                      description_ja="postgresqlのパスワードを指定する。",
                      description_en="Specify the postgresql password."),
-                dict(opt="pg_dbname", type=Options.T_STR, default='audit', required=False, multi=False, hide=True, choice=None,
+                dict(opt="pg_dbname", type=Options.T_STR, default='audit', required=False, multi=False, hide=True, choice=None, web="mask",
                      description_ja="postgresqlデータベース名を指定します。",
                      description_en="Specify the postgresql database name."),
             ]
         )
     
-    def initdb(self, data_dir:Path, logger:logging.Logger, pg_enabled:bool, pg_host:str, pg_port:int, pg_user:str, pg_password:str, pg_dbname:str) -> Any:
+    def get_context(self, data_dir:Path, logger:logging.Logger, pg_enabled:bool, pg_host:str, pg_port:int, pg_user:str, pg_password:str, pg_dbname:str) -> Any:
+        if pg_enabled:
+            #if logger.level == logging.DEBUG:
+            #    logger.debug(f"Initializing database with pg_enabled={pg_enabled}, pg_host={pg_host}, pg_port={pg_port}, pg_user={pg_user}, pg_dbname={pg_dbname}")
+            constr = f"host={pg_host} port={pg_port} user={pg_user} password={pg_password} dbname={pg_dbname} connect_timeout=60"
+            
+            if AuditBase._pg_pool is None:
+                AuditBase._pg_pool = ConnectionPool(constr, min_size=1, max_size=2)
+            return AuditBase._pg_pool.connection()
+        else:
+            db_path = data_dir / '.audit' / 'audit.db'
+            #if logger.level == logging.DEBUG:
+            #    logger.debug(f"Initializing database with db_path={db_path}")
+            db_path.parent.mkdir(parents=True, exist_ok=True)
+            conn = sqlite3.connect(db_path)
+            return conn
+
+    def initdb(self, data_dir:Path, logger:logging.Logger, pg_enabled:bool, pg_host:str, pg_port:int, pg_user:str, pg_password:str, pg_dbname:str) -> None:
         """
         データベースを初期化します
 
@@ -81,18 +98,9 @@ class AuditBase(feature.ResultEdgeFeature):
             pg_user (str): PostgreSQLユーザー名
             pg_password (str): PostgreSQLパスワード
             pg_dbname (str): PostgreSQLデータベース名
-
-        Returns:
-            Any: データベース接続オブジェクト
         """
-        if pg_enabled:
-            #if logger.level == logging.DEBUG:
-            #    logger.debug(f"Initializing database with pg_enabled={pg_enabled}, pg_host={pg_host}, pg_port={pg_port}, pg_user={pg_user}, pg_dbname={pg_dbname}")
-            constr = f"host={pg_host} port={pg_port} user={pg_user} password={pg_password} dbname={pg_dbname} connect_timeout=60"
-            
-            if AuditBase._pg_pool is None:
-                AuditBase._pg_pool = ConnectionPool(constr, min_size=1, max_size=2)
-            with AuditBase._pg_pool.connection() as conn:
+        with self.get_context(data_dir, logger, pg_enabled, pg_host, pg_port, pg_user, pg_password, pg_dbname) as conn:
+            if pg_enabled:
                 cursor = conn.cursor()
                 try:
                     cursor.execute("SELECT count(*) FROM information_schema.tables WHERE table_name='audit'")
@@ -120,37 +128,30 @@ class AuditBase(feature.ResultEdgeFeature):
                 finally:
                     conn.commit()
                     cursor.close()
-            return AuditBase._pg_pool
-        else:
-            db_path = data_dir / '.audit' / 'audit.db'
-            #if logger.level == logging.DEBUG:
-            #    logger.debug(f"Initializing database with db_path={db_path}")
-            db_path.parent.mkdir(parents=True, exist_ok=True)
-            conn = sqlite3.connect(db_path)
-            cursor = conn.cursor()
-            try:
-                cursor.execute("SELECT COUNT(*) FROM sqlite_master WHERE TYPE='table' AND NAME='audit'")
-                row = cursor.fetchone()
-                #if logger.level == logging.DEBUG:
-                #    logger.debug(f"SQL query: SELECT COUNT(*) FROM sqlite_master WHERE TYPE='table' AND NAME='audit'")
-                #    logger.debug(f"SQL row  : {row}")
-                if row[0] == 0:
-                    # テーブルが存在しない場合は作成
-                    cursor.execute('''
-                        CREATE TABLE IF NOT EXISTS audit (
-                            id INTEGER PRIMARY KEY AUTOINCREMENT,
-                            audit_type TEXT,
-                            clmsg_id TEXT,
-                            clmsg_date TEXT,
-                            clmsg_src TEXT,
-                            clmsg_title TEXT,
-                            clmsg_user TEXT,
-                            clmsg_body JSON,
-                            clmsg_tag JSON,
-                            svmsg_id TEXT,
-                            svmsg_date TEXT DEFAULT CURRENT_TIMESTAMP
-                        )
-                    ''')
-            finally:
-                cursor.close()
-        return conn
+            else:
+                cursor = conn.cursor()
+                try:
+                    cursor.execute("SELECT COUNT(*) FROM sqlite_master WHERE TYPE='table' AND NAME='audit'")
+                    row = cursor.fetchone()
+                    #if logger.level == logging.DEBUG:
+                    #    logger.debug(f"SQL query: SELECT COUNT(*) FROM sqlite_master WHERE TYPE='table' AND NAME='audit'")
+                    #    logger.debug(f"SQL row  : {row}")
+                    if row[0] == 0:
+                        # テーブルが存在しない場合は作成
+                        cursor.execute('''
+                            CREATE TABLE IF NOT EXISTS audit (
+                                id INTEGER PRIMARY KEY AUTOINCREMENT,
+                                audit_type TEXT,
+                                clmsg_id TEXT,
+                                clmsg_date TEXT,
+                                clmsg_src TEXT,
+                                clmsg_title TEXT,
+                                clmsg_user TEXT,
+                                clmsg_body JSON,
+                                clmsg_tag JSON,
+                                svmsg_id TEXT,
+                                svmsg_date TEXT DEFAULT CURRENT_TIMESTAMP
+                            )
+                        ''')
+                finally:
+                    cursor.close()