setup.py

@@ -10,7 +10,7 @@ setup(
     author_email="unit@paranoici.org",
     package_dir={"": "src"},
     packages=find_packages("src"),
-    entry_points={"console_scripts": ["phid=phi.app:cli"]},
+    entry_points={"console_scripts": ["phid=phi.web.app:cli"]},
     setup_requires=["pytest-runner"],
     install_requires=[
         "aiohttp==3.8.1",

src/phi/api/app.py

@@ -3,7 +3,7 @@ from aiohttp import web
 
 from phi.logging import get_logger
 from phi.api.routes import api_routes
-from phi.auth_middleware import authenticated
+from phi.web.auth_middleware import authenticated
 
 
 log = get_logger(__name__)

src/phi/web/app.py

@@ -9,8 +9,8 @@ import yaml
 from phi.config import get_config, merge_config, extract_secret
 from phi.logging import setup_logging, get_logger
 from phi.api.app import api_app
-from phi.client_store import ClientStore
+from phi.web.client_store import ClientStore
-from phi.login import login
+from phi.web.login import login
 
 log = get_logger(__name__)
 

src/phi/web/auth_middleware.py

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 from aiohttp.web import middleware, HTTPFound
 
-from phi import app
+from phi.web import app
 from phi.async_ldap.model import Hackers, Robots, Roles