azapyGUI 0.0.1__tar.gz → 0.0.2__tar.gz

{azapyGUI-0.0.1 → azapygui-0.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: azapyGUI
-Version: 0.0.1
+Version: 0.0.2
 Summary: GUI for azapy library - Financial Portfolio Optimization Algorithms
 Home-page: https://github.com/Mircea-MMXXI/azapyGUI.git
 Author: Mircea Marinescu

{azapyGUI-0.0.1 → azapygui-0.0.2}/azapyGUI/AppSettingsPage.py

@@ -36,7 +36,8 @@ class AppSettingsPage(tk.Frame):
         
         # on frm_set
         self._setDef = configSettings.settings_model[self._category]
-        self.settings = deepcopy(configSettings.MasterApplicationSettings)
+        #self.settings = deepcopy(configSettings.MasterApplicationSettings)
+        self.settings = {key: configSettings.MasterApplicationSettings[key] for key in self._setDef.keys()}
         row = 0
         self._chk_val = {}
         self._chk_btn = {}
@@ -156,7 +157,7 @@ class AppSettingsPage(tk.Frame):
                             if vpar is None:
                                 msg = (configMSG._validate_provider_key_msg
                                        +'\n' 
-                                       + configSettings.get_envkey_valriable_name(pp))
+                                       + configSettings.get_envkey_vriable_name(pp))
                                 tk.messagebox.showwarning(title="Warning", message=msg, parent=self._window)
                                 del self.settings[param][pp]
                                 self._chk_btn[param][pp].deselect()
@@ -189,10 +190,9 @@ class AppSettingsPage(tk.Frame):
         
         
     def _btn_save_func(self):
-        configSettings.MasterApplicationSettings = deepcopy(self.settings)
-        _saveMasterUserConfig(configSettings.MasterApplicationSettings)
-        #self._btn_cancel_func()
-        
+        configSettings.MasterApplicationSettings.update(self.settings)
+        _saveMasterUserConfig(configSettings.MasterApplicationSettings) 
+
         
     def _btn_reset_func(self):
         for kk, vv in self._setDef.items():

{azapyGUI-0.0.1 → azapygui-0.0.2}/azapyGUI/AppSettingsPageMisc.py

@@ -26,7 +26,8 @@ class AppSettingsPageMisc(tk.Frame):
         
         # on frm
         self._setDef = configSettings.settings_model[self._category]
-        self.settings = deepcopy(configSettings.MasterApplicationSettings)
+        #self.settings = deepcopy(configSettings.MasterApplicationSettings)
+        self.settings = {key: configSettings.MasterApplicationSettings[key] for key in self._setDef.keys()}
         row = 0
         self._chk_val = {}
         self._chk_btn = {}
@@ -92,9 +93,8 @@ class AppSettingsPageMisc(tk.Frame):
         
         
     def _btn_save_func(self):
-        for param in self._chk_val.keys():
-            self.settings[param] = self._chk_val[param].get()
-        configSettings.MasterApplicationSettings = deepcopy(self.settings)
+        self.settings.update({key: self._chk_val[key].get() for key in self._chk_val.keys()})
+        configSettings.MasterApplicationSettings.update(self.settings)
         _saveMasterUserConfig(configSettings.MasterApplicationSettings)
         config.tiptil.turned(on=configSettings.MasterApplicationSettings["ShowTips"])
 

{azapyGUI-0.0.1 → azapygui-0.0.2}/azapyGUI/BacktestEntryWindow.py

@@ -150,11 +150,8 @@ class BacktestEntryWindow:
         
         self._btn_start = tk.Button(master=frm_btn, text='Start', width=12, command=self._btn_start_func)
         self._btn_start.pack(side=tk.RIGHT, padx=5, pady=5,)
-        
-        # self._frm_progress = tk.LabelFrame(master=self._window, text="Progress", font=("Forte", 10), height=200, width=300)
-        # self._frm_progress.pack(fill=tk.X, expand=False, padx=5, pady=5)
- 
-        
+
+
     def _destroy_all_windows(self):
         for widget in self._window.winfo_children():
             if isinstance(widget, tk.Toplevel):

{azapyGUI-0.0.1 → azapygui-0.0.2}/azapyGUI/EditPortfolioWindow.py

@@ -147,13 +147,17 @@ class EditPortfolioWindow:
     def _tree_model_write(self):
         for name, selector in self.portfolio.selectors.items():
             item = self._tree_model.insert("", selector['index'], text=name, tags=("m_selector",))
+            invisible = configModels.param_default(name, visible=False)
             for kk, vv in selector['param'].items():
-                self._tree_model.insert(item, tk.END, text=kk +" =" + str(vv)) 
+                if kk in invisible: continue
+                self._tree_model.insert(item, tk.END, text=kk +" = "+ str(vv)) 
                 
         for name, optimizer in self.portfolio.optimizer.items():
             item = self._tree_model.insert("", tk.END, text=name, tags=("m_optimizer",)) 
+            invisible = configModels.param_default(name, visible=False)
             for kk, vv in optimizer['param'].items():
-                self._tree_model.insert(item, tk.END, text=kk + " = " + str(vv))
+                if kk in invisible: continue
+                self._tree_model.insert(item, tk.END, text=kk +" = "+ str(vv))
         
         
     def _set_tree_menu_selector(self):

{azapyGUI-0.0.1 → azapygui-0.0.2}/azapyGUI/GetMktData.py

@@ -19,18 +19,19 @@ class GetMktData():
                 param[kk] = vv
                 
         file_dir = configSettings.MasterApplicationSettings["UserMktDataDirectory"]
+        fsave, fforce = (False, True) if file_dir is None else (True, force)
         
         self._symb_req_default = {"symbol": None,
                                   "sdate": None,
                                   "edate": None,
                                   "output_format": 'dict',
                                   "source": source,
-                                  "force": force,
-                                  "save": True,
+                                  "force": fforce,
+                                  "save": fsave,
                                   "file_dir": file_dir,
                                   "file_format": 'csv',
-                                  'api_key': api_key,
-                                  'param': param,
+                                  "api_key": api_key,
+                                  "param": param,
                                   }
         self._mktr = az.MkTreader(verbose=False)
         

{azapyGUI-0.0.1 → azapygui-0.0.2}/azapyGUI/PortAnalyseWindow.py

@@ -56,6 +56,8 @@ class PortAnalyseWindow(TimeSeriesViewWindow):
         rep = pp.port_perf()
         cols = ['RR', 'DD', 'RoMaD']
         rep[cols] = (rep[cols] * 100).round(2)
+        rep.index = pd.Categorical(rep.index, categories=rep.index, ordered=True)
+        rep.index.name = 'Symbols'
         
         return rep, f'{pname} Summary', '400x200'
     
@@ -89,6 +91,7 @@ class PortAnalyseWindow(TimeSeriesViewWindow):
         rep = pp.port_quarterly_returns(withcomp=True)
         rep = (rep * 100).round(2)
         rep.rename(columns={'close': pname}, inplace=True)
+        rep.columns = pd.Categorical(rep.columns, categories=rep.columns, ordered=True)
         rep.columns.name = 'Symbols'
         
         rep.index = pd.MultiIndex.from_arrays(
@@ -106,6 +109,7 @@ class PortAnalyseWindow(TimeSeriesViewWindow):
         rep = pp.port_monthly_returns(withcomp=True)
         rep = (rep * 100).round(2)
         rep.rename(columns={'close': pname}, inplace=True)
+        rep.columns = pd.Categorical(rep.columns, categories=rep.columns, ordered=True)
         rep.columns.name = 'Symbols'
         
         rep.index = pd.MultiIndex.from_arrays(

{azapyGUI-0.0.1 → azapygui-0.0.2}/azapyGUI/config.py

@@ -1,4 +1,4 @@
-__version__ = '0.0.1'
+__version__ = '0.0.2'
 
 MktDataDict = {}
 PortDataDict = {}

{azapyGUI-0.0.1 → azapygui-0.0.2}/azapyGUI/configSettings.py

@@ -127,12 +127,12 @@ def get_settings_default_all():
     return rout
     
 
-def get_envkey_valriable_name(provider):
+def get_envkey_vriable_name(provider):
     return settings_model["MkTData"]["Provider"]["values"][provider]["key"]["envkey"]
 
 
 def get_envkey(provider):
-    return os.getenv(get_envkey_valriable_name(provider))
+    return os.getenv(get_envkey_vriable_name(provider))
 
 
 MasterApplicationSettings = None

{azapyGUI-0.0.1 → azapygui-0.0.2}/azapyGUI.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: azapyGUI
-Version: 0.0.1
+Version: 0.0.2
 Summary: GUI for azapy library - Financial Portfolio Optimization Algorithms
 Home-page: https://github.com/Mircea-MMXXI/azapyGUI.git
 Author: Mircea Marinescu

{azapyGUI-0.0.1 → azapygui-0.0.2}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as readme:
 
 setuptools.setup(
     name="azapyGUI",
-    version="0.0.1",
+    version="0.0.2",
     author="Mircea Marinescu",
     author_email="mircea.marinescu@outlook.com",
     description="GUI for azapy library - Financial Portfolio Optimization Algorithms",