Merge branch 'develop' into passwd

This commit is contained in:
Piotr Dec 2025-10-08 01:17:15 +02:00
commit c3fc2c290c
Signed by: stawros
GPG key ID: 74B18A3F0F1E99C0
3 changed files with 36 additions and 0 deletions

View file

@ -12,6 +12,12 @@ class AppConfig(BaseModel):
reload: bool = True
class GitConfig(BaseModel):
directory: str = "/opt/repo/sample"
branch: str = "master"
remote: str = "origin"
class KeePassConfig(BaseModel):
file: str = "database.kdbx"
secret: Path | str = "/run/secrets/kp_secret"
@ -20,6 +26,7 @@ class KeePassConfig(BaseModel):
class Settings(BaseSettings):
model_config = SettingsConfigDict(env_prefix="KARL_", env_nested_delimiter="__")
app: AppConfig = AppConfig()
git: GitConfig = GitConfig()
kp: KeePassConfig = KeePassConfig()
@classmethod

View file

@ -0,0 +1,28 @@
from git import Repo, Remote
from app.config import get_settings
class GitService:
def __init__(self):
self._settings = get_settings()
self._repo = Repo(self._settings.git.directory)
self._origin: Remote = self._repo.remotes.origin
def get_modified_compose(self) -> str | None:
self._update()
return self._diff()
def _update(self):
self._origin.pull()
def _diff(self) -> str | None:
diff = self._repo.head.commit.diff("HEAD~1")
composes = [f for f in diff if f.a_path.endswith("docker-compose.yml")]
match len(composes):
case 0:
return None
case 1:
return composes[0].a_path
case _:
raise Exception("Multiple compose files modified")

View file

@ -11,6 +11,7 @@ dependencies = [
"jinja2>=3.1.4",
"pydantic-settings>=2.4.0",
"pyyaml>=6.0.2",
"gitpython>=3.1.45",
"pykeepass>=4.1.1.post1"
]