Fix inconsistencies between course and e-book

jslvtr · web-flow · commit ee6df2b1e633 · 2022-11-07T11:06:22.000Z
- Wrong data type used in schemas.py
- Remove unused imports in 06/09/end
- Don't use gunicorn in Dockerfile of section 8 since it isn't introduced until later
diff --git a/docs/docs/05_flask_smorest/07_marshmallow_schemas/README.md b/docs/docs/05_flask_smorest/07_marshmallow_schemas/README.md
@@ -37,7 +37,7 @@ class ItemSchema(Schema):
     id = fields.Str(dump_only=True)
     name = fields.Str(required=True)
     price = fields.Float(required=True)
-    store_id = fields.Int(required=True)
+    store_id = fields.Str(required=True)
 ```
 
 A couple of weird things maybe!
diff --git a/docs/docs/05_flask_smorest/07_marshmallow_schemas/end/schemas.py b/docs/docs/05_flask_smorest/07_marshmallow_schemas/end/schemas.py
@@ -5,7 +5,7 @@ class ItemSchema(Schema):
     id = fields.Str(dump_only=True)
     name = fields.Str(required=True)
     price = fields.Float(required=True)
-    store_id = fields.Int(required=True)
+    store_id = fields.Str(required=True)
 
 
 class ItemUpdateSchema(Schema):
diff --git a/docs/docs/05_flask_smorest/08_validation_with_marshmallow/end/schemas.py b/docs/docs/05_flask_smorest/08_validation_with_marshmallow/end/schemas.py
@@ -5,7 +5,7 @@ class ItemSchema(Schema):
     id = fields.Str(dump_only=True)
     name = fields.Str(required=True)
     price = fields.Float(required=True)
-    store_id = fields.Int(required=True)
+    store_id = fields.Str(required=True)
 
 
 class ItemUpdateSchema(Schema):
diff --git a/docs/docs/05_flask_smorest/08_validation_with_marshmallow/start/schemas.py b/docs/docs/05_flask_smorest/08_validation_with_marshmallow/start/schemas.py
@@ -5,7 +5,7 @@ class ItemSchema(Schema):
     id = fields.Str(dump_only=True)
     name = fields.Str(required=True)
     price = fields.Float(required=True)
-    store_id = fields.Int(required=True)
+    store_id = fields.Str(required=True)
 
 
 class ItemUpdateSchema(Schema):
diff --git a/docs/docs/05_flask_smorest/09_decorating_responses/end/schemas.py b/docs/docs/05_flask_smorest/09_decorating_responses/end/schemas.py
@@ -5,7 +5,7 @@ class ItemSchema(Schema):
     id = fields.Str(dump_only=True)
     name = fields.Str(required=True)
     price = fields.Float(required=True)
-    store_id = fields.Int(required=True)
+    store_id = fields.Str(required=True)
 
 
 class ItemUpdateSchema(Schema):
diff --git a/docs/docs/05_flask_smorest/09_decorating_responses/start/schemas.py b/docs/docs/05_flask_smorest/09_decorating_responses/start/schemas.py
@@ -5,7 +5,7 @@ class ItemSchema(Schema):
     id = fields.Str(dump_only=True)
     name = fields.Str(required=True)
     price = fields.Float(required=True)
-    store_id = fields.Int(required=True)
+    store_id = fields.Str(required=True)
 
 
 class ItemUpdateSchema(Schema):
diff --git a/docs/docs/06_sql_storage_sqlalchemy/02_create_simple_sqlalchemy_model/start/schemas.py b/docs/docs/06_sql_storage_sqlalchemy/02_create_simple_sqlalchemy_model/start/schemas.py
@@ -5,7 +5,7 @@ class ItemSchema(Schema):
     id = fields.Str(dump_only=True)
     name = fields.Str(required=True)
     price = fields.Float(required=True)
-    store_id = fields.Int(required=True)
+    store_id = fields.Str(required=True)
 
 
 class ItemUpdateSchema(Schema):
diff --git a/docs/docs/06_sql_storage_sqlalchemy/09_delete_models_sqlalchemy/end/models/__init__.py b/docs/docs/06_sql_storage_sqlalchemy/09_delete_models_sqlalchemy/end/models/__init__.py
@@ -1,5 +1,2 @@
-from models.user import UserModel
 from models.item import ItemModel
-from models.tag import TagModel
 from models.store import StoreModel
-from models.item_tags import ItemsTags
diff --git a/docs/docs/06_sql_storage_sqlalchemy/09_delete_models_sqlalchemy/end/requirements.txt b/docs/docs/06_sql_storage_sqlalchemy/09_delete_models_sqlalchemy/end/requirements.txt
@@ -1,4 +1,5 @@
 flask
 flask-smorest
+flask-sqlalchemy
 python-dotenv
 marshmallow
diff --git a/docs/docs/08_flask_jwt_extended/04_flask_jwt_extended_setup/end/Dockerfile b/docs/docs/08_flask_jwt_extended/04_flask_jwt_extended_setup/end/Dockerfile
@@ -1,6 +1,7 @@
 FROM python:3.10
+EXPOSE 5000
 WORKDIR /app
 COPY ./requirements.txt requirements.txt
 RUN pip install --no-cache-dir --upgrade -r requirements.txt
 COPY . .
-CMD ["gunicorn", "--bind", "0.0.0.0:80", "app:create_app()"]
+CMD ["flask", "run", "--host", "0.0.0.0"]
diff --git a/docs/docs/08_flask_jwt_extended/04_flask_jwt_extended_setup/start/Dockerfile b/docs/docs/08_flask_jwt_extended/04_flask_jwt_extended_setup/start/Dockerfile
@@ -1,6 +1,7 @@
 FROM python:3.10
+EXPOSE 5000
 WORKDIR /app
 COPY ./requirements.txt requirements.txt
 RUN pip install --no-cache-dir --upgrade -r requirements.txt
 COPY . .
-CMD ["gunicorn", "--bind", "0.0.0.0:80", "app:create_app()"]
+CMD ["flask", "run", "--host", "0.0.0.0"]
diff --git a/docs/docs/08_flask_jwt_extended/05_user_model_and_schema/end/Dockerfile b/docs/docs/08_flask_jwt_extended/05_user_model_and_schema/end/Dockerfile
@@ -1,6 +1,7 @@
 FROM python:3.10
+EXPOSE 5000
 WORKDIR /app
 COPY ./requirements.txt requirements.txt
 RUN pip install --no-cache-dir --upgrade -r requirements.txt
 COPY . .
-CMD ["gunicorn", "--bind", "0.0.0.0:80", "app:create_app()"]
+CMD ["flask", "run", "--host", "0.0.0.0"]
diff --git a/docs/docs/08_flask_jwt_extended/05_user_model_and_schema/start/Dockerfile b/docs/docs/08_flask_jwt_extended/05_user_model_and_schema/start/Dockerfile
@@ -1,6 +1,7 @@
 FROM python:3.10
+EXPOSE 5000
 WORKDIR /app
 COPY ./requirements.txt requirements.txt
 RUN pip install --no-cache-dir --upgrade -r requirements.txt
 COPY . .
-CMD ["gunicorn", "--bind", "0.0.0.0:80", "app:create_app()"]
+CMD ["flask", "run", "--host", "0.0.0.0"]
diff --git a/docs/docs/08_flask_jwt_extended/06_registering_users_rest_api/end/Dockerfile b/docs/docs/08_flask_jwt_extended/06_registering_users_rest_api/end/Dockerfile
@@ -1,6 +1,7 @@
 FROM python:3.10
+EXPOSE 5000
 WORKDIR /app
 COPY ./requirements.txt requirements.txt
 RUN pip install --no-cache-dir --upgrade -r requirements.txt
 COPY . .
-CMD ["gunicorn", "--bind", "0.0.0.0:80", "app:create_app()"]
+CMD ["flask", "run", "--host", "0.0.0.0"]
diff --git a/docs/docs/08_flask_jwt_extended/06_registering_users_rest_api/start/Dockerfile b/docs/docs/08_flask_jwt_extended/06_registering_users_rest_api/start/Dockerfile
@@ -1,6 +1,7 @@
 FROM python:3.10
+EXPOSE 5000
 WORKDIR /app
 COPY ./requirements.txt requirements.txt
 RUN pip install --no-cache-dir --upgrade -r requirements.txt
 COPY . .
-CMD ["gunicorn", "--bind", "0.0.0.0:80", "app:create_app()"]
+CMD ["flask", "run", "--host", "0.0.0.0"]
diff --git a/docs/docs/08_flask_jwt_extended/07_login_users_rest_api/end/Dockerfile b/docs/docs/08_flask_jwt_extended/07_login_users_rest_api/end/Dockerfile
@@ -1,6 +1,7 @@
 FROM python:3.10
+EXPOSE 5000
 WORKDIR /app
 COPY ./requirements.txt requirements.txt
 RUN pip install --no-cache-dir --upgrade -r requirements.txt
 COPY . .
-CMD ["gunicorn", "--bind", "0.0.0.0:80", "app:create_app()"]
+CMD ["flask", "run", "--host", "0.0.0.0"]
diff --git a/docs/docs/08_flask_jwt_extended/07_login_users_rest_api/start/Dockerfile b/docs/docs/08_flask_jwt_extended/07_login_users_rest_api/start/Dockerfile
@@ -1,6 +1,7 @@
 FROM python:3.10
+EXPOSE 5000
 WORKDIR /app
 COPY ./requirements.txt requirements.txt
 RUN pip install --no-cache-dir --upgrade -r requirements.txt
 COPY . .
-CMD ["gunicorn", "--bind", "0.0.0.0:80", "app:create_app()"]
+CMD ["flask", "run", "--host", "0.0.0.0"]
diff --git a/docs/docs/08_flask_jwt_extended/08_protect_resources_with_jwt_required/end/Dockerfile b/docs/docs/08_flask_jwt_extended/08_protect_resources_with_jwt_required/end/Dockerfile
@@ -1,6 +1,7 @@
 FROM python:3.10
+EXPOSE 5000
 WORKDIR /app
 COPY ./requirements.txt requirements.txt
 RUN pip install --no-cache-dir --upgrade -r requirements.txt
 COPY . .
-CMD ["gunicorn", "--bind", "0.0.0.0:80", "app:create_app()"]
+CMD ["flask", "run", "--host", "0.0.0.0"]
diff --git a/docs/docs/08_flask_jwt_extended/08_protect_resources_with_jwt_required/start/Dockerfile b/docs/docs/08_flask_jwt_extended/08_protect_resources_with_jwt_required/start/Dockerfile
@@ -1,6 +1,7 @@
 FROM python:3.10
+EXPOSE 5000
 WORKDIR /app
 COPY ./requirements.txt requirements.txt
 RUN pip install --no-cache-dir --upgrade -r requirements.txt
 COPY . .
-CMD ["gunicorn", "--bind", "0.0.0.0:80", "app:create_app()"]
+CMD ["flask", "run", "--host", "0.0.0.0"]
diff --git a/docs/docs/08_flask_jwt_extended/09_jwt_claims_and_authorization/end/Dockerfile b/docs/docs/08_flask_jwt_extended/09_jwt_claims_and_authorization/end/Dockerfile
@@ -1,6 +1,7 @@
 FROM python:3.10
+EXPOSE 5000
 WORKDIR /app
 COPY ./requirements.txt requirements.txt
 RUN pip install --no-cache-dir --upgrade -r requirements.txt
 COPY . .
-CMD ["gunicorn", "--bind", "0.0.0.0:80", "app:create_app()"]
+CMD ["flask", "run", "--host", "0.0.0.0"]
diff --git a/docs/docs/08_flask_jwt_extended/09_jwt_claims_and_authorization/start/Dockerfile b/docs/docs/08_flask_jwt_extended/09_jwt_claims_and_authorization/start/Dockerfile
@@ -1,6 +1,7 @@
 FROM python:3.10
+EXPOSE 5000
 WORKDIR /app
 COPY ./requirements.txt requirements.txt
 RUN pip install --no-cache-dir --upgrade -r requirements.txt
 COPY . .
-CMD ["gunicorn", "--bind", "0.0.0.0:80", "app:create_app()"]
+CMD ["flask", "run", "--host", "0.0.0.0"]
diff --git a/docs/docs/08_flask_jwt_extended/10_logout_users_rest_api/end/Dockerfile b/docs/docs/08_flask_jwt_extended/10_logout_users_rest_api/end/Dockerfile
@@ -1,6 +1,7 @@
 FROM python:3.10
+EXPOSE 5000
 WORKDIR /app
 COPY ./requirements.txt requirements.txt
 RUN pip install --no-cache-dir --upgrade -r requirements.txt
 COPY . .
-CMD ["gunicorn", "--bind", "0.0.0.0:80", "app:create_app()"]
+CMD ["flask", "run", "--host", "0.0.0.0"]
diff --git a/docs/docs/08_flask_jwt_extended/10_logout_users_rest_api/start/Dockerfile b/docs/docs/08_flask_jwt_extended/10_logout_users_rest_api/start/Dockerfile
@@ -1,6 +1,7 @@
 FROM python:3.10
+EXPOSE 5000
 WORKDIR /app
 COPY ./requirements.txt requirements.txt
 RUN pip install --no-cache-dir --upgrade -r requirements.txt
 COPY . .
-CMD ["gunicorn", "--bind", "0.0.0.0:80", "app:create_app()"]
+CMD ["flask", "run", "--host", "0.0.0.0"]
diff --git a/docs/docs/08_flask_jwt_extended/12_token_refreshing_flask_jwt_extended/end/Dockerfile b/docs/docs/08_flask_jwt_extended/12_token_refreshing_flask_jwt_extended/end/Dockerfile
@@ -1,6 +1,7 @@
 FROM python:3.10
+EXPOSE 5000
 WORKDIR /app
 COPY ./requirements.txt requirements.txt
 RUN pip install --no-cache-dir --upgrade -r requirements.txt
 COPY . .
-CMD ["gunicorn", "--bind", "0.0.0.0:80", "app:create_app()"]
+CMD ["flask", "run", "--host", "0.0.0.0"]
diff --git a/docs/docs/08_flask_jwt_extended/12_token_refreshing_flask_jwt_extended/start/Dockerfile b/docs/docs/08_flask_jwt_extended/12_token_refreshing_flask_jwt_extended/start/Dockerfile
@@ -1,6 +1,7 @@
 FROM python:3.10
+EXPOSE 5000
 WORKDIR /app
 COPY ./requirements.txt requirements.txt
 RUN pip install --no-cache-dir --upgrade -r requirements.txt
 COPY . .
-CMD ["gunicorn", "--bind", "0.0.0.0:80", "app:create_app()"]
+CMD ["flask", "run", "--host", "0.0.0.0"]
