PyFemtet 1.5.1__tar.gz → 1.6.0__tar.gz

{pyfemtet-1.5.1 → pyfemtet-1.6.0}/PKG-INFO

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

{pyfemtet-1.5.1 → pyfemtet-1.6.0}/pyfemtet/opt/femopt.py

@@ -482,7 +482,7 @@ class FEMOpt:
                                'performing one of the following actions:\n'
                                '- {windows_only}Launch the `pyfemtet-opt-result-viewer` '
                                'shortcut on your desktop if exists.\n'
-                               '- {windows_only}Launch {path}.\n'
+                               '- {windows_only}Launch {dir}.\n'
                                '- Execute "py -m pyfemtet.opt.visualization.history_viewer" '
                                'in the command line',
                     jp_message='プログラム終了後も、結果ビューワを使って最適化結果を'

{pyfemtet-1.5.1 → pyfemtet-1.6.0}/pyfemtet/opt/interface/__init__.py

@@ -12,7 +12,7 @@ from ._base_interface import AbstractFEMInterface, NoFEM
 # 実際の実装が参照されるようにした。
 # VSCode では TYPE_CHECKING が True となる節が優先される。
 if platform.system() != 'Windows' and not TYPE_CHECKING:
-    from _dummy_classes import (
+    from ._dummy_classes import (
         FemtetInterface,
         FemtetWithNXInterface,
         FemtetWithSolidworksInterface,

{pyfemtet-1.5.1 → pyfemtet-1.6.0}/pyfemtet/opt/interface/_base_interface.py

@@ -90,9 +90,15 @@ class AbstractFEMInterface:
         # worker_space から探し
         # suffix を付与して rename し
         # その renamed path を返す関数
+        # ただし distribute_files を実行せずこれを実行して
+        # worker_space が取得できなかった場合は
+        # 元の path をそのまま返す
 
         worker_space = self._get_worker_space()
 
+        if worker_space is None:
+            return orig_path
+
         src_path = os.path.join(worker_space, os.path.basename(orig_path))
         p1_, p2_ = os.path.splitext(src_path)
         dst_path_ = p1_ + '_' + suffix + p2_
@@ -105,13 +111,17 @@ class AbstractFEMInterface:
 
         return dst_path_
 
-    def _get_worker_space(self) -> str:
+    def _get_worker_space(self) -> str | None:
         worker = get_worker()
         if worker is None:
-            assert hasattr(self, '_tmp_dir'), 'Internal Error! Run _distribute_files() first!'
-            return self._tmp_dir.name
+            if hasattr(self, '_tmp_dir'):
+                return self._tmp_dir.name
+            else:
+                return None
         else:
-            return worker.local_directory
+            out = worker.local_directory
+            assert out is not None, 'Internal Error: worker.local_directory is None'
+            return out
 
     def _distribute_files(self, paths: list[str], scheduler_address=None) -> None:
 

{pyfemtet-1.5.1 → pyfemtet-1.6.0}/pyfemtet/opt/interface/_femtet_with_nx_interface/femtet_with_nx_interface.py

@@ -201,7 +201,13 @@ class FemtetWithNXInterface(FemtetInterface, _NXInterface):
 
         # 競合しないよう保存先を temp にしておく
         worker_space = self._get_worker_space()
-        xt_path = os.path.join(worker_space, 'temp.x_t')
+        if worker_space is not None:
+            xt_path = os.path.join(worker_space, 'temp.x_t')
+
+        # worker_space が取得できなかった場合は
+        # カレントディレクトリに保存する
+        else:
+            xt_path = os.path.abspath('_temp.x_t')
 
         # export parasolid
         self._export_xt(xt_path)

{pyfemtet-1.5.1 → pyfemtet-1.6.0}/pyfemtet/opt/interface/_femtet_with_solidworks/femtet_with_solidworks_interface.py

@@ -122,7 +122,13 @@ class FemtetWithSolidworksInterface(FemtetInterface, SolidworksInterface, Abstra
 
         # 競合しないよう保存先を temp にしておく
         worker_space = self._get_worker_space()
-        xt_path = os.path.join(worker_space, 'temp.x_t')
+        if worker_space is not None:
+            xt_path = os.path.join(worker_space, 'temp.x_t')
+
+        # worker_space が取得できなかった場合は
+        # カレントディレクトリに保存する
+        else:
+            xt_path = os.path.abspath('_temp.x_t')
 
         # export parasolid
         self._export_xt(xt_path)

{pyfemtet-1.5.1 → pyfemtet-1.6.0}/pyproject.toml

@@ -33,7 +33,7 @@ dependencies = [
 
 #[project.optional-dependencies]
 #brep = ["brepmatching>=0.1.8,<0.2"]
-version = "1.5.1"
+version = "1.6.0"
 
 [project.urls]
 Repository = "https://github.com/pyfemtet/pyfemtet"