pyfemtet 0.8.11__py3-none-any.whl → 0.8.13__py3-none-any.whl

pyfemtet/__init__.py

@@ -1 +1 @@
-__version__ = "0.8.11"
+__version__ = "0.8.13"

pyfemtet/_message/locales/ja/LC_MESSAGES/messages.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2025-02-19 13:47+0900\n"
+"POT-Creation-Date: 2025-03-05 12:41+0900\n"
 "PO-Revision-Date: 2024-07-22 14:05+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: ja\n"
@@ -79,8 +79,8 @@ msgid "Model update failed."
 msgstr "モデル更新に失敗しました。"
 
 #: pyfemtet/_message/messages.py:60
-msgid "It was detected that the configuration of Femtet python macro constants has not been completed. The configuration was done automatically (python -m win32com.client.makepy FemtetMacro). Please restart the program."
-msgstr "Femtet マクロの定数の設定が未完了であることが検出され、設定コマンド（python -m win32com.client.makepy FemtetMacro）が自動実行されました。プログラムを再実行してください。"
+msgid "It was detected that the configuration of Femtet python macro constants has not been completed. The configuration was done automatically (python -m win32com.client.makepy FemtetMacro). Please restart the program. If the error persists, please run \"py -m win32com.client.makepy FemtetMacro\" or \"python -m win32com.client.makepy FemtetMacro\" on the command prompt."
+msgstr "Femtet マクロの定数の設定が未完了であることが検出され、設定コマンド（python -m win32com.client.makepy FemtetMacro）が自動実行されました。プログラムを再実行してください。もしエラーが解消されない場合は、コマンドプロンプトで「py -m win32com.client.makepy FemtetMacro」または「python -m win32com.client.makepy FemtetMacro」を実行してください。"
 
 #: pyfemtet/_message/messages.py:61
 msgid "Failed to connect to Femtet."

pyfemtet/_message/locales/messages.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2025-02-19 13:47+0900\n"
+"POT-Creation-Date: 2025-03-05 12:41+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -78,7 +78,7 @@ msgid "Model update failed."
 msgstr ""
 
 #: pyfemtet/_message/messages.py:60
-msgid "It was detected that the configuration of Femtet python macro constants has not been completed. The configuration was done automatically (python -m win32com.client.makepy FemtetMacro). Please restart the program."
+msgid "It was detected that the configuration of Femtet python macro constants has not been completed. The configuration was done automatically (python -m win32com.client.makepy FemtetMacro). Please restart the program. If the error persists, please run \"py -m win32com.client.makepy FemtetMacro\" or \"python -m win32com.client.makepy FemtetMacro\" on the command prompt."
 msgstr ""
 
 #: pyfemtet/_message/messages.py:61

pyfemtet/_message/messages.py

@@ -57,7 +57,7 @@ class Message:
     ERR_RUN_JOURNAL_NOT_FOUND = _(r'"%UGII_BASE_DIR%\NXBIN\run_journal.exe" is not found. Make sure you have NX installed and the environment variable UGII_BASE_DIR is set.')
     ERR_MODEL_RECONSTRUCTION_FAILED = _('Model reconstruction failed.')
     ERR_MODEL_UPDATE_FAILED = _('Model update failed.')
-    ERR_NO_MAKEPY = _('It was detected that the configuration of Femtet python macro constants has not been completed. The configuration was done automatically (python -m win32com.client.makepy FemtetMacro). Please restart the program.')
+    ERR_NO_MAKEPY = _('It was detected that the configuration of Femtet python macro constants has not been completed. The configuration was done automatically (python -m win32com.client.makepy FemtetMacro). Please restart the program. If the error persists, please run "py -m win32com.client.makepy FemtetMacro" or "python -m win32com.client.makepy FemtetMacro" on the command prompt.')
     ERR_FEMTET_CONNECTION_FAILED = _('Failed to connect to Femtet.')
     ERR_FEMTET_CRASHED_AND_RESTART_FAILED = _('The Femtet process crashed and could not be restarted successfully.')
     WARN_FEMTET_CRASHED_AND_TRY_RESTART = _('An abnormal termination of the Femtet process has been detected. Recovery will be attempted.')

pyfemtet/opt/_femopt_core.py

@@ -817,7 +817,7 @@ class History:
                 df = self.get_df()
                 trial = df['trial'].values[-1]
                 client = get_client()  # always returns valid client
-                client.run_on_scheduler(postprocess_func, trial, **postprocess_args)
+                client.run_on_scheduler(postprocess_func, *(trial, df), **postprocess_args)
 
     def _calc_non_domi(self, objectives, df):
 

pyfemtet/opt/interface/_base.py

@@ -84,7 +84,7 @@ class FEMInterface(ABC):
         """Preprocessing after launching a dask worker and before run optimization (if implemented in concrete class)."""
         pass
 
-    def _postprocess_func(self, trial: int, *args, dask_scheduler=None, **kwargs):
+    def _postprocess_func(self, trial: int, df: pd.DataFrame, *args, dask_scheduler=None, **kwargs):
         pass
 
     def _create_postprocess_args(self):

pyfemtet/opt/interface/_femtet.py

@@ -5,9 +5,11 @@ import os
 import sys
 from time import sleep, time
 import winreg
+import subprocess
 
 import pandas as pd
 import psutil
+import shutil
 from dask.distributed import get_worker
 
 # noinspection PyUnresolvedReferences
@@ -54,6 +56,9 @@ class FailedToPostProcess(Exception):
     pass
 
 
+
+
+
 class FemtetInterface(FEMInterface):
     """Control Femtet from optimizer.
 
@@ -73,7 +78,8 @@ class FemtetInterface(FEMInterface):
 
         save_pdt (str, optional):
             The type to save result file.
-            Can specify 'all' or None. Default is 'all'.
+            Valid values are 'all', 'none' or 'optimal'.
+            Default is 'all'.
 
         strictly_pid_specify (bool, optional):
             Whether to strictly specify the PID in Femtet connection.
@@ -124,7 +130,7 @@ class FemtetInterface(FEMInterface):
             femprj_path: str = None,
             model_name: str = None,
             connect_method: str = 'auto',  # dask worker では __init__ の中で 'new' にするので super() の引数にしない。（しても意味がない）
-            save_pdt: str = 'all',  # 'all' or None
+            save_pdt: str = 'all',  # 'all', 'none' or 'optimal'
             strictly_pid_specify: bool = True,  # dask worker では True にしたいので super() の引数にしない。
             allow_without_project: bool = False,  # main でのみ True を許容したいので super() の引数にしない。
             open_result_with_gui: bool = True,
@@ -301,7 +307,7 @@ class FemtetInterface(FEMInterface):
         # ensure makepy
         if not hasattr(constants, 'STATIC_C'):
             cmd = f'{sys.executable} -m win32com.client.makepy FemtetMacro'
-            os.system(cmd)
+            subprocess.run(cmd, shell=True)
             message = Msg.ERR_NO_MAKEPY
             logger.error('================')
             logger.error(message)
@@ -834,6 +840,7 @@ class FemtetInterface(FEMInterface):
             model_name=self.model_name,
             pdt_file_content=file_content,
             jpg_file_content=jpg_content,
+            save_results=self.save_pdt,  # 'all', 'optimal' or 'none'
         )
         return out
 
@@ -847,12 +854,20 @@ class FemtetInterface(FEMInterface):
     @staticmethod
     def _postprocess_func(
             trial: int,
+            df: pd.DataFrame,
             original_femprj_path: str,
+            save_results: str,
             model_name: str,
             pdt_file_content=None,
             jpg_file_content=None,
             dask_scheduler=None
     ):
+
+        # none なら何もしない
+        if save_results.lower() == 'none':
+            return
+
+        # all or optimal ならいったん保存する
         result_dir = original_femprj_path.replace('.femprj', '.Results')
         if pdt_file_content is not None:
             pdt_path = FemtetInterface._create_pdt_path(original_femprj_path, model_name, trial)
@@ -864,6 +879,15 @@ class FemtetInterface(FEMInterface):
             with open(jpg_path, 'wb') as f:
                 f.write(jpg_file_content)
 
+        # optimal なら不要ファイルの削除を実行する
+        if save_results.lower() == 'optimal':
+            for i, row in df.iterrows():
+                if not bool(row['non_domi']):
+                    trial_to_remove = int(row['trial'])
+                    pdt_path_to_remove = FemtetInterface._create_pdt_path(original_femprj_path, model_name, trial_to_remove)
+                    if os.path.isfile(pdt_path_to_remove):
+                        os.remove(pdt_path_to_remove)
+
     def _create_result_file_content(self):
         """Called after solve"""
         if self.save_pdt == 'all':

{pyfemtet-0.8.11.dist-info → pyfemtet-0.8.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pyfemtet
-Version: 0.8.11
+Version: 0.8.13
 Summary: Design parameter optimization using Femtet.
 License: BSD-3-Clause
 Author: kazuma.naito

{pyfemtet-0.8.11.dist-info → pyfemtet-0.8.13.dist-info}/RECORD

@@ -1,4 +1,4 @@
-pyfemtet/__init__.py,sha256=2JL5Qr1tMuuX9W0K2n-UaciQXJtKIEm_9ijSZ2wv2C0,22
+pyfemtet/__init__.py,sha256=n90UezNAM33B32NB_3LmwZMjC60o-5hKyMaeY9L9olc,22
 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=0BWID-tjOkmZwmgPFkcJMkWW39voccz5ARIBWvZbHaw,1877
@@ -6,10 +6,10 @@ pyfemtet/_message/1. make_pot.bat,sha256=wrTA0YaL7nUfNB0cS8zljOmwq2qgyG6RMwHQbrw
 pyfemtet/_message/2. make_mo.bat,sha256=6shJ3Yn4BXjDc0hhv_kiGUtVTq4oSRz8-iS4vW29rNE,155
 pyfemtet/_message/__init__.py,sha256=gE1-XX_PzHj9BbhqPaK5VcIHuv6_Tec5qlPMC3IRiBg,100
 pyfemtet/_message/babel.cfg,sha256=AQIFCQ7NlAA84PhV0gowHhbIXH41zA55mzhgyROniJk,73
-pyfemtet/_message/locales/ja/LC_MESSAGES/messages.mo,sha256=BsDrPmXWzKfaAjATSq-GZexNX4iG8ax7Ss0bfB1ocIk,19512
-pyfemtet/_message/locales/ja/LC_MESSAGES/messages.po,sha256=_ugJcUf__C1HdXt3ubcPurLQWKuL3dg0DGMcrDtTBbw,26047
-pyfemtet/_message/locales/messages.pot,sha256=G_6aRv0zZjpShKx13hm_1B2D60sViOuUHpZsX5QJSpQ,15372
-pyfemtet/_message/messages.py,sha256=ztDyORp0sjgNCe2DKEh-ojWfcVnVmOy3mEtAUt_yYhA,14185
+pyfemtet/_message/locales/ja/LC_MESSAGES/messages.mo,sha256=-NK_RbmdKtl51Vwjz-fToT16LaY-oskCmQokgPruFJ8,19875
+pyfemtet/_message/locales/ja/LC_MESSAGES/messages.po,sha256=WjA_LAT8L8PcplzHjo9lnGsA-oou_PxdK96nLeT1gIc,26414
+pyfemtet/_message/locales/messages.pot,sha256=7t_X5bq1yo9Www5CKEmswuSNhziDeDBV3qF9pKEqlhs,15526
+pyfemtet/_message/messages.py,sha256=UuB8Q6kXk7z6ahmKYySIIhiYsDPyY7dC6s8COTWAS3k,14335
 pyfemtet/_util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyfemtet/_util/dask_util.py,sha256=ufgr4m8slvyWP97lWBwolysQpJ1PmAO_-OI8IlEyvU8,233
 pyfemtet/_util/excel_macro_util.py,sha256=cF1Z3yl9FMM0J7dpMRTsle8uYxYcfHhQC0QffnVovdY,7944
@@ -25,7 +25,7 @@ pyfemtet/logger/__init__.py,sha256=UOJ9n_U2xwdTrp0Xgg-N6geySxNzKqTBQlXsaH0kW_w,4
 pyfemtet/logger/_impl.py,sha256=rsAd0HpmveOaLS39ucp3U2OcDhQMWjC5fnVGhbJtWVw,6375
 pyfemtet/opt/__init__.py,sha256=wRR8LbEhb5I6MUgmnCgjB6-tqHlOVxDIo7yPkq0QbBs,758
 pyfemtet/opt/_femopt.py,sha256=MSqSJzyD2sRYBNQAe0P5rpSvvVihOV2ugUa-hZyYnBA,40671
-pyfemtet/opt/_femopt_core.py,sha256=w8jcKAIxakO2JMC51TTWI3iL-3wlEg6wCDn45D4ZCe4,39366
+pyfemtet/opt/_femopt_core.py,sha256=AFHxZSVke1jpHAsdJtN_lY015TL5ipXO9qfZ8zYGL8g,39373
 pyfemtet/opt/_test_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyfemtet/opt/_test_utils/control_femtet.py,sha256=8oAl9y5V2n8Nnsgx_ebcZVzwFt1eI3swkdiKg6pg3-M,1085
 pyfemtet/opt/_test_utils/hyper_sphere.py,sha256=nQhw8EIY0DwvcTqrbKhkxiITLZifr4-nG77E-_6ggmA,700
@@ -43,9 +43,9 @@ pyfemtet/opt/advanced_samples/surrogate_model/gal_ex13_optimize_with_surrogate.p
 pyfemtet/opt/advanced_samples/surrogate_model/gal_ex13_optimize_with_surrogate_jp.py,sha256=OAOpHKyMMo1StSqNMqx4saYDn4hiGOKDypyK6uhTILQ,3215
 pyfemtet/opt/advanced_samples/surrogate_model/gal_ex13_parametric.femprj,sha256=iIHH1X-wWBqEYj4cFJXco73LCJXSrYBsSKOD0HxYu60,87599
 pyfemtet/opt/interface/__init__.py,sha256=SstCN9WMYqF5lKNbb8xAzq0hBV-Hk8YuCrajvF3sOg0,1350
-pyfemtet/opt/interface/_base.py,sha256=zbRhNB4fwznKHsllC1X29TONoB9MP8qMH8Nqz4NX_yA,2838
+pyfemtet/opt/interface/_base.py,sha256=hDv4C8LQpKaeZJR8iEfTSVd4Na2fQblFBv0Yw78xcRY,2856
 pyfemtet/opt/interface/_excel_interface.py,sha256=1PYB056rU2mX-LgBWRwwTUxDkt7crgHAk3fKJuMNMMU,40152
-pyfemtet/opt/interface/_femtet.py,sha256=bAeFG4oik0zt3PcbPOhhQOm0-kboS83JKn0RX_mIrP0,37779
+pyfemtet/opt/interface/_femtet.py,sha256=Y1t_GY_W0ivR6obv8eiMx1_-OoJFTjQAvhnoUkIMaaQ,38657
 pyfemtet/opt/interface/_femtet_excel.py,sha256=dWPQguKNOVdJ4jTfwLykCeM9iwA2S1KOLynw8UGzmvk,5968
 pyfemtet/opt/interface/_femtet_parametric.py,sha256=hxNiZfhR1IPtrMXg39TZutXTcOXdoxTKiRTTcYRGgVs,10181
 pyfemtet/opt/interface/_femtet_with_nx/__init__.py,sha256=-6W2g2FDEcKzGHmI5KAKQe-4U5jDpMj0CXuma-GZca0,83
@@ -148,8 +148,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=MZAjzbuq0toZrR-iJhElM3A12_jHVCTt65gz1kdNPbw,32193
-pyfemtet-0.8.11.dist-info/LICENSE,sha256=sVQBhyoglGJUu65-BP3iR6ujORI6YgEU2Qm-V4fGlOA,1485
-pyfemtet-0.8.11.dist-info/METADATA,sha256=Yg6P6oApQo_63zTEzB4m2Ls3TQCljx_Tddr_T5bWgYs,3549
-pyfemtet-0.8.11.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-pyfemtet-0.8.11.dist-info/entry_points.txt,sha256=ZfYqRaoiPtuWqFi2_msccyrVF0LurMn-IHlYamAegZo,104
-pyfemtet-0.8.11.dist-info/RECORD,,
+pyfemtet-0.8.13.dist-info/LICENSE,sha256=sVQBhyoglGJUu65-BP3iR6ujORI6YgEU2Qm-V4fGlOA,1485
+pyfemtet-0.8.13.dist-info/METADATA,sha256=bUXnv1egGK3lCJUXit-_WM6Ho16ZoLmMTIUmf-GEuYQ,3549
+pyfemtet-0.8.13.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+pyfemtet-0.8.13.dist-info/entry_points.txt,sha256=ZfYqRaoiPtuWqFi2_msccyrVF0LurMn-IHlYamAegZo,104
+pyfemtet-0.8.13.dist-info/RECORD,,