alchemist-nrel 0.2.1__py3-none-any.whl → 0.3.0__py3-none-any.whl

ui/variables_setup.py

@@ -2,6 +2,7 @@ import customtkinter as ctk
 from customtkinter import filedialog
 import json, csv, os
 from skopt.space import Real, Integer, Categorical
+from alchemist_core.data.search_space import SearchSpace
 from tkinter import StringVar
 import tkinter.messagebox as messagebox
 from tksheet import Sheet  # requires tksheet package
@@ -427,7 +428,52 @@ class SpaceSetupWindow(ctk.CTkToplevel):
         
         # Update the main UI if it has the necessary methods
         if hasattr(self.master, 'search_space'):
+            # Store the skopt-compatible dimensions for legacy UI code
             self.master.search_space = self.search_space
+        # Always create/update the SearchSpace manager on the master so the
+        # OptimizationSession and ExperimentManager get a consistent object.
+        try:
+            ss = SearchSpace().from_dict(self.master.variable_space_data)
+            self.master.search_space_manager = ss
+            # Keep the skopt-compatible reference too
+            try:
+                self.master.search_space = ss.to_skopt()
+            except Exception:
+                self.master.search_space = ss
+            # Ensure experiment manager is updated
+            if hasattr(self.master, 'experiment_manager'):
+                try:
+                    self.master.experiment_manager.set_search_space(ss)
+                except Exception:
+                    pass
+            # If there's an active OptimizationSession, update it as well
+            if hasattr(self.master, 'session') and self.master.session is not None:
+                try:
+                    self.master.session.search_space = ss
+                    self.master.session.experiment_manager.set_search_space(ss)
+                    # emit an event so other UI components can react
+                    try:
+                        self.master.session.events.emit('search_space_loaded', {'source': 'ui'})
+                    except Exception:
+                        pass
+                except Exception:
+                    pass
+        except Exception:
+            pass
+
+        # Let the main app know the search space changed so it can sync to session
+        if hasattr(self.master, '_sync_data_to_session'):
+            try:
+                self.master._sync_data_to_session()
+            except Exception:
+                pass
+
+        if hasattr(self.master, '_update_ui_state'):
+            try:
+                self.master._update_ui_state()
+            except Exception:
+                pass
+
         if hasattr(self.master, 'update_variables_display'):
             self.master.update_variables_display()
         elif hasattr(self.master, 'var_sheet'):
@@ -469,8 +515,7 @@ class SpaceSetupWindow(ctk.CTkToplevel):
                 self.master.load_exp_button.configure(state='normal')
             if hasattr(self.master, 'gen_template_button'):
                 self.master.gen_template_button.configure(state='normal')
-            if hasattr(self.master, 'cluster_switch'):
-                self.master.cluster_switch.configure(state='normal')
+            # Clustering UI removed; no cluster_switch configuration needed
                 
         except Exception as e:
             print(f"Error updating main UI variables: {e}")

ui/visualizations.py

@@ -93,11 +93,53 @@ class Visualizations:
     def initialize_figure(self):
         """Initialize the Matplotlib figure and axes."""
         if self.fig is None or self.ax is None:
-            self.fig, self.ax = plt.subplots(figsize=(6, 4))
+            # Use current rcParam DPI when creating the figure so text sizes
+            # are consistent with the active window's DPI settings.
+            dpi = plt.rcParams.get('figure.dpi', 100)
+            self.fig, self.ax = plt.subplots(figsize=(6, 4), dpi=dpi)
 
     def open_window(self):
         """Open the visualization window."""
-        self.initialize_figure()  # Ensure the figure is initialized
+        # Probe DPI from the parent window (avoids creating a new Tk root).
+        try:
+            dpi = int(self.parent.winfo_fpixels('1i'))
+        except Exception:
+            dpi = plt.rcParams.get('figure.dpi', 100)
+
+        # Apply DPI to matplotlib runtime settings so text and markers scale correctly
+        plt.rcParams['figure.dpi'] = dpi
+
+        # Cap font sizes to avoid oversized rendering on HiDPI displays
+        try:
+            fs = plt.rcParams.get('font.size', 10)
+            if fs > 14:
+                plt.rcParams['font.size'] = 10
+            if plt.rcParams.get('xtick.labelsize', 10) > 12:
+                plt.rcParams['xtick.labelsize'] = 8
+            if plt.rcParams.get('ytick.labelsize', 10) > 12:
+                plt.rcParams['ytick.labelsize'] = 8
+        except Exception:
+            pass
+
+        self.initialize_figure()  # Ensure the figure is initialized with corrected DPI
+        # Enforce additional rcParams to keep the figure compact and fonts reasonable
+        try:
+            plt.rcParams['axes.titlesize'] = min(12, plt.rcParams.get('axes.titlesize', 12))
+            plt.rcParams['axes.labelsize'] = min(10, plt.rcParams.get('axes.labelsize', 10))
+            plt.rcParams['legend.fontsize'] = min(9, plt.rcParams.get('legend.fontsize', 9))
+            plt.rcParams['xtick.labelsize'] = min(9, plt.rcParams.get('xtick.labelsize', 9))
+            plt.rcParams['ytick.labelsize'] = min(9, plt.rcParams.get('ytick.labelsize', 9))
+            plt.rcParams['lines.markersize'] = min(6, plt.rcParams.get('lines.markersize', 6))
+        except Exception:
+            pass
+
+        # Ensure the figure uses a compact size (in inches) and the detected DPI.
+        try:
+            # Prefer a slightly smaller figure to avoid huge white margins
+            self.fig.set_size_inches(5, 4, forward=True)
+            self.fig.set_dpi(dpi)
+        except Exception:
+            pass
 
         if self.search_space is None:
             print("Error: Search space is not defined.")
@@ -122,6 +164,15 @@ class Visualizations:
         visualization_window.focus_force()
         visualization_window.grab_set()
 
+        # Fix macOS Retina scaling by probing the new window's DPI and applying it
+        try:
+            dpi = int(visualization_window.winfo_fpixels('1i'))
+        except Exception:
+            dpi = plt.rcParams.get('figure.dpi', 100)
+
+        # Apply DPI to matplotlib runtime settings so text and markers scale correctly
+        plt.rcParams['figure.dpi'] = dpi
+
         # Top control frame for other visualizations (metrics, parity, hyperparameters)
         # Use two rows to avoid crowding
         control_container = ctk.CTkFrame(visualization_window)
@@ -191,8 +242,14 @@ class Visualizations:
         self.plot_frame = ctk.CTkFrame(main_container, height=450)
         self.plot_frame.pack(side="left", fill='both', expand=True, padx=5, pady=5)
         self.canvas = FigureCanvasTkAgg(self.fig, master=self.plot_frame)
+        # Draw and tighten layout before packing to reduce excess margins
+        try:
+            self.fig.tight_layout(pad=0.6)
+        except Exception:
+            pass
         self.canvas.draw()
-        self.canvas.get_tk_widget().pack(fill='both', expand=True, padx=5, pady=5)
+        # Use smaller padding so the canvas doesn't create excess whitespace
+        self.canvas.get_tk_widget().pack(fill='both', expand=True, padx=2, pady=2)
         self.metrics_toolbar = NavigationToolbar2Tk(self.canvas, self.plot_frame)
         self.metrics_toolbar.config(background='#2E2E2E')
         self.metrics_toolbar._message_label.config(background='#2E2E2E')

alchemist_nrel-0.2.1.dist-info/RECORD

@@ -1,54 +0,0 @@
-main.py,sha256=3sAO2QZxxibs4WRT82i2w6KVBBFmYEMNUoGiMYFowOw,126
-alchemist_core/__init__.py,sha256=YA4a1INzAl6iuumPEXGGrorX9weogVN20b-w-UbB9bY,1813
-alchemist_core/config.py,sha256=Sk5eM1okktO5bUMlMPv9yzF2fpuiyGr9LUtlCWIBDc8,3366
-alchemist_core/events.py,sha256=ty9nRzfZGHzk6b09dALIwrMY_5PYSv0wMaw94JLDjSk,6717
-alchemist_core/session.py,sha256=bZTpa5vatg3w4zSg6qaXDQbpV-WrGwaRqD_sNc4Qas8,23889
-alchemist_core/acquisition/__init__.py,sha256=3CYGI24OTBS66ETrlGFyHCNpfS6DBMP41MZDhvjFEzg,32
-alchemist_core/acquisition/base_acquisition.py,sha256=s51vGx0b0Nt91lSCiVwYP9IClugVg2VJ21dn2n_4LIs,483
-alchemist_core/acquisition/botorch_acquisition.py,sha256=9ofyetj6gyBzO_3y8Y50EfCxP6BiHKYXTGIHT3fx6eY,30947
-alchemist_core/acquisition/skopt_acquisition.py,sha256=YRdANqgiN3GWd4sn16oruN6jVnI4RLmvLhBMUfYyLp4,13115
-alchemist_core/data/__init__.py,sha256=wgEb03x0RzVCi0uJXOzEKXkbA2oNHom5EgSB3tKgl1E,256
-alchemist_core/data/experiment_manager.py,sha256=kS63mVmuTNxhI3A9io52VKGcZOcgcTIyJqrzUQuZgkw,5910
-alchemist_core/data/search_space.py,sha256=oA9YEF3JRWpRklHzSo_Uxlmfy7bHwZfLZFDf4_nl4ew,6230
-alchemist_core/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-alchemist_core/models/ax_model.py,sha256=Fnu19Et376WxLXpApZSalIbWHQE9OQnMk41_PW69XnQ,6040
-alchemist_core/models/base_model.py,sha256=gIpC2eoTZcp4ozI0Rctcxt_4bLhgaE6ALYCzvuIrMZw,3145
-alchemist_core/models/botorch_model.py,sha256=t-zqLRpCIGwSeIyveqJTjr8MQ9zWecnJIueaWg3Geck,42026
-alchemist_core/models/sklearn_model.py,sha256=ID0anz8BNGKDMpQlLlzKuyey1CvaJQkf0C79Q_S3tGo,34735
-alchemist_core/utils/__init__.py,sha256=oQsvUqukRng8GgiZSPMM-xmB-Lv46XveJzYQr2MdkOc,99
-alchemist_nrel-0.2.1.dist-info/licenses/LICENSE,sha256=wdIWWEj59ztfQViDuT_9wG3L1K8afUpRSygimXw36wY,1511
-api/__init__.py,sha256=ODc6pq4OSImgK4xvhX_zMhqUjIc7JvLfqxKF_-Ubw7g,49
-api/dependencies.py,sha256=sF1YYjnFRaw7nj7Y7URKLF2Ek-EfaXqjOyV1Zbktz2g,1090
-api/example_client.py,sha256=aZMNuJmt00hpNEkijn5RnVEV7ZPfKzwQxucSasTrrdw,6645
-api/main.py,sha256=Y2oPwxPK_jfOMNkT9qLQnM6lNzaM9sdJhOybJVFf8UM,3403
-api/middleware/__init__.py,sha256=WM4JEg3DibymvEvQ6hx_FJkv8lKLjHD48qNouSORGxA,313
-api/middleware/error_handlers.py,sha256=k5hNo6W5QDjGRHUY8Le-t7ubWkwSZBFpsTKcEF0nweI,4545
-api/models/__init__.py,sha256=YFtp8989mH9Zjzvd8W6pXklQJXTf8zWj4I2YWnLegDQ,1204
-api/models/requests.py,sha256=wy8KCgf3cwJ2Yz2wEzQjCqkUT6x0VHQHFTQDVMfbUMU,7213
-api/models/responses.py,sha256=c_okZVP0A8MF7aH199Bl6zjoJgede9lBrH5i8R8oPXc,8445
-api/routers/__init__.py,sha256=Mhg62NdA6iaPy-L5HLVp_dd9aUHmJ72KtMSRyO2kusA,180
-api/routers/acquisition.py,sha256=7c9ifuCFeDj8osWRHgCjAwbXjhd3iEBlVLW23FOAZXI,5710
-api/routers/experiments.py,sha256=q7Y1y5-pIIu0hRZAQKTpllL3AGstjbCP-dUqYAnQ-hI,4946
-api/routers/models.py,sha256=32Ln0MtlnCEjfN3Q6Io_EBwwwGoJXb73UbQEMIcVGjI,3651
-api/routers/sessions.py,sha256=k4gJe8qgb-8INT04_buYAfZIfMGBxfOOxn5tcXfr6LI,4523
-api/routers/variables.py,sha256=TiByX1ITabBDdTSMGAPa1lGd0LBipNgDfmPsbvTEAdE,10108
-api/routers/visualizations.py,sha256=qP__NhhflNKEAEcLV0c_WMQvofoNWSORMXbEMQCuVgI,23783
-api/services/__init__.py,sha256=0jw0tkL-8CtChv5ytdXRFeIz1OTVz7Vw1UaaDo86PQs,106
-api/services/session_store.py,sha256=Jot2S75Qrqaw_dbfNbeJt5rwlu25abexP4BMMCIgfdE,9605
-ui/__init__.py,sha256=H4kWlVey7KKf3iPQi74zuM7FSOg5Gh-ii3UwSTuIp8A,1203
-ui/acquisition_panel.py,sha256=zF-mQDrs-Y7sf2GXYF-bPlO9UXZMTzYRMDN-Wn5FyWw,39647
-ui/custom_widgets.py,sha256=UXNv4DiTw3tFC0VaN1Qtcf_-9umX34uDn46-cEA6cs0,3812
-ui/experiment_logger.py,sha256=dP3IGaQ31sURyz7awd_VrZBWaKLH2xXEeRalWZpvVcQ,8366
-ui/gpr_panel.py,sha256=cXZbYndkZ7E6GowkorYqBHVStpxEKDVJv8S-ZPzGGRQ,26230
-ui/notifications.py,sha256=evVd9r7OMqaZyx2WWXFnL-moIjrDFmRoMKrX9hvKB_g,28003
-ui/pool_viz.py,sha256=RwjggEfRSSEe-4nGjxc-I-1e5_aH64DgypT_YoubLIU,8765
-ui/ui.py,sha256=tJZoiBRACjY07NPrDdqYJc8we1Ze4fqnxJVUCHVkFZ8,54945
-ui/ui_utils.py,sha256=yud2-9LvT4XBcjTyfwUX5tYGNZRlAUVlu2YpcNY1HKA,658
-ui/utils.py,sha256=m19YFFkEUAY46YSj6S5RBmfUFjIWOk7F8CB4oKDRRZw,1078
-ui/variables_setup.py,sha256=4pu91MNRZlsK-DwRNd7U619wKDdSknI5Cf744o5Lxqo,21673
-ui/visualizations.py,sha256=X3Arl1k2UoQK2DCQ8YBnoJ4fscvinAlPJ1hInYkKvGo,67686
-alchemist_nrel-0.2.1.dist-info/METADATA,sha256=AAMdcL8KyjGcyjH9Ci2pqJOLenJSZ29b_CDigeK99Ak,6892
-alchemist_nrel-0.2.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-alchemist_nrel-0.2.1.dist-info/entry_points.txt,sha256=zTuR1EjHMjeeAtUOACu0njiTCBMoaCobFqLlQ7IPYs8,40
-alchemist_nrel-0.2.1.dist-info/top_level.txt,sha256=dwh-oxj7H6oAGYchcUDyfiu9UxxzCn4hUDx1oeM2k-8,27
-alchemist_nrel-0.2.1.dist-info/RECORD,,