Merge pull request #5 from equalitie/model_interface

Model Interface

Author: mazhurin

data/samples/sample_log_schema.json

@@ -0,0 +1,24 @@
+{
+   "name": "CustomLogs",
+   "properties": {
+     "timestamp": {
+       "type": "string",
+       "format": "date",
+       "pattern": "(\\d\\d\\d\\d-([0-2])?\\d-([0-3])?\\dT?([0-2])?\\d:([0-5])?\\d:([0-5])?\\d\\.\\d?\\d?\\d?Z?)"
+     },
+     "some_property": {
+       "type": "string"
+     },
+     "some_other_property": {
+       "type": "string"
+     },
+     "an_integer_property": {
+       "type": "integer"
+     },
+     "a_numeric_property": {
+       "type": "string"
+     }
+   },
+  "required": ["timestamp", "some_property"],
+   "additionalProperties": false
+}

src/baskerville/main.py

@@ -62,20 +62,6 @@ def run_simulation(conf, spark=None):
     print('Set up Simulation...')
 
 
-def populate_with_test_data(database_config):
-    """
-    Load the test data and save them in the database
-    :param dict[str, T] database_config:
-    :return:
-    """
-    global logger
-    from baskerville.util.model_serialization import import_pickled_model
-    path = os.path.join(get_default_data_path(), 'samples', 'sample_model')
-    test_model_path = os.path.join(get_default_data_path(), 'samples', 'test_model')
-    logger.info(f'Loading test model from: {test_model_path}')
-    import_pickled_model(database_config, path, test_model_path)
-
-
 def main():
     """
     Baskerville commandline arguments
@@ -99,13 +85,6 @@ def main():
              "in the configuration port",
     )
 
-    parser.add_argument(
-        "-t", "--testmodel", dest="test_model",
-        help="Add a test model in the models table",
-        default=False,
-        action="store_true"
-    )
-
     parser.add_argument(
         "-c", "--conf", action="store", dest="conf_file",
         default=os.path.join(src_dir, '..', 'conf', 'baskerville.yaml'),
@@ -143,10 +122,6 @@ def main():
         logger.info(f'Starting Baskerville Exporter at '
                     f'http://localhost:{port}')
 
-    # populate with test data if specified
-    if args.test_model:
-        populate_with_test_data(conf['database'])
-
     for p in PROCESS_LIST[::-1]:
         print(f"{p.name} starting...")
         p.start()