This commit is contained in:
Igor Radovanovic
2023-09-12 15:06:29 +02:00
parent f0b190783c
commit d5ad4652c6
2 changed files with 3 additions and 16 deletions

View File

@@ -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`.

View File

@@ -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])