pyfemtet 1.1.4__py3-none-any.whl → 1.1.5__py3-none-any.whl

pyfemtet/logger/_impl.py

@@ -81,6 +81,7 @@ def __create_formatter(colored=True):
 # ===== handler config =====
 
 STDOUT_HANDLER_NAME = 'stdout-handler'
+STDERR_HANDLER_NAME = 'stderr-handler'
 
 
 def __get_stdout_handler():
@@ -94,6 +95,17 @@ def __has_stdout_handler(logger):
     return any([handler.get_name() != STDOUT_HANDLER_NAME for handler in logger.handlers])
 
 
+def __get_stderr_handler():
+    stderr_handler = logging.StreamHandler(sys.stderr)
+    stderr_handler.set_name(STDERR_HANDLER_NAME)
+    stderr_handler.setFormatter(__create_formatter(colored=True))
+    return stderr_handler
+
+
+def __has_stderr_handler(logger):
+    return any([handler.get_name() != STDERR_HANDLER_NAME for handler in logger.handlers])
+
+
 def set_stdout_output(logger, level=logging.INFO):
 
     if not __has_stdout_handler(logger):
@@ -107,6 +119,19 @@ def remove_stdout_output(logger):
         logger.removeHandler(__get_stdout_handler())
 
 
+def set_stderr_output(logger, level=logging.INFO):
+
+    if not __has_stderr_handler(logger):
+        logger.addHandler(__get_stderr_handler())
+
+    logger.setLevel(level)
+
+
+def remove_stderr_output(logger):
+    if __has_stderr_handler(logger):
+        logger.removeHandler(__get_stderr_handler())
+
+
 def add_file_output(logger, filepath=None, level=logging.INFO) -> str:
     """Add FileHandler to the logger.
 
@@ -165,7 +190,7 @@ def setup_package_root_logger(package_name):
         with __lock:
             logger = logging.getLogger(package_name)
             logger.propagate = True
-            set_stdout_output(logger)
+            set_stderr_output(logger)
             logger.setLevel(logging.INFO)
             __initialized_root_packages.append(package_name)
     else:

pyfemtet/opt/optimizer/optuna_optimizer/_optuna_optimizer.py

@@ -43,6 +43,20 @@ warnings.filterwarnings('ignore', 'Argument ``constraints_func`` is an experimen
 _MESSAGE_ENQUEUED = 'Enqueued trial.'
 
 
+def check_float_and_raise(value, check_target):
+    if isinstance(value, int | float):
+        if np.isnan(value):
+            raise ValueError(_(
+                en_message=f'{check_target} is NaN.',
+                jp_message=f'{check_target} は NaN です。',
+            ))
+    else:
+        raise ValueError(_(
+            en_message=f'{check_target} should be a number, but {value} ({type(value)}) passed.',
+            jp_message=f'{check_target} は数値でなくてはなりませんが、{value} ({type(value)}) が与えられました。',
+        ))
+
+
 class MaxTrialsCallbackExcludingEnqueued(MaxTrialsCallback):
     def __call__(self, study: Study, trial: FrozenTrial) -> None:
         """
@@ -167,14 +181,31 @@ class OptunaOptimizer(AbstractOptimizer):
             self,
             name: str,
             initial_value: float,
-            lower_bound: float,
-            upper_bound: float,
+            lower_bound: float | None = None,
+            upper_bound: float | None = None,
             step: float | None = None,
             properties: dict[str, ...] | None = None,
             *,
             pass_to_fem: bool = True,
             fix: bool = False,
     ) -> None:
+
+        if lower_bound is None or upper_bound is None:
+            properties = properties or {}
+            if properties.get('dynamic_bounds_fun') is None:
+                raise ValueError(_(
+                    en_message='When using `OptunaOptimizer`, you must either specify `lower_bound` and `upper_bound`, ' \
+                               'or include `dynamic_bounds_fun` (Callable[[AbstractOptimizer], float]) in `properties`.',
+                    jp_message='OptunaOptimizer では、lower_bound と upper_bound を両方指定するか、' \
+                               'または properties に dynamic_bounds_fun (Callable[[AbstractOptimizer], float]) ' \
+                               'を含めなければなりません。'
+                ))
+            else:
+                logger.warning(_(
+                    en_message='`dynamic_bounds_fun` is under development. The functionally can be changed without any announcement.',
+                    jp_message='dynamic_bounds_fun は開発中の機能です。機能は予告なく変更されることがあります。',
+                ))
+
         AbstractOptimizer.add_parameter(self, name, initial_value, lower_bound, upper_bound, step, properties,
                                         pass_to_fem=pass_to_fem, fix=fix)
 
@@ -271,6 +302,13 @@ class OptunaOptimizer(AbstractOptimizer):
                     continue
 
                 if isinstance(prm, NumericParameter):
+                    dynamic_bounds_fun = prm.properties.get('dynamic_bounds_fun')
+                    if dynamic_bounds_fun:
+                        lb, ub = dynamic_bounds_fun(self)
+                        check_float_and_raise(lb, _(f'lower_bound of {prm.name}', f'{prm.name} の lower_bound'))
+                        check_float_and_raise(ub, _(f'upper_bound of {prm.name}', f'{prm.name} の upper_bound'))
+                        prm.lower_bound = lb
+                        prm.upper_bound = ub
                     prm.value = trial.suggest_float(
                         name,
                         prm.lower_bound,

pyfemtet/opt/problem/variable_manager/_variable_manager.py

@@ -311,6 +311,7 @@ class VariableManager:
         | dict[str, SupportedVariableTypes]
         | np.ndarray
     ):
+        # 参照を返す仕様を dynamic bounds で利用
 
         raw = {}
 

pyfemtet/opt/visualization/history_viewer/_complex_components/pm_graph.py

@@ -428,9 +428,10 @@ class PredictionModelGraph(AbstractPage):
                     self.CommandState.ready.value,
                     self.alert_region.create_alerts(
                         _(
-                            en_message='Cannot draw the graph because the selected parameter '
-                                       'is a fixed and its bounds are not given.',
-                            jp_message='選択された変数は固定値で上下限も与えられていないため、'
+                            en_message='Cannot draw the graph because '
+                                       'the bounds of selected parameter '
+                                       'are not given.',
+                            jp_message='選択された変数は上下限が与えられていないため、'
                                        'グラフを描画できません。',
                         ),
                         color='danger',

{pyfemtet-1.1.4.dist-info → pyfemtet-1.1.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyfemtet
-Version: 1.1.4
+Version: 1.1.5
 Summary: Design parameter optimization using Femtet.
 License-Expression: MIT
 License-File: LICENSE

{pyfemtet-1.1.4.dist-info → pyfemtet-1.1.5.dist-info}/RECORD

@@ -26,7 +26,7 @@ pyfemtet/core.py,sha256=t5tvWGrBNzCL9cP-91hbTR8q5lzULPsVeIEybeslhxQ,936
 pyfemtet/dispatch_extensions/__init__.py,sha256=BzxYq3x8YdkdClq4VvH4G5HTGxu5nyAhN7xlFsnTv8c,159
 pyfemtet/dispatch_extensions/_impl.py,sha256=Sgp350ioKcNVslXv9xRdtRjaQGRQM-BwbJYXjeildtw,11107
 pyfemtet/logger/__init__.py,sha256=lofBrZHr0P1hsxPUiPG1SQqKxCuSBk8zGnR7vUfCHYw,516
-pyfemtet/logger/_impl.py,sha256=uJ9el3kR-A4W2DvO_G5A6k9z2u1lkyl7GSvZ68uPy-U,6321
+pyfemtet/logger/_impl.py,sha256=tR71WZbjUvnZqULzxD4Y8Vhq8eBnJhMm360-JXxB5Dc,7012
 pyfemtet/opt/__init__.py,sha256=1LcwTddtoi8plemxkzmX0YEKiNpAZvKn9OoNQysyDLE,339
 pyfemtet/opt/exceptions.py,sha256=M_O7jm20Y4e_QxsKF6tnEl-OrAtErUOj6hNT7eEXCO4,1327
 pyfemtet/opt/femopt.py,sha256=Zht_H_eaTUwUcA7XFlzod0mGoJzTOZckqRK3VuwjaHM,23716
@@ -68,7 +68,7 @@ pyfemtet/opt/optimizer/_base_optimizer.py,sha256=o7XYqAJywX-gnXu2iyKXRKAhyIklZxb
 pyfemtet/opt/optimizer/_trial_queue.py,sha256=Yv6JlfVCYOiCukllfxk79xU4_utmxwRA3gcCWpdyG9k,2919
 pyfemtet/opt/optimizer/optuna_optimizer/__init__.py,sha256=u2Bwc79tkZTU5dMbhzzrPQi0RlFg22UgXc-m9K9G6wQ,242
 pyfemtet/opt/optimizer/optuna_optimizer/_optuna_attribute.py,sha256=7eZsruVCGgMlcnf3a9Vf55FOEE-D7V777MJQajI12Cw,1842
-pyfemtet/opt/optimizer/optuna_optimizer/_optuna_optimizer.py,sha256=2hWxS-PZ-oQyPw1cDfW5e6Tiu2bAUmE9Wo9WR01e2zc,32863
+pyfemtet/opt/optimizer/optuna_optimizer/_optuna_optimizer.py,sha256=mlp4jnjK78lV7hiw_SYrIc8k1CuE28z9hxHSfeefTIk,35078
 pyfemtet/opt/optimizer/optuna_optimizer/_pof_botorch/__init__.py,sha256=BFbMNvdXqV9kl1h340pW2sq0-cwNFV5dfTo6UnNnX2M,179
 pyfemtet/opt/optimizer/optuna_optimizer/_pof_botorch/debug-pof-botorch.reccsv,sha256=K6oI9jPi_5yayhBrI9Tm1RX3PoWWKo74TOdqnaPsIy8,1746
 pyfemtet/opt/optimizer/optuna_optimizer/_pof_botorch/enable_nonlinear_constraint.py,sha256=jq8cfkZuEkdd8Gvlr3Do4dl48bKSm9Uu7AcEy1dAf6U,9901
@@ -85,7 +85,7 @@ pyfemtet/opt/problem/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
 pyfemtet/opt/problem/problem.py,sha256=X9mro2yVJ6Uw9ck0F0OjG-0M2ReKtuWltu-JUEFIkzQ,10025
 pyfemtet/opt/problem/variable_manager/__init__.py,sha256=uzuraWUZfLzB3uZHIQHFL7uMxWvv7Oaf940zEozXtNY,476
 pyfemtet/opt/problem/variable_manager/_string_as_expression.py,sha256=aTJ9W9Gs6BS0Z_OsxWByJs9dAt32opD2_9913MCggPg,3626
-pyfemtet/opt/problem/variable_manager/_variable_manager.py,sha256=o6wtaHlgZ-1gbMrLrZYX555M_gTkLDO4p-VHIXE42-k,12725
+pyfemtet/opt/problem/variable_manager/_variable_manager.py,sha256=jtIHFWgVP2jhA3c5uSD388VZHuShR25ZZ8SYz5-6Rro,12785
 pyfemtet/opt/visualization/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyfemtet/opt/visualization/_create_wrapped_components.py,sha256=9AltJHr1DM6imZfpNp867rC-uAYqQ-emdgTLChKDrl8,2513
 pyfemtet/opt/visualization/history_viewer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -97,7 +97,7 @@ pyfemtet/opt/visualization/history_viewer/_complex_components/alert_region.py,sh
 pyfemtet/opt/visualization/history_viewer/_complex_components/control_femtet.py,sha256=FQUR9bYtMoj_3bvHXfzAhYMoYpbIWcDP8j7M2EwnYQM,6253
 pyfemtet/opt/visualization/history_viewer/_complex_components/detail_graphs.py,sha256=friaHAJOG5BEUAkoy7ukpO-vUhJ0DlJFwMB2ayNJ4so,19134
 pyfemtet/opt/visualization/history_viewer/_complex_components/main_graph.py,sha256=dMphOHbSV2R3oQvPlIQj7GwtV0phPiBwKniblxTAxMY,25978
-pyfemtet/opt/visualization/history_viewer/_complex_components/pm_graph.py,sha256=-fihXFDe_RdUTjaPepiVMWM4zVYAf6oD8QrPVdvA_wA,29840
+pyfemtet/opt/visualization/history_viewer/_complex_components/pm_graph.py,sha256=y3FSZGIdaWcJQdbACbfIkjuAumW6pXxQ89Wkafnp4pA,29854
 pyfemtet/opt/visualization/history_viewer/_detail_page.py,sha256=2LdCFSCcxZkAH6QMa9q6QX-KLYhVrRf-iTh7jNPrnnA,3406
 pyfemtet/opt/visualization/history_viewer/_helper.py,sha256=276488eouQEo-haK4XXCVM1Vy8_28Vyp5g0l7zt4Sfc,1009
 pyfemtet/opt/visualization/history_viewer/_process_monitor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -171,9 +171,9 @@ pyfemtet/opt/visualization/plotter/parallel_plot_creator.py,sha256=VRhT0CUG1mCHD
 pyfemtet/opt/visualization/plotter/pm_graph_creator.py,sha256=7EwmoJlnHwDrpw65NchiA63FIjgGTLq6vTcpTzrSnJo,11841
 pyfemtet/opt/wat_ex14_parametric_jp.femprj,sha256=dMwQMt6yok_PbZLyxPYdmg5wJQwgQDZ4RhS76zdGLGk,177944
 pyfemtet/opt/worker_status.py,sha256=simvPa1AkO1idmPXrF5WjYVEBx3tO7hLhbM3J1rFjdo,3824
-pyfemtet-1.1.4.dist-info/METADATA,sha256=Q9l6olWlrWO1Hhy_67IdqqhyKvJyjBiq25ywjv05TTs,3410
-pyfemtet-1.1.4.dist-info/WHEEL,sha256=M5asmiAlL6HEcOq52Yi5mmk9KmTVjY2RDPtO4p9DMrc,88
-pyfemtet-1.1.4.dist-info/entry_points.txt,sha256=Tsb_l_8Z6pyyq2tRfuKiwfJUV3nq_cHoLS61foALtsg,134
-pyfemtet-1.1.4.dist-info/licenses/LICENSE,sha256=LWUL5LlMGjSRTvsalS8_fFuwS4VMw18fJSNWFwDK8pc,1060
-pyfemtet-1.1.4.dist-info/licenses/LICENSE_THIRD_PARTY.txt,sha256=8_9-cgzTpmeuCqItPZb9-lyAZcH2Qp9sZTU_hYuOZIQ,191
-pyfemtet-1.1.4.dist-info/RECORD,,
+pyfemtet-1.1.5.dist-info/METADATA,sha256=wWktO1slosfUsyfHUxASVT6iauIeAypOMwE2A7YvbeE,3410
+pyfemtet-1.1.5.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+pyfemtet-1.1.5.dist-info/entry_points.txt,sha256=Tsb_l_8Z6pyyq2tRfuKiwfJUV3nq_cHoLS61foALtsg,134
+pyfemtet-1.1.5.dist-info/licenses/LICENSE,sha256=LWUL5LlMGjSRTvsalS8_fFuwS4VMw18fJSNWFwDK8pc,1060
+pyfemtet-1.1.5.dist-info/licenses/LICENSE_THIRD_PARTY.txt,sha256=8_9-cgzTpmeuCqItPZb9-lyAZcH2Qp9sZTU_hYuOZIQ,191
+pyfemtet-1.1.5.dist-info/RECORD,,

{pyfemtet-1.1.4.dist-info → pyfemtet-1.1.5.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.2.0
+Generator: poetry-core 2.2.1
 Root-Is-Purelib: true
 Tag: py3-none-any