Fixed build to docker

ingest/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.11-slim-bookworm
+FROM python:3.10-slim-bookworm
 
 SHELL ["/bin/bash", "-eux", "-o", "pipefail", "-c"]
 
@@ -15,12 +15,14 @@ RUN apt-get update \
 	&& rm -rf /var/lib/apt/lists/*
 
 COPY "./protobuf/datastore.proto" "/protobuf/datastore.proto"
-COPY "./api" "${DOCKER_PATH}/"
+COPY "./api" "${DOCKER_PATH}/api/"
 COPY "requirements.txt" "${DOCKER_PATH}/"
 COPY "./src/" "/ingest/src"
 COPY "./pyproject.toml" "/ingest/pyproject.toml"
+COPY "./setup.py" "/ingest/"
 
 RUN pip install --no-cache-dir --upgrade -r "${DOCKER_PATH}/requirements.txt"
+RUN pip install --no-cache-dir --upgrade pybind11
 
 # hadolint ignore=DL3013
 WORKDIR /ingest/src/ingest/bufr/
@@ -39,4 +41,4 @@ RUN python -m grpc_tools.protoc  \
 
 
 WORKDIR "${DOCKER_PATH}"
-CMD ["gunicorn", "main:app", "--workers=4", "--worker-class=uvicorn.workers.UvicornWorker", "--bind=0.0.0.0:8000"]
+CMD ["gunicorn", "api.main:app", "--workers=4", "--worker-class=uvicorn.workers.UvicornWorker", "--bind=0.0.0.0:8001"]

ingest/requirements.txt

@@ -1,12 +1,10 @@
-xarray == 2023.7.0
-netCDF4 ~= 1.6.4
 numpy ~= 1.25.2
 paho-mqtt ~= 1.6.1
 gunicorn~=21.2
 jsonschema ~= 4.19.0
-pybind11 == 2.11.1
 protobuf ~= 4.24.3
 grpcio == 1.59.0
 fastapi == 0.108.0
 grpcio-tools==1.58.0
 uvicorn==0.25.0
+python-multipart~=0.0.9

ingest/setup.py

@@ -5,8 +5,8 @@
 
 ext_modules = [
     Pybind11Extension(
-        "esoh.ingest.bufr.bufresohmsg_py",
-        sorted(glob("src/esoh/ingest/bufr/*.cpp")),  # Sort source files for reproducibility
+        "ingest.bufr.bufresohmsg_py",
+        sorted(glob("src/ingest/bufr/*.cpp")),  # Sort source files for reproducibility
         extra_compile_args=["-std=c++17"],
     ),
 ]

ingest/src/ingest/bufr/create_mqtt_message_from_bufr.py

@@ -3,12 +3,12 @@
 import os
 import sys
 
-from bufr.bufresohmsg_py import bufresohmsg_py
-from bufr.bufresohmsg_py import bufrlog_clear_py
-from bufr.bufresohmsg_py import bufrlog_py
-from bufr.bufresohmsg_py import init_bufr_schema_py
-from bufr.bufresohmsg_py import init_bufrtables_py
-from bufr.bufresohmsg_py import init_oscar_py
+from ingest.bufr.bufresohmsg_py import bufresohmsg_py
+from ingest.bufr.bufresohmsg_py import bufrlog_clear_py
+from ingest.bufr.bufresohmsg_py import bufrlog_py
+from ingest.bufr.bufresohmsg_py import init_bufr_schema_py
+from ingest.bufr.bufresohmsg_py import init_bufrtables_py
+from ingest.bufr.bufresohmsg_py import init_oscar_py
 
 
 def build_all_json_payloads_from_bufr(bufr_file_path: str) -> list[str]: