mg-pso-gui 0.2.99__py3-none-any.whl → 0.2.101__py3-none-any.whl

{mg_pso_gui-0.2.99.dist-info → mg_pso_gui-0.2.101.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mg-pso-gui
-Version: 0.2.99
+Version: 0.2.101
 Summary: GUI for MG-PSO
 Author: Robert Cordingly
 Author-email: <rcording@uw.ed>

{mg_pso_gui-0.2.99.dist-info → mg_pso_gui-0.2.101.dist-info}/RECORD

@@ -2,7 +2,7 @@ mgpsogui/__init__.py,sha256=q7AfBjeJABnFtbsZnsObpUwaXKPDVYtz46G6MKXLF74,42
 mgpsogui/mgpsogui.py,sha256=NIZmyNcbwC8EgSwf1ubdMUSJscrIEgoD4jLYziqHQ-k,148
 mgpsogui/start.yaml,sha256=ZjCVLb-MLqAxrGRm9kA7_SDpa-45EuKIELNQ2QqCAiU,4713
 mgpsogui/gui/HomePage.py,sha256=qnrbwfWKuSX6z2BEuRwLMfCe88WC55dFbBbvEe5PtFI,23626
-mgpsogui/gui/OptionManager.py,sha256=d-di4I9m9h0cPaKjnooTLf-QOqgIxYXbJma97EvP36I,21723
+mgpsogui/gui/OptionManager.py,sha256=W--xBfiaQdeJPr5RipPcyWtK5RB81MUiQ_lJWzQK5OI,22650
 mgpsogui/gui/OptionManager_backup.py,sha256=TCWfPnHL2foN5id47jsi267lamRG6yGU6y_M29eOOJk,18530
 mgpsogui/gui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/General/NoticeWindow.py,sha256=HcTtaYKK4b7HognnoAHXiIHZWAXI80QfR8HM2dTLTV8,1866
@@ -11,13 +11,13 @@ mgpsogui/gui/General/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
 mgpsogui/gui/PlatformTab/PlatformTab.py,sha256=8J2Aa3Zrh1q9x07zZ0Ap9PgwHjeSKOYyj6wlxx40udw,10985
 mgpsogui/gui/PlatformTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/RunTab/OptimalParameterView.py,sha256=nliUEWA840cPBQt7wjiZ-L7uBOp_ozzJhyBkL08fJzI,1752
-mgpsogui/gui/RunTab/RunTab.py,sha256=47_r8K-e7f8zs93_2iPYnNBzHDHZejtedk7iSElkubU,5608
+mgpsogui/gui/RunTab/RunTab.py,sha256=_JWzDx5LT_uISw0Vnv-W2ypIeuKgoWqBnvFnvrLhNQA,5917
 mgpsogui/gui/RunTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/SetupTab/BoundsEditorWindow.py,sha256=U64oaiDIOaimjbqKMz5rQNq2o1SrQtrRHDdTYQ9ux1s,2870
-mgpsogui/gui/SetupTab/BoundsList.py,sha256=UyXKujyZ3zOhgaLpICzLx-pm5RYsQOkwagZ75z9w9Hc,15204
+mgpsogui/gui/SetupTab/BoundsList.py,sha256=bc1g2LLdmxkVk_Gnr-koxsxw8342IWFzpaDXu27pJD4,15231
 mgpsogui/gui/SetupTab/CustomFunctionEditorWindow.py,sha256=yx0dHSNa7fGy99Q6qFcI6j9r8p0DlV3iOBgyPMGd8pM,2884
 mgpsogui/gui/SetupTab/CustomFunctionMetrics.py,sha256=vOJpElbTgz043m6JYwe9xz_2MBHg985S6KdbJkJERW4,5923
-mgpsogui/gui/SetupTab/FunctionsList.py,sha256=LoHu5FESu6e_QRucNVm8tuSXLl1aLoGYd9r7WOKFTaY,7059
+mgpsogui/gui/SetupTab/FunctionsList.py,sha256=6oFS8qKF3OCtxNi5aY5Rj_ovM9nv4-vh-oT_CbhVTj4,7043
 mgpsogui/gui/SetupTab/ListEditor.py,sha256=nin7Pl8z7d_yfKoAxM-yVS34uhj-LnprJ2mNRSB7Z0A,3197
 mgpsogui/gui/SetupTab/ListParametersView.py,sha256=mkGaC5cXhEOy5oD0MbTyK9z7VGZp019oK2Y8Ay-n05Q,7460
 mgpsogui/gui/SetupTab/OverrideParameterMetrics.py,sha256=rBfaSitYDOajbHvyi2TfoXAHYlz1cCt028UVpIJ_Dc0,3369
@@ -46,9 +46,9 @@ mgpsogui/gui/images/stop.png,sha256=JPuxXQerCGpLikcp7cAj3iLCOjULMYYZ2sZe0lArh68,
 mgpsogui/gui/images/test.png,sha256=MUnVpRK-isxhEHzx4Q6Yh0M6FRZD1qvgCHH2XmiSBbk,3642
 mgpsogui/gui/images/trash.png,sha256=j8cf0kWbJd-4Jp20lUVV1o1NSeQ4v1Ej4gfcIA3DVRQ,2958
 mgpsogui/gui/images/up.png,sha256=AQvFWCUqSQNaQ1E6LKZ9zNfSvW6t4mgy8uswdg9T2Hg,2457
-mgpsogui/gui/messages/welcome.txt,sha256=KzN_Zk3vaZeXx-G2KJmd5I7Q1_Shw62E9Fx8U4rQuUQ,5674
+mgpsogui/gui/messages/welcome.txt,sha256=fPuBbYcIso3p26vpyLBK0V7FPyk7JQDhyTnVClJFttc,5984
 mgpsogui/util/GraphGenerator.py,sha256=LHHDCvBuJQ0RYQm0azi5tC-etrZ1KLQh-tkahVurPSI,31990
-mgpsogui/util/PSORunner.py,sha256=MjK0xlKT88Pf5vk5U--xMnWJzqZGBAOR8n6AQMaYElc,15622
+mgpsogui/util/PSORunner.py,sha256=mTveURj8HGCwB5VHzvN9ELUhKtVzuynuQc8zJm4IFNs,15764
 mgpsogui/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/util/debug.py,sha256=Swzny9_1S-CCONWGssj9iDoSpbwu5Vr4f95g_9L8bec,19759
 mgpsogui/util/helpers.py,sha256=Ht2rge_4pGO7halz6KoLsL2eukB0k2tlkx68lBBmBA8,2669
@@ -73,8 +73,8 @@ mgpsogui/util/recosu/utils/trace_writer.py,sha256=V9BJlOjCbNYGoXGEk3CF5wjifBxvar
 mgpsogui/util/recosu/utils/utils.py,sha256=QB8vftq3142ekG0ORjz0ZBHU5YknXbR0oTsrxrPAsF0,3951
 mgpsogui/util/recosu/utils/plot/__init__.py,sha256=h1KjM7_tNDv351pcwt8A6Ibb1jhwWyx5Gbu-zj-sI3Q,71
 mgpsogui/util/recosu/utils/plot/cost_steps.py,sha256=1Ce11AJyweWkmvjXPxEygzS-h8yVLmQEDLS53yjPLqQ,3779
-mg_pso_gui-0.2.99.dist-info/METADATA,sha256=A2-cLJsvjJX-oVde3QyW3lqbcjo-ZTZ6PYBTg2kzvMo,9455
-mg_pso_gui-0.2.99.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-mg_pso_gui-0.2.99.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
-mg_pso_gui-0.2.99.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
-mg_pso_gui-0.2.99.dist-info/RECORD,,
+mg_pso_gui-0.2.101.dist-info/METADATA,sha256=3cxAV5Z54FU4K9TRRsHk4HFyWdBcC9bmDxxdmRE3sw8,9456
+mg_pso_gui-0.2.101.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+mg_pso_gui-0.2.101.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.2.101.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.2.101.dist-info/RECORD,,

mgpsogui/gui/OptionManager.py

@@ -369,7 +369,33 @@ class OptionManager():
         self._project_data["name"] = file_name
 
     def copy_list(self, source_mode):
+        name = "backup"
+        index = 0
+        while name + str(index) in self._data:
+            index += 1
+        self._data[name + str(index)] = self._data[self._mode_sv.get()]
+
         self._data[self._mode_sv.get()] = self._data[source_mode]
+
+    def combine_steps(self):
+        mode = self._mode_sv.get()
+
+        obj = {"parameter_objects": [], 
+            "override_parameter": [],
+            "objective_functions": [], 
+            "name": sv(), 
+            "open": True}
+        obj["name"].set("Combined Group")
+
+        for step in self._data[mode]["steps"]:
+            for param in step["parameter_objects"]:
+                obj["parameter_objects"].append(param)
+            for objective_function in step["objective_functions"]:
+                obj["objective_functions"].append(objective_function)
+            for override in step["override_parameter"]:
+                obj["override_parameter"].append(override)
+            
+        self._data[mode]["steps"] = [obj]
             
     def get_data(self):
         return self._data[self._mode_sv.get()]

mgpsogui/gui/RunTab/RunTab.py

@@ -75,6 +75,10 @@ def create_tab(self, tab):
         self.option_manager.copy_list("Optimization")
         self.refresh_step_view(0)
 
+    def combine_steps():
+        self.option_manager.combine_steps()
+        self.refresh_step_view(0)
+
     def open_project_folder():
         # Open the file in the default program
         folder = self.option_manager.get_project_folder()
@@ -101,15 +105,18 @@ def create_tab(self, tab):
     self.optimization_copy = customtkinter.CTkButton(self.project_editor, text="From Optimization", command=copy_optim)
     self.optimization_copy.grid(row=4, column=0, padx=(20, 20), pady=(5, 10), sticky="ew")
 
-    customtkinter.CTkLabel(self.project_editor, text="Project Management:").grid(row=5, column=0, padx=(20, 20), pady=(5, 10), sticky="ew")
+    self.combine_steps = customtkinter.CTkButton(self.project_editor, text="Combine Groups", command=combine_steps)
+    self.combine_steps.grid(row=5, column=0, padx=(20, 20), pady=(5, 10), sticky="ew")
+
+    customtkinter.CTkLabel(self.project_editor, text="Project Management:").grid(row=6, column=0, padx=(20, 20), pady=(5, 10), sticky="ew")
 
     self.open_folder = customtkinter.CTkButton(self.project_editor, text="Open Project Folder", command=open_project_folder)
-    self.open_folder.grid(row=6, column=0, padx=(20, 20), pady=(5, 10), sticky="ew")
+    self.open_folder.grid(row=7, column=0, padx=(20, 20), pady=(5, 10), sticky="ew")
 
-    customtkinter.CTkLabel(self.project_editor, text="Project Name:").grid(row=7, column=0, padx=(20, 20), pady=(10, 5), sticky="ew")
+    customtkinter.CTkLabel(self.project_editor, text="Project Name:").grid(row=8, column=0, padx=(20, 20), pady=(10, 5), sticky="ew")
     self.project_name_label = customtkinter.CTkLabel(self.project_editor, text=self.option_manager.get_project_data()["name"])
-    self.project_name_label.grid(row=8, column=0, padx=(20, 20), pady=(5, 10), sticky="ew")
+    self.project_name_label.grid(row=9, column=0, padx=(20, 20), pady=(5, 10), sticky="ew")
 
-    customtkinter.CTkLabel(self.project_editor, text="Project Path:").grid(row=9, column=0, padx=(20, 20), pady=(10, 5), sticky="ew")
+    customtkinter.CTkLabel(self.project_editor, text="Project Path:").grid(row=10, column=0, padx=(20, 20), pady=(10, 5), sticky="ew")
     self.project_path_label = customtkinter.CTkLabel(self.project_editor, text=self.option_manager.get_project_data()["path"])
-    self.project_path_label.grid(row=10, column=0, padx=(20, 20), pady=(5, 10), sticky="ew")
+    self.project_path_label.grid(row=11, column=0, padx=(20, 20), pady=(5, 10), sticky="ew")

mgpsogui/gui/SetupTab/BoundsList.py

@@ -153,7 +153,7 @@ class BoundsList(CTkFrame):
                 self.validate_number(bounds_max.get(), cc, bounds_max)
                 tt2 = ctt(bounds_max, delay=0.1, alpha=0.95, message="...")
                 
-                if (bound_type == "list"):
+                if (bound_type == "list" and mode == "Optimization"):
                     def button_click_event(bound_index):
                         BEW(title="Edit List Bound", step_index=self.step_index, bound_index=bound_index, option_manager=self.option_manager)
 

mgpsogui/gui/SetupTab/FunctionsList.py

@@ -54,7 +54,7 @@ class FunctionsList(CTkFrame):
             
             CTkLabel(self.containerFrame, text="Name:").grid(row=row, column=0, padx=(5, 5), pady=(5, 5), sticky="nsew")
             CTkLabel(self.containerFrame, text="Objective:").grid(row=row, column=1, padx=(5, 5), pady=(5, 5), sticky="nsew")
-            if mode != "Sensitivity Analysis":
+            if mode == "Optimization":
                 CTkLabel(self.containerFrame, text="Weight:").grid(row=row, column=2, padx=(5, 5), pady=(5, 5), sticky="nsew")
             
             row += 1
@@ -82,7 +82,7 @@ class FunctionsList(CTkFrame):
             
             CTkEntry(self.containerFrame, textvariable=func["name"]).grid(row=row, column=0, padx=(5, 5), pady=(5, 5), sticky="ew")
             CTkOptionMenu(self.containerFrame, values=columns, variable=func["objective_function"], command=self.refresh).grid(row=row, column=1, padx=(5, 5), pady=(5, 5), sticky="ew")
-            if mode != "Sensitivity Analysis":
+            if mode == "Optimization":
                 CTkEntry(self.containerFrame, textvariable=func["weight"]).grid(row=row, column=2, padx=(5, 5), pady=(5, 5), sticky="ew")
             
             row += 1

mgpsogui/gui/messages/welcome.txt

@@ -1,26 +1,28 @@
 --- Welcome to COSU Manager! ---
 
-To get started, it is highly recommended to open a default config file to get an example and build an understanding of how information is formatted.
+COSU stands for Calibration, Optimization, Sensitivity and Uncertainty. COSU Manager is a graphical user interface built with tkinter (https://docs.python.org/3/library/tkinter.html) to execute computational services using the Cloud Services Integration Platform (CSIP; https://alm.engr.colostate.edu/cb/project/csip).  The overall workflow of COSU starts with Sampling (Halton or Random), then Sensitivity Analysis, and finally Optimization using Multigroup Particle Swarm Optimization. In each of these service modes, COSU Manager is used to build service requests, read service responses, monitor service status, and display COSU results.
+
+To get started, it is highly recommended to open a default configuration file (.json) as an example and build an understanding of how information is formatted.
 
 --- Header ---
 
-The header contains many important controls. To get started, click the "Load" button to load a default config and enter an HTTP endpoint to the service that you will be using. The refresh button can be used to make a connection with the service and verify that it is available. The next element of the header is the mode selector. The mode selector is one of the most important features of COSU Manager and will be used to execute an entire workflow. You will notice that whenever you switch modes the entire content of COSU Manager changes depending on which mode you are in, don't worry, data is unique to each mode and not lost which modes are switched. The overall workflow of COSU Manager starts with Sampling (Halton or Random), then next to Sensitivity Analysis, and finally Optimization using Multigroup Particle Swarm Optimization. Each of of those modes you will interact with the four main tabs of the application: Platform, Setup, Results, and Project.
+The header contains many important controls. To get started, click the "Load" button to load a default config and enter an HTTP endpoint to the service that you will be using. The refresh button can be used to make a connection with the service and verify that it is available. The next element of the header is the mode selector. The mode selector is one of the most important features of COSU Manager and will be used to execute an entire workflow. You will notice that whenever you switch modes the entire content of COSU Manager changes depending on which mode you are in. Don't worry, data are unique to each mode and not lost when modes are switched. In each mode, you will interact with the four main tabs of the application: Platform, Setup, Results, and Project.
 
 --- Platform Tab ---
 
-The platform tab consists of 3 primary editors: Service Parameters, Service Status, and Minikube Environment Editor. The Service Parameters editor allow you to define attributes for the service such as timeouts and retry attempts. All of these parameters will be used when executing a step of the workflow and invoked at the service in the header. The Service Status editor is purely read-only and is used to view information returned from the service. This can be used to verify that the correct endpoint is being used and that the service is available. Service Status is populated whenever the refresh button in the header is clicked.
+The platform tab consists of 3 primary editors: Service Parameters, Service Status, and Minikube (Kubernites) Environment Editor. The Service Parameters editor allows you to define attributes for the service such as timeouts and retry attempts. All of these parameters will be used when executing a step of the workflow and invoked at the service in the header. The Service Status editor is purely read-only and is used to view information returned from the service. This can be used to verify that the correct endpoint is being used and that the service is available. Service Status is populated whenever the refresh button in the header is clicked.
 
-The final editor is the Minikube Environment Editor. This tool is used to deploy a local Minikube environment of any of the workflow services. This editor can be used to start Minikube, deploy the service of the selected mode, view the status of the service, and stop Minikube. After creating the Minikube service the endpoint can be filled into the endpoint prompt in the header to use COSU Manager in the exact same way as a externally hosted service. Minikube can be used as a testing environment before creating a cloud deployment.
+The final editor is the Minikube Environment Editor. This tool is used to deploy a local Minikube environment of any of the workflow services. This editor can be used to start Minikube, deploy the service of the selected mode, view the status of the service, and stop Minikube. After creating the Minikube service, the endpoint can be filled into the endpoint prompt in the header to use COSU Manager in the exact same way as an externally hosted service. Minikube can be used as a testing environment before creating a cloud deployment.
 
 --- Setup Tab ---
 
 The Setup Tab is the most advanced tab and will be used to define all of the parameters used in each of the workflow modes. In all modes, the right sidebar can be used to define Model Parameters and Hyperparameters. The values here depend on the mode, but both of these editors allow for various parameters to be defined. These editors support a variety of data types including strings, floats, integers, dates, and booleans. The editor will adapt the UI and show the appropriate editor depending on the data type (e.g. dates will have a date picker, booleans a True/False dropdown, or a textbox for strings).
 
-The second editor is the Group Editor. In Optimization you will be able to define multiple groups while all other modes only support a single group. The Group Editor includes options to create new groups, delete them, rearrange their order, expand/contract them, and overwrite global parameters defined in the sidebar. In each group you can define Bounds and Objective Functions. Each group has a variety of bounds and objective functions and all of their details can be defined here. Bounds can be imported from CSV files or edited in the interface. The Bounds editor will provide information about each parameter from the service in tooltips and notify when a parameter is outside the recommended bound by highlighting them in Red. In other modes besides Optimization the Setup Tab show less information, only the attributes relevant to each mode.
+The second editor is the Group Editor. In Optimization you will be able to define multiple groups while all other modes only support a single group. The Group Editor includes options to create new groups, delete them, rearrange their order, expand/contract them, and overwrite global parameters defined in the sidebar. In each group you can define parameter Bounds and Objective Functions. Bounds can be imported from CSV files or edited in the interface. The Bounds editor will provide information about each parameter from the service in tooltips and notify when a parameter is outside the recommended bound by highlighting them in Red. In other modes besides Optimization the Setup Tab show less information, only the attributes relevant to each mode.
 
 --- Results Tab ---
 
-The Results Tab is where data can be visualized after a workflow step is ran, or view progress while Optimization is running. The main interface of the Results Tab is the left sidebar, where the figure type can be selected and then any relevant fields are displayed to edit the figure. Each mode has different figure types:
+The Results Tab is where data can be visualized after a workflow step has run, or view progress while Optimization is running. The main interface of the Results Tab is the left sidebar, where the figure type can be selected and then any relevant fields are displayed to edit the figure. Each mode has different figure types:
 
 Optimization:
 - Best Cost Stacked
@@ -36,8 +38,8 @@ Sampling:
 - Sampling CSV
 - Matrix Editor
 
-Each of the CSV editors are the most powerful figure editors, each with extensive options to customize how the figure is generated and which dataset is being used. Figures can be generated with different themes and then Exported in a variety of formats including HTML, Plotly JSON, PDF, and PNG. If you need to more closely view a figure you can click the "Preview" option to open the graph in a web browser. While the a browser each figure has an interactive interface where the figure can be zoomed, cropped, analyzed, and exported into different formats.
+Each of the CSV editors are the most powerful figure editors with extensive options to customize how the figure is generated and which dataset is being used. Figures can be generated with different themes and then Exported in a variety of formats including HTML, Plotly JSON, PDF, and PNG. If you need to view a figure more closely, you can click the "Preview" option to open the graph in a web browser. While in the a browser each figure has an interactive interface where the figure can be zoomed, cropped, analyzed, and exported into different formats.
 
 --- Project Tab ---
 
-The final tab is the Project Tab. This tab is likely used the least compared to all of the others. Here you can view the console output of the interface, this can be used to observe errors that are happening. In addition to that this tab also has the Project Editor. This is where you can copy data between modes. So as the workflow is built out it is expected to start with Sampling, do Sensitivity Analysis, and end with Optimization. Instead of having to setup each mode individually the parameters from one can be transferred between modes using this tab. Alongside that the Project Folder and various other project attributes can be viewed here. Finally, the Optimal Parameters found using Optimization can be viewed here.
+The Project Tab is likely used the least compared to all of the others. Here you can view the console output of the interface, including any errors that are happening. This tab also has the Project Editor where you can copy data between modes. As the workflow is built out, it is expected to start with Sampling, followed by Sensitivity Analysis, and end with Optimization. Instead of having to setup each mode individually the parameters from one can be transferred between modes using the Project Tab. The Project Folder and various other project attributes can be viewed here. Finally, the Optimal Parameters found using Optimization can be viewed here.

mgpsogui/util/PSORunner.py

@@ -242,6 +242,8 @@ def run_sampling(data, mode, folder, results_queue):
     process_list(data, parameter_map, args, options, oh_strategy, config, metainfo, "service_parameters")
 
     output_steps = process_steps(data)
+    if len(output_steps) > 1:
+        output_steps = [output_steps[0]]
 
     trace_file = os.path.join(folder, 'results', mode + '_trace.csv')
     file_output_mode = data["sampling_output_mode"]
@@ -385,6 +387,8 @@ def run_sensitivity_analysis(data, folder, results_queue):
     trace_path = os.path.join(folder, 'results', 'trace.csv')
 
     output_steps = process_steps(data)
+    if len(output_steps) > 1:
+        output_steps = [output_steps[0]]
 
     # Get list of parameters from steps
     parameters = []