pyfemtet 0.6.5__tar.gz → 0.6.6__tar.gz

{pyfemtet-0.6.5 → pyfemtet-0.6.6}/PKG-INFO

@@ -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.6/pyfemtet/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.6.6"

pyfemtet-0.6.6/pyfemtet/brep/__init__.py

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

pyfemtet-0.6.6/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-0.6.5 → pyfemtet-0.6.6}/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 → pyfemtet-0.6.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyfemtet"
-version = "0.6.5"  # ignored by versioning plugin
+version = "0.6.6"  # ignored by versioning plugin
 description = "Design parameter optimization using Femtet."
 authors = ["kazuma.naito <kazuma.naito@murata.com>"]
 readme = "README.md"
@@ -33,6 +33,7 @@ optuna =  ">=3.4.0, <5.0.0"
 optuna-integration = ">=3.6.0, <5.0.0"
 botorch = "==0.9.5"
 torch = "~2.3.0"
+brepmatching = {version = "^0.1.6", optional = true}
 
 [tool.poetry.group.dev.dependencies]
 # license
@@ -52,6 +53,9 @@ bokeh = "^3.3.3"
 pytest = "^7.4.3"
 pytest-dashboard = "^0.1.2"
 
+[tool.poetry.extras]
+brep = ["brepmatching"]  # pip install pyfemtet[brep]
+
 [tool.poetry.scripts]
 pyfemtet-opt-result-viewer = 'pyfemtet.opt.visualization.result_viewer.application:main'
 
@@ -64,6 +68,7 @@ markers = [
     "sample",
     "cad",
     "nofem",
+    "brep",
     "excel",
 ]
 

pyfemtet-0.6.5/pyfemtet/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.6.5"