Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add some modifications on copula #132

Draft
wants to merge 17 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion example/1_ctgan_example.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,4 @@
isDiscrete = True
metrics = JSD.calculate(data_connector.read(), sampled_data, selected_columns, isDiscrete)

print("JSD metric of column %s: %g" % (selected_columns[0], metrics))
print("JSD metric of column %s: %g" % (selected_columns[0], metrics))
66 changes: 34 additions & 32 deletions sdgx/data_models/combiner.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ class MetadataCombiner(BaseModel):

def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
self.relationships = []

def check(self):
"""Do necessary checks:
Expand Down Expand Up @@ -62,19 +63,19 @@ def check(self):
# each table in metadata must in a relationship
if not (relationship_parents | relationship_children).issuperset(table_names):
raise MetadataCombinerInvalidError(
f"Table {table_names - (relationship_parents+relationship_children)} is missing in relationships."
f"Table {table_names - (relationship_parents + relationship_children)} is missing in relationships."
)

logger.info("MultiTableCombiner check finished.")

@classmethod
def from_dataloader(
cls,
dataloaders: list[DataLoader],
metadata_from_dataloader_kwargs: None | dict = None,
relationshipe_inspector: None | str | type[Inspector] = "SubsetRelationshipInspector",
relationships_inspector_kwargs: None | dict = None,
relationships: None | list[Relationship] = None,
cls,
dataloaders: list[DataLoader],
metadata_from_dataloader_kwargs: None | dict = None,
relationshipe_inspector: None | str | type[Inspector] = "SubsetRelationshipInspector",
relationships_inspector_kwargs: None | dict = None,
relationships: None | list[Relationship] = None,
):
"""
Combine multiple dataloaders with relationship.
Expand Down Expand Up @@ -116,13 +117,13 @@ def from_dataloader(

@classmethod
def from_dataframe(
cls,
dataframes: list[pd.DataFrame],
names: list[str],
metadata_from_dataloader_kwargs: None | dict = None,
relationshipe_inspector: None | str | type[Inspector] = "SubsetRelationshipInspector",
relationships_inspector_kwargs: None | dict = None,
relationships: None | list[Relationship] = None,
cls,
dataframes: list[pd.DataFrame],
names: list[str],
metadata_from_dataloader_kwargs: None | dict = None,
relationshipe_inspector: None | str | type[Inspector] = "SubsetRelationshipInspector",
relationships_inspector_kwargs: None | dict = None,
relationships: None | list[Relationship] = None,
) -> "MetadataCombiner":
"""
Combine multiple dataframes with relationship.
Expand Down Expand Up @@ -171,10 +172,10 @@ def _dump_json(self):
return self.model_dump_json()

def save(
self,
save_dir: str | Path,
metadata_subdir: str = "metadata",
relationship_subdir: str = "relationship",
self,
save_dir: str | Path,
metadata_subdir: str = "metadata",
relationship_subdir: str = "relationship",
):
"""
Save metadata to json file.
Expand Down Expand Up @@ -207,11 +208,11 @@ def save(

@classmethod
def load(
cls,
save_dir: str | Path,
metadata_subdir: str = "metadata",
relationship_subdir: str = "relationship",
version: None | str = None,
cls,
save_dir: str | Path,
metadata_subdir: str = "metadata",
relationship_subdir: str = "relationship",
version: None | str = None,
) -> "MetadataCombiner":
"""
Load metadata from json file.
Expand Down Expand Up @@ -247,10 +248,10 @@ def load(

@classmethod
def upgrade(
cls,
old_version: str,
named_metadata: dict[str, Metadata],
relationships: list[Relationship],
cls,
old_version: str,
named_metadata: dict[str, Metadata],
relationships: list[Relationship],
) -> None:
"""
Upgrade metadata from old version to new version
Expand All @@ -277,9 +278,10 @@ def __eq__(self, other):

# if self and other has the same
return (
self.version == other.version
and all(
self.get(key) == other.get(key) for key in set(chain(self.fields, other.fields))
)
and set(self.fields) == set(other.fields)
self.version == other.version
and all(
self.get(key) == other.get(key) for key in set(chain(self.fields, other.fields))
)
and set(self.fields) == set(other.fields)
)

Loading