plotguy 2.1.9__tar.gz → 2.2.0__tar.gz

{plotguy-2.1.9 → plotguy-2.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plotguy
-Version: 2.1.9
+Version: 2.2.0
 Summary: Plotguy
 Home-page: https://pypi.org/project/plotguy/
 Author: Plotguy Team
@@ -15,9 +15,9 @@ Requires-Dist: hkfdb
 Requires-Dist: pyarrow==23.0.0
 Requires-Dist: fastparquet
 Requires-Dist: polars==0.18.15
+Requires-Dist: dash==2.9.3
 Requires-Dist: plotly==5.18.0
 Requires-Dist: lxml
-Requires-Dist: dash==2.9.3
 Requires-Dist: dash_bootstrap_components
 Requires-Dist: dash_daq
 Requires-Dist: dash_dangerously_set_inner_html

{plotguy-2.1.9 → plotguy-2.2.0}/plotguy/components.py

@@ -798,73 +798,74 @@ class Components:
             saved_strategies_path = os.path.join(str_dir, 'saved_strategies.parquet')
             saved_strategies_df   = pd.read_parquet(saved_strategies_path)
 
-            for i, row in saved_strategies_df.iterrows():
-                equity_path = os.path.join(str_dir, row["equity_curve_folder"], str(row['ref_code']) + '.parquet')
-                #df_equity = pd.read_parquet(equity_path)
-
-                yearly_stats_string  = row['yearly_stats_string']
-                para_keys_str  = row['para_keys_str']
-                para_keys_list = para_keys_str.split('|')
-
-                parameters = {}
-                for para_keys in para_keys_list:
-                    parameters[para_keys] = str(row[para_keys])
-
-                equity_curve_dict = {}
-
-                equity_curve_dict['folder']        = str_dir
-                equity_curve_dict['backtest_name'] = row['backtest_name']
-                equity_curve_dict['equity_path']   =  equity_path
-                equity_curve_dict['parameters']    = parameters
-
-                equity_curve_dict['performance'] = {
-                    'initial_capital':   row['initial_capital'],
-                    'sharpe_ratio':      row['equity_annualized_sr'],
-                    'annualized_return': row['equity_annualized_return'],
-                    'net_profit_to_mdd': row['equity_net_profit_to_mdd'],
-                    'net_profit':        row['equity_net_profit'],
-                    'mdd_dollar':        row['equity_mdd_dollar'],
-                    'mdd_pct':           row['equity_mdd_pct'],
-                    'num_of_trade':      row['num_of_trade'],
-                    'num_of_win':        row['num_of_win'],
-                    'return_on_capital': row['equity_return_on_capital'],
-                    'total_commission':  row['total_commission'],
-                }
-
-                ref_code = str(row['ref_code'])
-                equity_curve_dict['ref_code'] = ref_code
-
-                yearly_stats_dict = {}
-                years_data = yearly_stats_string.split("|")
-
-                for year_data in years_data:
-                    parts = year_data.split(",")
-                    year = parts[0]
-                    yearly_stats_dict[year] = {}
-
-                    for item in parts[1:]:
-                        key, value = item.split(":")
-                        yearly_stats_dict[year][key] = float(value)
-
-                for idx, (year, value) in enumerate(yearly_stats_dict.items()):
-                    year_trade_count = value['year_trade_count']
-                    year_win_rate = value['year_win_rate']
-                    year_return = value['year_return']
-
-                    year_win_count =  year_trade_count * year_win_rate * 0.01
-
-                    ### dont remove ###
-                    # year_trade_count = "{:d}".format(int(year_trade_count))
-                    # year_win_count = "{:d}".format(int(year_win_count))
-                    # year_win_rate = "{:d}%".format(int(year_win_rate))
-                    # year_return = "{:.2f} %".format(int(year_return))
-
-                    equity_curve_dict['performance'][f'{year} Count']    = year_trade_count
-                    equity_curve_dict['performance'][f'{year} Win Rate'] = year_win_rate
-                    equity_curve_dict['performance'][f'{year} Win Count'] = year_win_count
-                    equity_curve_dict['performance'][f'{year} Return']   = year_return
-
-                equity_curves_dict_list.append(equity_curve_dict)
+            if len(saved_strategies_df.columns) > 1:
+                for i, row in saved_strategies_df.iterrows():
+                    equity_path = os.path.join(str_dir, row['equity_curve_folder'], str(row['ref_code']) + '.parquet')
+                    #df_equity = pd.read_parquet(equity_path)
+
+                    yearly_stats_string  = row['yearly_stats_string']
+                    para_keys_str  = row['para_keys_str']
+                    para_keys_list = para_keys_str.split('|')
+
+                    parameters = {}
+                    for para_keys in para_keys_list:
+                        parameters[para_keys] = str(row[para_keys])
+
+                    equity_curve_dict = {}
+
+                    equity_curve_dict['folder']        = str_dir
+                    equity_curve_dict['backtest_name'] = row['backtest_name']
+                    equity_curve_dict['equity_path']   =  equity_path
+                    equity_curve_dict['parameters']    = parameters
+
+                    equity_curve_dict['performance'] = {
+                        'initial_capital':   row['initial_capital'],
+                        'sharpe_ratio':      row['equity_annualized_sr'],
+                        'annualized_return': row['equity_annualized_return'],
+                        'net_profit_to_mdd': row['equity_net_profit_to_mdd'],
+                        'net_profit':        row['equity_net_profit'],
+                        'mdd_dollar':        row['equity_mdd_dollar'],
+                        'mdd_pct':           row['equity_mdd_pct'],
+                        'num_of_trade':      row['num_of_trade'],
+                        'num_of_win':        row['num_of_win'],
+                        'return_on_capital': row['equity_return_on_capital'],
+                        'total_commission':  row['total_commission'],
+                    }
+
+                    ref_code = str(row['ref_code'])
+                    equity_curve_dict['ref_code'] = ref_code
+
+                    yearly_stats_dict = {}
+                    years_data = yearly_stats_string.split("|")
+
+                    for year_data in years_data:
+                        parts = year_data.split(",")
+                        year = parts[0]
+                        yearly_stats_dict[year] = {}
+
+                        for item in parts[1:]:
+                            key, value = item.split(":")
+                            yearly_stats_dict[year][key] = float(value)
+
+                    for idx, (year, value) in enumerate(yearly_stats_dict.items()):
+                        year_trade_count = value['year_trade_count']
+                        year_win_rate = value['year_win_rate']
+                        year_return = value['year_return']
+
+                        year_win_count =  year_trade_count * year_win_rate * 0.01
+
+                        ### dont remove ###
+                        # year_trade_count = "{:d}".format(int(year_trade_count))
+                        # year_win_count = "{:d}".format(int(year_win_count))
+                        # year_win_rate = "{:d}%".format(int(year_win_rate))
+                        # year_return = "{:.2f} %".format(int(year_return))
+
+                        equity_curve_dict['performance'][f'{year} Count']    = year_trade_count
+                        equity_curve_dict['performance'][f'{year} Win Rate'] = year_win_rate
+                        equity_curve_dict['performance'][f'{year} Win Count'] = year_win_count
+                        equity_curve_dict['performance'][f'{year} Return']   = year_return
+
+                    equity_curves_dict_list.append(equity_curve_dict)
 
         line_colour = []
         for c in range(len(equity_curves_dict_list)):

{plotguy-2.1.9 → plotguy-2.2.0}/plotguy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plotguy
-Version: 2.1.9
+Version: 2.2.0
 Summary: Plotguy
 Home-page: https://pypi.org/project/plotguy/
 Author: Plotguy Team
@@ -15,9 +15,9 @@ Requires-Dist: hkfdb
 Requires-Dist: pyarrow==23.0.0
 Requires-Dist: fastparquet
 Requires-Dist: polars==0.18.15
+Requires-Dist: dash==2.9.3
 Requires-Dist: plotly==5.18.0
 Requires-Dist: lxml
-Requires-Dist: dash==2.9.3
 Requires-Dist: dash_bootstrap_components
 Requires-Dist: dash_daq
 Requires-Dist: dash_dangerously_set_inner_html

{plotguy-2.1.9 → plotguy-2.2.0}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="plotguy",
-    version="2.1.9",
+    version="2.2.0",
     author="Plotguy Team",
     author_email="plotguy.info@gmail.com",
     description="Plotguy",
@@ -19,9 +19,9 @@ setuptools.setup(
         'pyarrow==23.0.0',
         'fastparquet',
         'polars==0.18.15',
+        'dash==2.9.3',
         'plotly==5.18.0',
         'lxml',        
-        'dash==2.9.3',
         'dash_bootstrap_components',
         'dash_daq',
         'dash_dangerously_set_inner_html',

{plotguy-2.1.9 → plotguy-2.2.0}/plotguy.egg-info/requires.txt

@@ -5,9 +5,9 @@ hkfdb
 pyarrow==23.0.0
 fastparquet
 polars==0.18.15
+dash==2.9.3
 plotly==5.18.0
 lxml
-dash==2.9.3
 dash_bootstrap_components
 dash_daq
 dash_dangerously_set_inner_html