PyFemtet 1.9.2__tar.gz → 1.10.0__tar.gz

{pyfemtet-1.9.2 → pyfemtet-1.10.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyfemtet
-Version: 1.9.2
+Version: 1.10.0
 Summary: Design parameter optimization using Femtet.
 License-Expression: MIT
 License-File: LICENSE
@@ -31,7 +31,7 @@ Requires-Dist: optuna-integration (>=3.6.0,<5.0.0)
 Requires-Dist: packaging (>=25.0)
 Requires-Dist: pandas (>=2.2.3,<3)
 Requires-Dist: plotly (>=5.22.0,<6)
-Requires-Dist: psutil (>=5.9.6,<6)
+Requires-Dist: psutil (>=5.9.6)
 Requires-Dist: pywin32 (>=310) ; sys_platform == "win32"
 Requires-Dist: pyyaml (>=6.0.2,<7)
 Requires-Dist: scipy (>=1.11.4,<2)

{pyfemtet-1.9.2 → pyfemtet-1.10.0}/pyfemtet/_util/dask_util.py

@@ -3,7 +3,7 @@ from packaging.version import Version
 from threading import Lock as _ThreadingLock
 
 import dask
-from dask.distributed import LocalCluster, Client, Lock as _DaskLock, Nanny
+from dask.distributed import LocalCluster, Client, Lock as _DaskLock, Nanny, Worker
 from dask.distributed import get_client as _get_client, get_worker as _get_worker
 from dask import config as cfg
 
@@ -41,14 +41,14 @@ __all__ = [
 _lock_pool = {}
 
 
-def get_client(scheduler_address=None):
+def get_client(scheduler_address=None) -> Client | None:
     try:
         return _get_client(scheduler_address)
     except ValueError:
         return None
 
 
-def get_worker():
+def get_worker() -> Worker | None:
     try:
         return _get_worker()
     except ValueError:

{pyfemtet-1.9.2 → pyfemtet-1.10.0}/pyfemtet/opt/history/_history.py

@@ -53,7 +53,7 @@ logger = get_module_logger("opt.history", False)
 logger_dask = get_module_logger("opt.dask", False)
 
 
-def get_trial_name(trial=None, fidelity=None, sub_sampling=None, row: pd.Series = None):
+def get_trial_name(trial=None, fidelity=None, sub_sampling=None, row: pd.Series | None = None):
     if row is not None:
         assert not math.isnan(row["trial"])
         trial = row["trial"]
@@ -188,7 +188,7 @@ class DataFrameWrapper:
     def lock(self):
         return Lock(self._lock_name)
 
-    def get_df(self, equality_filters: dict = None) -> pd.DataFrame:
+    def get_df(self, equality_filters: dict | None = None) -> pd.DataFrame:
         """
 
         Args:
@@ -240,7 +240,7 @@ class DataFrameWrapper:
 
         return df
 
-    def set_df(self, df, equality_filters: dict = None):
+    def set_df(self, df, equality_filters: dict | None = None):
         """
 
         Args:
@@ -1227,7 +1227,7 @@ class Records:
         self.df_wrapper.set_df(df)
 
     def remove_nan_columns(
-        self, df, meta_columns, columns_to_keep: list[str] | None = None
+        self, df: pd.DataFrame, meta_columns: list[str], columns_to_keep: list[str] | None = None
     ) -> tuple[pd.DataFrame, tuple[str]]:
         """
 
@@ -1506,7 +1506,7 @@ class History:
 
         self._finalized = True
 
-    def get_df(self, equality_filters: dict = None) -> pd.DataFrame:
+    def get_df(self, equality_filters: dict | None = None) -> pd.DataFrame:
         """Returns the optimization history.
 
         Args:

{pyfemtet-1.9.2 → pyfemtet-1.10.0}/pyfemtet/opt/interface/_femtet_interface/femtet_interface.py

@@ -135,6 +135,7 @@ class FemtetInterface(COMInterface):
             always_open_copy=False,
             # ユーザーはメソッドを使うことを推奨。GUI などで使用。
             parametric_output_indexes_use_as_objective: dict[int, str | float] | None = None,
+            skip_model_update: bool = False,
     ):
         if parametric_output_indexes_use_as_objective is not None:
             if FemtetInterface._show_parametric_index_warning:
@@ -158,6 +159,7 @@ class FemtetInterface(COMInterface):
         self.open_result_with_gui = open_result_with_gui
         self.save_pdt = save_pdt
         self._always_open_copy = always_open_copy
+        self.skip_model_update = skip_model_update
 
         # その他のメンバーの宣言や初期化
         self.Femtet = None
@@ -965,23 +967,24 @@ class FemtetInterface(COMInterface):
     def update_model(self) -> None:
         """Updates the analysis model only."""
 
-        # 設計変数に従ってモデルを再構築
-        self._call_femtet_api(
-            "self.Femtet.Gaudi.ReExecute",
-            False,
-            ModelError,  # 生きてるのに失敗した場合
-            error_message=Msg.ERR_RE_EXECUTE_MODEL_FAILED,
-            is_Gaudi_method=True,
-        )
+        if not self.skip_model_update:
+            # 設計変数に従ってモデルを再構築
+            self._call_femtet_api(
+                "self.Femtet.Gaudi.ReExecute",
+                False,
+                ModelError,  # 生きてるのに失敗した場合
+                error_message=Msg.ERR_RE_EXECUTE_MODEL_FAILED,
+                is_Gaudi_method=True,
+            )
 
-        # 処理を確定
-        self._call_femtet_api(
-            self.Femtet.Redraw,
-            False,  # 戻り値は常に None なのでこの変数に意味はなく None 以外なら何でもいい
-            ModelError,  # 生きてるのに失敗した場合
-            error_message=Msg.ERR_MODEL_REDRAW_FAILED,
-            is_Gaudi_method=True,
-        )
+            # 処理を確定
+            self._call_femtet_api(
+                self.Femtet.Redraw,
+                False,  # 戻り値は常に None なのでこの変数に意味はなく None 以外なら何でもいい
+                ModelError,  # 生きてるのに失敗した場合
+                error_message=Msg.ERR_MODEL_REDRAW_FAILED,
+                is_Gaudi_method=True,
+            )
 
     @with_reopen
     def solve(self) -> None:

{pyfemtet-1.9.2 → pyfemtet-1.10.0}/pyproject.toml

@@ -10,7 +10,7 @@ dependencies = [
     "babel>=2.15.0,<3",
     "tqdm>=4.66.1,<5",
     "colorlog>=6.8.0,<7",
-    "psutil>=5.9.6,<6",
+    "psutil>=5.9.6",
     "pywin32>=310; sys_platform == 'win32'",
     "femtetutils>=1.0.0,<2 ; sys_platform=='win32'",
     "dask~=2024.12.1",
@@ -34,7 +34,7 @@ dependencies = [
 
 #[project.optional-dependencies]
 #brep = ["brepmatching>=0.1.8,<0.2"]
-version = "1.9.2"
+version = "1.10.0"
 
 [project.urls]
 Repository = "https://github.com/pyfemtet/pyfemtet"