sdv 1.33.2.dev0__tar.gz → 1.34.1.dev0__tar.gz

{sdv-1.33.2.dev0/sdv.egg-info → sdv-1.34.1.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sdv
-Version: 1.33.2.dev0
+Version: 1.34.1.dev0
 Summary: Generate synthetic data for single table, multi table and sequential data
 Author-email: "DataCebo, Inc." <info@sdv.dev>
 License-Expression: BUSL-1.1

{sdv-1.33.2.dev0 → sdv-1.34.1.dev0}/pyproject.toml

@@ -150,7 +150,7 @@ namespaces = false
 version = {attr = 'sdv.__version__'}
 
 [tool.bumpversion]
-current_version = "1.33.2.dev0"
+current_version = "1.34.1.dev0"
 parse = '(?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+)(?P<candidate>\d+))?'
 serialize = [
     '{major}.{minor}.{patch}.{release}{candidate}',

{sdv-1.33.2.dev0 → sdv-1.34.1.dev0}/sdv/__init__.py

@@ -6,7 +6,7 @@
 
 __author__ = 'DataCebo, Inc.'
 __email__ = 'info@sdv.dev'
-__version__ = '1.33.2.dev0'
+__version__ = '1.34.1.dev0'
 
 
 import sys

{sdv-1.33.2.dev0 → sdv-1.34.1.dev0}/sdv/metadata/metadata.py

@@ -325,7 +325,7 @@ class Metadata(MultiTableMetadata):
         table_name = self._handle_table_name(table_name)
         super().add_column(table_name, column_name, **kwargs)
 
-    def _remove_matching_relationships(self, element, keys):
+    def _remove_relationships_by_table(self, element, keys):
         """Remove relationships where the element matches the keys to check."""
         updated_relationships = []
         for relationship in self.relationships:
@@ -335,6 +335,22 @@ class Metadata(MultiTableMetadata):
 
         self.relationships = updated_relationships
 
+    def _remove_relationships_by_column(self, table_name, column_name):
+        """Remove relationships where the column is a key for the given table."""
+        updated_relationships = []
+        for relationship in self.relationships:
+            should_remove = (
+                relationship['child_foreign_key'] == column_name
+                and relationship['child_table_name'] == table_name
+            ) or (
+                relationship['parent_primary_key'] == column_name
+                and relationship['parent_table_name'] == table_name
+            )
+            if not should_remove:
+                updated_relationships.append(relationship)
+
+        self.relationships = updated_relationships
+
     def remove_table(self, table_name):
         """Remove a table from the metadata.
 
@@ -348,7 +364,7 @@ class Metadata(MultiTableMetadata):
         self._validate_table_exists(table_name)
 
         # Remove relationships
-        self._remove_matching_relationships(table_name, ['parent_table_name', 'child_table_name'])
+        self._remove_relationships_by_table(table_name, ['parent_table_name', 'child_table_name'])
         del self.tables[table_name]
         self._multi_table_updated = True
 
@@ -380,9 +396,7 @@ class Metadata(MultiTableMetadata):
         table_metadata._validate_column_exists(column_name)
 
         # Remove relationships
-        self._remove_matching_relationships(
-            column_name, ['parent_primary_key', 'child_foreign_key']
-        )
+        self._remove_relationships_by_column(table_name, column_name)
         updated_column_relationships = []
         for column_relationship in table_metadata.column_relationships:
             if column_name not in column_relationship.get('column_names', []):

{sdv-1.33.2.dev0 → sdv-1.34.1.dev0}/sdv/metadata/multi_table.py

@@ -543,25 +543,36 @@ class MultiTableMetadata:
         """
         for parent_candidate in self.tables.keys():
             primary_key = self.tables[parent_candidate].primary_key
+            if primary_key is None:
+                continue
+
+            pk_sdtype = self.tables[parent_candidate].columns[primary_key]['sdtype']
             for child_candidate in self.tables.keys() - {parent_candidate}:
                 child_meta = self.tables[child_candidate]
                 if primary_key in child_meta.columns.keys():
+                    original_fk_meta = deepcopy(child_meta.columns[primary_key])
+                    original_fk_sdtype = original_fk_meta['sdtype']
+                    if pk_sdtype != 'id' and original_fk_sdtype != pk_sdtype:
+                        continue
+
                     try:
-                        original_foreign_key_sdtype = child_meta.columns[primary_key]['sdtype']
-                        if original_foreign_key_sdtype != 'id':
+                        if pk_sdtype == 'id' and original_fk_sdtype != 'id':
                             self.update_column(
-                                table_name=child_candidate, column_name=primary_key, sdtype='id'
+                                table_name=child_candidate,
+                                column_name=primary_key,
+                                sdtype='id',
                             )
-
                         self.add_relationship(
                             parent_candidate, child_candidate, primary_key, primary_key
                         )
+
                     except InvalidMetadataError:
-                        self.update_column(
-                            table_name=child_candidate,
-                            column_name=primary_key,
-                            sdtype=original_foreign_key_sdtype,
-                        )
+                        if pk_sdtype == 'id' and original_fk_sdtype != 'id':
+                            self.update_column(
+                                table_name=child_candidate,
+                                column_name=primary_key,
+                                **original_fk_meta,
+                            )
                         continue
 
     def _detect_relationships(self, data=None, foreign_key_inference_algorithm='column_name_match'):

{sdv-1.33.2.dev0 → sdv-1.34.1.dev0/sdv.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sdv
-Version: 1.33.2.dev0
+Version: 1.34.1.dev0
 Summary: Generate synthetic data for single table, multi table and sequential data
 Author-email: "DataCebo, Inc." <info@sdv.dev>
 License-Expression: BUSL-1.1