fix(models): make FMP-omittable ExchangeVariant and screener fields optional

crates/fmp-py/python/fmp/_native/screener/__init__.pyi

@@ -41,23 +41,23 @@ class CompanyScreenerResult:
     @property
     def industry(self) -> builtins.str: ...
     @property
-    def beta(self) -> builtins.float: ...
+    def beta(self) -> typing.Optional[builtins.float]: ...
     @property
-    def price(self) -> builtins.float: ...
+    def price(self) -> typing.Optional[builtins.float]: ...
     @property
-    def last_annual_dividend(self) -> builtins.float: ...
+    def last_annual_dividend(self) -> typing.Optional[builtins.float]: ...
     @property
     def volume(self) -> builtins.float: ...
     @property
     def exchange(self) -> builtins.str: ...
     @property
     def exchange_short_name(self) -> builtins.str: ...
     @property
-    def country(self) -> builtins.str: ...
+    def country(self) -> typing.Optional[builtins.str]: ...
     @property
     def is_etf(self) -> builtins.bool: ...
     @property
-    def is_fund(self) -> builtins.bool: ...
+    def is_fund(self) -> typing.Optional[builtins.bool]: ...
     @property
     def is_actively_trading(self) -> builtins.bool: ...
     def __eq__(self, other: builtins.object, /) -> builtins.bool: ...
@@ -69,15 +69,15 @@ class CompanyScreenerResult:
         market_cap: builtins.float,
         sector: builtins.str,
         industry: builtins.str,
-        beta: builtins.float,
-        price: builtins.float,
-        last_annual_dividend: builtins.float,
+        beta: typing.Optional[builtins.float],
+        price: typing.Optional[builtins.float],
+        last_annual_dividend: typing.Optional[builtins.float],
         volume: builtins.float,
         exchange: builtins.str,
         exchange_short_name: builtins.str,
-        country: builtins.str,
+        country: typing.Optional[builtins.str],
         is_etf: builtins.bool,
-        is_fund: builtins.bool,
+        is_fund: typing.Optional[builtins.bool],
         is_actively_trading: builtins.bool,
     ) -> CompanyScreenerResult: ...
     def __getnewargs_ex__(self) -> tuple[tuple, dict]: ...

crates/fmp-py/python/fmp/_native/search/__init__.pyi

@@ -140,7 +140,7 @@ class ExchangeVariant:
     @property
     def symbol(self) -> builtins.str: ...
     @property
-    def price(self) -> builtins.float: ...
+    def price(self) -> typing.Optional[builtins.float]: ...
     @property
     def beta(self) -> builtins.float: ...
     @property
@@ -150,49 +150,49 @@ class ExchangeVariant:
     @property
     def last_div(self) -> builtins.float: ...
     @property
-    def range(self) -> builtins.str: ...
+    def range(self) -> typing.Optional[builtins.str]: ...
     @property
-    def changes(self) -> builtins.float: ...
+    def changes(self) -> typing.Optional[builtins.float]: ...
     @property
     def company_name(self) -> builtins.str: ...
     @property
     def currency(self) -> builtins.str: ...
     @property
-    def cik(self) -> builtins.str: ...
+    def cik(self) -> typing.Optional[builtins.str]: ...
     @property
-    def isin(self) -> builtins.str: ...
+    def isin(self) -> typing.Optional[builtins.str]: ...
     @property
-    def cusip(self) -> builtins.str: ...
+    def cusip(self) -> typing.Optional[builtins.str]: ...
     @property
     def exchange(self) -> builtins.str: ...
     @property
     def exchange_short_name(self) -> builtins.str: ...
     @property
     def industry(self) -> builtins.str: ...
     @property
-    def website(self) -> builtins.str: ...
+    def website(self) -> typing.Optional[builtins.str]: ...
     @property
     def description(self) -> builtins.str: ...
     @property
-    def ceo(self) -> builtins.str: ...
+    def ceo(self) -> typing.Optional[builtins.str]: ...
     @property
     def sector(self) -> builtins.str: ...
     @property
     def country(self) -> builtins.str: ...
     @property
-    def full_time_employees(self) -> builtins.str: ...
+    def full_time_employees(self) -> typing.Optional[builtins.str]: ...
     @property
-    def phone(self) -> builtins.str: ...
+    def phone(self) -> typing.Optional[builtins.str]: ...
     @property
-    def address(self) -> builtins.str: ...
+    def address(self) -> typing.Optional[builtins.str]: ...
     @property
-    def city(self) -> builtins.str: ...
+    def city(self) -> typing.Optional[builtins.str]: ...
     @property
-    def state(self) -> builtins.str: ...
+    def state(self) -> typing.Optional[builtins.str]: ...
     @property
-    def zip(self) -> builtins.str: ...
+    def zip(self) -> typing.Optional[builtins.str]: ...
     @property
-    def dcf_diff(self) -> builtins.float: ...
+    def dcf_diff(self) -> typing.Optional[builtins.float]: ...
     @property
     def dcf(self) -> builtins.float: ...
     @property
@@ -214,33 +214,33 @@ class ExchangeVariant:
         cls,
         *,
         symbol: builtins.str,
-        price: builtins.float,
+        price: typing.Optional[builtins.float],
         beta: builtins.float,
         vol_avg: builtins.float,
         market_cap: builtins.float,
         last_div: builtins.float,
-        range: builtins.str,
-        changes: builtins.float,
+        range: typing.Optional[builtins.str],
+        changes: typing.Optional[builtins.float],
         company_name: builtins.str,
         currency: builtins.str,
-        cik: builtins.str,
-        isin: builtins.str,
-        cusip: builtins.str,
+        cik: typing.Optional[builtins.str],
+        isin: typing.Optional[builtins.str],
+        cusip: typing.Optional[builtins.str],
         exchange: builtins.str,
         exchange_short_name: builtins.str,
         industry: builtins.str,
-        website: builtins.str,
+        website: typing.Optional[builtins.str],
         description: builtins.str,
-        ceo: builtins.str,
+        ceo: typing.Optional[builtins.str],
         sector: builtins.str,
         country: builtins.str,
-        full_time_employees: builtins.str,
-        phone: builtins.str,
-        address: builtins.str,
-        city: builtins.str,
-        state: builtins.str,
-        zip: builtins.str,
-        dcf_diff: builtins.float,
+        full_time_employees: typing.Optional[builtins.str],
+        phone: typing.Optional[builtins.str],
+        address: typing.Optional[builtins.str],
+        city: typing.Optional[builtins.str],
+        state: typing.Optional[builtins.str],
+        zip: typing.Optional[builtins.str],
+        dcf_diff: typing.Optional[builtins.float],
         dcf: builtins.float,
         image: builtins.str,
         ipo_date: datetime.date,

crates/fmp-py/src/models/screener.rs

@@ -20,23 +20,23 @@ pub(crate) struct CompanyScreenerResult {
     #[pyo3(get)]
     pub industry: String,
     #[pyo3(get)]
-    pub beta: f64,
+    pub beta: Option<f64>,
     #[pyo3(get)]
-    pub price: f64,
+    pub price: Option<f64>,
     #[pyo3(get)]
-    pub last_annual_dividend: f64,
+    pub last_annual_dividend: Option<f64>,
     #[pyo3(get)]
     pub volume: f64,
     #[pyo3(get)]
     pub exchange: String,
     #[pyo3(get)]
     pub exchange_short_name: String,
     #[pyo3(get)]
-    pub country: String,
+    pub country: Option<String>,
     #[pyo3(get)]
     pub is_etf: bool,
     #[pyo3(get)]
-    pub is_fund: bool,
+    pub is_fund: Option<bool>,
     #[pyo3(get)]
     pub is_actively_trading: bool,
 }
@@ -54,15 +54,15 @@ impl CompanyScreenerResult {
         market_cap: f64,
         sector: String,
         industry: String,
-        beta: f64,
-        price: f64,
-        last_annual_dividend: f64,
+        beta: Option<f64>,
+        price: Option<f64>,
+        last_annual_dividend: Option<f64>,
         volume: f64,
         exchange: String,
         exchange_short_name: String,
-        country: String,
+        country: Option<String>,
         is_etf: bool,
-        is_fund: bool,
+        is_fund: Option<bool>,
         is_actively_trading: bool,
     ) -> Self {
         Self {
@@ -266,7 +266,7 @@ impl From<libfmp::responses::screener::CompanyScreenerResult> for CompanyScreene
             volume: value.volume,
             exchange: value.exchange,
             exchange_short_name: value.exchange_short_name.into_inner(),
-            country: value.country.into_inner(),
+            country: value.country.map(|value| value.into_inner()),
             is_etf: value.is_etf,
             is_fund: value.is_fund,
             is_actively_trading: value.is_actively_trading,

crates/fmp-py/src/models/search.rs

@@ -659,7 +659,7 @@ pub(crate) struct ExchangeVariant {
     #[pyo3(get)]
     pub symbol: String,
     #[pyo3(get)]
-    pub price: f64,
+    pub price: Option<f64>,
     #[pyo3(get)]
     pub beta: f64,
     #[pyo3(get)]
@@ -669,49 +669,49 @@ pub(crate) struct ExchangeVariant {
     #[pyo3(get)]
     pub last_div: f64,
     #[pyo3(get)]
-    pub range: String,
+    pub range: Option<String>,
     #[pyo3(get)]
-    pub changes: f64,
+    pub changes: Option<f64>,
     #[pyo3(get)]
     pub company_name: String,
     #[pyo3(get)]
     pub currency: String,
     #[pyo3(get)]
-    pub cik: String,
+    pub cik: Option<String>,
     #[pyo3(get)]
-    pub isin: String,
+    pub isin: Option<String>,
     #[pyo3(get)]
-    pub cusip: String,
+    pub cusip: Option<String>,
     #[pyo3(get)]
     pub exchange: String,
     #[pyo3(get)]
     pub exchange_short_name: String,
     #[pyo3(get)]
     pub industry: String,
     #[pyo3(get)]
-    pub website: String,
+    pub website: Option<String>,
     #[pyo3(get)]
     pub description: String,
     #[pyo3(get)]
-    pub ceo: String,
+    pub ceo: Option<String>,
     #[pyo3(get)]
     pub sector: String,
     #[pyo3(get)]
     pub country: String,
     #[pyo3(get)]
-    pub full_time_employees: String,
+    pub full_time_employees: Option<String>,
     #[pyo3(get)]
-    pub phone: String,
+    pub phone: Option<String>,
     #[pyo3(get)]
-    pub address: String,
+    pub address: Option<String>,
     #[pyo3(get)]
-    pub city: String,
+    pub city: Option<String>,
     #[pyo3(get)]
-    pub state: String,
+    pub state: Option<String>,
     #[pyo3(get)]
-    pub zip: String,
+    pub zip: Option<String>,
     #[pyo3(get)]
-    pub dcf_diff: f64,
+    pub dcf_diff: Option<f64>,
     #[pyo3(get)]
     pub dcf: f64,
     #[pyo3(get)]
@@ -739,33 +739,33 @@ impl ExchangeVariant {
     #[pyo3(signature = (*, symbol, price, beta, vol_avg, market_cap, last_div, range, changes, company_name, currency, cik, isin, cusip, exchange, exchange_short_name, industry, website, description, ceo, sector, country, full_time_employees, phone, address, city, state, zip, dcf_diff, dcf, image, ipo_date, default_image, is_etf, is_actively_trading, is_adr, is_fund))]
     fn new(
         symbol: String,
-        price: f64,
+        price: Option<f64>,
         beta: f64,
         vol_avg: f64,
         market_cap: f64,
         last_div: f64,
-        range: String,
-        changes: f64,
+        range: Option<String>,
+        changes: Option<f64>,
         company_name: String,
         currency: String,
-        cik: String,
-        isin: String,
-        cusip: String,
+        cik: Option<String>,
+        isin: Option<String>,
+        cusip: Option<String>,
         exchange: String,
         exchange_short_name: String,
         industry: String,
-        website: String,
+        website: Option<String>,
         description: String,
-        ceo: String,
+        ceo: Option<String>,
         sector: String,
         country: String,
-        full_time_employees: String,
-        phone: String,
-        address: String,
-        city: String,
-        state: String,
-        zip: String,
-        dcf_diff: f64,
+        full_time_employees: Option<String>,
+        phone: Option<String>,
+        address: Option<String>,
+        city: Option<String>,
+        state: Option<String>,
+        zip: Option<String>,
+        dcf_diff: Option<f64>,
         dcf: f64,
         image: String,
         ipo_date: ::chrono::NaiveDate,
@@ -1155,9 +1155,9 @@ impl From<libfmp::responses::search::ExchangeVariant> for ExchangeVariant {
             changes: value.changes,
             company_name: value.company_name,
             currency: value.currency.into_inner(),
-            cik: value.cik.into_inner(),
-            isin: value.isin.into_inner(),
-            cusip: value.cusip.into_inner(),
+            cik: value.cik.map(|value| value.into_inner()),
+            isin: value.isin.map(|value| value.into_inner()),
+            cusip: value.cusip.map(|value| value.into_inner()),
             exchange: value.exchange,
             exchange_short_name: value.exchange_short_name.into_inner(),
             industry: value.industry,