pyfemtet 0.6.6__py3-none-any.whl → 0.7.0__py3-none-any.whl

pyfemtet/__init__.py

@@ -1 +1 @@
-__version__ = "0.6.6"
+__version__ = "0.7.0"

pyfemtet/_femtet_config_util/exit.py

@@ -1,5 +1,4 @@
 from time import time, sleep
-import logging
 
 from win32com.client import CDispatch
 from femtetutils import util
@@ -9,7 +8,9 @@ from pyfemtet.dispatch_extensions._impl import _get_pid
 from pyfemtet.core import _version
 from pyfemtet._message import Msg
 
-logger = logging.getLogger('fem')
+from pyfemtet.logger import get_module_logger
+
+logger = get_module_logger('util.femtet.exit', __name__)
 
 
 def _exit_or_force_terminate(timeout, Femtet: CDispatch, force=True):

pyfemtet/_util/excel_macro_util.py

@@ -1,25 +1,19 @@
 """Excel のエラーダイアログを補足します。"""
-import sys
 from time import sleep
 from threading import Thread
-import logging
 import asyncio  # for timeout
 import win32gui
 import win32con
 import win32api
 
-logger = logging.getLogger(__name__)
-if __name__ == '__main__':
-    formatter = logging.Formatter(logging.BASIC_FORMAT)
-    handler = logging.StreamHandler(sys.stdout)
-    handler.setFormatter(formatter)
-    logger.addHandler(handler)
-    logger.setLevel(logging.DEBUG)
+from pyfemtet.logger import get_module_logger
+
+logger = get_module_logger('util.excel', __name__)
 
 
 class _ExcelDialogProcessor:
 
-    def __init__(self, excel_, timeout):
+    def __init__(self, excel_, timeout, restore_book=True):
         self.excel = excel_
         self.__excel_window_title = f' - Excel'  # {basename} - Excel
         self.__error_dialog_title = 'Microsoft Visual Basic'
@@ -31,6 +25,7 @@ class _ExcelDialogProcessor:
         self.__error_raised = False
         self.__excel_state_stash = dict()
         self.__watch_thread = None
+        self.restore_book = restore_book
 
     async def watch(self):
 
@@ -133,15 +128,17 @@ class _ExcelDialogProcessor:
         # if exc_type is not None:
         #     if issubclass(exc_type, com_error) and self.__error_raised:
         if self.__error_raised:
+            if self.restore_book:
                 logger.debug('エラーハンドリングの副作用でブックを閉じているので'
                              'Excel のブックを開きなおします。')
                 for wb_path in self.__workbook_paths:
                     self.excel.Workbooks.Open(wb_path)
 
 
-def watch_excel_macro_error(excel_, timeout):
+def watch_excel_macro_error(excel_, timeout, restore_book=True):
     """Excel のエラーダイアログの出現を監視し、検出されればブックを閉じます。"""
-    return _ExcelDialogProcessor(excel_, timeout)
+    return _ExcelDialogProcessor(excel_, timeout, restore_book)
+
 
 
 if __name__ == '__main__':

pyfemtet/dispatch_extensions/__init__.py

@@ -9,4 +9,3 @@ from pyfemtet.dispatch_extensions._impl import (
     _get_pid,
     _get_pids,
 )
-

pyfemtet/dispatch_extensions/_impl.py

@@ -18,14 +18,11 @@ from multiprocessing.context import BaseContext, SpawnProcess, _concrete_context
 from multiprocessing.process import _children, _cleanup
 from multiprocessing.managers import SyncManager
 
-import logging
-from pyfemtet.logger import get_logger
-
 from pyfemtet._message import Msg
 
+from pyfemtet.logger import get_module_logger
 
-logger = get_logger('dispatch')
-logger.setLevel(logging.INFO)
+logger = get_module_logger('dispatch', __name__)
 
 
 DISPATCH_TIMEOUT = 120

pyfemtet/logger/__init__.py

@@ -1,3 +1,22 @@
-from pyfemtet.logger._impl import get_logger
+import logging
+from pyfemtet.logger._impl import (
+    get_module_logger,
+    add_file_output,
+    set_stdout_output,
+    remove_file_output,
+    remove_stdout_output,
+    remove_all_output,
+)
 
-__all__ = ['get_logger']
+
+def get_dask_logger():
+    return logging.getLogger('distributed')
+
+
+def get_optuna_logger():
+    import optuna
+    return optuna.logging.get_logger('optuna')
+
+
+def get_dash_logger():
+    return logging.getLogger('werkzeug')

pyfemtet/logger/_impl.py

@@ -1,107 +1,231 @@
+import logging
 import os
 import sys
-import logging
+import datetime
+import locale
+from threading import Lock
+from pathlib import Path
+import platform
+
 from colorlog import ColoredFormatter
 from dask.distributed import get_worker
 
+LOCALE, LOCALE_ENCODING = locale.getlocale()
+if platform.system() == 'Windows':
+    DATEFMT = '%#m/%#d %#H:%M'
+else:
+    DATEFMT = '%-m/%-d %-H:%M'
+
+__lock = Lock()  # thread 並列されたタスクがアクセスする場合に備えて
 
-def _get_worker_name_as_prefix():
-    name = '(Main) '
+__initialized_root_packages: list[str] = list()
+
+
+# ===== set dask worker prefix to ``ROOT`` logger =====
+
+def _get_dask_worker_name():
+    name = '(Main)'
     try:
         worker = get_worker()
         if isinstance(worker.name, str):  # local なら index, cluster なら tcp address
-            name = f'({worker.name}) '
+            name = f'({worker.name})'
         else:
-            name = f'(Sub{worker.name}) '
+            name = f'(Sub{worker.name})'
     except ValueError:
         pass
     return name
 
 
 class _DaskLogRecord(logging.LogRecord):
-    """Generate a log message with dask worker name."""
-
-    # def __init__(self, *args, **kwargs):
-    #     super().__init__(*args, **kwargs)
-    #     self.worker = _get_worker_name_as_prefix()
-
     def getMessage(self):
-        """Add worker name to loggin message.
-
-        This function is originated from logging.LogRecord.
-
-            # Copyright (C) 2001-2022 Vinay Sajip. All Rights Reserved.
-
-        """
         msg = str(self.msg)
         if self.args:
             msg = msg % self.args
-        msg = _get_worker_name_as_prefix() + msg
+        msg = _get_dask_worker_name() + ' ' + msg
         return msg
 
 
-logging.setLogRecordFactory(_DaskLogRecord)  # すべての logging %(message)s の前に prefix を入れる
+logging.setLogRecordFactory(_DaskLogRecord)
+
+
+# ===== format config =====
+
+def __create_formatter(colored=True):
+
+    if colored:
+        # colorized
+        header = "%(log_color)s" + "[%(name)s %(levelname).4s]" + " %(asctime)s" + "%(reset)s"
+
+        formatter = ColoredFormatter(
+            f"{header} %(message)s",
+            datefmt=DATEFMT,
+            reset=True,
+            log_colors={
+                "DEBUG": "purple",
+                "INFO": "cyan",
+                "WARNING": "yellow",
+                "ERROR": "light_red",
+                "CRITICAL": "red",
+            },
+        )
+
+    else:
+        header = "[%(name)s %(levelname).4s]"
+        formatter = logging.Formatter(
+            f"{header} %(message)s",
+            datefmt=DATEFMT,
+        )
+
+    return formatter
+
+
+# ===== handler config =====
+
+STDOUT_HANDLER_NAME = 'stdout-handler'
+
+
+def __get_stdout_handler():
+    stdout_handler = logging.StreamHandler(sys.stdout)
+    stdout_handler.set_name(STDOUT_HANDLER_NAME)
+    stdout_handler.setFormatter(__create_formatter(colored=True))
+    return stdout_handler
+
+
+def __has_stdout_handler(logger):
+    return any([handler.get_name() != STDOUT_HANDLER_NAME for handler in logger.handlers])
+
+
+def set_stdout_output(logger, level=logging.INFO):
 
+    if not __has_stdout_handler(logger):
+        logger.addHandler(__get_stdout_handler())
 
-def _color_supported() -> bool:
-    """Detection of color support.
+    logger.setLevel(level)
 
-    This function is originated from optuna.logging.
 
-        # Copyright (c) 2018 Preferred Networks, Inc.
+def remove_stdout_output(logger):
+    if __has_stdout_handler(logger):
+        logger.removeHandler(__get_stdout_handler())
+
+
+def add_file_output(logger, filepath=None, level=logging.INFO) -> str:
+    """Add FileHandler to the logger.
+
+    Returns:
+        str: THe name of the added handler.
+        Its format is 'filehandler-{os.path.basename(filepath)}'
 
     """
 
-    # NO_COLOR environment variable:
-    if os.environ.get("NO_COLOR", None):
-        return False
+    # certify filepath
+    if filepath is None:
+        filepath = datetime.datetime.now().strftime('%Y%m%d-%H%M%S') + f'_{logger.name}.log'
+
+    # add file handler
+    file_handler = logging.FileHandler(filename=filepath, encoding=LOCALE_ENCODING)
+    file_handler.set_name(f'filehandler-{os.path.basename(filepath)}')
+    file_handler.setFormatter(__create_formatter(colored=False))
+    logger.addHandler(file_handler)
+
+    # set (default) log level
+    logger.setLevel(level)
+
+    return file_handler.get_name()
+
+
+def remove_file_output(logger, filepath=None):
+    """Removes FileHandler from the logger.
+
+    If filepath is None, remove all FileHandler.
+    """
+
+    if filepath is None:
+        for handler in logger.handlers:
+            if 'filehandler-' in handler.name:
+                logger.removeHandler(handler)
 
-    if not hasattr(sys.stderr, "isatty") or not sys.stderr.isatty():
-        return False
     else:
-        return True
-
-
-def _create_formatter() -> logging.Formatter:
-    """Create a formatter."""
-    # header = f"[pyfemtet %(name)s] %(levelname).4s %(worker)s]"
-    header = f"[pyfemtet %(name)s %(levelname).4s]"
-    message = "%(message)s"
-
-    formatter = ColoredFormatter(
-        f"%(log_color)s{header}%(reset)s {message}",
-        datefmt=None,
-        reset=True,
-        log_colors={
-            "DEBUG": "purple",
-            "INFO": "cyan",
-            "WARNING": "yellow",
-            "ERROR": "light_red",
-            "CRITICAL": "red",
-        },
-    )
+        handler_name = f'filehandler-{os.path.basename(filepath)}'
+        for handler in logger.handlers:
+            if handler_name == handler.name:
+                logger.removeHandler(handler)
+
+
+def remove_all_output(logger):
+    for handler in logger.handlers:
+        logger.removeHandler(handler)
+
+    logger.addHandler(logging.NullHandler())
 
-    return formatter
 
+# ===== root-package logger =====
 
-def get_logger(logger_name):
-    """Returns a logger.
+def setup_package_root_logger(package_name):
+    global __initialized_root_packages
+    if package_name not in __initialized_root_packages:
+        with __lock:
+            logger = logging.getLogger(package_name)
+            logger.propagate = True
+            set_stdout_output(logger)
+            logger.setLevel(logging.INFO)
+            __initialized_root_packages.append(package_name)
+    else:
+        logger = logging.getLogger(package_name)
+    return logger
+
+
+# ===== module logger =====
 
-    Examples:
-        >>> # Retrieves a specific logger used in pyfemtet.opt.
-        >>> import logging  # doctest: +SKIP
-        >>> from pyfemtet.logger import get_logger  # doctest: +SKIP
-        >>> logger = get_logger('opt')  # logger of optimizer  # doctest: +SKIP
-        >>> logger.setLevel(logging.ERROR)  # disable all log from optimizer  # doctest: +SKIP
+def get_module_logger(name: str, __module_name__: str, ) -> logging.Logger:
+    """Return the module-level logger.
+
+    The format is defined in the package_root_logger.
+
+    Args:
+        name (str): The logger name to want.
+        __module_name__ (str): __name__ of the module.
+
+    Returns:
+        logging.Logger:
+            The logger its name is ``root_package.subpackage.module``.
+            child level logger's signal propagates to the parent logger
+            and is shown in the parent(s)'s handler(s).
 
     """
 
-    formatter = _create_formatter()
+    # check root logger initialized
+    name_arr = name.split('.')
+    if name_arr[0] not in __initialized_root_packages:
+        setup_package_root_logger(name_arr[0])
+
+    # get logger
+    logger = logging.getLogger(name)
 
-    logger = logging.getLogger(logger_name)
-    handler = logging.StreamHandler()
-    handler.setFormatter(formatter)
-    logger.addHandler(handler)
-    logger.setLevel(logging.DEBUG)
+    # If not root logger, ensure propagate is True.
+    if len(name_arr) > 1:
+        logger.propagate = True
+
+    # If debug mode, set specific level.
+    if __module_name__ == '__main__':
+        logger.setLevel(logging.DEBUG)
 
     return logger
+
+
+if __name__ == '__main__':
+
+    root_logger = setup_package_root_logger('logger')
+    optimizer_logger = get_module_logger('logger.optimizer', __name__); optimizer_logger.setLevel(logging.INFO)
+    interface_logger = get_module_logger('logger.interface', __name__)
+
+    root_logger.info("This is root logger's info.")
+    optimizer_logger.info("This is optimizer logger's info.")
+
+    add_file_output(interface_logger, 'test-module-log.log', level=logging.DEBUG)
+    interface_logger.debug('debugging...')
+    remove_file_output(interface_logger, 'test-module-log.log')
+
+    interface_logger.debug('debug is finished.')
+    root_logger.debug("This message will not be shown "
+                      "even if the module_logger's level "
+                      "is logging.DEBUG.")

pyfemtet/opt/_femopt_core.py

@@ -22,7 +22,7 @@ if version.parse(optuna.version.__version__) < version.parse('4.0.0'):
 else:
     from optuna._hypervolume import wfg
     compute_hypervolume = wfg.compute_hypervolume
-from dask.distributed import Lock, get_client
+from dask.distributed import Lock, get_client, Client
 
 # win32com
 from win32com.client import constants, Constants
@@ -32,10 +32,9 @@ from pyfemtet.opt.interface import FEMInterface, FemtetInterface
 from pyfemtet._message import encoding, Msg
 
 # logger
-import logging
-from pyfemtet.logger import get_logger
-logger = get_logger('femopt')
-logger.setLevel(logging.INFO)
+from pyfemtet.logger import get_module_logger
+
+logger = get_module_logger('opt.core', __name__)
 
 
 __all__ = [
@@ -503,19 +502,6 @@ class ObjectivesFunc:
         return f
 
 
-class _HistoryDfCore:
-    """Class for managing a DataFrame object in a distributed manner."""
-
-    def __init__(self):
-        self.df = pd.DataFrame()
-
-    def set_df(self, df):
-        self.df = df
-
-    def get_df(self):
-        return self.df
-
-
 class History:
     """Class for managing the history of optimization results.
 
@@ -543,8 +529,6 @@ class History:
     is_restart = False
     is_processing = False
     _df = None  # in case without client
-    _future = None  # in case with client
-    _actor_data = None  # in case with client
 
     def __init__(
             self,
@@ -565,6 +549,7 @@ class History:
         self.obj_names = obj_names
         self.cns_names = cns_names
         self.additional_metadata = additional_metadata or ''
+        self.__scheduler_address = client.scheduler.address if client is not None else None
 
         # 最適化実行中かどうか
         self.is_processing = client is not None
@@ -572,10 +557,6 @@ class History:
         # 最適化実行中の process monitor である場合
         if self.is_processing:
 
-            # actor の生成
-            self._future = client.submit(_HistoryDfCore, actor=True)
-            self._actor_data = self._future.result()
-
             # csv が存在すれば続きからモード
             self.is_restart = os.path.isfile(self.path)
 
@@ -641,16 +622,36 @@ class History:
         self.set_df(df)
 
     def get_df(self) -> pd.DataFrame:
-        if self._actor_data is None:
+        if self.__scheduler_address is None:
             return self._df
         else:
-            return self._actor_data.get_df().result()
+            # scheduler がまだ存命か確認する
+            try:
+                with Lock('access-df'):
+                    client_: 'Client' = get_client(self.__scheduler_address)
+                    if 'df' in client_.list_datasets():
+                        return client_.get_dataset('df')
+                    else:
+                        logger.debug('Access df of History before it is initialized.')
+                        return pd.DataFrame()
+            except OSError:
+                logger.error('Scheduler is already dead. Most frequent reasen to show this message is that the pyfemtet monitor UI is not refreshed even if the main optimization process is terminated.')
+                return pd.DataFrame()
 
     def set_df(self, df: pd.DataFrame):
-        if self._actor_data is None:
+        if self.__scheduler_address is None:
             self._df = df
         else:
-            self._actor_data.set_df(df).result()
+            try:
+                with Lock('access-df'):
+                    client_: 'Client' = get_client(self.__scheduler_address)
+                    if 'df' in client_.list_datasets():
+                        client_.unpublish_dataset('df')  # 更新する場合は前もって削除が必要、本来は dask collection をここに入れる使い方をする。
+                    client_.publish_dataset(**dict(
+                        df=df
+                    ))
+            except OSError:
+                logger.error('Scheduler is already dead. Most frequent reasen to show this message is that the pyfemtet monitor UI is not refreshed even if the main optimization process is terminated.')
 
     def create_df_columns(self):
         """Create columns of history."""

pyfemtet/opt/_test_utils/control_femtet.py

@@ -5,12 +5,6 @@ from tqdm import tqdm
 from win32com.client import Dispatch
 from femtetutils import util
 
-import logging
-
-
-logger = logging.getLogger("test")
-logger.setLevel(logging.DEBUG)
-
 
 def _open_femprj(femprj_path):
     Femtet = Dispatch("FemtetMacro.Femtet")

pyfemtet/opt/interface/__init__.py

@@ -1,4 +1,4 @@
-from pyfemtet.opt.interface._base import FEMInterface, logger
+from pyfemtet.opt.interface._base import FEMInterface
 from pyfemtet.opt.interface._base import NoFEM
 from pyfemtet.opt.interface._femtet import FemtetInterface
 from pyfemtet.opt.interface._femtet_with_sldworks import FemtetWithSolidworksInterface

pyfemtet/opt/interface/_base.py

@@ -5,11 +5,9 @@ from abc import ABC, abstractmethod
 
 import pandas as pd
 
-import logging
-from pyfemtet.logger import get_logger
-logger = get_logger('FEM')
-logger.setLevel(logging.INFO)
+from pyfemtet.logger import get_module_logger
 
+logger = get_module_logger('opt.interface', __name__)
 
 here, me = os.path.split(__file__)
 

pyfemtet/opt/interface/_excel_interface.py

@@ -1,6 +1,7 @@
 import os
 from pathlib import Path
 from time import sleep
+import gc
 
 import pandas as pd
 import numpy as np
@@ -29,13 +30,108 @@ from pyfemtet._util.excel_macro_util import watch_excel_macro_error
 
 from pyfemtet._warning import show_experimental_warning
 
-import logging
-
-logger = logging.getLogger(__name__)
-logger.setLevel(logging.INFO)
+from pyfemtet.opt.interface._base import logger
 
 
 class ExcelInterface(FEMInterface):
+    """Excel を計算コアとして利用するためのクラス。
+
+    通常の有限要素法を Excel に
+    置き換えて使用することが可能です。
+
+    すでに Excel マクロと Femtet を
+    連携させた自動解析システムを
+    構築している場合、このクラスは
+    それをラップします。これにより、
+    PyFemtet を用いた最適化を
+    行う際に便利な機能を提供します。
+
+    Args:
+        input_xlsm_path (str or Path):
+            設計変数の定義を含む Excel ファイルのパスを指定
+            します。
+            
+        input_sheet_name (str):
+            設計変数の定義を含むシートの名前を指定します。
+            
+        output_xlsm_path (str or Path, optional):
+            目的関数の定義を含む Excel ファイルのパスを指定
+            します。指定しない場合は ``input_xlsm_path`` と
+            同じと見做します。
+            
+        output_sheet_name (str, optional):
+            目的関数の定義を含む含むシートの名前を指定します。
+            指定しない場合は ``input_sheet_name`` と同じと見
+            做します。
+            
+        procedure_name (str, optional):
+            Excel マクロ関数名を指定します。指定しない場合は
+            ``FemtetMacro.FemtetMain`` と見做します。
+            
+        procedure_args (list or tuple, optional):
+            Excel マクロ関数に渡す引数をリストまたはタプルで
+            指定します。
+            
+        connect_method (str, optional):
+            Excel との接続方法を指定します。 'auto' または
+            'new' が利用可能です。デフォルトは 'auto' です。
+            
+        procedure_timeout (float or None, optional):
+            Excel マクロ関数のタイムアウト時間を秒単位で指定
+            します。 None の場合はタイムアウトなしとなります。
+            
+        with_call_femtet (bool, optional):
+            Femtet を呼び出すかどうかを指定します。
+            デフォルトは False です。
+
+    
+    Attributes:
+        input_xlsm_path (Path):
+            設計変数の定義を含む Excel ファイルのパス。
+            
+        input_sheet_name (str):
+            設計変数の定義を含むシートの名前。
+
+        output_xlsm_path (Path):
+            目的関数の定義を含む Excel ファイルのパス。
+
+        output_sheet_name (str):
+            目的関数の定義を含む含むシートの名前。
+
+        procedure_name (str):
+            実行する Excel マクロ関数名。
+
+        procedure_args (list or tuple):
+            Excel マクロ関数に渡す引数のリストまたはタプル。
+
+        connect_method (str):
+            接続方法。'new' または 'auto'。
+
+        procedure_timeout (float or None):
+            Excel マクロ関数の実行タイムアウト。
+            Noneの場合は無制限。
+
+        terminate_excel_when_quit (bool):
+            プログラム終了時に Excel を終了するかどうか。
+            connect_method が 'new' の場合 True,
+            'auto' の場合 False。
+
+        excel (CDispatch):
+            Excel の COM オブジェクト。
+
+        input_sheet (CDispatch):
+            設計変数を含むシートの COM オブジェクト。
+
+        output_sheet (CDispatch):
+            目的関数を含むシートの COM オブジェクト。
+
+        input_workbook (CDispatch):
+            設計変数を含む xlsm ファイルの COM オブジェクト。
+
+        output_workbook (CDispatch):
+            設計変数を含む xlsm ファイルの COM オブジェクト。
+
+    """
 
     input_xlsm_path: Path  # 操作対象の xlsm パス
     input_sheet_name: str  # 変数セルを定義しているシート名
@@ -55,11 +151,14 @@ class ExcelInterface(FEMInterface):
 
     visible: bool = False  # excel を可視化するかどうか
     display_alerts: bool = False  # ダイアログを表示するかどうか
+    terminate_excel_when_quit: bool  # 終了時に Excel を終了するかどうか
 
-    _load_problem_from_me: bool = True  # TODO: add_parameter() 等を省略するかどうか。定義するだけでフラグとして機能する。
+    _load_problem_from_me: bool = True
     _excel_pid: int
     _excel_hwnd: int
     _femtet_autosave_buffer: bool  # Femtet の自動保存機能の一時退避場所。最適化中はオフにする。
+    _with_call_femtet: bool  # Femtet を Python から起動するかどうか。Excel から起動できる場合は False でよい。
+
 
     def __init__(
             self,
@@ -71,7 +170,9 @@ class ExcelInterface(FEMInterface):
             procedure_args: list or tuple = None,
             connect_method: str = 'auto',  # or 'new'
             procedure_timeout: float or None = None,
+            with_call_femtet: bool = False
     ):
+
         show_experimental_warning("ExcelInterface")
 
         # 初期化
@@ -85,6 +186,8 @@ class ExcelInterface(FEMInterface):
         self.connect_method = connect_method
         self._femtet_autosave_buffer = _get_autosave_enabled()
         self.procedure_timeout = procedure_timeout
+        self._with_call_femtet = with_call_femtet
+        self.terminate_excel_when_quit = self.connect_method == 'new'
 
         # dask サブプロセスのときは space 直下の input_xlsm_path を参照する
         try:
@@ -101,19 +204,6 @@ class ExcelInterface(FEMInterface):
             else:
                 self.output_xlsm_path = Path(os.path.abspath(output_xlsm_path)).resolve()
 
-        # FIXME:
-        #   そもそも ExcelInterface なので Femtet 関連のことをやらなくていいと思う。
-        #   FemtetRef が文句なく動けばいいのだが、手元環境ではなぜか動いたり動かなかったりするため
-        #   仕方なく Femtet を Python 側から動かしている仮実装。
-        # 先に femtet を起動
-        util.execute_femtet()
-
-        # 直後の Excel 起動に間に合わない場合があったため
-        # Femtet が Dispatch 可能になるまで捨てプロセスで待つ
-        p = _NestableSpawnProcess(target=wait_femtet)
-        p.start()
-        p.join()
-
         # サブプロセスでの restore のための情報保管
         kwargs = dict(
             input_xlsm_path=self.input_xlsm_path,
@@ -124,6 +214,7 @@ class ExcelInterface(FEMInterface):
             procedure_args=self.procedure_args,
             connect_method='new',  # subprocess で connect する際は new を強制する
             procedure_timeout=self.procedure_timeout,
+            with_call_femtet=self._with_call_femtet,
         )
         FEMInterface.__init__(self, **kwargs)
 
@@ -207,17 +298,53 @@ class ExcelInterface(FEMInterface):
 
     def add_femtet_ref_xla(self, wb):
 
+        # search
+        ref_file_1 = r'C:\Program Files\Microsoft Office\root\Office16\XLSTART\FemtetRef.xla'
+        if not os.path.exists(ref_file_1):
+            # 32bit
+            ref_file_1 = r'C:\Program Files (x86)\Microsoft Office\root\Office16\XLSTART\FemtetRef.xla'
+        if not os.path.exists(ref_file_1):
+            raise FileNotFoundError(f'{ref_file_1} not found. Please check the "Enable Macros" command was fired.')
+        contain_1 = False
+        for ref in wb.VBProject.References:
+            if ref.FullPath is not None:
+                if ref.FullPath.lower() == ref_file_1.lower():
+                    contain_1 = True
+        # add
+        if not contain_1:
+            wb.VBProject.References.AddFromFile(ref_file_1)
+
         # search
         ref_file_2 = os.path.abspath(util._get_femtetmacro_dllpath())
-        contain = False
+        contain_2 = False
         for ref in wb.VBProject.References:
             if ref.Description is not None:
                 if ref.Description == 'FemtetMacro':  # FemtetMacro
-                    contain = True
+                    contain_2 = True
         # add
-        if not contain:
+        if not contain_2:
             wb.VBProject.References.AddFromFile(ref_file_2)
 
+    def remove_femtet_ref_xla(self, wb):
+
+        # search
+        ref_file_1 = r'C:\Program Files\Microsoft Office\root\Office16\XLSTART\FemtetRef.xla'
+        if not os.path.exists(ref_file_1):
+            # 32bit
+            ref_file_1 = r'C:\Program Files (x86)\Microsoft Office\root\Office16\XLSTART\FemtetRef.xla'
+        if not os.path.exists(ref_file_1):
+            raise FileNotFoundError(f'{ref_file_1} not found. Please check the "Enable Macros" command was fired.')
+        for ref in wb.VBProject.References:
+            if ref.FullPath is not None:
+                if ref.FullPath == ref_file_1:  # or ``FemtetMacroを使用するための参照設定を自動で行ないます。``
+                    wb.VBProject.References.Remove(ref)
+
+        # search
+        for ref in wb.VBProject.References:
+            if ref.Description is not None:
+                if ref.Description == 'FemtetMacro':  # FemtetMacro
+                    wb.VBProject.References.Remove(ref)
+
     def _setup_after_parallel(self, *args, **kwargs):
         # サブプロセス又はメインプロセスのサブスレッドで、最適化を開始する前の前処理
 
@@ -227,7 +354,17 @@ class ExcelInterface(FEMInterface):
         # 最適化中は femtet の autosave を無効にする
         _set_autosave_enabled(False)
 
-        # excel に繋ぎなおす
+        # 必要なら Femtet を起動する
+        if self._with_call_femtet:
+            util.execute_femtet()
+
+            # 直後の Excel 起動に間に合わない場合があるため
+            # Femtet が Dispatch 可能になるまで捨てプロセスで待つ
+            p = _NestableSpawnProcess(target=wait_femtet)
+            p.start()
+            p.join()
+
+        # excel に繋ぐ
         self.connect_excel(self.connect_method)
 
         # load_objective は 1 回目に呼ばれたのが main thread なので
@@ -240,11 +377,6 @@ class ExcelInterface(FEMInterface):
             if isinstance(obj.fun, ScapeGoatObjective):
                 opt.objectives[obj_name].fun = self.objective_from_excel
 
-        # TODO:
-        #   __init__ が作った Femtet 以外を排他処理して
-        #   Excel がそれを使うことを保証するようにする（遅すぎるか？）
-        #   そもそも、excel から Femtet を起動できればそれで済む（？）。
-
     def update(self, parameters: pd.DataFrame) -> None:
 
         # params を作成
@@ -273,44 +405,51 @@ class ExcelInterface(FEMInterface):
         except com_error as e:
             raise SolveError(f'Failed to run macro {self.procedure_name}. The original message is: {e}')
 
-
     def quit(self):
-        logger.info('Excel-Femtet の終了処理を開始します。')  # FIXME: message にする
+        if self.terminate_excel_when_quit:
+            logger.info('Excel の終了処理を開始します。')
+
+            self.remove_femtet_ref_xla(self.wb_input)
+            self.remove_femtet_ref_xla(self.wb_output)
+
+            del self.sh_input
+            del self.sh_output
 
-        del self.sh_input
-        del self.sh_output
+            with watch_excel_macro_error(self.excel, timeout=10, restore_book=False):
+                self.wb_input.Close(SaveChanges := False)
+            if self.input_xlsm_path.name != self.output_xlsm_path.name:
+                with watch_excel_macro_error(self.excel, timeout=10, restore_book=False):
+                    self.wb_output.Close(SaveChanges := False)
 
-        self.wb_input.Close(SaveChanges := False)
-        if self.input_xlsm_path.name != self.output_xlsm_path.name:
-            self.wb_output.Close(SaveChanges := False)
-        del self.wb_input
-        del self.wb_output
+            del self.wb_input
+            del self.wb_output
 
-        self.excel.Quit()
-        del self.excel
+            with watch_excel_macro_error(self.excel, timeout=10, restore_book=False):
+                self.excel.Quit()
+            del self.excel
 
-        import gc
-        gc.collect()
+            gc.collect()  # ここで Excel のプロセスが残らず落ちる
 
-        # quit した後ならば femtet を終了できる
-        # excel の process の消滅を待つ
-        logger.info('Excel の終了を待っています。')
-        while self._excel_pid == _get_pid(self._excel_hwnd):
-            sleep(1)
+            if self._with_call_femtet:
 
-        # 正確だが時間がかかるかも
-        logger.info('終了する Femtet を特定しています。')
-        femtet_pid = util.get_last_executed_femtet_process_id()
-        from multiprocessing import Process
-        p = Process(target=_terminate_femtet, args=(femtet_pid,))
-        p.start()
+                # quit した後ならば femtet を終了できる
+                # excel の process の消滅を待つ
+                logger.info('Excel の終了を待っています。')
+                while self._excel_pid == _get_pid(self._excel_hwnd):
+                    sleep(1)
+
+                # TODO: 正確だが時間がかかる。選択できるようにしたほうがいいかもしれない。
+                logger.info('終了する Femtet を特定しています。')
+                femtet_pid = util.get_last_executed_femtet_process_id()
+                from multiprocessing import Process
+                p = Process(target=_terminate_femtet, args=(femtet_pid,))
+                p.start()
+                p.join()
+                logger.info('Excel-Femtet を終了しました。')
 
         logger.info('自動保存機能の設定を元に戻しています。')
         _set_autosave_enabled(self._femtet_autosave_buffer)
 
-        p.join()
-        logger.info('Excel-Femtet を終了しました。')
-
     # 直接アクセスしてもよいが、ユーザーに易しい名前にするためだけのプロパティ
     @property
     def output_sheet(self) -> CDispatch:
@@ -432,6 +571,7 @@ def _terminate_femtet(femtet_pid_):
     Femtet, caught_pid = dispatch_specific_femtet(femtet_pid_)
     _exit_or_force_terminate(timeout=3, Femtet=Femtet, force=True)
 
+
 # main thread で作成した excel への参照を含む関数を
 # 直接 thread や process に渡すと機能しない
 class ScapeGoatObjective:

pyfemtet/opt/interface/_femtet.py

@@ -33,11 +33,17 @@ from pyfemtet.dispatch_extensions import (
     _get_pids,
     DispatchExtensionException,
 )
-from pyfemtet.opt.interface import FEMInterface, logger
+from pyfemtet.opt.interface import FEMInterface
 from pyfemtet._message import Msg
 from pyfemtet._femtet_config_util.autosave import _get_autosave_enabled, _set_autosave_enabled
 from pyfemtet._femtet_config_util.exit import _exit_or_force_terminate
 
+if __name__ == '__main__':
+    from pyfemtet.logger import get_module_logger
+    logger = get_module_logger('opt.interface.FemtetInterface', __name__)
+else:
+    from pyfemtet.opt.interface._base import logger
+
 
 def _post_activate_message(hwnd):
     win32gui.PostMessage(hwnd, win32con.WM_ACTIVATE, win32con.WA_ACTIVE, 0)

pyfemtet/opt/interface/_femtet_parametric.py

@@ -60,7 +60,7 @@ def add_parametric_results_as_objectives(femopt, indexes, directions) -> bool:
 def _parametric_objective(Femtet, parametric_result_index):
     # load dll and set target femtet
     dll = _get_dll_with_set_femtet(Femtet)
-    dll.GetPrmResult.restype = ctypes.c_double
+    dll.GetPrmResult.restype = ctypes.c_double  # 複素数の場合は実部しか取らない
     return dll.GetPrmResult(parametric_result_index)
 
 

pyfemtet/opt/interface/_femtet_with_nx/_interface.py

@@ -6,7 +6,7 @@ import pandas as pd
 from dask.distributed import get_worker
 
 from pyfemtet.core import ModelError
-from pyfemtet.opt.interface import FemtetInterface, logger
+from pyfemtet.opt.interface import FemtetInterface
 from pyfemtet._message import Msg
 
 

pyfemtet/opt/interface/_femtet_with_sldworks.py

@@ -10,7 +10,7 @@ from win32com.client import DispatchEx
 from pythoncom import CoInitialize, CoUninitialize, com_error
 
 from pyfemtet.core import ModelError
-from pyfemtet.opt.interface import FemtetInterface, logger
+from pyfemtet.opt.interface import FemtetInterface
 from pyfemtet._message import Msg
 
 

pyfemtet/opt/optimizer/_base.py

@@ -16,10 +16,9 @@ from pyfemtet._message import Msg
 from pyfemtet.opt.optimizer.parameter import ExpressionEvaluator, Parameter
 
 # logger
-import logging
-from pyfemtet.logger import get_logger
-logger = get_logger('opt')
-logger.setLevel(logging.INFO)
+from pyfemtet.logger import get_module_logger
+
+logger = get_module_logger('opt.optimizer', __name__)
 
 
 class OptimizationMethodChecker:

pyfemtet/opt/optimizer/_optuna/_botorch_patch/enable_nonlinear_constraint.py

@@ -14,9 +14,12 @@ from botorch.acquisition import AcquisitionFunction
 from botorch.optim.initializers import gen_batch_initial_conditions
 
 from pyfemtet.opt._femopt_core import Constraint
-from pyfemtet.opt.optimizer import OptunaOptimizer, logger
+from pyfemtet.opt.optimizer import OptunaOptimizer
 from pyfemtet._message import Msg
 
+from pyfemtet.logger import get_module_logger
+
+logger = get_module_logger(__file__, __name__)
 
 
 BotorchConstraint = Callable[[Tensor], Tensor]

pyfemtet/opt/samples/femprj_sample/constrained_pipe.py

@@ -65,7 +65,6 @@ def radius_diff(Femtet, opt):
     external_r = params['external_r']
     return external_r - internal_r
 
-
 if __name__ == '__main__':
     # Setup optimization method
     opt = OptunaOptimizer(

pyfemtet/opt/visualization/_base.py

@@ -20,14 +20,14 @@ from pyfemtet.opt.visualization._wrapped_components import html, dcc, dbc
 from abc import ABC, abstractmethod
 import logging
 import psutil
-from pyfemtet.logger import get_logger
+from pyfemtet.logger import get_module_logger, get_dash_logger
 
+logger = get_module_logger('opt.monitor', __name__)
+logger.setLevel(logging.ERROR)
 
-dash_logger = logging.getLogger('werkzeug')
+dash_logger = get_dash_logger()
 dash_logger.setLevel(logging.ERROR)
 
-logger = get_logger('viewer')
-logger.setLevel(logging.ERROR)
 
 
 class AbstractPage(ABC):

{pyfemtet-0.6.6.dist-info → pyfemtet-0.7.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyfemtet
-Version: 0.6.6
+Version: 0.7.0
 Summary: Design parameter optimization using Femtet.
 Home-page: https://github.com/pyfemtet/pyfemtet
 License: BSD-3-Clause

{pyfemtet-0.6.6.dist-info → pyfemtet-0.7.0.dist-info}/RECORD

@@ -1,7 +1,7 @@
-pyfemtet/__init__.py,sha256=GTf8rijLTDSqTWQgxKQN312t-j2E-t3ioZB4U22DXxc,21
+pyfemtet/__init__.py,sha256=P1kRuZW02tF-ekLuBqSjV_tIKKqcbfRPDdpp9C8ftUY,21
 pyfemtet/_femtet_config_util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyfemtet/_femtet_config_util/autosave.py,sha256=dNirA9XGuFehas8_Jkj2BW9GOzMbPyhnt1WHcH_ObSU,2070
-pyfemtet/_femtet_config_util/exit.py,sha256=sx8Wcepgi-lL5qJpJl6WvlzbeVheU9_Dtf1f38mmoTo,1822
+pyfemtet/_femtet_config_util/exit.py,sha256=0BWID-tjOkmZwmgPFkcJMkWW39voccz5ARIBWvZbHaw,1877
 pyfemtet/_message/1. make_pot.bat,sha256=wrTA0YaL7nUfNB0cS8zljOmwq2qgyG6RMwHQbrwjvY4,476
 pyfemtet/_message/2. make_mo.bat,sha256=6shJ3Yn4BXjDc0hhv_kiGUtVTq4oSRz8-iS4vW29rNE,155
 pyfemtet/_message/__init__.py,sha256=gE1-XX_PzHj9BbhqPaK5VcIHuv6_Tec5qlPMC3IRiBg,100
@@ -10,36 +10,36 @@ pyfemtet/_message/locales/ja/LC_MESSAGES/messages.po,sha256=F2bJGHVMtk086pekjVwY
 pyfemtet/_message/locales/messages.pot,sha256=8Yjf462pJdEtxBLySKT34zMG5CH5uLB_8VaJQll_QsY,14493
 pyfemtet/_message/messages.py,sha256=F8ENLZKoHq5irn-Ag7rqA3aSDsTmRWDyNHvOLY76ROI,13368
 pyfemtet/_util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pyfemtet/_util/excel_macro_util.py,sha256=Euxz3QmvTnnQCkWnbnPhvX7xXxppRONX69VlFxNCojA,7540
+pyfemtet/_util/excel_macro_util.py,sha256=wja_yE79xXHnr8YuesDypXRXkC6mI4ZYaUU-1wunZCE,7470
 pyfemtet/_warning.py,sha256=TSOj8mOhuyfOUJB24LsW6GNhTA3IzIEevJw_hLKTrq8,2205
 pyfemtet/brep/__init__.py,sha256=V1IQ2s-8eWjXOVlTp2jMav9u-NBiSkmyAX1vmtHDEso,73
 pyfemtet/brep/_impl.py,sha256=Amf_wsUxUosQB3XXhErJ5RGKXBxRnaaPpavb_0Xx6Ek,404
 pyfemtet/core.py,sha256=3lqfBGJ5IuKz2Nqj5pRo7YQqKwx_0ZDL72u95Ur_1p0,1386
-pyfemtet/dispatch_extensions/__init__.py,sha256=MI9b6oIS2IXnTNHy8jvZ4QURdTHQd9PN-gifYxqVvk4,272
-pyfemtet/dispatch_extensions/_impl.py,sha256=HU7rKRAzEe5yYukWrKtdi1aIbUas_kLyaa_KZZGCELE,16244
-pyfemtet/logger/__init__.py,sha256=DZNTD9BboiFU9LOiyPKi_Y6gWAga5f1lWkVoq7LV_y0,71
-pyfemtet/logger/_impl.py,sha256=ZN5Rj3kb9UEGFt5KSLlzwfrLF_SAoOxgPBkadwh2Y8w,2825
+pyfemtet/dispatch_extensions/__init__.py,sha256=QKpwZ0ffWUB-fiXXhhTL653FcPGLR-JKfxDNidEFoeM,271
+pyfemtet/dispatch_extensions/_impl.py,sha256=yH_yeAnQ-Xi9GfjX-FQt9u3yHnrLYIteRb6HkgYHVEc,16222
+pyfemtet/logger/__init__.py,sha256=UOJ9n_U2xwdTrp0Xgg-N6geySxNzKqTBQlXsaH0kW_w,420
+pyfemtet/logger/_impl.py,sha256=rsAd0HpmveOaLS39ucp3U2OcDhQMWjC5fnVGhbJtWVw,6375
 pyfemtet/opt/__init__.py,sha256=wRR8LbEhb5I6MUgmnCgjB6-tqHlOVxDIo7yPkq0QbBs,758
 pyfemtet/opt/_femopt.py,sha256=h3DQpwdNyPDU9jxc52DEsHaDWO1mVnA4hOT5_omXglo,37377
-pyfemtet/opt/_femopt_core.py,sha256=Sn13SI1r5OvSu6C9XjkqTrFz2IgO_vMszIAgA-gx-TU,34348
+pyfemtet/opt/_femopt_core.py,sha256=rKuZcv3Dn9zzaXrcXXOWLyFFpL_6yva4-29lFTWikXQ,35288
 pyfemtet/opt/_test_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pyfemtet/opt/_test_utils/control_femtet.py,sha256=Oy2MmNS-LhUXF9rKLa8AXAfJhppIQI8Nha8LmEZflmk,1169
+pyfemtet/opt/_test_utils/control_femtet.py,sha256=8oAl9y5V2n8Nnsgx_ebcZVzwFt1eI3swkdiKg6pg3-M,1085
 pyfemtet/opt/_test_utils/hyper_sphere.py,sha256=nQhw8EIY0DwvcTqrbKhkxiITLZifr4-nG77E-_6ggmA,700
 pyfemtet/opt/_test_utils/record_history.py,sha256=JCNJLZMCNTpJ6VT7iwEt2DIbwmsuQmgC0ClQSfcatj4,3915
-pyfemtet/opt/interface/__init__.py,sha256=5hel-mP6tuxzIEJFMZJZWUEWEbFSsskzCWlQ3HORTYI,466
-pyfemtet/opt/interface/_base.py,sha256=aPJ55dTp4-Q4KMkUZVRlquuBBWWOIOdC6yQsYZR4Jy0,2626
-pyfemtet/opt/interface/_excel_interface.py,sha256=kUNTtv98Zfot1ZJk281fhg6-EGQp8Jf_T8MeuO9LS08,16830
-pyfemtet/opt/interface/_femtet.py,sha256=dmKyRG8sWuX2JHjcXpvJ2q632oZh4I94iVo4u7Z7w_M,34742
-pyfemtet/opt/interface/_femtet_parametric.py,sha256=KDG8SB43AgwuhpCStjvx10G0RzyHhga6k4dfvp0gvYU,2175
+pyfemtet/opt/interface/__init__.py,sha256=P5Ij-xjB4628qdgacIXLu_WBaWCoBkAk4nEMUCAQzWs,458
+pyfemtet/opt/interface/_base.py,sha256=NVrvHVL7npgZbAQdMziA5TbTBghgi31JwrFH57edBKE,2615
+pyfemtet/opt/interface/_excel_interface.py,sha256=C9Ix1oUm2dHAHrKQPpb4gJo86iGJBcpXjXLa4c_VGSA,22853
+pyfemtet/opt/interface/_femtet.py,sha256=7FFwGJ4TFIhvjCCRIuEsJpJ-Cmo2OIO5cWKosLqcs-U,34944
+pyfemtet/opt/interface/_femtet_parametric.py,sha256=0pAEhHflp0wIxWBVMXI8nCC02oAyRKLinH3Y6O8bq3M,2224
 pyfemtet/opt/interface/_femtet_with_nx/__init__.py,sha256=-6W2g2FDEcKzGHmI5KAKQe-4U5jDpMj0CXuma-GZca0,83
-pyfemtet/opt/interface/_femtet_with_nx/_interface.py,sha256=BXWdzIFcId1EovpbRD5DmkW0BwqhpDvOuGBv9kdCGy8,5994
+pyfemtet/opt/interface/_femtet_with_nx/_interface.py,sha256=oefISc6c6RPPyhPnWuzCb60tgsrzGiqoIWk1DsiKzTk,5986
 pyfemtet/opt/interface/_femtet_with_nx/update_model.py,sha256=P7VH0i_o-X9OUe6AGaLF1fACPeHNrMjcrOBCA3MMrI4,3092
-pyfemtet/opt/interface/_femtet_with_sldworks.py,sha256=A9o-IY8Npq0CHK7yGxBw47wmOtNv5IYR80U2XAabSWM,11019
+pyfemtet/opt/interface/_femtet_with_sldworks.py,sha256=qqo2P4qZN0d89uNQyohKxq-Yhdql5vC0QHg4bpy7Ky8,11011
 pyfemtet/opt/optimizer/__init__.py,sha256=Ia6viowECkG0IFXtFef0tJ4jDKsoDzJLqMJ9xLFH2LQ,543
-pyfemtet/opt/optimizer/_base.py,sha256=0jX68VEfLI08Qr01BvfPCHKKlr3Bj6gWQ0T81qpX0y4,12507
+pyfemtet/opt/optimizer/_base.py,sha256=GsTOs3ZHLqCglYYRBk4XSJ5h1lR_W9eA2STiyQig6dM,12497
 pyfemtet/opt/optimizer/_optuna/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyfemtet/opt/optimizer/_optuna/_botorch_patch/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pyfemtet/opt/optimizer/_optuna/_botorch_patch/enable_nonlinear_constraint.py,sha256=2hUP2c8mokkRaSQ8nXxgCCmz8e0JKvEz8R2qIGnTGm0,8863
+pyfemtet/opt/optimizer/_optuna/_botorch_patch/enable_nonlinear_constraint.py,sha256=b2-PP2HM46kJS4cJkBWnxnW9AS9JfeVkEjmkoKK_ziE,8949
 pyfemtet/opt/optimizer/_optuna/_optuna.py,sha256=nKlEYizSu6BQu8OMhRWRJxk5eXJ0LAPR7h6CQOjbdxE,16460
 pyfemtet/opt/optimizer/_optuna/_pof_botorch.py,sha256=yVyg1V3trqirSDtbRepgftvS02AEkAhrgjou21JS124,72717
 pyfemtet/opt/optimizer/_scipy.py,sha256=_2whhMNq6hC1lr5PlYhpZ8Zlh6-DkAjz8SVB5qHIpYg,4766
@@ -60,7 +60,7 @@ pyfemtet/opt/samples/femprj_sample/cad_ex01_SW.femprj,sha256=knN0bBTHm5CqExLdmxd
 pyfemtet/opt/samples/femprj_sample/cad_ex01_SW.py,sha256=JoGQSwH3yJnABxyd-WJfrwMkhd1UV0yYF2L2RvMFXmc,4559
 pyfemtet/opt/samples/femprj_sample/cad_ex01_SW_test_result.reccsv,sha256=NS0Zik2c1mbMdGa0hGJaRQdCD08Bltx84n9QzP5CjPo,4736
 pyfemtet/opt/samples/femprj_sample/constrained_pipe.femprj,sha256=MAl-VQfethwYvl49RkuW7FQlFCQ9_mYvc03SsqBCad0,57414
-pyfemtet/opt/samples/femprj_sample/constrained_pipe.py,sha256=9Y5kE8ilNTaPzcjn1qCAdXQnyjYRCHpu_hYMOmJXKO8,3227
+pyfemtet/opt/samples/femprj_sample/constrained_pipe.py,sha256=mIscUYVGmoz5IpR_T9wyC1vTVW95PbGAeuTcDvq1Nk8,3226
 pyfemtet/opt/samples/femprj_sample/constrained_pipe_test_result.reccsv,sha256=AbAMXLtxrEBHLjdM0HnGQ7j3uJtVHZpxOZxOqNmO1CA,1796
 pyfemtet/opt/samples/femprj_sample/gal_ex58_parametric.femprj,sha256=dbanN3W2eX_ciZ0wZGqK60mc4edSVh5G2OqbbMKyFng,74898
 pyfemtet/opt/samples/femprj_sample/gal_ex58_parametric.py,sha256=RxLSXFs0SqUjlug_JZAKlkJhqJdQCY3Y3F-DtSQRtVM,2458
@@ -99,7 +99,7 @@ pyfemtet/opt/samples/femprj_sample_jp/wat_ex14_parametric_jp.femprj,sha256=dMwQM
 pyfemtet/opt/samples/femprj_sample_jp/wat_ex14_parametric_jp.py,sha256=vMy-KUP1wEMV9Rt6yXjkE40Fcs1t1cpQK-nQJK8hHao,2284
 pyfemtet/opt/samples/femprj_sample_jp/wat_ex14_parametric_parallel_jp.py,sha256=4X0cl3YWpYarcNBCH79mrlyFuKUYSqvnGzokEbv9ILk,2335
 pyfemtet/opt/visualization/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pyfemtet/opt/visualization/_base.py,sha256=k0PDvqNKn7sFYIgajWykOTgFztlu5_1bc-xfQQh8bKA,7589
+pyfemtet/opt/visualization/_base.py,sha256=xh6yIkoyBrV670JhAnR9rRewpH7P25wz0pnr0JH0pvc,7623
 pyfemtet/opt/visualization/_complex_components/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyfemtet/opt/visualization/_complex_components/alert_region.py,sha256=sX8xqT4NqhACagK4YgumF4ResrTqhOKQ8dN4q58shI8,2106
 pyfemtet/opt/visualization/_complex_components/control_femtet.py,sha256=LcMoh_MQQ1-hiz7nMGOmxSSoJLOX8viVxZB6uIggg_g,6243
@@ -120,8 +120,8 @@ pyfemtet/opt/visualization/result_viewer/.gitignore,sha256=ryvb4aqbbsHireHWlPQfx
 pyfemtet/opt/visualization/result_viewer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyfemtet/opt/visualization/result_viewer/application.py,sha256=WcHBx_J5eNLKSaprpk9BGifwhO04oN8FiNGYTWorrXA,1691
 pyfemtet/opt/visualization/result_viewer/pages.py,sha256=laEAKHAtdshCAHxgXo-zMNg3RP6lCxfszO3XwLnF1dU,32156
-pyfemtet-0.6.6.dist-info/LICENSE,sha256=sVQBhyoglGJUu65-BP3iR6ujORI6YgEU2Qm-V4fGlOA,1485
-pyfemtet-0.6.6.dist-info/METADATA,sha256=4fvkbBciIFpFpL6UBZ7EQ62imk4AdT9AwbuPGXTbktE,3371
-pyfemtet-0.6.6.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-pyfemtet-0.6.6.dist-info/entry_points.txt,sha256=ZfYqRaoiPtuWqFi2_msccyrVF0LurMn-IHlYamAegZo,104
-pyfemtet-0.6.6.dist-info/RECORD,,
+pyfemtet-0.7.0.dist-info/LICENSE,sha256=sVQBhyoglGJUu65-BP3iR6ujORI6YgEU2Qm-V4fGlOA,1485
+pyfemtet-0.7.0.dist-info/METADATA,sha256=T0IJPwww5DvoZN1Z2ucdGJhBsThjPn05lVU27zfC_go,3371
+pyfemtet-0.7.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+pyfemtet-0.7.0.dist-info/entry_points.txt,sha256=ZfYqRaoiPtuWqFi2_msccyrVF0LurMn-IHlYamAegZo,104
+pyfemtet-0.7.0.dist-info/RECORD,,