sdv 1.36.2.dev0__tar.gz → 1.36.3.dev0__tar.gz

{sdv-1.36.2.dev0/sdv.egg-info → sdv-1.36.3.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sdv
-Version: 1.36.2.dev0
+Version: 1.36.3.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.36.2.dev0 → sdv-1.36.3.dev0}/pyproject.toml

@@ -149,7 +149,7 @@ namespaces = false
 version = {attr = 'sdv.__version__'}
 
 [tool.bumpversion]
-current_version = "1.36.2.dev0"
+current_version = "1.36.3.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.36.2.dev0 → sdv-1.36.3.dev0}/sdv/__init__.py

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

{sdv-1.36.2.dev0 → sdv-1.36.3.dev0}/sdv/cag/__init__.py

@@ -7,7 +7,6 @@ from sdv.cag.range import Range
 from sdv.cag.one_hot_encoding import OneHotEncoding
 from sdv.cag.programmable_constraint import (
     ProgrammableConstraint,
-    SingleTableProgrammableConstraint,
 )
 
 __all__ = (
@@ -17,5 +16,4 @@ __all__ = (
     'Range',
     'OneHotEncoding',
     'ProgrammableConstraint',
-    'SingleTableProgrammableConstraint',
 )

{sdv-1.36.2.dev0 → sdv-1.36.3.dev0}/sdv/cag/programmable_constraint.py

@@ -2,14 +2,13 @@
 
 from copy import deepcopy
 
-from sdv.cag._errors import ConstraintNotMetError
 from sdv.cag.base import BaseConstraint
 
 
 class ProgrammableConstraint:
     """Base class to create programmable constraints."""
 
-    _is_single_table = False
+    _is_single_table = True
 
     def validate(self, metadata):
         """Validates that the metadata is compatible with the constraint and its parameters.
@@ -125,12 +124,6 @@ class ProgrammableConstraint:
         return synthetic_data
 
 
-class SingleTableProgrammableConstraint(ProgrammableConstraint):
-    """Single table variant of the base programmable constraint class."""
-
-    _is_single_table = True
-
-
 class ProgrammableConstraintHarness(BaseConstraint):
     """Constraint interface class for programmable constraints."""
 
@@ -141,21 +134,9 @@ class ProgrammableConstraintHarness(BaseConstraint):
         self._is_single_table = self.programmable_constraint._is_single_table
 
     def _validate_constraint_with_metadata(self, metadata):
-        if self.programmable_constraint._is_single_table and len(metadata.tables) != 1:
-            if getattr(self.programmable_constraint, 'table_name', None) is None:
-                raise ConstraintNotMetError(
-                    'SingleTableProgrammableConstraint cannot be used with multi-table metadata '
-                    'if the `table_name` attribute has not been set. Please set the table name '
-                    'attribute to the target table, or use the ProgrammableContraint '
-                    'base class instead.'
-                )
-
         self.programmable_constraint.validate(metadata)
 
     def _validate_constraint_with_data(self, data, metadata):
-        if self._is_single_table:
-            data = data[self._get_single_table_name(metadata)]
-
         self.programmable_constraint.validate_input_data(data)
 
     def _get_updated_metadata(self, metadata):
@@ -163,41 +144,13 @@ class ProgrammableConstraintHarness(BaseConstraint):
         return self.programmable_constraint.get_updated_metadata(metadata)
 
     def _fit(self, data, metadata):
-        if self._is_single_table:
-            data = data[self._table_name]
-
         self.programmable_constraint.fit(data, metadata)
 
     def _transform(self, data):
-        if self._is_single_table:
-            data = data[self._table_name]
-
-        transformed = self.programmable_constraint.transform(data)
-
-        if self._is_single_table:
-            return {self._table_name: transformed}
-
-        return transformed
+        return self.programmable_constraint.transform(data)
 
     def _reverse_transform(self, data):
-        if self._is_single_table:
-            data = data[self._table_name]
-
-        reverse_transformed = self.programmable_constraint.reverse_transform(data)
-
-        if self._is_single_table:
-            return {self._table_name: reverse_transformed}
-
-        return reverse_transformed
+        return self.programmable_constraint.reverse_transform(data)
 
     def _is_valid(self, data, metadata):
-        if self._is_single_table:
-            table_name = self._get_single_table_name(metadata)
-            data = data[table_name]
-
-        is_valid = self.programmable_constraint.is_valid(data)
-
-        if self._is_single_table:
-            return {table_name: is_valid}
-
-        return is_valid
+        return self.programmable_constraint.is_valid(data)

{sdv-1.36.2.dev0 → sdv-1.36.3.dev0}/sdv/sequential/par.py

@@ -209,13 +209,13 @@ class PARSynthesizer(LossValuesMixin, MissingModuleMixin, BaseSynthesizer):
     def add_constraints(self, constraints):
         """Add constraints to the synthesizer.
 
-        For PARSynthesizers allow SingleTableProgrammableConstraints and built-in constraints
+        For PARSynthesizers allow ProgrammableConstraints and built-in constraints
         that follow these rules:
 
         1) All constraints must be either for all contextual columns or non-contextual column.
            No mixing constraints that cover both contextual and non-contextual columns
         2) No overlapping constraints (there are no constraints that act on the same column)
-        3) Any custom constraint is allowed, as long as it is a SingleTableProgrammableConstraint
+        3) Any custom constraint is allowed, as long as it is a single table constraint
 
         Args:
             constraints (list):

{sdv-1.36.2.dev0 → sdv-1.36.3.dev0}/sdv/single_table/base.py

@@ -1439,6 +1439,7 @@ class BaseSingleTableSynthesizer(BaseSynthesizer):
         """
         self._validate_fit_before_sample()
         output_file_path = validate_file_path(output_file_path)
+        sample_timestamp = datetime.datetime.now()
 
         num_rows = functools.reduce(
             lambda num_rows, condition: condition.get_num_rows() + num_rows, conditions, 0
@@ -1474,6 +1475,16 @@ class BaseSingleTableSynthesizer(BaseSynthesizer):
         except (Exception, KeyboardInterrupt) as error:
             handle_sampling_error(output_file_path, error)
 
+        SYNTHESIZER_LOGGER.info({
+            'EVENT': 'Sample',
+            'TIMESTAMP': sample_timestamp,
+            'SYNTHESIZER CLASS NAME': self.__class__.__name__,
+            'SYNTHESIZER ID': self._synthesizer_id,
+            'TOTAL NUMBER OF TABLES': 1,
+            'TOTAL NUMBER OF ROWS': len(sampled),
+            'TOTAL NUMBER OF COLUMNS': len(sampled.columns),
+        })
+
         return sampled
 
     def _validate_known_columns(self, conditions):
@@ -1513,6 +1524,7 @@ class BaseSingleTableSynthesizer(BaseSynthesizer):
 
         known_columns = known_columns.copy()
         self._validate_known_columns(known_columns)
+        sample_timestamp = datetime.datetime.now()
         sampled = pd.DataFrame()
         try:
             with tqdm.tqdm(total=len(known_columns)) as progress_bar:
@@ -1535,4 +1547,14 @@ class BaseSingleTableSynthesizer(BaseSynthesizer):
         except (Exception, KeyboardInterrupt) as error:
             handle_sampling_error(output_file_path, error)
 
+        SYNTHESIZER_LOGGER.info({
+            'EVENT': 'Sample',
+            'TIMESTAMP': sample_timestamp,
+            'SYNTHESIZER CLASS NAME': self.__class__.__name__,
+            'SYNTHESIZER ID': self._synthesizer_id,
+            'TOTAL NUMBER OF TABLES': 1,
+            'TOTAL NUMBER OF ROWS': len(sampled),
+            'TOTAL NUMBER OF COLUMNS': len(sampled.columns),
+        })
+
         return sampled

{sdv-1.36.2.dev0 → sdv-1.36.3.dev0/sdv.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sdv
-Version: 1.36.2.dev0
+Version: 1.36.3.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