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

pyfemtet/__init__.py

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

pyfemtet/brep/__init__.py

@@ -0,0 +1,3 @@
+from pyfemtet.brep._impl import ModelUpdater
+
+__all__ = ['ModelUpdater']

pyfemtet/brep/_impl.py

@@ -0,0 +1,14 @@
+try:
+    import brepmatching
+except ModuleNotFoundError as e:
+    import warnings
+    warnings.warn(
+        'There is no installation of `brepmatching`. '
+        'Please confirm installation via '
+        '`pip install pyfemtet[brep]` or '
+        '`pip install brepmatching` command.'
+    )
+    raise e
+
+from brepmatching.pyfemtet_scripts.replace_model_considering_their_matching import ModelUpdater
+

pyfemtet/opt/interface/_excel_interface.py

@@ -263,15 +263,15 @@ class ExcelInterface(FEMInterface):
         try:
             with watch_excel_macro_error(self.excel, timeout=self.procedure_timeout):
                 self.excel.Run(
-                    f'{self.wb_input.Name}!{self.procedure_name}',
+                    f'{self.procedure_name}',
                     *self.procedure_args
                 )
 
             # 再計算
             self.excel.CalculateFull()
 
-        except com_error:
-            raise SolveError(f'Failed to run macro {self.wb_input.Name}!{self.procedure_name}')
+        except com_error as e:
+            raise SolveError(f'Failed to run macro {self.procedure_name}. The original message is: {e}')
 
 
     def quit(self):
@@ -293,7 +293,7 @@ class ExcelInterface(FEMInterface):
         gc.collect()
 
         # quit した後ならば femtet を終了できる
-        # excel の process の完全消滅を待つ
+        # excel の process の消滅を待つ
         logger.info('Excel の終了を待っています。')
         while self._excel_pid == _get_pid(self._excel_hwnd):
             sleep(1)
@@ -301,12 +301,14 @@ class ExcelInterface(FEMInterface):
         # 正確だが時間がかかるかも
         logger.info('終了する Femtet を特定しています。')
         femtet_pid = util.get_last_executed_femtet_process_id()
-        Femtet, caught_pid = dispatch_specific_femtet(femtet_pid)
-        _exit_or_force_terminate(timeout=3, Femtet=Femtet, force=True)
+        from multiprocessing import Process
+        p = Process(target=_terminate_femtet, args=(femtet_pid,))
+        p.start()
 
         logger.info('自動保存機能の設定を元に戻しています。')
         _set_autosave_enabled(self._femtet_autosave_buffer)
 
+        p.join()
         logger.info('Excel-Femtet を終了しました。')
 
     # 直接アクセスしてもよいが、ユーザーに易しい名前にするためだけのプロパティ
@@ -425,6 +427,11 @@ def wait_femtet():
         Femtet = Dispatch('FemtetMacro.Femtet')
 
 
+def _terminate_femtet(femtet_pid_):
+    CoInitialize()
+    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-0.6.5.dist-info → pyfemtet-0.6.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyfemtet
-Version: 0.6.5
+Version: 0.6.6
 Summary: Design parameter optimization using Femtet.
 Home-page: https://github.com/pyfemtet/pyfemtet
 License: BSD-3-Clause
@@ -12,8 +12,10 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Provides-Extra: brep
 Requires-Dist: babel (>=2.15.0,<3.0.0)
 Requires-Dist: botorch (==0.9.5)
+Requires-Dist: brepmatching (>=0.1.6,<0.2.0) ; extra == "brep"
 Requires-Dist: colorlog (>=6.8.0,<7.0.0)
 Requires-Dist: dash (>=2.17.0,<3.0.0)
 Requires-Dist: dash-bootstrap-components (>=1.5.0,<2.0.0)

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

@@ -1,4 +1,4 @@
-pyfemtet/__init__.py,sha256=_f8whmZJ36ZCTk0Zldzy3KONxDBm0bxyKt7pCSHC3cE,21
+pyfemtet/__init__.py,sha256=GTf8rijLTDSqTWQgxKQN312t-j2E-t3ioZB4U22DXxc,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
@@ -12,6 +12,8 @@ pyfemtet/_message/messages.py,sha256=F8ENLZKoHq5irn-Ag7rqA3aSDsTmRWDyNHvOLY76ROI
 pyfemtet/_util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyfemtet/_util/excel_macro_util.py,sha256=Euxz3QmvTnnQCkWnbnPhvX7xXxppRONX69VlFxNCojA,7540
 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
@@ -26,7 +28,7 @@ pyfemtet/opt/_test_utils/hyper_sphere.py,sha256=nQhw8EIY0DwvcTqrbKhkxiITLZifr4-n
 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=7wJ8SOJaCyl6rVnmjLjw67Yv95bO1gwFBThc-cDLRYE,16649
+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/_femtet_with_nx/__init__.py,sha256=-6W2g2FDEcKzGHmI5KAKQe-4U5jDpMj0CXuma-GZca0,83
@@ -118,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.5.dist-info/LICENSE,sha256=sVQBhyoglGJUu65-BP3iR6ujORI6YgEU2Qm-V4fGlOA,1485
-pyfemtet-0.6.5.dist-info/METADATA,sha256=04L0xEjP4MQaiIYEV0YZ6rXzf2P1ruOZzyW4hvhsXts,3287
-pyfemtet-0.6.5.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-pyfemtet-0.6.5.dist-info/entry_points.txt,sha256=ZfYqRaoiPtuWqFi2_msccyrVF0LurMn-IHlYamAegZo,104
-pyfemtet-0.6.5.dist-info/RECORD,,
+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,,