PyFemtet 1.8.2__tar.gz → 1.8.3__tar.gz

{pyfemtet-1.8.2 → pyfemtet-1.8.3}/PKG-INFO

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

{pyfemtet-1.8.2 → pyfemtet-1.8.3}/pyfemtet/_util/excel_macro_util.py

@@ -31,7 +31,16 @@ class _ExcelDialogProcessor:
 
     def __init__(self, excel_, timeout, restore_book=True):
         self.excel = excel_
-        self.excel_pid = _get_pid(excel_.hWnd)
+
+        if hasattr(excel_, 'hWnd'):
+            self.excel_pid = _get_pid(excel_.hWnd)
+        elif hasattr(excel_, 'Hwnd'):
+            self.excel_pid = _get_pid(excel_.Hwnd)
+        elif hasattr(excel_, 'HWnd'):
+            self.excel_pid = _get_pid(excel_.HWnd)
+        else:
+            raise AttributeError('Cannot found excel window handle attribute.')
+
         self.__excel_window_title = f' - Excel'  # {basename} - Excel
         self.__error_dialog_title = 'Microsoft Visual Basic'
         self.__vbe_window_title = f'Microsoft Visual Basic for Applications - '  # Microsoft Visual Basic for Applications - {basename}

{pyfemtet-1.8.2 → pyfemtet-1.8.3}/pyfemtet/opt/interface/_excel_interface/excel_interface.py

@@ -470,11 +470,19 @@ class ExcelInterface(COMInterface):
         sleep(0.5)
 
         # 起動した excel の pid を記憶する
-        self._excel_hwnd = self.excel.hWnd
+        if hasattr(self.excel, "hWnd"):
+            self._excel_hwnd = self.excel.hWnd
+        elif hasattr(self.excel, "Hwnd"):
+            self._excel_hwnd = self.excel.Hwnd
+        elif hasattr(self.excel, "HWnd"):
+            self._excel_hwnd = self.excel.HWnd
+        else:
+            raise RuntimeError('Failed to get Excel window handle. Cannot determine Excel process ID.')
+
         self._excel_pid = 0
         while self._excel_pid == 0:
             sleep(0.5)
-            self._excel_pid = _get_pid(self.excel.hWnd)
+            self._excel_pid = _get_pid(self._excel_hwnd)
 
         # 可視性の設定
         self.excel.Visible = self.visible
@@ -583,7 +591,13 @@ class ExcelInterface(COMInterface):
         self.remove_femtet_addin_reference(wb)
         femtet_addin_path = self.get_femtet_addin_path()
         if femtet_addin_path is not None:
-            wb.VBProject.References.AddFromFile(femtet_addin_path)
+            try:
+                wb.VBProject.References.AddFromFile(femtet_addin_path)
+            except com_error:
+                logger.warning(_(
+                    jp_message="Femtet のアドインファイルの参照の追加に失敗しました。すでに追加されている可能性があります。",
+                    en_message="Failed to add reference of Femtet add-in file. It may have already been added.",
+                )) 
 
     # ===== load =====
     def load_variables(self, opt: OptimizationDataPerFEM, raise_if_no_keyword=True) -> None:
@@ -776,13 +790,13 @@ class ExcelInterface(COMInterface):
     def objective_from_excel(self, _, name: str):
         r = 1 + search_r(self.output_xlsm_path, self.output_sheet_name, name)
         c = 1 + search_c(self.output_xlsm_path, self.output_sheet_name, ParseAsObjective.value)
-        v = self.sh_output.Cells(r, c).value
+        v = self.sh_output.Cells(r, c).Value
         return float(v)
 
     def constraint_from_excel(self, _, name: str):
         r = 1 + search_r(self.constraint_xlsm_path, self.constraint_sheet_name, name)
         c = 1 + search_c(self.constraint_xlsm_path, self.constraint_sheet_name, ParseAsConstraint.value)
-        v = self.sh_constraint.Cells(r, c).value
+        v = self.sh_constraint.Cells(r, c).Value
         return float(v)
 
     # ===== Workbook and WorkSheet =====
@@ -797,7 +811,13 @@ class ExcelInterface(COMInterface):
 
     @staticmethod
     def _get_sh(wb: CDispatch, name) -> CDispatch:
-        for sh in wb.WorkSheets:
+        if hasattr(wb, 'WorkSheets'):
+            sheets = wb.WorkSheets
+        elif hasattr(wb, 'Worksheets'):
+            sheets = wb.Worksheets
+        else:
+            raise RuntimeError('Failed to get Worksheets. Cannot determine sheet collection.')
+        for sh in sheets:
             if sh.Name == name:
                 return sh
         else:
@@ -857,7 +877,7 @@ class ExcelInterface(COMInterface):
         if self.use_named_range:
             for key, variable in self.current_prm_values.items():
                 try:
-                    self.sh_input.Range(key).value = variable.value
+                    self.sh_input.Range(key).Value = variable.value
                 except com_error:
                     logger.warning(
                         _(
@@ -874,7 +894,7 @@ class ExcelInterface(COMInterface):
             for name, variable in self.current_prm_values.items():
                 r = 1 + search_r(self.input_xlsm_path, self.input_sheet_name, name)
                 c = 1 + search_c(self.input_xlsm_path, self.input_sheet_name, ParseAsParameter.value)
-                self.sh_input.Cells(r, c).value = variable.value
+                self.sh_input.Cells(r, c).Value = variable.value
 
         # 再計算
         self.excel.CalculateFull()

{pyfemtet-1.8.2 → pyfemtet-1.8.3}/pyfemtet/opt/optimizer/optuna_optimizer/_pof_botorch/pof_botorch_sampler.py

@@ -6,7 +6,7 @@
 MIT License
 
 Copyright (c) 2018 Preferred Networks, Inc.
-Copyright (c) 2024 Kazuma NAITO.
+Copyright (c) 2024 pyfemtet developers
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

{pyfemtet-1.8.2 → pyfemtet-1.8.3}/pyproject.toml

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