move /app to /src

.gitignore

@@ -1,6 +1,6 @@
 __pycache__/
-app/resources/generated
-app/static/raw_docs
+src/resources/generated
+src/static/raw_docs
 .env
 .idea/
 venv/

Dockerfile

@@ -22,5 +22,5 @@ RUN poetry install --no-interaction --no-cache --without dev
 
 
 # Run app
-COPY ./app /code/app
+COPY src /code/app
 CMD ["poetry", "run", "uvicorn", "app.main:app", "--proxy-headers", "--host", "0.0.0.0", "--port", "80"]

alembic/env.py

@@ -4,7 +4,7 @@
 from sqlalchemy import engine_from_config, pool
 
 from alembic import context
-from app.database.models import Base
+from src.database.models import Base
 
 # this is the Alembic Config object, which provides
 # access to the values within the .ini file in use.

create_cr_and_diff.py

@@ -3,9 +3,9 @@
 import os
 from dataclasses import asdict
 
-from app.difftool.diffmaker import CRDiffMaker
-from app.parsing.cr import extract_cr
-from app.parsing.utils.formatter import CRFormatterFactory
+from src.difftool.diffmaker import CRDiffMaker
+from src.parsing.cr import extract_cr
+from src.parsing.utils.formatter import CRFormatterFactory
 
 
 async def diff(old_txt, new_txt, old_set_code=None, new_set_code=None, forced_matches=None):
@@ -69,7 +69,7 @@ async def diffall():
         await diff_save(old, new)
 
 
-cr_in_dir = "app/static/raw_docs/cr"
+cr_in_dir = "src/static/raw_docs/cr"
 cr_out_dir = "./gen/cr"
 diff_dir = "./gen/diff_unchecked"
 maps_dir = "./gen/map"

create_mtr_and_diff.py

@@ -1,11 +1,12 @@
 import json
+import sys
 from datetime import date
 from pathlib import Path
 
 from dotenv import load_dotenv
 
-from app.difftool.diffmaker import MtrDiffMaker
-from app.parsing.mtr.extract_mtr import extract
+from src.difftool.diffmaker import MtrDiffMaker
+from src.parsing.mtr.extract_mtr import extract
 
 load_dotenv()
 
@@ -74,8 +75,8 @@ def diff_batch():
 
 
 if __name__ == "__main__":
-    diff_batch()
-    exit()
-    # old = sys.argv[1]
-    # new = sys.argv[2]
-    # diff_save(old, new)
+    # diff_batch()
+    # exit()
+    old = sys.argv[1]
+    new = sys.argv[2]
+    diff_save(old, new)

devstart.py

@@ -3,4 +3,4 @@
 
 if __name__ == "__main__":
     load_dotenv()
-    uvicorn.run("app.main:app", host="localhost", port=8000, reload=True)
+    uvicorn.run("src.main:app", host="localhost", port=8000, reload=True)

docker-compose.yml

@@ -11,8 +11,8 @@ services:
       USE_TIKA: 1
       TIKA_URL: http://tika:9998
     volumes:
-      - ./app:/code/app:rw
-      - ./generated:/code/app/resources/generated:rw
+      - ./src:/code/src:rw
+      - ./generated:/code/src/resources/generated:rw
 
   db:
     image: postgres

app/main.py → src/main.py

@@ -8,8 +8,8 @@
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.responses import JSONResponse
 
-from app.openapi import strings
-from app.openapi.openapi_decorators import (
+from src.openapi import strings
+from src.openapi.openapi_decorators import (
     ApiLogoDecorator,
     BaseResolver,
     CachingDecorator,

app/openapi/openapi_decorators.py → src/openapi/openapi_decorators.py

@@ -5,8 +5,8 @@
 from fastapi.routing import APIRoute
 from starlette.routing import BaseRoute
 
-from app.openapi.no422 import is_marked_no422
-from app.openapi.strings import Tag
+from src.openapi.no422 import is_marked_no422
+from src.openapi.strings import Tag
 
 
 class OpenApiResolver(ABC):

app/parsing/cr/extract_cr.py → src/parsing/cr/extract_cr.py

@@ -2,9 +2,9 @@
 import json
 import re
 
-from app.resources import static_paths as paths
-from app.utils.keyword_def import ability_words_rule, keyword_action_regex, keyword_regex
-from app.utils.response_models import ToCSection, ToCSubsection
+from src.resources import static_paths as paths
+from src.utils.keyword_def import ability_words_rule, keyword_action_regex, keyword_regex
+from src.utils.response_models import ToCSection, ToCSubsection
 
 # TODO rework into new class hierarchy
 

app/parsing/cr/refresh_cr.py → src/parsing/cr/refresh_cr.py

@@ -4,14 +4,14 @@
 
 import requests
 
-from app.database import operations as ops
-from app.database.db import SessionLocal
-from app.difftool.diffmaker import CRDiffMaker
-from app.parsing.cr import extract_cr
-from app.resources import static_paths as paths
-from app.resources.cache import GlossaryCache, KeywordCache
-from app.utils import notifier
-from app.utils.logger import logger
+from src.database import operations as ops
+from src.database.db import SessionLocal
+from src.difftool.diffmaker import CRDiffMaker
+from src.parsing.cr import extract_cr
+from src.resources import static_paths as paths
+from src.resources.cache import GlossaryCache, KeywordCache
+from src.utils import notifier
+from src.utils.logger import logger
 
 
 def get_response_text(response: requests.Response) -> str | None:

app/parsing/cr_scraper.py → src/parsing/cr_scraper.py

@@ -3,9 +3,9 @@
 import requests
 from bs4 import BeautifulSoup
 
-from app.database import operations as ops
-from app.database.db import SessionLocal
-from app.utils.logger import logger
+from src.database import operations as ops
+from src.database.db import SessionLocal
+from src.utils.logger import logger
 
 from ..utils.notifier import notify_new_cr, notify_scrape_error
 

app/parsing/docs_scraper.py → src/parsing/docs_scraper.py

@@ -5,10 +5,10 @@
 import requests
 from sqlalchemy.orm import Session
 
-from app.database import operations as ops
-from app.database.db import SessionLocal
-from app.database.models import PendingRedirect
-from app.utils.logger import logger
+from src.database import operations as ops
+from src.database.db import SessionLocal
+from src.database.models import PendingRedirect
+from src.utils.logger import logger
 
 from ..utils.notifier import notify_new_doc, notify_scrape_error
 

app/parsing/ipg/refresh_ipg.py → src/parsing/ipg/refresh_ipg.py

@@ -1,7 +1,7 @@
-from app.database import operations as ops
-from app.database.db import SessionLocal
-from app.database.models import Ipg
-from app.parsing.utils.download_doc import download_doc
+from src.database import operations as ops
+from src.database.db import SessionLocal
+from src.database.models import Ipg
+from src.parsing.utils.download_doc import download_doc
 
 
 def refresh_ipg(link: str):

app/parsing/mtr/extract_mtr.py → src/parsing/mtr/extract_mtr.py

@@ -6,7 +6,7 @@
 
 from tika import parser
 
-from app.utils.response_models import MtrChunk
+from src.utils.response_models import MtrChunk
 
 
 class ParagraphSplitter:

app/parsing/mtr/refresh_mtr.py → src/parsing/mtr/refresh_mtr.py

@@ -1,12 +1,12 @@
 from datetime import date
 from pathlib import Path
 
-from app.database import operations as ops
-from app.database.db import SessionLocal
-from app.database.models import PendingMtr, PendingMtrDiff
-from app.difftool.diffmaker import MtrDiffMaker
-from app.parsing.mtr.extract_mtr import extract
-from app.parsing.utils.download_doc import download_doc
+from src.database import operations as ops
+from src.database.db import SessionLocal
+from src.database.models import PendingMtr, PendingMtrDiff
+from src.difftool.diffmaker import MtrDiffMaker
+from src.parsing.mtr.extract_mtr import extract
+from src.parsing.utils.download_doc import download_doc
 
 
 def refresh_mtr(link: str):

app/parsing/utils/download_doc.py → src/parsing/utils/download_doc.py

@@ -3,7 +3,7 @@
 
 import requests
 
-from app.resources import static_paths as paths
+from src.resources import static_paths as paths
 
 
 def download_doc(link: str, kind: Literal["mtr", "ipg"]):

app/resources/seeder.py → src/resources/seeder.py

@@ -1,7 +1,7 @@
 import os
 from pathlib import Path
 
-from app.utils.logger import logger
+from src.utils.logger import logger
 
 from . import static_paths as paths
 

app/resources/static_paths.py → src/resources/static_paths.py

@@ -7,6 +7,6 @@
 structured_rules_dict = __gen + "/cr-structured.json"
 unofficial_glossary_dict = __dir + "/unofficial-glossary.json"
 
-docs_dir = "app/static/raw_docs"
-cr_dir = "app/static/raw_docs/cr"
+docs_dir = "src/static/raw_docs"
+cr_dir = "src/static/raw_docs/cr"
 current_cr = cr_dir + "/cr-current.txt"

app/routers/link.py → src/routers/link.py

@@ -2,7 +2,7 @@
 from fastapi.responses import RedirectResponse
 from sqlalchemy.orm import Session
 
-from app.openapi.no422 import no422
+from src.openapi.no422 import no422
 
 from ..database import operations as ops
 from ..database.db import get_db

app/routers/mtr.py → src/routers/mtr.py

@@ -1,9 +1,9 @@
 from fastapi import APIRouter, Depends, HTTPException
 from sqlalchemy.orm import Session
 
-from app.database import operations as ops
-from app.database.db import get_db
-from app.utils.response_models import Error, Mtr, MtrChunk
+from src.database import operations as ops
+from src.database.db import get_db
+from src.utils.response_models import Error, Mtr, MtrChunk
 
 router = APIRouter()
 

app/routers/rawfile.py → src/routers/rawfile.py

@@ -43,7 +43,7 @@ def raw_latest_cr(db: Session = Depends(get_db)):
     route may be better suited for you.
     """
     file_name = ops.get_latest_cr_filename(db)
-    path = "app/static/raw_docs/cr/" + file_name  # FIXME hardcoded path
+    path = "src/static/raw_docs/cr/" + file_name  # FIXME hardcoded path
     return FileResponse(path)
 
 
@@ -73,7 +73,7 @@ async def raw_cr_by_set_code(
         response.status_code = 404
         return {"detail": "CR for this set not available in specified format"}
 
-    path = "app/static/raw_docs/cr/" + file_name  # FIXME hardcoded path
+    path = "src/static/raw_docs/cr/" + file_name  # FIXME hardcoded path
     return FileResponse(path)
 
 
@@ -96,7 +96,7 @@ async def raw_ipg_by_date(
         response.status_code = 404
         return {"detail": "IPG not available for this date"}
 
-    path = "app/static/raw_docs/ipg/" + file_name  # FIXME hardcoded path
+    path = "src/static/raw_docs/ipg/" + file_name  # FIXME hardcoded path
     return FileResponse(path)
 
 
@@ -119,5 +119,5 @@ async def raw_mtr_by_date(
         response.status_code = 404
         return {"detail": "MTR not available for this date"}
 
-    path = "app/static/raw_docs/mtr/" + file_name  # FIXME hardcoded path
+    path = "src/static/raw_docs/mtr/" + file_name  # FIXME hardcoded path
     return FileResponse(path)

app/routers/rule.py → src/routers/rule.py

@@ -5,7 +5,7 @@
 from sqlalchemy.orm import Session
 from thefuzz import fuzz, process
 
-from app.openapi.no422 import no422
+from src.openapi.no422 import no422
 
 from ..database import operations as ops
 from ..database.db import get_db

app/routers/rule_deprecated.py → src/routers/rule_deprecated.py

@@ -4,7 +4,7 @@
 from fastapi.responses import FileResponse
 from sqlalchemy.orm import Session
 
-from app.openapi.no422 import no422
+from src.openapi.no422 import no422
 
 from ..database import operations as ops
 from ..database.db import get_db

app/routers/unofficial_glossary_deprecated.py → src/routers/unofficial_glossary_deprecated.py

@@ -1,8 +1,8 @@
 from fastapi import APIRouter
 from fastapi.responses import FileResponse
 
-from app.resources import static_paths as paths
-from app.utils.response_models import GlossaryTerm
+from src.resources import static_paths as paths
+from src.utils.response_models import GlossaryTerm
 
 router = APIRouter()
 

app/utils/backup.py → src/utils/backup.py

@@ -6,9 +6,9 @@
 from botocore.exceptions import ClientError
 from dotenv import load_dotenv
 
-from app.resources import static_paths as paths
-from app.utils import notifier
-from app.utils.logger import logger
+from src.resources import static_paths as paths
+from src.utils import notifier
+from src.utils.logger import logger
 
 load_dotenv()
 

app/utils/trace.py → src/utils/trace.py

@@ -1,5 +1,5 @@
-from app.database.models import CrDiffItem, DiffItemKind
-from app.utils.response_models import CRDiffMetadata, TraceDiffRule, TraceItem, TraceItemAction
+from src.database.models import CrDiffItem, DiffItemKind
+from src.utils.response_models import CRDiffMetadata, TraceDiffRule, TraceItem, TraceItemAction
 
 
 def format_trace_item(db_item: CrDiffItem) -> TraceItem: