fix rebase

Author: fealho

sdv/single_table/_dayz_utils.py

@@ -82,7 +82,7 @@ def _detect_datetime_column_parameters(series, column_metadata):
     return params
 
 
-def _detect_categorical_or_boolean_column_parameters(series):
+def _detect_categorical_column_parameters(series):
     """Detect categorical/boolean parameters."""
     categorical_values = series.dropna().unique()
     if len(categorical_values) == 0:
@@ -113,37 +113,14 @@ def detect_column_parameters(data, metadata, table_name):
         sdtype = column_metadata['sdtype']
         params = {}
         if sdtype == 'numerical':
-            column_parameters[column_name] = {
-                'num_decimal_digits': learn_rounding_digits(data[column_name]),
-                'min_value': data[column_name].min(),
-                'max_value': data[column_name].max(),
-            }
+            params.update(_detect_numerical_column_parameters(data[column_name]))
         elif sdtype == 'datetime':
-            datetime_format = column_metadata.get('datetime_format', None)
-            if datetime_format:
-                datetime_column = pd.to_datetime(
-                    data[column_name], format=datetime_format, errors='coerce'
-                )
-                start_timestamp = datetime_column.min().strftime(datetime_format)
-                end_timestamp = datetime_column.max().strftime(datetime_format)
-
-            else:
-                datetime_column = pd.to_datetime(data[column_name], errors='coerce')
-                start_timestamp = str(datetime_column.min())
-                end_timestamp = str(datetime_column.max())
-
-            column_parameters[column_name] = {
-                'start_timestamp': start_timestamp,
-                'end_timestamp': end_timestamp,
-            }
+            params.update(_detect_datetime_column_parameters(data[column_name], column_metadata))
         elif sdtype == 'categorical':
-            column_parameters[column_name] = {
-                'category_values': data[column_name].dropna().unique().tolist()
-            }
+            params.update(_detect_categorical_column_parameters(data[column_name]))
 
-        column_parameters[column_name]['missing_values_proportion'] = float(
-            data[column_name].isna().mean()
-        )
+        params['missing_values_proportion'] = _compute_missing_values_proportion(data[column_name])
+        column_parameters[column_name] = params
 
     return {'columns': column_parameters}
 

tests/unit/single_table/test_dayz.py

@@ -375,7 +375,6 @@ def test_validate_parameters(
         # Assert
         mock__validate_parameters.assert_called_once_with(metadata, dayz_parameters)
 
-<<<<<<< HEAD
     def test__validate_parameters_errors_with_multi_table_metadata(self):
         """Test that single-table validation errors if multi-table metadata is provided."""
         # Setup
@@ -434,11 +433,11 @@ def test__validate_parameters_errors_with_relationships(self):
         )
         with pytest.raises(SynthesizerProcessingError, match=expected_error_msg):
             DayZSynthesizer.validate_parameters(metadata, dayz_parameters)
-=======
-    def test_create_parameters_with_empty_dataframe_returns_valid_defaults(self):
-        """create_parameters should not emit invalid values for empty dataframes."""
+
+    def test_create_parameters_returns_valid_defaults(self):
+        """Test create_parameters returns valid defaults."""
         # Setup
-        data = pd.DataFrame({'col': []})
+        data = pd.DataFrame({'col': [np.nan]})
         metadata = Metadata.detect_from_dataframe(data)
 
         # Run
@@ -449,9 +448,9 @@ def test_create_parameters_with_empty_dataframe_returns_valid_defaults(self):
             'tables': {
                 'table': {
                     'columns': {
-                        'col': {'missing_values_proportion': 0.0},
+                        'col': {'missing_values_proportion': 1.0},
                     },
-                    'num_rows': 0,
+                    'num_rows': 1,
                 },
             },
             'DAYZ_SPEC_VERSION': 'V1',
@@ -524,4 +523,3 @@ def test_create_parameters_all_null_datetime_column(self):
             },
             'DAYZ_SPEC_VERSION': 'V1',
         }
->>>>>>> eb252ea1 (Implement fallback)