diff --git a/.gitignore b/.gitignore index 52364cd..06c7873 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,6 @@ uv.lock **/*.kdbx* .compose_repository -__pycache__/ +deployment/ **/dist/ **/*.log diff --git a/src/karl/api/v1.py b/src/karl/api/v1.py index de85719..8a529ab 100644 --- a/src/karl/api/v1.py +++ b/src/karl/api/v1.py @@ -8,8 +8,7 @@ from starlette.responses import JSONResponse, Response from karl.api.models import Request from karl.core.injects import AutowireSupport -from karl.core.woodpecker import Woodpecker -from karl.model.webhook import WoodpeckerEvent +from karl.model.webhook import WoodpeckerEvent, ReloadEvent router = APIRouter() logger = logging.getLogger(__name__) @@ -21,7 +20,6 @@ async def root(): @cbv(router) class APIv1: - woodpecker: Woodpecker = Depends(AutowireSupport.woodpecker) bus: EventBus = Depends(AutowireSupport.bus) def __init__(self): @@ -39,3 +37,10 @@ class APIv1: async def ci(self, request: Request): await self.bus.dispatch(mapper.map(request)) return Response(status_code=201) + + @router.get("/reload", summary="Manual service reload") + async def reload(self, service: str = None) -> Response: + if service is None: + return Response(status_code=400) + await self.bus.dispatch(ReloadEvent(service=service)) + return Response(status_code=201) diff --git a/src/karl/config/settings.py b/src/karl/config/settings.py index 79e66c9..8e20b51 100644 --- a/src/karl/config/settings.py +++ b/src/karl/config/settings.py @@ -51,4 +51,8 @@ class Settings(BaseSettings): @lru_cache def get_settings() -> Settings: - return Settings.from_yaml() + paths = ['deployment/config.yaml', 'config/config.yaml'] + for path in paths: + if Path(path).exists(): + return Settings.from_yaml(path) + raise Exception("Config file not found") diff --git a/src/karl/core/injects.py b/src/karl/core/injects.py index 34a6280..b52451b 100644 --- a/src/karl/core/injects.py +++ b/src/karl/core/injects.py @@ -1,6 +1,7 @@ from bubus import EventBus from injectable import inject +from karl.core.reload import ReloadService from karl.core.woodpecker import Woodpecker @@ -10,6 +11,10 @@ class AutowireSupport: def woodpecker(): return inject(Woodpecker) + @staticmethod + def reload(): + return inject(ReloadService) + @staticmethod def bus(): return inject(EventBus) diff --git a/src/karl/core/reload.py b/src/karl/core/reload.py new file mode 100644 index 0000000..f3975c4 --- /dev/null +++ b/src/karl/core/reload.py @@ -0,0 +1,48 @@ +import logging +from datetime import datetime +from pathlib import Path +from typing import Annotated + +from bubus import EventBus +from injectable import injectable, autowired, Autowired + +from karl import get_settings +from model.webhook import ReloadEvent, WoodpeckerEvent +from services import GitService + +logger = logging.getLogger(__name__) + + +@injectable(singleton=True) +class ReloadService: + + @autowired + def __init__(self, bus: Annotated[EventBus, Autowired]): + self._bus = bus + self._git = GitService() + bus.on(ReloadEvent, self.on_reload) + self.root_path = get_settings().git.path + logger.info("ReloadService initialized.") + + async def on_reload(self, event: ReloadEvent): + try: + logger.info(f"Received ReloadEvent: {event.service}") + head = self._git.get_head() + file_path = Path(self.root_path) / f"files/{event.service}" + if not file_path.exists(): + raise Exception(f"Service {event.service} not found: {file_path.absolute()} does not exist.") + logger.debug(f"Found service files at {file_path}: {', '.join([str(f) for f in list(file_path.iterdir())])}") + mos = list(file_path.glob('*.mo.*')) + logger.debug(f"Found {len(mos)} .mo files") + we = WoodpeckerEvent( + _id=-1, + commit=head.sha, + ref=head.branch, + message=f"Manual reload of {event.service}", + started=int(datetime.now().timestamp()), + files=[f"compose/{event.service}/docker-compose.yml"] + [str(pp).replace(str(self.root_path), '') for pp in mos] + ) + logger.debug(f"Sending Head: + if self._repo.head.is_detached: + return Head(self._repo.head.object.hexsha, "detached") + return Head( + self._repo.active_branch.commit.hexsha, + self._repo.active_branch.name + )