finalytics 0.3.0__tar.gz → 0.4.0__tar.gz

{finalytics-0.3.0 → finalytics-0.4.0}/PKG-INFO

@@ -1,12 +1,14 @@
 Metadata-Version: 2.3
 Name: finalytics
-Version: 0.3.0
+Version: 0.4.0
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Requires-Dist: polars ==0.19.12
 Requires-Dist: pyarrow ==14.0.0
-Requires-Dist: ipython ==8.18.0
+Requires-Dist: plotly ==5.22.0
+Requires-Dist: notebook >=5.3
+Requires-Dist: ipywidgets >=7.5
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown; charset=UTF-8; variant=GFM
 
@@ -15,11 +17,10 @@ Description-Content-Type: text/markdown; charset=UTF-8; variant=GFM
 [![pypi](https://img.shields.io/pypi/v/finalytics)](https://pypi.org/project/finalytics/)
 ![License](https://img.shields.io/crates/l/finalytics)
 [![Homepage](https://img.shields.io/badge/homepage-finalytics.rs-blue)](https://finalytics.rs/)
-[![Documentation Status](https://readthedocs.org/projects/finalytics-py/badge/?version=latest)](https://finalytics-py.readthedocs.io/en/latest/?badge=latest)
+[![Documentation Status](https://readthedocs.org/projects/finalytics/badge/?version=latest)](https://finalytics.readthedocs.io/en/latest/?badge=latest)
 ![Platform](https://img.shields.io/badge/Platform-Windows%20%7C%20Linux%20%7C%20MacOS-brightgreen)
 ![Python Version](https://img.shields.io/badge/Python-3.7%20%7C%203.8%20%7C%203.9%20%7C%203.10%20%7C%203.11%20%7C%203.12-blue)
 ![PePy](https://static.pepy.tech/personalized-badge/finalytics?period=total&units=international_system&left_color=black&right_color=blue&left_text=Downloads)
-[![CodeFactor](https://www.codefactor.io/repository/github/nnamdi-sys/finalytics-py/badge)](https://www.codefactor.io/repository/github/nnamdi-sys/finalytics-py)
 
 
 
@@ -33,42 +34,23 @@ pip install finalytics
 
 ## Documentation
 
-View Library documentation on readthedocs [here](https://finalytics-py.readthedocs.io/en/latest/)
+View Library documentation on readthedocs [here](https://finalytics.readthedocs.io/en/latest/)
 
 
-### Symbol Search
-
-```python
-from finalytics import get_symbols
-
-print(get_symbols(query="Apple", asset_class="Equity"))
-print(get_symbols(query="Bitcoin", asset_class="Crypto"))
-print(get_symbols(query="S&P 500", asset_class="Index"))
-print(get_symbols(query="EURUSD", asset_class="Currency"))
-print(get_symbols(query="SPY", asset_class="ETF"))
-```
-
 ### Security Analysis
 
 ```python
 from finalytics import Ticker
 
-ticker = Ticker(symbol="AAPL")
-print(ticker.get_current_price())
-print(ticker.get_summary_stats())
-print(ticker.get_price_history(start="2023-01-01", end="2023-10-31", interval="1d"))
-print(ticker.get_options_chain())
-print(ticker.get_news(compute_sentiment=False))
-print(ticker.get_income_statement())
-print(ticker.get_balance_sheet())
-print(ticker.get_cashflow_statement())
-print(ticker.get_financial_ratios())
-print(ticker.compute_performance_stats(start="2023-01-01", end="2023-10-31", interval="1d", benchmark="^GSPC", 
-                                       confidence_level=0.95, risk_free_rate=0.02))
-ticker.display_performance_chart(start="2023-01-01", end="2023-10-31", interval="1d", benchmark="^GSPC", 
-                                 confidence_level=0.95, risk_free_rate=0.02, display_format="notebook")
-ticker.display_candlestick_chart(start="2023-01-01", end="2023-10-31", interval="1d", display_format="html")
-ticker.display_options_chart(risk_free_rate=0.02, chart_type="surface", display_format="png")
+ticker = Ticker(symbol="AAPL",
+                start="2023-01-01",
+                end="2023-10-31",
+                interval="1d",
+                confidence_level=0.95,
+                risk_free_rate=0.02)
+
+print(ticker.performance_stats())
+ticker.performance_chart().show()
 ```
 
 ### Portfolio Optimization
@@ -76,12 +58,13 @@ ticker.display_options_chart(risk_free_rate=0.02, chart_type="surface", display_
 ```python
 from finalytics import Portfolio
 
-portfolio = Portfolio(ticker_symbols=["AAPL", "GOOG", "MSFT", "BTC-USD"], 
-                      benchmark_symbol="^GSPC", start_date="2020-01-01", end_date="2022-01-01", interval="1d", 
-                      confidence_level=0.95, risk_free_rate=0.02, max_iterations=1000, 
+portfolio = Portfolio(ticker_symbols=["AAPL", "GOOG", "MSFT", "BTC-USD"],
+                      benchmark_symbol="^GSPC", start_date="2020-01-01", end_date="2022-01-01", interval="1d",
+                      confidence_level=0.95, risk_free_rate=0.02, max_iterations=1000,
                       objective_function="max_sharpe")
+
 print(portfolio.get_optimization_results())
-portfolio.display_portfolio_charts("performance", "html")
+portfolio.portfolio_chart("performance").show()
 ```
 
 

{finalytics-0.3.0 → finalytics-0.4.0}/README.md

@@ -38,86 +38,22 @@ use finalytics::prelude::*;
 async fn main() -> Result<(), Box<dyn Error>> {
 
     // Instantiate the Ticker Object
-    let ticker = TickerBuilder::new().ticker("AAPL")?
+    let ticker = TickerBuilder::new()
+        .ticker("AAPL")
         .start_date("2023-01-01")
         .end_date("2023-02-01")
         .interval(Interval::OneDay)
         .benchmark_symbol("^GSPC")
         .confidence_level(0.95)
         .risk_free_rate(0.02)
-        .build()?;
-
-    // Fetch Ticker Data
-    let quote = ticker.get_quote().await?;
-    let stats = ticker.get_ticker_stats().await?;
-    let chart = ticker.get_chart().await?;
-    let options = ticker.get_options().await?;
-
-    println!("{:?}", quote);
-    println!("{:?}", stats);
-    println!("{:?}", chart);
-    println!("{:?}", options);
-
-    // Fundamental Analysis
-    let income_statement = ticker.income_statement().await?;
-    let balance_sheet = ticker.balance_sheet().await?;
-    let cash_flow = ticker.cashflow_statement().await?;
-    let financial_ratios = ticker.financial_ratios().await?;
+        .build();
+    
+    // Display the Security Analysis Results
     let performance_stats = ticker.performance_stats().await?;
-    let volatility_surface = ticker.volatility_surface().await?;
-
-    println!("{:?}", income_statement);
-    println!("{:?}", balance_sheet);
-    println!("{:?}", cash_flow);
-    println!("{:?}", financial_ratios);
     println!("{:?}", performance_stats);
-    println!("{:?}", volatility_surface);
-
-    // Technical Analysis
-    let sma = ticker.sma(50).await?;
-    let ema = ticker.ema(3).await?;
-    let macd = ticker.macd(12, 26, 9).await?;
-    let rsi = ticker.rsi(14).await?;
-    let fs = ticker.fs(14).await?;
-    let ss = ticker.ss(7, 3).await?;
-    let ppo = ticker.ppo(12, 26, 9).await?;
-    let roc = ticker.roc(1).await?;
-    let mfi = ticker.mfi(14).await?;
-    let bb = ticker.bb(20, 2.0).await?;
-    let sd = ticker.sd(20).await?;
-    let mad = ticker.mad(20).await?;
-    let atr = ticker.atr(14).await?;
-    let max = ticker.max(20).await?;
-    let min = ticker.min(20).await?;
-    let obv = ticker.obv().await?;
-
-    println!("SMA:{:?}\nEMA:{:?}\nMACD:{:?}\nRSI:{:?}\nFS:{:?}\nSS:{:?}\nPPO:{:?}\nROC:{:?}\nMFI:{:?}\
-            \nBB:{:?}\nSD:{:?}\nMAD:{:?}\nATR:{:?}\nMAX:{:?}\nMIN:{:?}\nOBV:{:?}\n",
-             sma, ema, macd, rsi, fs, ss, ppo, roc, mfi, bb, sd, mad, atr, max, min, obv);
-
-    // News Sentiment Analysis
-    let news_sentiment = ticker.get_news(true).await?;
-    println!("{:?}", news_sentiment);
-
-    // Display Ticker Charts
-    let candlestick_chart = ticker.candlestick_chart().await?;
+    
     let performance_chart = ticker.performance_chart().await?;
-    let volatility_charts = ticker.volatility_charts().await?;
-    let summary_stats_table = ticker.summary_stats_table().await?;
-    let performance_stats_table = ticker.performance_stats_table().await?;
-    let financials_tables = ticker.financials_tables().await?;
-
-    candlestick_chart.show();
     performance_chart.show();
-    summary_stats_table.show();
-    performance_stats_table.show();
-    volatility_charts["Volatility Surface"].show();
-    volatility_charts["Volatility Smile"].show();
-    volatility_charts["Volatility Term Structure"].show();
-    financials_tables["Income Statement"].show();
-    financials_tables["Balance Sheet"].show();
-    financials_tables["Cashflow Statement"].show();
-    financials_tables["Financial Ratios"].show();
 
     Ok(())
 
@@ -132,6 +68,7 @@ use finalytics::prelude::*;
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn Error>> {
+    
    // Construct the Portfolio Object
     let ticker_symbols = Vec::from(["NVDA", "BRK-A", "AAPL", "ZN=F"]);
     let portfolio = PortfolioBuilder::new().ticker_symbols(ticker_symbols)
@@ -147,12 +84,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
 
     // Display Portfolio Optimization Results
     println!("{:?}", portfolio.performance_stats);
-
-   // Display Portfolio Analytics Charts
-    portfolio.optimization_chart()?.show();
     portfolio.performance_chart()?.show();
-    portfolio.asset_returns_chart()?.show();
-    portfolio.performance_stats_table()?.show();
 
     Ok(())
 }
@@ -177,11 +109,10 @@ The Finalytics Telegram Bot allows you to perform security analysis, portfolio o
 [![pypi](https://img.shields.io/pypi/v/finalytics)](https://pypi.org/project/finalytics/)
 ![License](https://img.shields.io/crates/l/finalytics)
 [![Homepage](https://img.shields.io/badge/homepage-finalytics.rs-blue)](https://finalytics.rs/)
-[![Documentation Status](https://readthedocs.org/projects/finalytics-py/badge/?version=latest)](https://finalytics-py.readthedocs.io/en/latest/?badge=latest)
+[![Documentation Status](https://readthedocs.org/projects/finalytics/badge/?version=latest)](https://finalytics.readthedocs.io/en/latest/?badge=latest)
 ![Platform](https://img.shields.io/badge/Platform-Windows%20%7C%20Linux%20%7C%20MacOS-brightgreen)
 ![Python Version](https://img.shields.io/badge/Python-3.7%20%7C%203.8%20%7C%203.9%20%7C%203.10%20%7C%203.11%20%7C%203.12-blue)
 ![PePy](https://static.pepy.tech/personalized-badge/finalytics?period=total&units=international_system&left_color=black&right_color=blue&left_text=Downloads)
-[![CodeFactor](https://www.codefactor.io/repository/github/nnamdi-sys/finalytics-py/badge)](https://www.codefactor.io/repository/github/nnamdi-sys/finalytics-py)
 
 
 ## Installation
@@ -192,7 +123,7 @@ pip install finalytics
 
 ## Documentation
 
-View Library documentation on readthedocs [here](https://finalytics-py.readthedocs.io/en/latest/)
+View Library documentation on readthedocs [here](https://finalytics.readthedocs.io/en/latest/)
 
 
 ### Security Analysis
@@ -200,22 +131,15 @@ View Library documentation on readthedocs [here](https://finalytics-py.readthedo
 ```python
 from finalytics import Ticker
 
-ticker = Ticker(symbol="AAPL")
-print(ticker.get_current_price())
-print(ticker.get_summary_stats())
-print(ticker.get_price_history(start="2023-01-01", end="2023-10-31", interval="1d"))
-print(ticker.get_options_chain())
-print(ticker.get_news(compute_sentiment=True))
-print(ticker.get_income_statement())
-print(ticker.get_balance_sheet())
-print(ticker.get_cashflow_statement())
-print(ticker.get_financial_ratios())
-print(ticker.compute_performance_stats(start="2023-01-01", end="2023-10-31", interval="1d", benchmark="^GSPC", 
-                                       confidence_level=0.95, risk_free_rate=0.02))
-ticker.display_performance_chart(start="2023-01-01", end="2023-10-31", interval="1d", benchmark="^GSPC", 
-                                 confidence_level=0.95, risk_free_rate=0.02, display_format="notebook")
-ticker.display_candlestick_chart(start="2023-01-01", end="2023-10-31", interval="1d", display_format="html")
-ticker.display_options_chart(risk_free_rate=0.02, chart_type="surface", display_format="png")
+ticker = Ticker(symbol="AAPL",
+                start="2023-01-01",
+                end="2023-10-31",
+                interval="1d",
+                confidence_level=0.95,
+                risk_free_rate=0.02)
+
+print(ticker.performance_stats())
+ticker.performance_chart().show()
 ```
 
 ### Portfolio Optimization
@@ -227,8 +151,9 @@ portfolio = Portfolio(ticker_symbols=["AAPL", "GOOG", "MSFT", "BTC-USD"],
                       benchmark_symbol="^GSPC", start_date="2020-01-01", end_date="2022-01-01", interval="1d", 
                       confidence_level=0.95, risk_free_rate=0.02, max_iterations=1000, 
                       objective_function="max_sharpe")
+
 print(portfolio.get_optimization_results())
-portfolio.display_portfolio_charts("performance", "html")
+portfolio.portfolio_chart(chart_type="performance").show()
 ```
 
 

{finalytics-0.3.0 → finalytics-0.4.0}/finalytics/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "finalytics"
-version = "0.4.0"
+version = "0.5.0"
 authors = ["Nnamdi Olisaeloka <nnamdiolisaeloka@gmail.com>"]
 edition = "2021"
 homepage = "https://finalytics.rs/"
@@ -33,12 +33,9 @@ rand = "0.8.5"
 ndarray = "0.15.6"
 rand_distr = "0.4.3"
 optimization = "0.2.0"
-rusqlite = { version = "0.31.0", features = ["bundled"] }
-lazy_static = "1.4.0"
-r2d2 = "0.8.10"
-r2d2_sqlite = "0.24.0"
 html-escape = "0.2.13"
 plotly = { version = "0.8.4", package = "plotly-fork"}
+once_cell = "1.19.0"
 
 [features]
 kaleido = ["plotly/kaleido"]

{finalytics-0.3.0 → finalytics-0.4.0}/finalytics/src/analytics/fundamentals.rs

@@ -24,27 +24,27 @@ impl Financials for Ticker {
         
         let df = df!(
             "date" => *&income_statement.column("asOfDate")?,
-            "gross_profit_margin" => *&income_statement.column("GrossProfit")? / *&income_statement.column("TotalRevenue")?,
-            "operating_profit_margin" => *&income_statement.column("EBIT")? / *&income_statement.column("TotalRevenue")?,
-            "net_profit_margin" => *&income_statement.column("NetIncome")? / *&income_statement.column("TotalRevenue")?,
-            "return_on_assets" => *&income_statement.column("NetIncome")? / *&balance_sheet.column("TotalAssets")?,
-            "return_on_equity" => *&income_statement.column("NetIncome")? / *&balance_sheet.column("TotalEquityGrossMinorityInterest")?,
-            "quick_ratio" => *&balance_sheet.column("CurrentAssets")? / *&balance_sheet.column("CurrentLiabilities")?,
-            "current_ratio" => *&balance_sheet.column("CurrentAssets")? / *&balance_sheet.column("CurrentLiabilities")?,
-            "debt_to_equity" => *&balance_sheet.column("TotalLiabilitiesNetMinorityInterest")? / *&balance_sheet.column("TotalEquityGrossMinorityInterest")?,
-            "debt_to_assets" => *&balance_sheet.column("TotalLiabilitiesNetMinorityInterest")? / *&balance_sheet.column("TotalAssets")?,
-            "interest_coverage" => *&income_statement.column("EBIT")? / *&income_statement.column("InterestExpense")?,
-            "asset_turnover" => *&income_statement.column("TotalRevenue")? / *&balance_sheet.column("TotalAssets")?,
-            "inventory_turnover" => *&income_statement.column("CostOfRevenue")? / *&balance_sheet.column("Inventory")?,
-            "days_receivable" => *&balance_sheet.column("AccountsReceivable")? / *&income_statement.column("TotalRevenue")? * 365.0,
-            "days_inventory" => *&balance_sheet.column("Inventory")? / *&income_statement.column("CostOfRevenue")? * 365.0,
-            "days_payable" => *&balance_sheet.column("AccountsPayable")? / *&income_statement.column("CostOfRevenue")? * 365.0,
-            "earnings_per_share" => *&income_statement.column("DilutedEPS")?,
-            "price_to_earnings" => *&balance_sheet.column("TotalCapitalization")? / *&income_statement.column("NetIncome")?,
-            "price_to_book" => *&balance_sheet.column("TotalCapitalization")? / *&balance_sheet.column("TotalEquityGrossMinorityInterest")?,
-            "price_to_sales" => *&balance_sheet.column("TotalCapitalization")? / *&income_statement.column("TotalRevenue")?,
-            "price_to_cash_flow" => *&balance_sheet.column("TotalCapitalization")? / *&cash_flow.column("OperatingCashFlow")?,
-            "price_to_free_cash_flow" => *&balance_sheet.column("TotalCapitalization")? / *&cash_flow.column("FreeCashFlow")?,
+            "Gross Profit Margin" => *&income_statement.column("GrossProfit")? / *&income_statement.column("TotalRevenue")?,
+            "Operating Profit Margin" => *&income_statement.column("EBIT")? / *&income_statement.column("TotalRevenue")?,
+            "Net Profit Margin" => *&income_statement.column("NetIncome")? / *&income_statement.column("TotalRevenue")?,
+            "Return on Assets" => *&income_statement.column("NetIncome")? / *&balance_sheet.column("TotalAssets")?,
+            "Return on Equity" => *&income_statement.column("NetIncome")? / *&balance_sheet.column("TotalEquityGrossMinorityInterest")?,
+            "Quick Ratio" => *&balance_sheet.column("CurrentAssets")? / *&balance_sheet.column("CurrentLiabilities")?,
+            "Current Ratio" => *&balance_sheet.column("CurrentAssets")? / *&balance_sheet.column("CurrentLiabilities")?,
+            "Debt to Equity" => *&balance_sheet.column("TotalLiabilitiesNetMinorityInterest")? / *&balance_sheet.column("TotalEquityGrossMinorityInterest")?,
+            "Debt to Assets" => *&balance_sheet.column("TotalLiabilitiesNetMinorityInterest")? / *&balance_sheet.column("TotalAssets")?,
+            "Interest Coverage" => *&income_statement.column("EBIT")? / *&income_statement.column("InterestExpense")?,
+            "Asset Turnover" => *&income_statement.column("TotalRevenue")? / *&balance_sheet.column("TotalAssets")?,
+            "Inventory Turnover" => *&income_statement.column("CostOfRevenue")? / *&balance_sheet.column("Inventory")?,
+            "Days Receivable" => *&balance_sheet.column("AccountsReceivable")? / *&income_statement.column("TotalRevenue")? * 365.0,
+            "Days Inventory" => *&balance_sheet.column("Inventory")? / *&income_statement.column("CostOfRevenue")? * 365.0,
+            "Days Payable" => *&balance_sheet.column("AccountsPayable")? / *&income_statement.column("CostOfRevenue")? * 365.0,
+            "Earnings per Share" => *&income_statement.column("DilutedEPS")?,
+            "Price to Earnings" => *&balance_sheet.column("TotalCapitalization")? / *&income_statement.column("NetIncome")?,
+            "Price to Book" => *&balance_sheet.column("TotalCapitalization")? / *&balance_sheet.column("TotalEquityGrossMinorityInterest")?,
+            "Price to Sales" => *&balance_sheet.column("TotalCapitalization")? / *&income_statement.column("TotalRevenue")?,
+            "Price to Cashflow" => *&balance_sheet.column("TotalCapitalization")? / *&cash_flow.column("OperatingCashFlow")?,
+            "Price to Free Cashflow" => *&balance_sheet.column("TotalCapitalization")? / *&cash_flow.column("FreeCashFlow")?,
         )?;
 
         // Transpose the DataFrame

{finalytics-0.3.0 → finalytics-0.4.0}/finalytics/src/analytics/performance.rs

@@ -1,7 +1,7 @@
 use polars::prelude::*;
 use std::error::Error;
 
-use crate::data::ticker::Interval;
+use crate::data::config::Interval;
 use crate::models::ticker::{Ticker, TickerBuilder};
 use crate::analytics::technicals::TechnicalIndicators;
 use crate::analytics::optimization::{ObjectiveFunction, portfolio_optimization};
@@ -38,15 +38,15 @@ impl TickerPerformance for Ticker {
         let security_prices = security_df.column("close")?.clone();
         let security_returns = DataFrame::new(vec![
             security_df.column("timestamp")?.clone(),
-            security_df.column("roc-1")?.clone().with_name(&*self.ticker.symbol)
+            security_df.column("roc-1")?.clone().with_name(&*self.ticker)
         ])?;
-        let benchmark_ticker = TickerBuilder::new().ticker(&self.benchmark_symbol.clone())?
+        let benchmark_ticker = TickerBuilder::new().ticker(&self.benchmark_symbol.clone())
             .start_date(&self.start_date.clone())
             .end_date(&self.end_date.clone())
             .interval(self.interval.clone())
             .confidence_level(self.confidence_level)
             .risk_free_rate(self.risk_free_rate)
-            .build()?;
+            .build();
         let benchmark_returns = benchmark_ticker.roc(1).await?;
         let benchmark_returns = benchmark_returns.join(
             &security_returns,
@@ -58,12 +58,12 @@ impl TickerPerformance for Ticker {
         let benchmark_returns = benchmark_returns.fill_null(FillNullStrategy::Forward(None))?;
         let benchmark_returns = benchmark_returns.fill_null(FillNullStrategy::Backward(None))?;
         let benchmark_returns = benchmark_returns.column("roc-1")?.clone();
-        let security_returns = security_returns.column(&*self.ticker.symbol)?.clone();
+        let security_returns = security_returns.column(&*self.ticker)?.clone();
         let performance_stats = PerformanceStats::compute_stats(
             security_returns.clone(), benchmark_returns.clone(),
             self.risk_free_rate, self.confidence_level, self.interval)?;
         Ok(TickerPerformanceStats {
-            ticker_symbol: self.ticker.symbol.clone(),
+            ticker_symbol: self.ticker.clone(),
             benchmark_symbol: self.benchmark_symbol.clone(),
             start_date: self.start_date.clone(),
             end_date: self.end_date.clone(),
@@ -133,13 +133,13 @@ impl PortfolioPerformanceStats {
     ) -> Result<PortfolioPerformanceStats, Box<dyn Error>> {
         let mut dfs: Vec<DataFrame> = Vec::new();
         for ticker_symbol in ticker_symbols.iter() {
-            let ticker = TickerBuilder::new().ticker(ticker_symbol)?
+            let ticker = TickerBuilder::new().ticker(ticker_symbol)
                 .start_date(start_date)
                 .end_date(end_date)
                 .interval(interval)
                 .confidence_level(confidence_level)
                 .risk_free_rate(risk_free_rate)
-                .build()?;
+                .build();
             let security_df = ticker.roc(1).await?;
             let security_returns_df = DataFrame::new(vec![
                 security_df.column("timestamp")?.clone(),
@@ -163,13 +163,13 @@ impl PortfolioPerformanceStats {
         portfolio_returns = portfolio_returns.fill_null(FillNullStrategy::Forward(None))?;
         portfolio_returns = portfolio_returns.fill_null(FillNullStrategy::Backward(None))?;
 
-        let benchmark_ticker = TickerBuilder::new().ticker(benchmark_symbol)?
+        let benchmark_ticker = TickerBuilder::new().ticker(benchmark_symbol)
             .start_date(start_date)
             .end_date(end_date)
             .interval(interval)
             .confidence_level(confidence_level)
             .risk_free_rate(risk_free_rate)
-            .build()?;
+            .build();
         let benchmark_returns = benchmark_ticker.roc(1).await?;
         let benchmark_returns = if portfolio_returns.height() > benchmark_returns.height() {
             benchmark_returns.join(

{finalytics-0.3.0 → finalytics-0.4.0}/finalytics/src/analytics/sentiment.rs

@@ -5,7 +5,8 @@ use serde::{Deserialize, Serialize};
 use tokio::time::Duration;
 use tokio::time::timeout;
 use crate::models::ticker::Ticker;
-use crate::utils::web_utils::scrape_text;
+use crate::data::ticker::TickerData;
+use crate::utils::web_utils::{scrape_text, REQUEST_CLIENT};
 
 #[allow(dead_code)]
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -38,10 +39,11 @@ impl NewsSentiment for Ticker {
     /// * `Vec<News>` Vector of News struct
     async fn get_news(&self, compute_sentiment: bool) -> Result<Vec<News>, Box<dyn Error>> {
         let mut result = vec![];
-        let symbol = if self.ticker.asset_class == "CRYPTOCURRENCY" { self.ticker.symbol.replace("-USD", "") } else { self.ticker.symbol.clone() };
-        let token = format!("({} OR {})", &symbol, &self.ticker.name);
+        let quote = self.get_quote().await?;
+        let symbol = if quote.asset_class == "CRYPTOCURRENCY" { self.ticker.replace("-USD", "") } else { self.ticker.clone() };
+        let token = format!("({} OR {})", &symbol, &quote.name);
         let url = format!("https://news.google.com/rss/search?q=allintext:{token}+when:1d");
-        let response = reqwest::get(&url).await?;
+        let response = REQUEST_CLIENT.get(&url).send().await?;
         let body = response.text().await?;
         let document = Document::from_read(body.as_bytes()).unwrap();
 

{finalytics-0.3.0 → finalytics-0.4.0}/finalytics/src/analytics/statistics.rs

@@ -8,7 +8,7 @@ use smartcore::linalg::basic::matrix::DenseMatrix;
 use smartcore::linear::linear_regression::LinearRegression;
 use statrs::statistics::Statistics;
 use statrs::distribution::{ContinuousCDF, Normal};
-use crate::data::ticker::Interval;
+use crate::data::config::Interval;
 
 #[derive(Debug, Clone)]
 pub struct PerformanceStats {

{finalytics-0.3.0 → finalytics-0.4.0}/finalytics/src/analytics/stochastics.rs

@@ -272,14 +272,14 @@ impl VolatilitySurface for Ticker {
 
         let mut ivols_df = DataFrame::new(vec![Series::new("strike", &strikes)])?;
         for (i, ttm) in ttms.iter().enumerate() {
-            let ttm = *ttm as i64;
+            let ttm = format!("{:.2}", *ttm);
             let col = Series::new(&*format!("{}M", ttm), ivols[i].clone());
             ivols_df.hstack_mut(&[col])?;
         }
 
 
         Ok(VolatilitySurfaceData{
-            symbol: self.ticker.symbol.clone(),
+            symbol: self.ticker.clone(),
             risk_free_rate: self.risk_free_rate,
             ticker_price,
             expiration_dates,

{finalytics-0.3.0 → finalytics-0.4.0}/finalytics/src/charts/portfolio.rs

@@ -9,19 +9,24 @@ use crate::models::portfolio::Portfolio;
 
 
 pub trait PortfolioCharts {
-    fn optimization_chart(&self) -> Result<Plot, Box<dyn Error>>;
-    fn performance_chart(&self) -> Result<Plot, Box<dyn Error>>;
-    fn asset_returns_chart(&self) -> Result<Plot, Box<dyn Error>>;
-    fn performance_stats_table(&self) -> Result<Plot, Box<dyn Error>>;
+    fn optimization_chart(&self, height: usize, width: usize) -> Result<Plot, Box<dyn Error>>;
+    fn performance_chart(&self, height: usize, width: usize) -> Result<Plot, Box<dyn Error>>;
+    fn asset_returns_chart(&self, height: usize, width: usize) -> Result<Plot, Box<dyn Error>>;
+    fn performance_stats_table(&self, height: usize, width: usize) -> Result<Plot, Box<dyn Error>>;
 }
 
 impl PortfolioCharts for Portfolio {
     /// Generates Chart of the Portfolio Optimization Results
     ///
+    /// # Arguments
+    ///
+    /// * `height` - usize - Height of the chart
+    /// * `width` - usize - Width of the chart
+    ///
     /// # Returns
     ///
     /// * `Plot` Plotly Chart struct
-    fn optimization_chart(&self) -> Result<Plot, Box<dyn Error>> {
+    fn optimization_chart(&self, height: usize, width: usize) -> Result<Plot, Box<dyn Error>> {
         let days = self.performance_stats.interval.to_days();
 
         let ef_returns = self.performance_stats.efficient_frontier.clone().iter()
@@ -61,8 +66,8 @@ impl PortfolioCharts for Portfolio {
 
         // Set layout for the plot
         let layout = Layout::new()
-            .height(800)
-            .width(1200)
+            .height(height)
+            .width(width)
             .title(Title::from("<span style=\"font-weight:bold; color:darkgreen;\">Portfolio Optimization Chart</span>"))
             .grid(
                 LayoutGrid::new()
@@ -97,10 +102,15 @@ impl PortfolioCharts for Portfolio {
 
     /// Generates Chart of the Portfolio Performance Results
     ///
+    /// # Arguments
+    ///
+    /// * `height` - usize - Height of the chart
+    /// * `width` - usize - Width of the chart
+    ///
     /// # Returns
     ///
     /// * `Plot` Plotly Chart struct
-    fn performance_chart(&self) -> Result<Plot, Box<dyn Error>> {
+    fn performance_chart(&self, height: usize, width: usize) -> Result<Plot, Box<dyn Error>> {
         let dates = generate_dates(&*self.performance_stats.start_date,
                                    &*self.performance_stats.end_date, 1);
 
@@ -146,8 +156,8 @@ impl PortfolioCharts for Portfolio {
 
         // Set layout for the plot
         let layout = Layout::new()
-            .height(800)
-            .width(1200)
+            .height(height)
+            .width(width)
             .title(Title::from("<span style=\"font-weight:bold; color:darkgreen;\">Portfolio Performance Chart</span>"))
             .grid(
                 LayoutGrid::new()
@@ -185,7 +195,7 @@ impl PortfolioCharts for Portfolio {
     /// # Returns
     ///
     /// * `Plot` Plotly Chart struct
-    fn asset_returns_chart(&self) -> Result<Plot, Box<dyn Error>> {
+    fn asset_returns_chart(&self, height: usize, width: usize) -> Result<Plot, Box<dyn Error>> {
         let symbols = self.performance_stats.ticker_symbols.clone();
         let asset_returns = self.performance_stats.portfolio_returns.clone();
         let dates = generate_dates(&*self.performance_stats.start_date, &*self.performance_stats.end_date, 1);
@@ -202,8 +212,8 @@ impl PortfolioCharts for Portfolio {
         }
 
         let layout = Layout::new()
-            .height(800)
-            .width(1200)
+            .height(height)
+            .width(width)
             .title(Title::from("<span style=\"font-weight:bold; color:darkgreen;\">Portfolio Assets Cumulative Returns</span>"))
             .y_axis(
                 Axis::new()
@@ -220,7 +230,7 @@ impl PortfolioCharts for Portfolio {
     /// # Returns
     ///
     /// * `Plot` Plotly Chart struct
-    fn performance_stats_table(&self) -> Result<Plot, Box<dyn Error>> {
+    fn performance_stats_table(&self, height: usize, width: usize) -> Result<Plot, Box<dyn Error>> {
         let stats = &self.performance_stats.performance_stats;
 
         let fields = vec![
@@ -273,8 +283,8 @@ impl PortfolioCharts for Portfolio {
         plot.add_trace(trace);
 
         let layout = Layout::new()
-            .height(1000)
-            .width(1200)
+            .height(height)
+            .width(width)
             .title(Title::from("<span style=\"font-weight:bold; color:darkgreen;\"> Portfolio Performance Stats</span>"));
 
         plot.set_layout(layout);