Update fastAPI==0.47.1 and specify pydantic==v1.4 to include v1 pydan…

…tic upgrades.

backend/app/app/api/api_v1/endpoints/users.py

@@ -2,7 +2,7 @@
 
 from fastapi import APIRouter, Body, Depends, HTTPException
 from fastapi.encoders import jsonable_encoder
-from pydantic.types import EmailStr
+from pydantic.networks import EmailStr
 from sqlalchemy.orm import Session
 
 from app import crud

backend/app/app/api/api_v1/endpoints/utils.py

@@ -1,5 +1,5 @@
 from fastapi import APIRouter, Depends, Security, HTTPException
-from pydantic.types import EmailStr
+from pydantic.networks import EmailStr
 from sqlalchemy.orm import Session
 
 from app import crud

backend/app/app/crud/farm_token.py

@@ -18,7 +18,7 @@ def create_farm_token(db: Session, token: FarmTokenCreate):
 
 def update_farm_token(db: Session, token: FarmToken, token_in: FarmTokenUpdate):
     token_data = jsonable_encoder(token)
-    update_data = token_in.dict(skip_defaults=True)
+    update_data = token_in.dict(exclude_unset=True)
     for field in token_data:
         if field in update_data:
             setattr(token, field, update_data[field])

backend/app/app/models/api_model.py

@@ -4,4 +4,4 @@
 class APIModel(BaseModel):
     class Config(BaseConfig):
         orm_mode = True
-        allow_population_by_alias = True
+        allow_population_by_field_name = True

backend/backend.dockerfile

@@ -1,6 +1,6 @@
 FROM tiangolo/uvicorn-gunicorn-fastapi:python3.7
 
-RUN pip install celery~=4.3 passlib[bcrypt] tenacity requests emails "fastapi==0.30.0" uvicorn gunicorn pyjwt python-multipart email_validator jinja2 psycopg2-binary alembic SQLAlchemy "farmOS==0.1.5"
+RUN pip install celery~=4.3 passlib[bcrypt] tenacity requests emails "fastapi==0.47.1" "pydantic==1.4" uvicorn gunicorn pyjwt python-multipart email_validator jinja2 psycopg2-binary alembic SQLAlchemy "farmOS==0.1.5"
 
 # For development, Jupyter remote kernel, Hydrogen
 # Using inside the container:

backend/celeryworker.dockerfile

@@ -1,6 +1,6 @@
 FROM python:3.7
 
-RUN pip install raven celery~=4.3 passlib[bcrypt] tenacity requests "fastapi==0.30.0" emails pyjwt email_validator jinja2 psycopg2-binary alembic SQLAlchemy "farmOS==0.1.5"
+RUN pip install raven celery~=4.3 passlib[bcrypt] tenacity requests "fastapi==0.47.1" "pydantic==1.4" emails pyjwt email_validator jinja2 psycopg2-binary alembic SQLAlchemy "farmOS==0.1.5"
 
 # For development, Jupyter remote kernel, Hydrogen
 # Using inside the container:

backend/tests.dockerfile

@@ -1,6 +1,6 @@
 FROM python:3.7
 
-RUN pip install requests pytest tenacity passlib[bcrypt] celery~=4.3 "fastapi==0.30.0" pyjwt psycopg2-binary SQLAlchemy "farmOS==0.1.5"
+RUN pip install requests pytest tenacity passlib[bcrypt] celery~=4.3 "fastapi==0.47.1" "pydantic==1.4" pyjwt psycopg2-binary SQLAlchemy "farmOS==0.1.5"
 
 # For development, Jupyter remote kernel, Hydrogen
 # Using inside the container: