voly 0.0.66__py3-none-any.whl → 0.0.68__py3-none-any.whl

voly/client.py

@@ -338,17 +338,14 @@ class VolyClient:
         logger.info(f"Fitting {model_name.upper()} model to market data")
 
         # Fit the model
-        fit_results, fit_performance = fit_model(
+        fit_results = fit_model(
             option_chain=option_chain,
             model_name=model_name,
             initial_params=initial_params,
             param_bounds=param_bounds
         )
 
-        return {
-            'fit_results': fit_results,
-            'fit_performance': fit_performance
-        }
+        return fit_results
 
     @staticmethod
     def get_iv_surface(fit_results: Dict[str, Any],

voly/core/fit.py

@@ -53,22 +53,42 @@ def fit_model(option_chain: pd.DataFrame,
     initial_params = initial_params or SVIModel.DEFAULT_INITIAL_PARAMS
     param_bounds = param_bounds or SVIModel.DEFAULT_PARAM_BOUNDS
 
-    # Define column names for the result DataFrame
-    result_columns = [
-        's', 'u', 'maturity_date', 'dtm', 'ytm',
-        'a', 'b', 'rho', 'm', 'sigma',
-        'nu', 'psi', 'p', 'c', 'nu_tilde',
-        'oi', 'volume', 'r',
-        'fit_success', 'cost', 'optimality',
-        'rmse', 'mae', 'r2', 'max_error', 'n_points'
-    ]
+    # Define column names and their data types
+    column_dtypes = {
+        's': float,
+        'u': float,
+        'maturity_date': 'datetime64[ns]',
+        'dtm': float,
+        'ytm': float,
+        'a': float,
+        'b': float,
+        'rho': float,
+        'm': float,
+        'sigma': float,
+        'nu': float,
+        'psi': float,
+        'p': float,
+        'c': float,
+        'nu_tilde': float,
+        'oi': float,
+        'volume': float,
+        'r': float,
+        'fit_success': bool,
+        'cost': float,
+        'optimality': float,
+        'rmse': float,
+        'mae': float,
+        'r2': float,
+        'max_error': float,
+        'n_points': int
+    }
 
     # Get unique maturities and sort them
     unique_ytms = sorted(option_chain['ytm'].unique())
     maturity_names = [option_chain[option_chain['ytm'] == ytm]['maturity_name'].iloc[0] for ytm in unique_ytms]
 
-    # Create empty DataFrame with maturity_names as index
-    results_df = pd.DataFrame(index=maturity_names, columns=result_columns)
+    # Store results in a dictionary first
+    results_data = {col: [] for col in column_dtypes.keys()}
 
     # ANSI color codes for terminal output
     GREEN, RED, RESET = '\033[32m', '\033[31m', '\033[0m'
@@ -119,21 +139,50 @@ def fit_model(option_chain: pd.DataFrame,
         # Calculate Jump-Wing parameters
         nu, psi, p, c, nu_tilde = SVIModel.raw_to_jw_params(a, b, sigma, rho, m, ytm)
 
-        # Store all results in the DataFrame
-        results_df.loc[maturity_name] = [
-            s, u, maturity_data['maturity_date'].iloc[0], dtm, ytm,
-            a, b, rho, m, sigma,
-            nu, psi, p, c, nu_tilde,
-            oi, volume, r,
-            result.success, result.cost, result.optimality,
-            rmse, mae, r2, max_error, len(maturity_data)
-        ]
+        # Store values in the results dictionary with proper types
+        results_data['s'].append(float(s))
+        results_data['u'].append(float(u))
+        results_data['maturity_date'].append(maturity_data['maturity_date'].iloc[0])
+        results_data['dtm'].append(float(dtm))
+        results_data['ytm'].append(float(ytm))
+        results_data['a'].append(float(a))
+        results_data['b'].append(float(b))
+        results_data['rho'].append(float(rho))
+        results_data['m'].append(float(m))
+        results_data['sigma'].append(float(sigma))
+        results_data['nu'].append(float(nu))
+        results_data['psi'].append(float(psi))
+        results_data['p'].append(float(p))
+        results_data['c'].append(float(c))
+        results_data['nu_tilde'].append(float(nu_tilde))
+        results_data['oi'].append(float(oi))
+        results_data['volume'].append(float(volume))
+        results_data['r'].append(float(r))
+        results_data['fit_success'].append(bool(result.success))
+        results_data['cost'].append(float(result.cost))
+        results_data['optimality'].append(float(result.optimality))
+        results_data['rmse'].append(float(rmse))
+        results_data['mae'].append(float(mae))
+        results_data['r2'].append(float(r2))
+        results_data['max_error'].append(float(max_error))
+        results_data['n_points'].append(int(len(maturity_data)))
 
         # Log result
         status = f'{GREEN}SUCCESS{RESET}' if result.success else f'{RED}FAILED{RESET}'
         logger.info(f'Optimization for {maturity_name}: {status}')
         logger.info('-------------------------------------')
 
+    # Create DataFrame with proper types
+    results_df = pd.DataFrame(results_data, index=maturity_names)
+
+    # Convert columns to appropriate types
+    for col, dtype in column_dtypes.items():
+        if col in results_df.columns:
+            try:
+                results_df[col] = results_df[col].astype(dtype)
+            except (ValueError, TypeError) as e:
+                logger.warning(f"Could not convert column {col} to {dtype}: {e}")
+
     return results_df
 
 

{voly-0.0.66.dist-info → voly-0.0.68.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: voly
-Version: 0.0.66
+Version: 0.0.68
 Summary: Options & volatility research package
 Author-email: Manu de Cara <manu.de.cara@gmail.com>
 License: MIT

{voly-0.0.66.dist-info → voly-0.0.68.dist-info}/RECORD

@@ -1,18 +1,18 @@
 voly/__init__.py,sha256=8xyDk7rFCn_MOD5hxuv5cxxKZvBVRiSIM7TgaMPpwpw,211
-voly/client.py,sha256=8_ICxM-tOZsY5Ip85J61U7IziMBkyE5gNjqiu4uJy50,20643
+voly/client.py,sha256=fXcS856ZYyJrhHjxUhGnth4N4BQbR-ExMYd25CTpR64,20539
 voly/exceptions.py,sha256=PBsbn1vNMvKcCJwwJ4lBO6glD85jo1h2qiEmD7ArAjs,92
 voly/formulas.py,sha256=wSbGAH6GuQThT9QyQY4Ud2eUf9fo1YFHglUmP6fNris,11871
 voly/models.py,sha256=LXXIlpXZQEfXTuCngxC8Hd3bWtw6wdXDCSGxTLmHM-c,3659
 voly/core/__init__.py,sha256=bu6fS2I1Pj9fPPnl-zY3L7NqrZSY5Zy6NY2uMUvdhKs,183
 voly/core/charts.py,sha256=rsAkVddQVwAwCle9NQ-_zDO-29U7gPF_Zx8n4OjK-X8,28467
 voly/core/data.py,sha256=e8qBArubNqPkrfuIYB_q2WhRf7TKzA4Z3FhMC-xyLEE,8862
-voly/core/fit.py,sha256=ATTycxY7im4QYAuj7djXgx0TBSBNy-M5EBMw9rwaQTI,7455
+voly/core/fit.py,sha256=JOr2XjM-I9HtfbyEN0tdGuNCZimQ2ttm4lNUpF-tKb4,9226
 voly/core/interpolate.py,sha256=ztVIePJZOh-CIbn69wkh1JW2rKywNe2FEewRN0zcSAo,8185
 voly/core/rnd.py,sha256=8FTU-Qp9epW9yE4XSOdiFGIRXrGyXqF6mVgZn1NMvxk,11813
 voly/utils/__init__.py,sha256=E05mWatyC-PDOsCxQV1p5Xi1IgpOomxrNURyCx_gB-w,200
 voly/utils/logger.py,sha256=4-_2bVJmq17Q0d7Rd2mPg1AeR8gxv6EPvcmBDMFWcSM,1744
-voly-0.0.66.dist-info/LICENSE,sha256=wcHIVbE12jfcBOai_wqBKY6xvNQU5E909xL1zZNq_2Q,1065
-voly-0.0.66.dist-info/METADATA,sha256=pd5csji3cfg29B85bqfHl3WOKk5zNYJv3VaLE7UrbEc,4092
-voly-0.0.66.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-voly-0.0.66.dist-info/top_level.txt,sha256=ZfLw2sSxF-LrKAkgGjOmeTcw6_gD-30zvtdEY5W4B7c,5
-voly-0.0.66.dist-info/RECORD,,
+voly-0.0.68.dist-info/LICENSE,sha256=wcHIVbE12jfcBOai_wqBKY6xvNQU5E909xL1zZNq_2Q,1065
+voly-0.0.68.dist-info/METADATA,sha256=GcwW-KAqS4hbQ3ARYxkdDYKqC4U7aef7kQYZbeVeY4U,4092
+voly-0.0.68.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+voly-0.0.68.dist-info/top_level.txt,sha256=ZfLw2sSxF-LrKAkgGjOmeTcw6_gD-30zvtdEY5W4B7c,5
+voly-0.0.68.dist-info/RECORD,,