From 49ca8543115bc43b437a840828deb6be289eb75b Mon Sep 17 00:00:00 2001 From: Diogo Sousa Date: Wed, 2 Aug 2023 11:56:01 +0100 Subject: [PATCH] reorder balance items --- .../fmp/openbb_fmp/models/balance_sheet.py | 43 ++++++------ .../fmp/openbb_fmp/models/treasury_rates.py | 5 +- .../openbb_provider/models/balance_sheet.py | 67 ++++++++++++------- .../openbb_provider/models/stock_ownership.py | 6 +- .../openbb_provider/models/treasury_rates.py | 6 +- 5 files changed, 75 insertions(+), 52 deletions(-) diff --git a/openbb_sdk/providers/fmp/openbb_fmp/models/balance_sheet.py b/openbb_sdk/providers/fmp/openbb_fmp/models/balance_sheet.py index 945a12df6ab..253dc0a7cfd 100644 --- a/openbb_sdk/providers/fmp/openbb_fmp/models/balance_sheet.py +++ b/openbb_sdk/providers/fmp/openbb_fmp/models/balance_sheet.py @@ -38,53 +38,56 @@ class FMPBalanceSheetData(BalanceSheetData): "accepted_date": "acceptedDate", "cash_and_cash_equivalents": "cashAndCashEquivalents", "short_term_investments": "shortTermInvestments", - "cash_and_short_term_investments": "cashAndShortTermInvestments", "net_receivables": "netReceivables", - "tax_assets": "taxAssets", "other_current_assets": "otherCurrentAssets", "current_assets": "totalCurrentAssets", "long_term_investments": "longTermInvestments", "property_plant_equipment_net": "propertyPlantEquipmentNet", "intangible_assets": "intangibleAssets", "other_non_current_assets": "otherNonCurrentAssets", - "noncurrent_assets": "totalNonCurrentAssets", + "tax_assets": "taxAssets", "other_assets": "otherAssets", + "noncurrent_assets": "totalNonCurrentAssets", "assets": "totalAssets", - "short_term_debt": "shortTermDebt", - "tax_payables": "taxPayables", "account_payables": "accountPayables", "other_current_liabilities": "otherCurrentLiabilities", + "tax_payables": "taxPayables", + "short_term_debt": "shortTermDebt", "deferred_revenue": "deferredRevenue", "current_liabilities": "totalCurrentLiabilities", "long_term_debt": "longTermDebt", "other_non_current_liabilities": "otherNonCurrentLiabilities", - "noncurrent_liabilities": "totalNonCurrentLiabilities", "other_liabilities": "otherLiabilities", + "noncurrent_liabilities": "totalNonCurrentLiabilities", "liabilities": "totalLiabilities", "common_stock": "commonStock", - "retained_earnings": "retainedEarnings", + "other_stockholder_equity": "othertotalStockholdersEquity", "accumulated_other_comprehensive_income_loss": "accumulatedOtherComprehensiveIncomeLoss", - "total_stockholders_equity": "totalStockholdersEquity", + "preferred_stock": "preferredStock", + "retained_earnings": "retainedEarnings", "minority_interest": "minorityInterest", + "total_stockholders_equity": "totalStockholdersEquity", "total_equity": "totalEquity", "total_liabilities_and_stockholders_equity": "totalLiabilitiesAndStockholdersEquity", + "total_liabilities_and_total_equity": "totalLiabilitiesAndTotalEquity", } - calendarYear: Optional[int] - - goodwillAndIntangibleAssets: Optional[int] - - deferredRevenueNonCurrent: Optional[int] - deferredTaxLiabilitiesNonCurrent: Optional[int] - - othertotalStockholdersEquity: Optional[int] - # Leftovers below - totalLiabilitiesAndTotalEquity: Optional[int] - totalInvestments: Optional[int] - netDebt: Optional[int] + calendarYear: Optional[int] + link: Optional[str] finalLink: Optional[str] + cashAndShortTermInvestments: Optional[int] + goodwillAndIntangibleAssets: Optional[int] + deferredRevenueNonCurrent: Optional[int] + totalInvestments: Optional[int] + + capitalLeaseObligations: Optional[int] + deferredTaxLiabilitiesNonCurrent: Optional[int] + totalNonCurrentLiabilities: Optional[int] + totalDebt: Optional[int] + netDebt: Optional[int] + class FMPBalanceSheetFetcher( Fetcher[ diff --git a/openbb_sdk/providers/fmp/openbb_fmp/models/treasury_rates.py b/openbb_sdk/providers/fmp/openbb_fmp/models/treasury_rates.py index 6b4c0baca8a..ca5c34b1ab0 100644 --- a/openbb_sdk/providers/fmp/openbb_fmp/models/treasury_rates.py +++ b/openbb_sdk/providers/fmp/openbb_fmp/models/treasury_rates.py @@ -9,11 +9,10 @@ from openbb_provider.models.treasury_rates import ( TreasuryRatesData, TreasuryRatesQueryParams, ) - -from openbb_fmp.utils.helpers import get_querystring, get_data_many - from pydantic import validator +from openbb_fmp.utils.helpers import get_data_many, get_querystring + class FMPTreasuryRatesQueryParams(TreasuryRatesQueryParams): """FMP Stock News Query. diff --git a/openbb_sdk/sdk/provider/openbb_provider/models/balance_sheet.py b/openbb_sdk/sdk/provider/openbb_provider/models/balance_sheet.py index 57ace240e68..b78080cf387 100644 --- a/openbb_sdk/sdk/provider/openbb_provider/models/balance_sheet.py +++ b/openbb_sdk/sdk/provider/openbb_provider/models/balance_sheet.py @@ -30,41 +30,62 @@ class BalanceSheetData(Data): accepted_date: Optional[datetime] = Field(description="Accepted date.") period: Optional[str] = Field(description="Period of the income statement.") - cash_and_cash_equivalents: Optional[int] - short_term_investments: Optional[int] - cash_and_short_term_investments: Optional[int] - net_receivables: Optional[int] - tax_assets: Optional[int] - inventory: Optional[int] - other_current_assets: Optional[int] - current_assets: Optional[int] + cash_and_cash_equivalents: Optional[int] = Field( + description="Cash and cash equivalents" + ) + short_term_investments: Optional[int] = Field(description="Short-term investments") + inventory: Optional[int] = Field(description="Inventory") + net_receivables: Optional[int] = Field(description="Receivables, net") + other_current_assets: Optional[int] = Field(description="Other current assets") + current_assets: Optional[int] = Field(description="Total current assets") - long_term_investments: Optional[int] - property_plant_equipment_net: Optional[int] - goodwill: Optional[int] - intangible_assets: Optional[int] - other_non_current_assets: Optional[int] + long_term_investments: Optional[int] = Field(description="Long-term investments") + property_plant_equipment_net: Optional[int] = Field( + description="Property, plant and equipment, net" + ) + goodwill: Optional[int] = Field(description="Goodwill") + intangible_assets: Optional[int] = Field(description="Intangible assets") + other_non_current_assets: Optional[int] = Field( + description="Other non-current assets" + ) + tax_assets: Optional[int] = Field(description="Accrued income taxes") + other_assets: Optional[int] = Field(description="Other assets") noncurrent_assets: Optional[int] - other_assets: Optional[int] assets: Optional[int] - short_term_debt: Optional[int] - tax_payables: Optional[int] account_payables: Optional[int] other_current_liabilities: Optional[int] - deferred_revenue: Optional[int] + tax_payables: Optional[int] = Field(description="Accrued income taxes") + deferred_revenue: Optional[int] = Field( + description="Accrued income taxes, other deferred revenue" + ) + short_term_debt: Optional[int] = Field( + description="Short-term borrowings, Long-term debt due within one year, Operating lease obligations due within one year, Finance lease obligations due within one year" + ) current_liabilities: Optional[int] - long_term_debt: Optional[int] - other_non_current_liabilities: Optional[int] - noncurrent_liabilities: Optional[int] + long_term_debt: Optional[int] = Field( + description="Long-term debt, Operating lease obligations, Long-term finance lease obligations" + ) + other_non_current_liabilities: Optional[int] = Field( + description="Deferred income taxes and other" + ) other_liabilities: Optional[int] + noncurrent_liabilities: Optional[int] liabilities: Optional[int] common_stock: Optional[int] - retained_earnings: Optional[int] - accumulated_other_comprehensive_income_loss: Optional[int] + other_stockholder_equity: Optional[int] = Field( + description="Capital in excess of par value" + ) + + accumulated_other_comprehensive_income_loss: Optional[int] = Field( + description="Accumulated other comprehensive income (loss)" + ) + preferred_stock: Optional[int] = Field(description="Preferred stock") + retained_earnings: Optional[int] = Field(description="Retained earnings") + minority_interest: Optional[int] = Field(description="Minority interest") total_stockholders_equity: Optional[int] - minority_interest: Optional[int] total_equity: Optional[int] total_liabilities_and_stockholders_equity: Optional[int] + total_liabilities_and_total_equity: Optional[int] diff --git a/openbb_sdk/sdk/provider/openbb_provider/models/stock_ownership.py b/openbb_sdk/sdk/provider/openbb_provider/models/stock_ownership.py index 77b88422a21..7a987661664 100644 --- a/openbb_sdk/sdk/provider/openbb_provider/models/stock_ownership.py +++ b/openbb_sdk/sdk/provider/openbb_provider/models/stock_ownership.py @@ -4,12 +4,12 @@ from datetime import date as dateType from typing import Optional +from pydantic import Field, validator + from openbb_provider.abstract.data import Data from openbb_provider.abstract.query_params import QueryParams +from openbb_provider.descriptions import DATA_DESCRIPTIONS, QUERY_DESCRIPTIONS from openbb_provider.models.base import BaseSymbol -from openbb_provider.descriptions import QUERY_DESCRIPTIONS, DATA_DESCRIPTIONS - -from pydantic import Field, validator def most_recent_quarter(base: dateType = dateType.today()) -> dateType: diff --git a/openbb_sdk/sdk/provider/openbb_provider/models/treasury_rates.py b/openbb_sdk/sdk/provider/openbb_provider/models/treasury_rates.py index 93a1ea11ef9..4a2c6a568bf 100644 --- a/openbb_sdk/sdk/provider/openbb_provider/models/treasury_rates.py +++ b/openbb_sdk/sdk/provider/openbb_provider/models/treasury_rates.py @@ -4,11 +4,11 @@ from datetime import date as dateType from typing import Optional +from pydantic import Field + from openbb_provider.abstract.data import Data from openbb_provider.abstract.query_params import QueryParams -from openbb_provider.descriptions import QUERY_DESCRIPTIONS, DATA_DESCRIPTIONS - -from pydantic import Field +from openbb_provider.descriptions import DATA_DESCRIPTIONS, QUERY_DESCRIPTIONS class TreasuryRatesQueryParams(QueryParams):