From d5ad4652c6abcc149037eb3b720e5323de4faebc Mon Sep 17 00:00:00 2001 From: Igor Radovanovic <74266147+IgorWounds@users.noreply.github.com> Date: Tue, 12 Sep 2023 15:06:29 +0200 Subject: [PATCH] Cleanup --- .../sdk/core/openbb_core/app/model/obbject.py | 6 ------ openbb_sdk/sdk/core/openbb_core/app/utils.py | 13 +++---------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/openbb_sdk/sdk/core/openbb_core/app/model/obbject.py b/openbb_sdk/sdk/core/openbb_core/app/model/obbject.py index 38311533751..9bb84def10a 100644 --- a/openbb_sdk/sdk/core/openbb_core/app/model/obbject.py +++ b/openbb_sdk/sdk/core/openbb_core/app/model/obbject.py @@ -179,12 +179,6 @@ class OBBject(GenericModel, Generic[T], Tagged): return results - # def to_dict(self, list_fields: bool = False) -> Dict[str, Any]: - # if list_fields: - # df = self.to_dataframe().reset_index() - # return {field: df[field].tolist() for field in df.columns} - # return self.dict()["results"] - def to_chart(self, **kwargs): """ Create or update the `Chart`. diff --git a/openbb_sdk/sdk/core/openbb_core/app/utils.py b/openbb_sdk/sdk/core/openbb_core/app/utils.py index c252fda7577..5e1874fcdd3 100644 --- a/openbb_sdk/sdk/core/openbb_core/app/utils.py +++ b/openbb_sdk/sdk/core/openbb_core/app/utils.py @@ -10,20 +10,13 @@ def basemodel_to_df( index: Optional[Union[str, Iterable]] = None, ) -> pd.DataFrame: """Convert list of BaseModel to a Pandas DataFrame.""" - # Get consistent column order from the first data instance - columns_order = ( - list(data[0].dict().keys()) - if isinstance(data, list) and data - else list(data.dict().keys()) # type: ignore - ) - if isinstance(data, list): - df = pd.DataFrame([d.dict() for d in data], columns=columns_order) + df = pd.DataFrame([d.dict() for d in data]) else: try: - df = pd.DataFrame(data.dict(), columns=columns_order) + df = pd.DataFrame(data.dict()) except ValueError: - df = pd.DataFrame(data.dict(), index=["values"], columns=columns_order) + df = pd.DataFrame(data.dict(), index=["values"]) if "is_multiindex" in df.columns: col_names = ast.literal_eval(df.multiindex_names.unique()[0])