Merge pull request #24 from uzh-dqbm-cmi/bugfix_kwargs_SAD_load_file

Bugfix: Missing kwargs option in SAD.load_from_file

datatc/self_aware_data.py

@@ -358,7 +358,7 @@ def __init__(self, data: Any, metadata: TransformSequenceConvertible = None):
  self.transform_sequence = TransformSequence(metadata)
 
  @classmethod
- def load_from_file(cls, file_path: str) -> 'SelfAwareData':
+ def load_from_file(cls, file_path: str, **kwargs) -> 'SelfAwareData':
  """
  Create a SelfAwareData object with a initial SourceFileTransformStep
 
@@ -368,7 +368,7 @@ def load_from_file(cls, file_path: str) -> 'SelfAwareData':
  Returns: SelfAwareData with a TransformSequence containing a SourceFileTransformStep pointing to file_path
 
  """
- data = MagicDataInterface.load(file_path)
+ data = MagicDataInterface.load(file_path, **kwargs)
  metadata = [{'file_path': file_path}]
  return cls(data, metadata)
 

tests/test_self_aware_data.py

@@ -181,6 +181,16 @@ def test_load_SAD_from_file(self):
  self.raw_df.to_csv(raw_data_path, index=False)
  from_file_sad = SelfAwareData.load_from_file(raw_data_path)
 
+ pd.testing.assert_frame_equal(from_file_sad.data, self.raw_df)
+ self.assertEqual(len(from_file_sad.transform_sequence.sequence), 1)
+ self.assertTrue(type(from_file_sad.transform_sequence.sequence[0]), SourceFileTransformStep)
+
+ def test_load_SAD_from_file_with_kwargs(self):
+ raw_data_path = Path(self.test_dir, 'raw_df.csv')
+ self.raw_df.to_csv(raw_data_path, index=False, sep='|')
+ from_file_sad = SelfAwareData.load_from_file(raw_data_path, sep='|')
+
+ pd.testing.assert_frame_equal(from_file_sad.data, self.raw_df)
  self.assertEqual(len(from_file_sad.transform_sequence.sequence), 1)
  self.assertTrue(type(from_file_sad.transform_sequence.sequence[0]), SourceFileTransformStep)