From e6c81a3884ba42ae34f0cb69fcfd3f83371a033a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?c=C4=83t=C4=83lin?= Date: Thu, 6 Mar 2025 18:49:16 +0100 Subject: [PATCH] fix: have uvicorn use Settings.port and Settings.host --- Dockerfile | 2 +- Makefile | 2 +- charts/huesoporro/Chart.yaml | 4 ++-- charts/huesoporro/values.yaml | 2 +- pyproject.toml | 2 +- src/apps/httpapi/litestar/main.py | 8 ++++++++ uv.lock | 2 +- 7 files changed, 15 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index f58efb1..87f5527 100644 --- a/Dockerfile +++ b/Dockerfile @@ -38,7 +38,7 @@ COPY --chown=$USERNAME migrations/ migrations/ FROM base AS serve -CMD ["make", "serve"] +CMD ["uv", "run", "uvicorn", "src.apps.httpapi.litestar.main:app"] FROM base AS migrate diff --git a/Makefile b/Makefile index b17fc9f..243b013 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ tests: uv run coverage xml serve: - uv run uvicorn src.apps.httpapi.litestar.main:app + uv run python src/apps/httpapi/litestar/main.py build: docker build . -t git.roboces.dev/catalin/$(PROJECT_NAME):$(PROJECT_TAG) --target $(PROJECT_TARGET) diff --git a/charts/huesoporro/Chart.yaml b/charts/huesoporro/Chart.yaml index 2147082..2f7c8f0 100644 --- a/charts/huesoporro/Chart.yaml +++ b/charts/huesoporro/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 -appVersion: 0.3.2 +appVersion: 0.3.3 description: A Helm chart for Kubernetes name: huesoporro type: application -version: 0.3.2 +version: 0.3.3 diff --git a/charts/huesoporro/values.yaml b/charts/huesoporro/values.yaml index 1c3bd9a..815bfda 100644 --- a/charts/huesoporro/values.yaml +++ b/charts/huesoporro/values.yaml @@ -8,7 +8,7 @@ fullnameOverride: '' image: pullPolicy: Always repository: git.roboces.dev/catalin/huesoporro - tag: 0.3.2 + tag: 0.3.3 imagePullSecrets: [] ingress: annotations: {} diff --git a/pyproject.toml b/pyproject.toml index 46b32ec..044ff55 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "huesoporro" -version = "0.3.2" +version = "0.3.3" description = "Misc Twitch bot" readme = "README.md" authors = [ diff --git a/src/apps/httpapi/litestar/main.py b/src/apps/httpapi/litestar/main.py index 44ee9c8..b24432f 100644 --- a/src/apps/httpapi/litestar/main.py +++ b/src/apps/httpapi/litestar/main.py @@ -1,4 +1,5 @@ import httpx +import uvicorn from litestar import Litestar, get from litestar.contrib.jinja import JinjaTemplateEngine from litestar.di import Provide @@ -113,3 +114,10 @@ def create_app(): app = create_app() + + +if __name__ == "__main__": + s = Settings.get() + config = uvicorn.Config("main:app", host=s.host, port=s.port, log_level="info") + server = uvicorn.Server(config) + server.run() diff --git a/uv.lock b/uv.lock index b349f89..b5c850d 100644 --- a/uv.lock +++ b/uv.lock @@ -517,7 +517,7 @@ wheels = [ [[package]] name = "huesoporro" -version = "0.3.0" +version = "0.3.3" source = { editable = "." } dependencies = [ { name = "aiosqlite" },