More reorg

backend/src/processing/layer1/auth.py

@@ -3,7 +3,7 @@
 
 from src.constants import OWNER, REPO
 from src.data.github.rest import RESTError
-from src.subscriber.aggregation import (
+from src.processing.layer0 import (
     get_repo_stargazers,
     get_user_stars,
     get_valid_db_user,

backend/src/processing/layer1/user.py

@@ -9,7 +9,7 @@
 from src.data.mongo.secret import update_keys
 from src.data.mongo.user_months import UserMonth, get_user_months, set_user_month
 from src.models.user.main import UserPackage
-from src.subscriber.aggregation import get_user_data
+from src.processing.layer0 import get_user_data
 from src.utils import alru_cache, date_to_datetime
 
 s = requests.Session()

backend/src/processing/layer1/wrapped.py

@@ -1,10 +1,9 @@
 from datetime import date, timedelta
 from typing import Optional, Tuple
 
-from backend.src.processing.layer0 import get_wrapped_data
-
 from src.data.mongo.user import PublicUserModel, get_public_user as db_get_public_user
 from src.models import UserPackage, WrappedPackage
+from src.processing.layer0 import get_wrapped_data
 from src.processing.layer1.user import query_user
 from src.utils import alru_cache
 

backend/src/processing/layer2/__init__.py

@@ -1,9 +1,18 @@
-from src.processing.layer2.user.commits import get_top_languages, get_top_repos
-from src.processing.layer2.user.models import LanguageStats, RepoStats
+from src.processing.layer2.auth import authenticate, delete_user, set_user_key
+from src.processing.layer2.commits import get_top_languages, get_top_repos
+from src.processing.layer2.get_data import get_user, get_user_demo
+from src.processing.layer2.models import LanguageStats, RepoStats
+from src.processing.layer2.svg import svg_base
 
 __all__ = [
     "get_top_languages",
     "get_top_repos",
     "LanguageStats",
     "RepoStats",
+    "set_user_key",
+    "authenticate",
+    "delete_user",
+    "get_user",
+    "get_user_demo",
+    "svg_base",
 ]

backend/src/processing/layer2/user/commits.py → backend/src/processing/layer2/commits.py

@@ -2,7 +2,7 @@
 
 from src.constants import DEFAULT_COLOR
 from src.models import UserPackage
-from src.processing.layer2.user.models import LanguageStats, RepoStats
+from src.processing.layer2.models import LanguageStats, RepoStats
 
 dict_type = Dict[str, Union[str, int, float]]
 

backend/src/processing/layer3/user/svg.py → backend/src/processing/layer2/svg.py

@@ -2,7 +2,7 @@
 from typing import Optional, Tuple
 
 from src.models import UserPackage
-from src.processing.layer3.user.get_data import get_user, get_user_demo
+from src.processing.layer2.get_data import get_user, get_user_demo
 from src.utils import use_time_range
 
 

backend/src/render/top_langs.py

@@ -4,13 +4,9 @@
 
 from svgwrite import Drawing
 
-from backend.src.processing.layer2 import LanguageStats
+from src.processing.layer2 import LanguageStats
 from src.render.error import get_no_data_svg
-from src.render.template import (
-    get_bar_section,
-    get_lang_name_section,
-    get_template,
-)
+from src.render.template import get_bar_section, get_lang_name_section, get_template
 from src.utils import format_number
 
 

backend/src/render/top_repos.py

@@ -4,13 +4,9 @@
 
 from svgwrite import Drawing
 
-from src.processing.layer2.user.models import RepoStats
+from src.processing.layer2.models import RepoStats
 from src.render.error import get_no_data_svg
-from src.render.template import (
-    get_bar_section,
-    get_lang_name_section,
-    get_template,
-)
+from src.render.template import get_bar_section, get_lang_name_section, get_template
 from src.utils import format_number
 
 

backend/src/routers/auth/standalone.py

@@ -1,11 +1,11 @@
 import logging
 from typing import Optional
 
-from backend.src.processing.layer3 import authenticate, delete_user
 from fastapi import APIRouter
 from fastapi.responses import RedirectResponse
 
 from src.constants import OAUTH_CLIENT_ID
+from src.processing.layer2 import authenticate, delete_user
 from src.routers.decorators import get_redirect_url
 
 router = APIRouter()

backend/src/routers/auth/website.py

@@ -4,7 +4,7 @@
 from fastapi.responses import Response
 from fastapi.routing import APIRouter
 
-from src.publisher.processing import authenticate, delete_user, set_user_key
+from src.processing.layer2 import authenticate, delete_user, set_user_key
 from src.utils import async_fail_gracefully
 
 router = APIRouter()

backend/src/routers/dev.py

@@ -6,7 +6,7 @@
 
 from src.data.mongo.secret import update_keys
 from src.models import UserPackage, WrappedPackage
-from src.subscriber.aggregation import get_user_data, get_wrapped_data
+from src.processing.layer0 import get_user_data, get_wrapped_data
 from src.utils import async_fail_gracefully, use_time_range
 
 router = APIRouter()

backend/src/routers/users/main.py

@@ -1,10 +1,10 @@
 from datetime import date, timedelta
 from typing import Optional
 
-from backend.src.processing.layer3 import get_user
 from fastapi import APIRouter, Response, status
 
 from src.models import UserPackage
+from src.processing.layer2 import get_user
 from src.routers.users.db import router as db_router
 from src.routers.users.svg import router as svg_router
 from src.utils import async_fail_gracefully

backend/src/routers/users/svg.py

@@ -1,12 +1,11 @@
 from datetime import date, timedelta
 from typing import Any
 
-from backend.src.processing.layer2 import get_top_languages, get_top_repos
-from backend.src.processing.layer3 import svg_base
 from fastapi import Response, status
 from fastapi.responses import HTMLResponse
 from fastapi.routing import APIRouter
 
+from src.processing.layer2 import get_top_languages, get_top_repos, svg_base
 from src.render import (
     get_empty_demo_svg,
     get_loading_svg,

backend/tests/subscriber/aggregation/test_contributions.py

@@ -4,7 +4,7 @@
 
 from src.constants import TEST_TOKEN as TOKEN, TEST_USER_ID as USER_ID
 from src.models import UserContributions
-from src.subscriber.aggregation import get_contributions
+from src.processing.layer0 import get_contributions
 
 
 class TestTemplate(AsyncTestCase):

backend/tests/subscriber/aggregation/test_follows.py

@@ -2,7 +2,7 @@
 
 from src.constants import TEST_TOKEN as TOKEN, TEST_USER_ID as USER_ID
 from src.models import UserFollows
-from src.subscriber.aggregation import get_user_follows
+from src.processing.layer0 import get_user_follows
 
 
 class TestTemplate(unittest.TestCase):