Refactored API code into subpackage

Pipfile

@@ -4,7 +4,8 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-aw-core = {ref = "master",git = "https://github.com/ActivityWatch/aw-core.git"}
+aw_core = {editable = true, path = "../aw-core"}
+aw-server = {editable = true, path = "."}
 flask-restplus = ">=0.9.2"
 appdirs = ">=1.4.0"
 python-json-logger = ">=0.1.5"

aw_server/__init__.py

@@ -8,6 +8,6 @@
 from .server import create_app
 
 from . import api
-from . import rest
+from . import resources
 
 from .main import main

aw_server/main.py

@@ -6,8 +6,6 @@
 from .server import _start
 from .config import config
 
-logger = logging.getLogger(__name__)
-
 
 def main():
     """Called from the executable and __main__.py"""
@@ -23,6 +21,7 @@ def main():
     setup_logging("aw-server", testing=settings.testing, verbose=settings.verbose,
                   log_stderr=True, log_file=True, log_file_json=False)
 
+    logger = logging.getLogger(__name__)
     logger.info("Using storage method: {}".format(settings.storage))
 
     if settings.testing:

aw_server/rest.py → aw_server/resources/rest.py

@@ -1,6 +1,7 @@
 from typing import Dict
 import traceback
 import json
+import logging
 
 from flask import request, Blueprint, jsonify, current_app, make_response
 from flask_restplus import Api, Resource, fields
@@ -10,11 +11,11 @@
 from aw_core import schema
 from aw_core.models import Event
 
-from . import logger
-from .api import ServerAPI
-from .exceptions import BadRequest, Unauthorized
+from aw_server.api import ServerAPI
+from aw_server.exceptions import BadRequest, Unauthorized
 from aw_analysis.query2_error import QueryException
 
+logger = logging.getLogger(__name__)
 
 # SECURITY
 # As we work our way through features, disable (while this is False, we should only accept connections from localhost)

aw_server/server.py

@@ -8,9 +8,9 @@
 import aw_datastore
 from aw_datastore import Datastore
 
-from .log import FlaskLogHandler
-from .api import ServerAPI
-from . import rest
+from aw_server.log import FlaskLogHandler
+from aw_server.api import ServerAPI
+from aw_server.resources import rest
 
 
 logger = logging.getLogger(__name__)

setup.py

@@ -9,7 +9,7 @@
 except ImportError:  # for pip <= 9.0.3
     from pip.req import parse_requirements
 
-from setuptools import setup
+from setuptools import setup, find_packages
 
 here = os.path.abspath(os.path.dirname(__file__))
 
@@ -22,14 +22,18 @@
 
 requirements = parse_requirements("./requirements.txt", session=False)
 
+packages = find_packages()
+if packages != ["aw_server", "aw_server.resources"]:
+    print(f"Found extra packages: {packages}")
+
 setup(name='aw-server',
       version=about["__version__"],
       description='ActivityWatch server',
       long_description=readme,
       author='Erik Bjäreholt',
       author_email='[email protected]',
       url='https://github.com/ActivityWatch/aw-server',
-      packages=['aw_server'],
+      packages=packages,
       include_package_data=True,
       install_requires=[str(requirement.req) for requirement in requirements],
       entry_points={