Merge pull request #77 from jowilf/dev

Add additional Ruff rules & update dependencies

Author: jowilf

.github/workflows/test.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [ "3.7", "3.8", "3.9", "3.10","3.11" ]
+        python-version: [ "3.8", "3.9", "3.10","3.11" ]
 
     services:
       postgres:

.pre-commit-config.yaml

@@ -12,19 +12,18 @@ repos:
     -   id: end-of-file-fixer
     -   id: trailing-whitespace
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v3.3.1
+    rev: v3.9.0
     hooks:
     -   id: pyupgrade
         args:
-        - --py3-plus
-        - --keep-runtime-typing
+        - --py38-plus
 -   repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.0.254
+    rev: v0.0.277
     hooks:
     -   id: ruff
         args:
         - --fix
 -   repo: https://github.com/psf/black
-    rev: 23.1.0
+    rev: 23.7.0
     hooks:
     -   id: black

README.md

@@ -111,8 +111,8 @@ engine = create_engine(
 )
 Base.metadata.create_all(engine)
 
-with Session(engine) as session:
-    session.add(Attachment(name="attachment1", content=open("./example.txt", "rb")))
+with Session(engine) as session, open("./example.txt", "rb") as local_file:
+    session.add(Attachment(name="attachment1", content=local_file))
     session.add(Attachment(name="attachment2", content=b"Hello world"))
     session.add(Attachment(name="attachment3", content="Hello world"))
     file = File(content="Hello World", filename="hello.txt", content_type="text/plain")

docs/index.md

@@ -110,8 +110,8 @@ engine = create_engine(
 )
 Base.metadata.create_all(engine)
 
-with Session(engine) as session:
-    session.add(Attachment(name="attachment1", content=open("./example.txt", "rb")))
+with Session(engine) as session, open("./example.txt", "rb") as local_file:
+    session.add(Attachment(name="attachment1", content=local_file))
     session.add(Attachment(name="attachment2", content=b"Hello world"))
     session.add(Attachment(name="attachment3", content="Hello world"))
     file = File(content="Hello World", filename="hello.txt", content_type="text/plain")

docs_src/example.py

@@ -30,8 +30,8 @@ class Attachment(Base):
 )
 Base.metadata.create_all(engine)
 
-with Session(engine) as session:
-    session.add(Attachment(name="attachment1", content=open("./example.txt", "rb")))
+with Session(engine) as session, open("./example.txt", "rb") as local_file:
+    session.add(Attachment(name="attachment1", content=local_file))
     session.add(Attachment(name="attachment2", content=b"Hello world"))
     session.add(Attachment(name="attachment3", content="Hello world"))
     file = File(content="Hello World", filename="hello.txt", content_type="text/plain")

docs_src/tutorial/quick-start/save_your_model.py

@@ -30,8 +30,8 @@ class Attachment(Base):
 )
 Base.metadata.create_all(engine)
 
-with Session(engine) as session:
-    session.add(Attachment(name="attachment1", content=open("./example.txt", "rb")))
+with Session(engine) as session, open("./example.txt", "rb") as local_file:
+    session.add(Attachment(name="attachment1", content=local_file))
     session.add(Attachment(name="attachment2", content=b"Hello world"))
     session.add(Attachment(name="attachment3", content="Hello world"))
     # Use sqlalchemy_file.File object to provide custom filename and content_type

docs_src/tutorial/using-files-in-models/007_multiple_file.py

@@ -29,14 +29,14 @@ class Attachment(Base):
 )
 Base.metadata.create_all(engine)
 
-with Session(engine) as session:
+with Session(engine) as session, open("./example.txt", "rb") as file:
     session.add(
         Attachment(
             name="attachment1",
             multiple_content=[
                 "from str",
                 b"from bytes",
-                open("./example.txt", "rb"),
+                file,
                 File(
                     content="Hello World",
                     filename="hello.txt",

docs_src/tutorial/using-files-in-models/008_file_information.py

@@ -30,8 +30,8 @@ class Attachment(Base):
 )
 Base.metadata.create_all(engine)
 
-with Session(engine) as session:
-    session.add(Attachment(name="attachment1", content=open("./example.txt", "rb")))
+with Session(engine) as session, open("./example.txt", "rb") as local_file:
+    session.add(Attachment(name="attachment1", content=local_file))
     session.add(Attachment(name="attachment2", content=b"Hello world"))
     session.add(Attachment(name="attachment3", content="Hello world"))
     file = File(content="Hello World", filename="hello.txt", content_type="text/plain")

examples/fastapi/app.py

@@ -1,3 +1,4 @@
+import contextlib
 import os
 from typing import Generator, List, Optional, Union
 
@@ -31,13 +32,10 @@
 os.makedirs("./upload_dir", 0o777, exist_ok=True)
 driver = get_driver(Provider.LOCAL)("./upload_dir")
 
-# cls = get_driver(Provider.MINIO)
-# driver = cls("minioadmin", "minioadmin", secure=False, host="127.0.0.1", port=9000)
 
-try:
+with contextlib.suppress(ContainerAlreadyExistsError):
     driver.create_container(container_name="category")
-except ContainerAlreadyExistsError:
-    pass
+
 
 container = driver.get_container(container_name="category")
 
@@ -135,7 +133,7 @@ async def serve_files(storage: str = Path(...), file_id: str = Path(...)):
             return FileResponse(
                 file.get_cdn_url(), media_type=file.content_type, filename=file.filename
             )
-        elif file.get_cdn_url() is not None:
+        elif file.get_cdn_url() is not None:  # noqa: RET505
             """If file has public url, redirect to this url"""
             return RedirectResponse(file.get_cdn_url())
         else:

examples/flask/app.py

@@ -1,3 +1,4 @@
+import contextlib
 import os
 
 from flask_sqlalchemy import SQLAlchemy
@@ -87,7 +88,7 @@ def serve_files(storage, file_id):
                 mimetype=file.content_type,
                 download_name=file.filename,
             )
-        elif file.get_cdn_url() is not None:
+        elif file.get_cdn_url() is not None:  # noqa: RET505
             """If file has public url, redirect to this url"""
             return app.redirect(file.get_cdn_url())
         else:
@@ -105,17 +106,18 @@ def serve_files(storage, file_id):
     os.makedirs("./upload_dir", 0o777, exist_ok=True)
     driver = get_driver(Provider.LOCAL)("./upload_dir")
 
-    # cls = get_driver(Provider.MINIO)
-    # driver = cls("minioadmin", "minioadmin", secure=False, host="127.0.0.1", port=9000)
+    """
+    Or with MinIO:
 
-    try:
+    cls = get_driver(Provider.MINIO)
+    driver = cls("minioadmin", "minioadmin", secure=False, host="127.0.0.1", port=9000)
+    """
+
+    with contextlib.suppress(ContainerAlreadyExistsError):
         driver.create_container(container_name="images")
-    except ContainerAlreadyExistsError:
-        pass
-    try:
+
+    with contextlib.suppress(ContainerAlreadyExistsError):
         driver.create_container(container_name="documents")
-    except ContainerAlreadyExistsError:
-        pass
 
     StorageManager.add_storage("images", driver.get_container(container_name="images"))
     StorageManager.add_storage(