mg-pso-gui 0.2.96__py3-none-any.whl → 0.2.98__py3-none-any.whl

{mg_pso_gui-0.2.96.dist-info → mg_pso_gui-0.2.98.dist-info}/METADATA

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

{mg_pso_gui-0.2.96.dist-info → mg_pso_gui-0.2.98.dist-info}/RECORD

@@ -1,12 +1,12 @@
 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=035xS1y_Z4u9qpohOWvTUAmhcq-8RMXGR5KYCD5wFX8,23610
-mgpsogui/gui/OptionManager.py,sha256=OczLGSmS9MfE2HgpPNw0OFbl2AdNQ_70pxQUKIDWAnU,21707
+mgpsogui/gui/HomePage.py,sha256=qnrbwfWKuSX6z2BEuRwLMfCe88WC55dFbBbvEe5PtFI,23626
+mgpsogui/gui/OptionManager.py,sha256=d-di4I9m9h0cPaKjnooTLf-QOqgIxYXbJma97EvP36I,21723
 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
-mgpsogui/gui/General/ParameterView.py,sha256=gTpsXQomHgWxdHhiMxjOk171PeefXqdpVQefH88PE_c,6384
+mgpsogui/gui/General/ParameterView.py,sha256=to57aODZOQXC52Pjcw_dYCRcf50WKj73SkLdb3i7wps,9493
 mgpsogui/gui/General/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/PlatformTab/PlatformTab.py,sha256=8J2Aa3Zrh1q9x07zZ0Ap9PgwHjeSKOYyj6wlxx40udw,10985
 mgpsogui/gui/PlatformTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -14,10 +14,10 @@ mgpsogui/gui/RunTab/OptimalParameterView.py,sha256=nliUEWA840cPBQt7wjiZ-L7uBOp_o
 mgpsogui/gui/RunTab/RunTab.py,sha256=47_r8K-e7f8zs93_2iPYnNBzHDHZejtedk7iSElkubU,5608
 mgpsogui/gui/RunTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/SetupTab/BoundsEditorWindow.py,sha256=U64oaiDIOaimjbqKMz5rQNq2o1SrQtrRHDdTYQ9ux1s,2870
-mgpsogui/gui/SetupTab/BoundsList.py,sha256=x1D1A0S0EAeKwuA5LFzcqslpws4O1mFUR6bKnuPTDMA,15221
+mgpsogui/gui/SetupTab/BoundsList.py,sha256=UyXKujyZ3zOhgaLpICzLx-pm5RYsQOkwagZ75z9w9Hc,15204
 mgpsogui/gui/SetupTab/CustomFunctionEditorWindow.py,sha256=yx0dHSNa7fGy99Q6qFcI6j9r8p0DlV3iOBgyPMGd8pM,2884
 mgpsogui/gui/SetupTab/CustomFunctionMetrics.py,sha256=vOJpElbTgz043m6JYwe9xz_2MBHg985S6KdbJkJERW4,5923
-mgpsogui/gui/SetupTab/FunctionsList.py,sha256=dhFP_kP8yFrDWNZAo3CMCOMThdcXFSFnj8fj_eJX2h0,6955
+mgpsogui/gui/SetupTab/FunctionsList.py,sha256=LoHu5FESu6e_QRucNVm8tuSXLl1aLoGYd9r7WOKFTaY,7059
 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
@@ -48,7 +48,7 @@ mgpsogui/gui/images/trash.png,sha256=j8cf0kWbJd-4Jp20lUVV1o1NSeQ4v1Ej4gfcIA3DVRQ
 mgpsogui/gui/images/up.png,sha256=AQvFWCUqSQNaQ1E6LKZ9zNfSvW6t4mgy8uswdg9T2Hg,2457
 mgpsogui/gui/messages/welcome.txt,sha256=KzN_Zk3vaZeXx-G2KJmd5I7Q1_Shw62E9Fx8U4rQuUQ,5674
 mgpsogui/util/GraphGenerator.py,sha256=LHHDCvBuJQ0RYQm0azi5tC-etrZ1KLQh-tkahVurPSI,31990
-mgpsogui/util/PSORunner.py,sha256=6RaIlXHcCloGnAGxS7ukxKgR6Yg831sDfOm4-0ai-gM,23456
+mgpsogui/util/PSORunner.py,sha256=MjK0xlKT88Pf5vk5U--xMnWJzqZGBAOR8n6AQMaYElc,15622
 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.96.dist-info/METADATA,sha256=3tWAk4BIG7JI_BYM7lmCbC2o_VGVJtOMKqCzwJMSKD0,9455
-mg_pso_gui-0.2.96.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-mg_pso_gui-0.2.96.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
-mg_pso_gui-0.2.96.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
-mg_pso_gui-0.2.96.dist-info/RECORD,,
+mg_pso_gui-0.2.98.dist-info/METADATA,sha256=ekBafcNKgLuq4c_qlN4Mwmx_V17NXcQOzXXS0teTJ0M,9455
+mg_pso_gui-0.2.98.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+mg_pso_gui-0.2.98.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.2.98.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.2.98.dist-info/RECORD,,

mgpsogui/gui/General/ParameterView.py

@@ -57,7 +57,7 @@ class ParameterView(CTkScrollableFrame):
                 CTkEntry(self.containerFrame, textvariable=self.key_values[index]["name"]).grid(row=row, column=0, columnspan=3, padx=(5, 5), pady=(5, 5), sticky="ew")
             
             if self.edit_mode and not required:
-                type_menu = CTkOptionMenu(self.containerFrame, variable=self.key_values[index]["type"], values=["integer", "float", "date", "boolean", "string"], width=20)
+                type_menu = CTkOptionMenu(self.containerFrame, variable=self.key_values[index]["type"], values=["integer", "float", "date", "datetime", "boolean", "string"], width=20)
                 type_menu.grid(row=row, column=3, columnspan=1, padx=(0, 0), pady=(5, 5), sticky="ew")
 
                 dest_menu = CTkOptionMenu(self.containerFrame, variable=self.key_values[index]["destination"], values=["args", "kwargs", "conf", "options", "oh_strategy", "metainfo"], width=20)
@@ -73,6 +73,48 @@ class ParameterView(CTkScrollableFrame):
                 if type == "boolean":
                     bb = CTkOptionMenu(self.containerFrame, values=["True", "False", "NULL"], variable=self.key_values[index]["value"])
                     bb.grid(row=row, column=3, columnspan=3, padx=(5, 5), pady=(5, 5), sticky="ew")
+                elif type == "datetime":
+                    om_text_var = self.key_values[index]["value"]
+                    year = sv()
+                    month = sv()
+                    day = sv()
+                    hour = sv()
+                    minute = sv()
+                    second = sv()
+                    date_time = om_text_var.get().split(" ")
+                    vv = date_time[0].split("-")
+                    ss = date_time[1].split(":")
+                    year.set(vv[0])
+                    month.set(vv[1])
+                    day.set(vv[2])
+                    hour.set(ss[0])
+                    minute.set(ss[1])
+                    second.set(ss[2])
+                    year_options = [str(i) for i in range(1999, 2030)]
+                    month_options = ["01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12"]
+                    day_options = ["01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31"]
+                    hour_options = [str(i) for i in range(0, 24)]
+                    minute_options = [str(i) for i in range(0, 60)]
+                    second_options = [str(i) for i in range(0, 60)]
+
+                    update_date = lambda om_text_var=om_text_var, year=year, month=month, day=day: om_text_var.set(f"{year.get()}-{month.get()}-{day.get()} {hour.get()}:{minute.get()}:{second.get()}")
+
+                    datetime_module = CTkFrame(self.containerFrame)
+                    datetime_module.grid(row=row, column=3, columnspan=3, padx=(5, 5), pady=(5, 5), sticky="ew")
+
+                    year_menu = CTkOptionMenu(datetime_module, variable=year, values=year_options, width=50, command=update_date)
+                    year_menu.grid(row=0, column=0, columnspan=1, padx=(0, 0), pady=(5, 5), sticky="ew")
+                    month_menu = CTkOptionMenu(datetime_module, variable=month, values=month_options, width=20, command=update_date)
+                    month_menu.grid(row=0, column=1, columnspan=1, padx=(0, 0), pady=(5, 5), sticky="ew")
+                    day_menu = CTkOptionMenu(datetime_module, variable=day, values=day_options, width=20, command=update_date)
+                    day_menu.grid(row=0, column=2, columnspan=1, padx=(0, 0), pady=(5, 5), sticky="ew")
+                    hour_menu = CTkOptionMenu(datetime_module, variable=hour, values=hour_options, width=20, command=update_date)
+                    hour_menu.grid(row=1, column=0, columnspan=1, padx=(0, 0), pady=(5, 5), sticky="ew")
+                    minute_menu = CTkOptionMenu(datetime_module, variable=minute, values=minute_options, width=20, command=update_date)
+                    minute_menu.grid(row=1, column=1, columnspan=1, padx=(0, 0), pady=(5, 5), sticky="ew")
+                    second_menu = CTkOptionMenu(datetime_module, variable=second, values=second_options, width=20, command=update_date)
+                    second_menu.grid(row=1, column=2, columnspan=1, padx=(0, 0), pady=(5, 5), sticky="ew")
+
                 elif type == "date":
                     om_text_var = self.key_values[index]["value"]
                     year = sv()

mgpsogui/gui/HomePage.py

@@ -415,7 +415,7 @@ class App(customtkinter.CTk):
 		#self.progress_message_middle.configure(text="Job starting...")
 		self.footer_progress_label.configure(text="Starting...")
 		
-		self.textbox.insert("0.0", "Starting job...\n\n")
+		self.textbox.insert("0.0", "Starting job of " + mode + "...\n\n")
 		self.textbox.insert("0.0", "Job Parameters:\n")
 		self.textbox.insert("0.0", json.dumps(data, indent=4) + "\n\n")
 		try:

mgpsogui/gui/OptionManager.py

@@ -16,7 +16,7 @@ class OptionManager():
         self.init_lists()
 
     def init_lists(self): 
-        self._project_data = {"name": "", "path": ""}
+        self._project_data = {"name": "cosu_default", "path": "/tmp"}
         self._data = {}
 
         self._mode_sv.set("Sampling: Halton")

mgpsogui/gui/SetupTab/BoundsList.py

@@ -105,7 +105,7 @@ class BoundsList(CTkFrame):
             tt2 = None
             tt3 = None
                         
-            tt = CTkOptionMenu(self.containerFrame, dynamic_resizing=False, values=['float', 'int', 'list', 'string', 'custom'], variable=bound["type"], command=self.refresh)
+            tt = CTkOptionMenu(self.containerFrame, dynamic_resizing=False, values=['float', 'list', 'custom'], variable=bound["type"], command=self.refresh)
             #command = lambda _, index=index, option=tt: (self.update_type(index, option)) 
             #tt.configure(command=command)
             #tt.set(bound["type"].get())

mgpsogui/gui/SetupTab/FunctionsList.py

@@ -54,7 +54,8 @@ 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")
-            CTkLabel(self.containerFrame, text="Weight:").grid(row=row, column=2, padx=(5, 5), pady=(5, 5), sticky="nsew")
+            if mode != "Sensitivity Analysis":
+                CTkLabel(self.containerFrame, text="Weight:").grid(row=row, column=2, padx=(5, 5), pady=(5, 5), sticky="nsew")
             
             row += 1
             
@@ -81,7 +82,8 @@ 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")
-            CTkEntry(self.containerFrame, textvariable=func["weight"]).grid(row=row, column=2, padx=(5, 5), pady=(5, 5), sticky="ew")
+            if mode != "Sensitivity Analysis":
+                CTkEntry(self.containerFrame, textvariable=func["weight"]).grid(row=row, column=2, padx=(5, 5), pady=(5, 5), sticky="ew")
             
             row += 1
 
@@ -107,7 +109,7 @@ class FunctionsList(CTkFrame):
 
                 row += 1
             
-            if mode != "Sensitive Analysis":
+            if mode != "Sensitivity Analysis":
                 CTkLabel(self.containerFrame, text="Observed and Simulated Data:").grid(row=row, column=0, columnspan=3, padx=(5, 5), pady=(5, 5), sticky="nsew")
                 
                 row += 1

mgpsogui/util/PSORunner.py

@@ -468,226 +468,4 @@ def sensitivity_analysis(url, request_file, trace_file, output_directory):
         exit(1)
 
     if result.is_finished():
-        download_output(result, output_directory)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-"""
-def run_process_old(stdout_queue, stderr_queue, results_queue, data, folder):
-    steps = data['steps']
-    args = data['arguments']
-    calib = data['calibration_parameters']
-    
-    my_mode = args["mode"]
-
-    # If "mode" in args remove it
-    if "mode" in args:
-        del args["mode"]
-    
-    calibration_map = {}
-    for param in calib:
-        param_name = param['name']
-        param_value = param['value']
-        calibration_map[param_name] = param_value
-        
-    if not os.path.exists(folder):
-        os.makedirs(folder)
-
-    if not os.path.exists(os.path.join(folder, "results")):
-        os.makedirs(os.path.join(folder, "results"))
-
-    if (os.path.exists(os.path.join(folder, 'output.txt'))):
-        os.remove(os.path.join(folder, 'output.txt'))
-        
-    if (os.path.exists(os.path.join(folder, 'error.txt'))):
-        os.remove(os.path.join(folder, 'error.txt'))
-    
-    old_stdout = sys.stdout
-    old_stderr = sys.stderr
-    
-    read_stdout, write_stdout = os.pipe()
-    read_stderr, write_stderr = os.pipe()
-    
-    sys.stdout = os.fdopen(write_stdout, 'w')
-    sys.stderr = os.fdopen(write_stderr, 'w')
-    
-    stdout_thread = threading.Thread(target=enqueue_output, args=(os.fdopen(read_stdout, 'r'), stdout_queue))
-    stderr_thread = threading.Thread(target=enqueue_output, args=(os.fdopen(read_stderr, 'r'), stderr_queue))
-    stdout_thread.daemon = True
-    stderr_thread.daemon = True
-    stdout_thread.start()
-    stderr_thread.start()
-    
-    try:
-        
-        options = {}
-        oh_strategy = {}
-        
-        for key in calibration_map.keys():
-            if "options_" in key:
-                options[key.replace("options_", "")] = float(calibration_map[key])
-            if "strategy_" in key:
-                oh_strategy[key.replace("strategy_", "")] = calibration_map[key]
-
-        config = {}
-
-        if my_mode == "Sampling":
-            config = {
-                'service_timeout': int(calibration_map['service_timeout']),
-                'http_retry': int(calibration_map['http_retry']),
-                'allow_redirects': True if calibration_map['allow_redirects'] == "True" else False,
-                'async_call': True if calibration_map['async_call'] == "True" else False,
-                'conn_timeout': int(calibration_map['conn_timeout']),
-                'read_timeout': int(calibration_map['read_timeout']),
-                'step_trace': os.path.join(folder, 'pso_step_trace.json')
-            }
-        elif my_mode == "Optimization":
-            config = {
-                'service_timeout': int(calibration_map['service_timeout']),
-                'http_retry': int(calibration_map['http_retry']),
-                'http_allow_redirects': True if calibration_map['allow_redirects'] == "True" else False,
-                'async_call': True if calibration_map['async_call'] == "True" else False,
-                'http_conn_timeout': int(calibration_map['conn_timeout']),
-                'http_read_timeout': int(calibration_map['read_timeout']),
-                'particles_fail': int(calibration_map['particles_fail']),
-                'step_trace': os.path.join(folder, 'pso_step_trace.json')
-            }
-
-        print("\n")
-        print(steps)
-        print("\n")
-        print(args)
-        print("\n")
-        print(calibration_map)
-        print("\n")
-        print(options)
-        print("\n")
-        print(oh_strategy)
-        print("\n")
-        print(config)
-        print("\n", flush=True)
-
-        if my_mode == "Sampling: Halton":
-            print("Running Halton Sampling..\n", flush=True)
-            trace = run_sampler(steps, 
-                                args, 
-                                int(calibration_map['count']), 
-                                int(calibration_map['num_threads']), 
-                                "halton", 
-                                conf=config, 
-                                trace_file=os.path.join(folder, 'results', 'halton_trace.csv'),
-                                offset=int(calibration_map['offset']))
-            results_queue.put(trace)
-            print(trace, flush=True)
-            print("\n", flush=True)
-            
-        elif my_mode == "Sampling: Random":
-            print("Running Random Sampling...\n", flush=True)
-            trace = run_sampler(steps, 
-                    args, 
-                    int(calibration_map['count']), 
-                    int(calibration_map['num_threads']), 
-                    "random", 
-                    conf=config, 
-                    trace_file=os.path.join(folder, 'results', 'random_trace.csv'))
-            results_queue.put(trace)
-            print(trace, flush=True)
-            print("\n", flush=True)
-
-        elif my_mode == "Sensitivity Analysis":
-            
-            print("Running Sensitivity Analysis", flush=True)
-
-            shutil.copyfile(data["sensitivity_analysis_path"], os.path.join(folder, 'results', 'trace.csv'))
-            trace_path = os.path.join(folder, 'results', 'trace.csv')
-
-            # Get list of parameters from steps
-            parameters = []
-            for param in steps[0]['param']:
-                parameters.append(param['name'])
-
-            request_json = {
-                "metainfo": {
-                    "service_url": None,
-                    "description": "",
-                    "name": "",
-                    "mode": "async"
-                },
-                "parameter": [
-                    {
-                    "name": "parameters",
-                    "value": parameters
-                    },
-                    {
-                    "name": "positiveBestMetrics",
-                    "value": ["ns","kge","mns","kge09","nslog2"]
-                    },
-                    {
-                    "name": "zeroBestMetrics",
-                    "value": ["pbias","rmse"]
-                    }
-                ]
-            }
-            
-            with open(os.path.join(folder, 'results', 'request.json'), 'w') as json_file:
-                json.dump(request_json, json_file, indent=4)
-            
-            request_path = os.path.join(folder, 'results', 'request.json')
-
-            output_directory = os.path.join(folder, 'results')
-
-            print("Starting ", args['url'], request_path, trace_path, output_directory, flush=True)
-
-            sensitivity_analysis(args['url'], request_path, trace_path, output_directory)
-
-            print("Finished Sensitivity Analysis", flush=True)
-        else:
-            print("Running MG-PSO Optimization...\n", flush=True)
-            optimizer, trace = global_best(steps,   
-                    rounds=(int(calibration_map['min_rounds']), int(calibration_map['max_rounds'])),              
-                    args=args,      
-                    n_particles=int(calibration_map['n_particles']),      
-                    iters=int(calibration_map['iters']),  
-                    n_threads=int(calibration_map['n_threads']),      
-                    options=options,
-                    oh_strategy=oh_strategy, 
-                    conf=config
-                )
-            
-            results_queue.put(trace)
-            print(trace, flush=True)
-        
-        print("Finishing up...", flush=True)
-        time.sleep(5)
-    except Exception as e:
-        print("An exception occurred: ", flush=True)
-        print(str(e))
-        # Print stack trace
-        import traceback
-        traceback.print_exc()
-
-        # Write all of this information to a crash file
-        with open(os.path.join(folder, 'crash.txt'), 'w') as f:
-            f.write(str(e))
-            f.write("\n")
-            traceback.print_exc(file=f)
-    finally:
-        stdout_thread.join()
-        stderr_thread.join()
-        
-        sys.stdout = old_stdout
-        sys.stderr = old_stderr
-"""
+        download_output(result, output_directory)