diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 6fbf436..70e9a9d 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -25,5 +25,5 @@ }, }, // Needed for git security feature, and flux config - "postStartCommand": "git config --global --add safe.directory /workspaces/flux-python-api && flux R encode --hosts=$(hostname) > /etc/flux/system/R && sed -i 's@HOSTNAME@'$(hostname)'@' /etc/flux/system/conf.d/broker.toml && sudo service munge start" + "postStartCommand": "git config --global --add safe.directory /workspaces/flux-restful-api && flux R encode --hosts=$(hostname) > /etc/flux/system/R && sed -i 's@HOSTNAME@'$(hostname)'@' /etc/flux/system/conf.d/broker.toml && sudo service munge start" } diff --git a/CHANGELOG.md b/CHANGELOG.md index 4796af5..4324ad3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ and **Merged pull requests**. Critical items to know are: The versions coincide with releases on pip. Only major versions will be released as tags on Github. ## [0.0.x](https://github.com/flux-framework/flux-restful-api/tree/main) (0.0.x) + - Bump of pydantic/fastapi versions, adding pydantic-settings (0.1.14) - Ensure we update flux environment for user (0.1.13) - Add better multi-user mode - running jobs on behalf of user (0.1.12) - Restore original rpc to get job info (has more information) (0.1.11) diff --git a/VERSION b/VERSION index 7ac4e5e..71d6a66 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.1.13 +0.1.14 diff --git a/app/core/config.py b/app/core/config.py index e110733..0aa6ee9 100644 --- a/app/core/config.py +++ b/app/core/config.py @@ -5,7 +5,7 @@ import shlex import string -from pydantic import BaseSettings +from pydantic_settings import BaseSettings logger = logging.getLogger(__name__) diff --git a/app/library/auth.py b/app/library/auth.py index d247041..4b0c357 100644 --- a/app/library/auth.py +++ b/app/library/auth.py @@ -51,7 +51,11 @@ def check_auth( db, user_name=credentials.username, password=credentials.password ) if not user: - raise HTTPException(status_code=401, detail="Incorrect email or password", headers={"WWW-Authenticate": "Basic"}) + raise HTTPException( + status_code=401, + detail="Incorrect email or password", + headers={"WWW-Authenticate": "Basic"}, + ) elif not crud_user.is_active(user): raise HTTPException(status_code=400, detail="Inactive user") return credentials.username diff --git a/docs/requirements.txt b/docs/requirements.txt index 7cafd45..779feb7 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,6 +1,6 @@ sphinx<7.2 markupsafe -sphinx-immaterial>=0.11.6 +sphinx-immaterial>=0.11.6 numpy pydantic pandas diff --git a/requirements.txt b/requirements.txt index f670c80..fe4f732 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ requests==2.27.1 -fastapi==0.72.0 +fastapi uvicorn==0.17.0 python-dotenv==0.19.2 aiofiles==0.8.0 @@ -11,6 +11,7 @@ pyaml sqlalchemy # install also provides alembic binary alembic -pydantic==2.0.1 +pydantic +pydantic-settings python-jose[cryptography] passlib[bcrypt]