mg-pso-gui 0.2.97__tar.gz → 0.2.98__tar.gz

{mg_pso_gui-0.2.97 → mg_pso_gui-0.2.98}/PKG-INFO

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

{mg_pso_gui-0.2.97 → mg_pso_gui-0.2.98}/mg_pso_gui.egg-info/PKG-INFO

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

{mg_pso_gui-0.2.97 → mg_pso_gui-0.2.98}/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()

{mg_pso_gui-0.2.97 → mg_pso_gui-0.2.98}/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:

{mg_pso_gui-0.2.97 → mg_pso_gui-0.2.98}/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")

{mg_pso_gui-0.2.97 → mg_pso_gui-0.2.98}/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())

{mg_pso_gui-0.2.97 → mg_pso_gui-0.2.98}/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)

{mg_pso_gui-0.2.97 → mg_pso_gui-0.2.98}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import codecs
 import os
 
-VERSION = '0.2.97'
+VERSION = '0.2.98'
 DESCRIPTION = 'GUI for MG-PSO'
 LONG_DESCRIPTION = open('../README.md').read()