some small fixes for predictor path

Author: paxcema

__init__.py

@@ -4,9 +4,8 @@
     - train_native.py: for training a predictor using MindsDB Native
     - TODO: train_sdk.py: for training a predictor using the MindsDB Python SDK
 """
-import pandas as pd
-import mindsdb_native
 from mindsdb_forecast_visualizer.core.dispatch import visualize
+import pandas as pd
 
 
 if __name__ == '__main__':
@@ -17,16 +16,15 @@
     predictor_name = 'arrival_forecast_example'
 
     # Specify a DataFrame that has your queries (make sure there are enough rows for each group!)
-    query_df = pd.read_csv('./arrivals_test.csv')
+    query_df = pd.read_csv('arrivals_test.csv')
 
-    # None predicts for all groups
     # Examples: [{'col1': 'val1'}, {'col1': 'val1', 'col2': 'val2', ...}]
-    subset = None
+    subset = None  # None predicts for all groups
 
     # Set rolling amount of predictions (1 if predictor was trained for t+N with N>1)
     rolling = 1
 
-    # Set other predictor parameters (NOTE: this will be automatically retrieved soon)
+    # Set other predictor parameters
     params = {
         'order': ['T'],
         'target': 'Traffic',
@@ -36,14 +34,8 @@
         'pred_name': predictor_name
     }
 
-    pred_path = None  # set if predictor was saved in a non-default location (or e.g. a previous native version)
-    if pred_path is None and mode == 'Native':
-        pred_path = '/mindsdb_native/mindsdb_native/mindsdb_storage/' + \
-                    mindsdb_native.__version__.replace('.', '_')
-    elif pred_path is None and mode == 'SDK':
-        pred_path = '/storage/predictors'
+    pred_path = None  # set this if the predictor was saved in a non-default location
 
-    # Plot!
     visualize(predictor_name,
               query_df,
               params=params,

example/__init__.py

@@ -4,7 +4,6 @@
 
 if __name__ == '__main__':
     p_name = 'arrival_forecast_example'
-
     train_df = pd.read_csv('./arrivals_train.csv')
 
     predictor = mindsdb_native.Predictor(name=p_name)

mindsdb_forecast_visualizer/example/arrivals_test.csv renamed to example/arrivals_test.csv

@@ -5,6 +5,5 @@
 __email__ = "[email protected]"
 __author__ = 'MindsDB Inc'
 __github__ = 'https://github.com/mindsdb/mindsdb_forecast_visualizer'
-# __pypi__ = 'https://pypi.org/project/mindsdb'
 __license__ = 'GPL-3.0'
 __copyright__ = 'Copyright 2021- mindsdb'

mindsdb_forecast_visualizer/example/arrivals_train.csv renamed to example/arrivals_train.csv

@@ -1 +0,0 @@
-from mindsdb_forecast_visualizer.__about__ import __package_name__ as name, __version__

mindsdb_forecast_visualizer/example/example.py renamed to example/example.py

@@ -1,13 +1,17 @@
 import os
-
-import pandas as pd
 import mindsdb
-from mindsdb_native import CONFIG, Predictor
+from mindsdb_native import CONFIG, Predictor, __version__, __file__
 
 from mindsdb_forecast_visualizer.core.forecaster import forecast
 
 
 def visualize(predictor_name, df, params=None, subset=None, mode='Native', pred_path=None, rolling=1):
+    if pred_path is None and mode == 'Native':
+            native_path = os.path.dirname(__file__)
+            pred_path = os.path.join(native_path, 'mindsdb_storage', __version__.replace('.', '_'))
+    elif pred_path is None and mode == 'SDK':
+        pred_path = '/storage/predictors'
+
     if mode == 'Native':
         # Path configuration
         mdb_path = mindsdb.root_storage_dir  if not pred_path else pred_path
@@ -17,7 +21,6 @@ def visualize(predictor_name, df, params=None, subset=None, mode='Native', pred_
         mdb_predictor = Predictor(name=predictor_name)
 
         # TODO: fetch params automatically from training params
-
         forecast(mdb_predictor,
                  df,
                  params,