From b600260f62fe2e67dc7fcbc5d5e67f7917e44ad5 Mon Sep 17 00:00:00 2001
From: perezgonzalez-irene <iregon@noc.ac.uk>
Date: Fri, 21 Feb 2020 13:38:11 +0000
Subject: [PATCH] Changed output type from dict to class
---
read.py | 21 ++++++++++++++++-----
1 file changed, 16 insertions(+), 5 deletions(-)
diff --git a/read.py b/read.py
index 7a1e940..cc4b4d9 100644
--- a/read.py
+++ b/read.py
@@ -3,11 +3,11 @@
"""
Created on Tue Apr 30 09:38:17 2019
-Reads source data (file) to
-a pandas DataFrame. The source data model needs to be input to the module as
-a named model (included in the module) or as the path to a valid data model.
+Reads a data file to a pandas DataFrame using a pre-defined data model.
-Data is validated against its data model after reading, producing a boolean mask.
+The data model needs to be input to the module as a named model (included in the module) or as the path to a valid data model.
+
+Data elements are validated against its data model after reading, producing a boolean mask.
Uses submodules:
- schemas
@@ -35,6 +35,7 @@ from .validate import validate
toolPath = os.path.dirname(os.path.abspath(__file__))
schema_lib = os.path.join(toolPath,'schemas','lib')
+# AUX FUNCTIONS ---------------------------------------------------------------
def ERV(TextParser,read_sections_list, schema, code_tables_path):
data_buffer = StringIO()
@@ -99,6 +100,9 @@ def validate_path(arg_name,arg_value):
else:
return True
+# END AUX FUNCTIONS -----------------------------------------------------------
+
+
def read(source, data_model = None, data_model_path = None, sections = None,chunksize = None,
skiprows = None, out_path = None ):
@@ -197,7 +201,14 @@ def read(source, data_model = None, data_model_path = None, sections = None,chun
json.dump(out_atts_json,fileObj,indent=4)
# 5. Return data
- return {'data':data,'atts':out_atts,'valid_mask':valid}
+ class output():
+ def __init__(self):
+ self.data = data
+ self.atts = out_atts
+ self.mask = valid
+
+
+ return output()
if __name__=='__main__':
kwargs = dict(arg.split('=') for arg in sys.argv[2:])
--
GitLab