Merge pull request #176 from RUGSoftEng/backend/periodic_fetching

Fixing periodic fetching, refactoring backend code

.gitignore

@@ -113,3 +113,4 @@ ENV/
 .vscode
 #Directories
 /pydash/logs
+/pydash/.pytest_cache

Pipfile

@@ -0,0 +1,11 @@
+[[source]]
+url = "https://pypi.python.org/simple"
+verify_ssl = true
+name = "pypi"
+
+[packages]
+
+[dev-packages]
+
+[requires]
+python_version = "3.6"

build_and_run.sh

@@ -41,7 +41,8 @@ RunFlask()
 {
     PydashPrint "Finally: Starting flask webservice. Close with Ctrl+C"
     cd pydash
-    pipenv run "flask run --no-reload"
+    pipenv run flask run --no-reload
+    cd ..
 }
 
 BuildFrontend

pydash/Pipfile

@@ -1,12 +1,9 @@
 [[source]]
-
 url = "https://pypi.python.org/simple"
 verify_ssl = true
 name = "pypi"
 
-
 [packages]
-
 Flask = "*"
 Flask-WTF = "*"
 flask-login = "*"
@@ -18,16 +15,14 @@ requests = "*"
 Flask-Cors = "*"
 pqdict = "*"
 
-
 [dev-packages]
-
-
+pytest = "*"
+pytest-cov = "*"
+pytest-xdist = "*"
+pytest-env = "*"
 
 [requires]
-
 python_version = "3.6"
 
-
 [pipenv]
-
 keep_outdated = true

pydash/conftest.py

@@ -0,0 +1,9 @@
+import pytest
+import pydash_database
+import pydash_app.user.repository
+import pydash_app.dashboard.repository
+@pytest.fixture(autouse=True)
+def clean_in_memory_database(*_):
+    pydash_app.user.repository.clear_all()
+    pydash_app.dashboard.repository.clear_all()
+

pydash/pydash_app/impl/fetch.py → pydash/flask_monitoring_dashboard_client/__init__.py

@@ -1,14 +1,22 @@
+"""
+Performs the remote requests to the flask-monitoring-dashboard.
+
+The method names in this module 1:1 reflect the names of the flask-monitoring-dashboard API
+(but without the word 'JSON' in them, because conversion from JSON to Python dictionaries/lists
+is one of the thing this module handles for you.)
+"""
+
 import requests
 import jwt
 import json
 
-import pydash_app.impl.logger as pylog
+import pydash_logger
 
 DETAILS_ENDPOINT = 0
 RULES_ENDPOINT = 1
 DATA_ENDPOINT = 2
 
-logger = pylog.Logger(__name__)
+logger = pydash_logger.Logger(__name__)
 
 def get_details(dashboard_url):
     """

pydash/pydash_app/impl/periodic_tasks/__init__.py → pydash/periodic_tasks/__init__.py

@@ -19,26 +19,31 @@
 The scheduler will be started by calling the `start()` function. It will stop scheduling and tear down the spawned processes when calling the `stop()` function.
 This function will also (in most cases) be automatically called when the main process finishes execution.
 
+
 Example code with default scheduler:
 
 
-    >>> import pydash_app.impl.periodic_tasks as pt
+    >>> import periodic_tasks as pt
     >>> import datetime
     >>> pt.start_default_scheduler()
     >>> pt.add_periodic_task('foo', datetime.timedelta(seconds=3), pt.foo)
     >>> pt.add_periodic_task('bar', datetime.timedelta(seconds=5), pt.bar)
     >>> pt.add_background_task('baz', pt.baz)
     >>> pt.add_periodic_task('bar', datetime.timedelta(seconds=1), pt.bar) # overrides previous `bar` task with new settings
     >>> pt.remove_task('foo')
+    >>> pt.default_task_scheduler.stop()
+
 
 Example code with custom scheduler:
 
-    >>> import pydash_app.impl.periodic_tasks as pt
+    >>> import periodic_tasks as pt
     >>> ts = pt.TaskScheduler()
-    >>> import datetime
+    >>> import datetime, time
     >>> ts.start()
-    >>> ts.add_periodic_task('foo', datetime.timedelta(seconds=1), pt.foo)
-    >>> ts.add_periodic_task('bar', datetime.timedelta(seconds=5), pt.bar)
+    >>> ts.add_periodic_task('foo', datetime.timedelta(milliseconds=1), pt.foo)
+    >>> ts.add_periodic_task('bar', datetime.timedelta(milliseconds=5), pt.bar)
+    >>> time.sleep(2)
+    >>> ts.stop()
 """
 
 from .task_scheduler import TaskScheduler