Analytics project structure improvement #215 (#228)

* bin & analytics folders

* sys path & config relocation

* fix analytics path in node

analytics/Compilation.md

@@ -7,6 +7,6 @@ Compiled module is supported by all *nix systems.
 ```bash
 pip3 install pyinstaller
 cd $HASTIC_SERVER_PATH/analytics
-pyinstaller --additional-hooks-dir=pyinstaller_hooks server.py
+pyinstaller --additional-hooks-dir=pyinstaller_hooks bin/server
 ```
 

analytics/Dockerfile

@@ -17,4 +17,4 @@ VOLUME [ "/var/www/data" ]
 
 COPY . /var/www/analytics/
 
-CMD ["python", "server.py"]
+CMD ["python", "bin/server"]

analytics/analytics/config.py

@@ -2,7 +2,7 @@ import os
 import json
 
 
-PARENT_FOLDER = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
+PARENT_FOLDER = os.path.dirname(os.path.dirname(os.path.dirname(os.path.realpath(__file__))))
 CONFIG_FILE = os.path.join(PARENT_FOLDER, 'config.json')
 
 
@@ -10,6 +10,8 @@ config_exists = os.path.isfile(CONFIG_FILE)
 if config_exists:
     with open(CONFIG_FILE) as f:
         config = json.load(f)
+else:
+    print('Config file %s doesn`t exist, using defaults' % CONFIG_FILE)
 
 
 def get_config_field(field, default_val = None):

analytics/analytics/utils/__init__.py

@@ -0,0 +1,2 @@
+from utils.common import *
+from utils.segments import *

analytics/analytics/utils/segments.py

@@ -1,6 +1,6 @@
 import pandas as pd
 
-from common import timestamp_to_index
+from utils.common import timestamp_to_index
 
 def parse_segment(segment, dataframe):
     start = timestamp_to_index(dataframe, pd.to_datetime(segment['from'], unit='ms'))

analytics/bin/server

@@ -1,13 +1,16 @@
+#!/usr/bin/env python3
+
+import sys
+import os
+
+#TODO: make wrapper script that set PYTHONPATH instead
+sys.path.append(os.path.join(os.path.dirname(__file__), '..', 'analytics'))
+
 import config
 import json
 import logging
-import sys
 import asyncio
 import traceback
-import os
-
-#TODO: make wrapper script that set PYTHONPATH instead
-sys.path.append(os.path.join(os.path.dirname(__file__), 'utils'))
 
 import services
 from analytic_unit_manager import handle_analytic_task

analytics/tests/test_utils.py

@@ -7,6 +7,5 @@ class TestUtils(unittest.TestCase):
         self.assertTrue(True)
 
 
-
 if __name__ == '__main__':
     unittest.main()

analytics/utils/__init__.py

@@ -1,2 +0,0 @@
-from common import *
-from segments import *

server/src/services/analytics_service.ts

@@ -122,10 +122,12 @@ export class AnalyticsService {
       console.log('dist/server/server');
       cp = childProcess.spawn('dist/server/server', [], cpOptions);
     } else {
-      console.log('python3 server.py');
+      const ANALYTICS_SERVER_PATH = path.join('bin', 'server');
+      console.log('python3 ' + ANALYTICS_SERVER_PATH);
       // If compiled analytics script doesn't exist - fallback to regular python
       console.log(config.ANALYTICS_PATH);
-      cp = childProcess.spawn('python3', ['server.py'], cpOptions);
+      // maybe starting it via bash better that put python3
+      cp = childProcess.spawn('python3', [ANALYTICS_SERVER_PATH], cpOptions);
     }
 
     if(cp.pid === undefined) {