plotguy 2.1.3__tar.gz → 2.1.5__tar.gz

{plotguy-2.1.3 → plotguy-2.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plotguy
-Version: 2.1.3
+Version: 2.1.5
 Summary: Plotguy
 Home-page: https://pypi.org/project/plotguy/
 Author: Plotguy Team
@@ -8,7 +8,7 @@ Author-email: plotguy.info@gmail.com
 Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
 Description-Content-Type: text/markdown
-Requires-Dist: setuptools
+Requires-Dist: setuptools==80.10.2
 Requires-Dist: numpy==2.4.2
 Requires-Dist: pandas==2.3.3
 Requires-Dist: hkfdb

{plotguy-2.1.3 → plotguy-2.1.5}/plotguy/__init__.py

@@ -156,6 +156,9 @@ def save_backtest_result(df, para_combination_item):
     price_annualized_sr = round(price_annualized_sr, 2)
     price_net_profit_to_mdd = round(100 * price_net_profit_to_mdd, 2)
 
+    last_action = df['action'].iloc[-1]
+    if last_action == 'open':
+        df = df.drop(df.index[-1])
     df_count = df[(df['trd_side'] == 'BUY') | (df['trd_side'] == 'SELL_SHORT')].copy()
 
     if len(df_count) == 0:

{plotguy-2.1.3 → plotguy-2.1.5}/plotguy/components.py

@@ -397,13 +397,22 @@ class Components:
                 year_return      = '-----'
             else:
                 format_content = value['year_win_rate']
-                year_win_rate = "{:d} %".format(int(format_content))
+                if np.isnan(format_content):
+                    year_win_rate = 'nan'
+                else:
+                    year_win_rate = "{:d} %".format(int(format_content))
 
                 format_content = value['year_return']
-                year_return = "{:d} %".format(int(format_content))
+                if np.isnan(format_content):
+                    year_return = 'nan'
+                else:
+                    year_return = "{:d} %".format(int(format_content))
 
                 format_content = value['year_trade_count']
-                year_trade_count = str(int(format_content))
+                if np.isnan(format_content):
+                    year_trade_count = 'nan'
+                else:
+                    year_trade_count = str(int(format_content))
 
             if idx%2 == 1:
                 year_col1.append(
@@ -489,8 +498,8 @@ class Components:
     filter_options = {
         'num_of_trade':'Number of Trade',
         'equity_return_on_capital': 'Return on Capital',
-        'annualized_return': 'Annualized Return',
-        'equity_annualized_return': 'Sharpe Ratio',
+        'equity_annualized_return': 'Annualized Return',
+        'equity_annualized_sr': 'Sharpe Ratio',
         'equity_mdd_pct':'MDD Percentage',
         'cov_count':'COV (Count)',
         'cov_return': 'COV (Return)',
@@ -500,11 +509,12 @@ class Components:
         }
 
     def update_filter_div(self, filter_list):
+
         filter_btn = []
         for i, element in enumerate(filter_list):
             element = filter_list[i]
             filter_full = []
-            filter_full.append(html.Div(self. filter_options[element[0]], style={'margin-right': '15px', 'display': 'inline'}))
+            filter_full.append(html.Div(self.filter_options[element[0]], style={'margin-right': '15px', 'display': 'inline'}))
             filter_full.append(html.Div(element[1], style={'margin-right': '15px', 'display': 'inline'}))
             filter_full.append(html.Div(element[2], style={'margin-right': '15px', 'display': 'inline'}))
             filter_btn.append(dbc.Row([

{plotguy-2.1.3 → plotguy-2.1.5}/plotguy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plotguy
-Version: 2.1.3
+Version: 2.1.5
 Summary: Plotguy
 Home-page: https://pypi.org/project/plotguy/
 Author: Plotguy Team
@@ -8,7 +8,7 @@ Author-email: plotguy.info@gmail.com
 Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
 Description-Content-Type: text/markdown
-Requires-Dist: setuptools
+Requires-Dist: setuptools==80.10.2
 Requires-Dist: numpy==2.4.2
 Requires-Dist: pandas==2.3.3
 Requires-Dist: hkfdb

{plotguy-2.1.3 → plotguy-2.1.5}/plotguy.egg-info/requires.txt

@@ -1,4 +1,4 @@
-setuptools
+setuptools==80.10.2
 numpy==2.4.2
 pandas==2.3.3
 hkfdb

{plotguy-2.1.3 → plotguy-2.1.5}/setup.py

@@ -5,14 +5,14 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="plotguy",
-    version="2.1.3",
+    version="2.1.5",
     author="Plotguy Team",
     author_email="plotguy.info@gmail.com",
     description="Plotguy",
     long_description=long_description,
     long_description_content_type="text/markdown",
     install_requires=[         
-        'setuptools',  
+        'setuptools==80.10.2',  
         'numpy==2.4.2',  
         'pandas==2.3.3',  
         'hkfdb',