Merge pull request #31 from ufcg-lsd/fixing_timeout_on_aws

Fixing timeout on aws

Author: Geraldo155

auth/.dockerignore

@@ -0,0 +1 @@
+.venv

auth/Dockerfile

@@ -1,23 +1,21 @@
 FROM python:3.12.11-slim
+COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
 LABEL org.opencontainers.image.authors="Hystax"
 
 WORKDIR /usr/src/app/
-ENV PYTHONPATH /usr/src/app/
 
 RUN apt-get update && apt-get install -y libsodium-dev \
     && apt-get autoremove -y \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
-COPY tools/optscale_exceptions tools/optscale_exceptions
-COPY tools/optscale_time tools/optscale_time
-COPY tools/optscale_password tools/optscale_password
-COPY optscale_client/config_client optscale_client/config_client
-COPY optscale_client/rest_api_client optscale_client/rest_api_client
+COPY tools tools
+COPY optscale_client optscale_client
 COPY auth/zoho_integrator auth/zoho_integrator
 
-COPY auth/requirements.txt auth/requirements.txt
-RUN pip install --no-cache-dir -r /usr/src/app/auth/requirements.txt
+COPY auth/__init__.py auth/__init__.py
+COPY auth/pyproject.toml auth/pyproject.toml
+COPY auth/uv.lock auth/uv.lock
 
 COPY auth/auth_server/alembic auth/auth_server/alembic
 COPY auth/auth_server/controllers auth/auth_server/controllers
@@ -27,7 +25,9 @@ COPY auth/auth_server/models auth/auth_server/models
 COPY auth/auth_server/*.py ./auth/auth_server/
 COPY auth/auth_server/alembic.template auth/auth_server/alembic.template
 COPY auth/auth_server/swagger auth/auth_server/swagger
-RUN python -u auth/auth_server/write_spec.py
 
-CMD ["python", "-u","/usr/src/app/auth/auth_server/server.py"]
+RUN uv --project auth sync --locked --no-dev
+RUN uv --project auth run python -u auth/auth_server/write_spec.py
+
+CMD ["uv", "--project", "auth", "run", "python", "-u", "/usr/src/app/auth/auth_server/server.py"]
 EXPOSE 8905

auth/Dockerfile_tests

@@ -1,11 +1,13 @@
 ARG BUILDTAG=build
 FROM auth:${BUILDTAG}
+COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
+
 LABEL org.opencontainers.image.authors="Hystax"
 
 COPY tools/check_alembic_down_revisions tools/check_alembic_down_revisions
 COPY optscale_client/auth_client /usr/src/app/optscale_client/auth_client
-COPY auth/test-requirements.txt auth/test-requirements.txt
-COPY auth/.pylintrc auth/.coveragerc ./auth/
-RUN pip install --no-cache-dir -r auth/test-requirements.txt
+COPY auth/.pylintrc auth/.coveragerc auth/pyproject.toml auth/uv.lock auth/__init__.py ./auth/
+
+RUN uv --project auth sync --locked
 
 COPY auth/auth_server/tests auth/auth_server/tests

auth/pyproject.toml

@@ -0,0 +1,51 @@
+[project]
+name = "auth"
+version = "0.1.0"
+requires-python = ">=3.12.11,<3.13"
+dependencies = [
+    "alembic==1.13.1",
+    "apispec==6.3.1",
+    "config-client",
+    "cryptography==44.0.1",
+    "google-auth==1.23.0",
+    "mysql-connector-python==9.1.0",
+    "optscale-exceptions",
+    "optscale-password",
+    "optscale-time",
+    "ordered-set==4.1.0",
+    "pyjwt>=2.4.0",
+    "pymacaroons==0.9.2",
+    "pyyaml==6.0.1",
+    "requests==2.32.4",
+    "restapi-client",
+    "sqlalchemy==1.3.24",
+    "tornado==6.5",
+    "zcrmsdk==3.1.0",
+]
+
+[build-system]
+requires = ["uv_build==0.8.15"]
+build-backend = "uv_build"
+
+[tool.uv.build-backend]
+module-root = ".."
+module-name = "auth"
+
+[tool.uv.sources]
+optscale-exceptions = { path = "../tools/optscale_exceptions" }
+optscale-time = { path = "../tools/optscale_time" }
+optscale-password = { path = "../tools/optscale_password" }
+config-client = { path = "../optscale_client/config_client" }
+restapi-client = { path = "../optscale_client/rest_api_client" }
+auth-client = { path = "../optscale_client/auth_client" }
+check-alembic-down-revisions = { path = "../tools/check_alembic_down_revisions" }
+
+[dependency-groups]
+dev = [
+    "auth-client",
+    "check-alembic-down-revisions",
+    "coverage==4.2",
+    "freezegun==0.3.8",
+    "pycodestyle==2.11.1",
+    "pylint==3.0.3",
+]

auth/requirements.txt

@@ -8,22 +8,22 @@ docker build -t ${TEST_IMAGE} --build-arg BUILDTAG=${BUILD_TAG} -f auth/Dockerfi
 
 echo "Pycodestyle tests>>>"
 docker run -i --rm ${TEST_IMAGE} \
-    bash -c "pycodestyle auth"
+    bash -c "uv --project auth run pycodestyle --exclude=.venv auth"
 echo "<<<Pycodestyle tests"
 
 echo "Pylint tests>>>"
 docker run -i --rm ${TEST_IMAGE} \
-    bash -c "pylint --rcfile=auth/.pylintrc --fail-under=9 --fail-on=E,C,F ./auth"
+    bash -c "uv --directory auth run pylint --fail-under=9 --fail-on=E,F ."
 echo "<<Pylint tests"
 
 echo "Alembic down revision tests>>>"
 docker run -i --rm ${TEST_IMAGE} bash -c \
-    "tools/check_alembic_down_revisions/check_alembic_down_revisions.py --alembic_versions_path auth/auth_server/alembic/versions"
+    "uv --project auth run tools/check_alembic_down_revisions/check_alembic_down_revisions.py --alembic_versions_path auth/auth_server/alembic/versions"
 echo "<<Alembic down revision tests"
 
 echo "Unit tests>>>"
 docker run -i --rm ${TEST_IMAGE} \
-    bash -c "python3 -m unittest discover ./auth/auth_server/tests"
+    bash -c "uv --project auth run python -m unittest discover ./auth/auth_server/tests"
 echo "<<Unit tests"
 
 docker rmi ${TEST_IMAGE}