From beea425cfc48fca531070ad760b4ee91e1f2dd24 Mon Sep 17 00:00:00 2001 From: Crag Wolfe Date: Wed, 29 Mar 2023 11:43:51 -0700 Subject: [PATCH 1/5] chore: add sensible logging config --- Dockerfile | 1 + Makefile | 2 +- logger_config.yaml | 42 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 logger_config.yaml diff --git a/Dockerfile b/Dockerfile index 25138e338..18e0af111 100644 --- a/Dockerfile +++ b/Dockerfile @@ -65,4 +65,5 @@ COPY --chown=${NB_USER}:${NB_USER} pipeline-notebooks pipeline-notebooks EXPOSE 5000 ENTRYPOINT ["uvicorn", "prepline_general.api.app:app", \ + "--log-config", "logger_config.yaml", \ "--host", "0.0.0.0"] diff --git a/Makefile b/Makefile index ef9b9895f..13301f2db 100644 --- a/Makefile +++ b/Makefile @@ -76,7 +76,7 @@ docker-build: .PHONY: docker-start-api docker-start-api: - docker run -p 8000:8000 --mount type=bind,source=$(realpath .),target=/home/notebook-user/local -t --rm pipeline-family-${PIPELINE_FAMILY}-dev:latest + docker run -p 8000:8000 --mount type=bind,source=$(realpath .),target=/home/notebook-user/local -t --rm pipeline-family-${PIPELINE_FAMILY}-dev:latest --log-config logger_config.yaml --host 0.0.0.0 --port 8000 # Note(austin) we need to install the dev dependencies for this to work # Do we want to build separate dev images? diff --git a/logger_config.yaml b/logger_config.yaml new file mode 100644 index 000000000..4643575b8 --- /dev/null +++ b/logger_config.yaml @@ -0,0 +1,42 @@ +version: 1 +disable_existing_loggers: False +formatters: + default_format: + "()": uvicorn.logging.DefaultFormatter + format: '%(asctime)s %(name)s %(levelname)s %(message)s' + access: + "()": uvicorn.logging.AccessFormatter + format: '%(asctime)s %(client_addr)s %(request_line)s - %(status_code)s' +handlers: + access_handler: + formatter: access + class: logging.StreamHandler + stream: ext://sys.stderr + standard_handler: + formatter: default_format + class: logging.StreamHandler + stream: ext://sys.stderr +loggers: + uvicorn.error: + level: INFO + handlers: + - standard_handler + propagate: no + # disable logging for uvicorn.error by not having a handler + uvicorn.access: + level: INFO + handlers: + - access_handler + propagate: no + # disable logging for uvicorn.access by not having a handler + unstructured: + level: INFO + handlers: + - standard_handler + propagate: no + unstructured_inference: + level: DEBUG + handlers: + - standard_handler + propagate: no + From 6c61a4a273171d95af11d5bb4847f2c45fe11962 Mon Sep 17 00:00:00 2001 From: Crag Wolfe Date: Wed, 29 Mar 2023 11:44:21 -0700 Subject: [PATCH 2/5] version bump --- CHANGELOG.md | 4 ++++ preprocessing-pipeline-family.yaml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 87a384273..eedc91c1e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.0.8 + +* Sensible logging config + ## 0.0.7 * Minor version bump diff --git a/preprocessing-pipeline-family.yaml b/preprocessing-pipeline-family.yaml index b57c51f05..777a1b0cb 100644 --- a/preprocessing-pipeline-family.yaml +++ b/preprocessing-pipeline-family.yaml @@ -1,2 +1,2 @@ name: general -version: 0.0.7 +version: 0.0.8 From 540fdb86c21eb3c8f78f5152cabcf0556dab6cf9 Mon Sep 17 00:00:00 2001 From: Crag Wolfe Date: Wed, 29 Mar 2023 11:45:57 -0700 Subject: [PATCH 3/5] add to Dockerfile --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 18e0af111..d4510aa02 100644 --- a/Dockerfile +++ b/Dockerfile @@ -58,6 +58,7 @@ USER root RUN ln -s /home/notebook-user/.local/bin/pip /usr/local/bin/pip USER ${NB_USER} +COPY --chown=${NB_USER}:${NB_USER} logger_config.yaml logger_config.yaml COPY --chown=${NB_USER}:${NB_USER} prepline_${PIPELINE_PACKAGE}/ prepline_${PIPELINE_PACKAGE}/ COPY --chown=${NB_USER}:${NB_USER} exploration-notebooks exploration-notebooks COPY --chown=${NB_USER}:${NB_USER} pipeline-notebooks pipeline-notebooks From 90a38a79a700d9bcb2bbf10effe95fe18a56ac24 Mon Sep 17 00:00:00 2001 From: Crag Wolfe Date: Wed, 29 Mar 2023 11:47:53 -0700 Subject: [PATCH 4/5] add to non-docker Makefile target --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 13301f2db..6710086ef 100644 --- a/Makefile +++ b/Makefile @@ -100,7 +100,7 @@ run-jupyter: ## run-web-app: runs the FastAPI api with hot reloading .PHONY: run-web-app run-web-app: - PYTHONPATH=$(realpath .) uvicorn ${PACKAGE_NAME}.api.app:app --reload + PYTHONPATH=$(realpath .) uvicorn ${PACKAGE_NAME}.api.app:app --reload --log-config logger_config.yaml ################# # Test and Lint # From e3a7105fdd364536077edd1f180b9e21fb5a11fe Mon Sep 17 00:00:00 2001 From: Crag Wolfe Date: Wed, 29 Mar 2023 11:55:55 -0700 Subject: [PATCH 5/5] make generate-api --- prepline_general/api/general.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prepline_general/api/general.py b/prepline_general/api/general.py index b6a4bc2c6..b5b6c2e41 100644 --- a/prepline_general/api/general.py +++ b/prepline_general/api/general.py @@ -150,7 +150,7 @@ async def stream_response(self, send: Send) -> None: @router.post("/general/v0/general") -@router.post("/general/v0.0.7/general") +@router.post("/general/v0.0.8/general") def pipeline_1( request: Request, files: Union[List[UploadFile], None] = File(default=None),