Fixed pytest configuration

Author: MrMatAP

.github/workflows/build.yml

@@ -71,7 +71,7 @@ jobs:
       run: |
         export PYTHONUSERBASE=${HOME}/.local
         pip install --user -r requirements.txt -r requirements.dev.txt
-        PYTHONPATH=${GITHUB_WORKSPACE}/src python -m pytest --cov=mrmat_python_api_fastapi
+        PYTHONPATH=${GITHUB_WORKSPACE}/src pytest
         PYTHONPATH=${GITHUB_WORKSPACE}/src python -m build --wheel -n
         ls build
 

pyproject.toml

@@ -50,7 +50,7 @@ init_forbid_extra = true
 init_typed = true
 warn_required_dynamic_aliases = true
 
-[pytest]
+[tool.pytest.ini_options]
 testpaths = 'tests'
 addopts = '--cov=mrmat_python_api_fastapi --cov-report=term --cov-report=xml:build/coverage.xml --junit-xml=build/junit.xml'
 junit_family = 'xunit2'

src/mrmat_python_api_fastapi/__init__.py

@@ -19,9 +19,14 @@
 #  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 #  SOFTWARE.
+from pydantic import BaseModel
 
 from .config import Config
 app_config = Config.from_json_file()
 
-from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.orm import declarative_base
 Base = declarative_base()
+
+
+class BaseSchema(BaseModel):
+    model_config = {'from_attributes': True}

src/mrmat_python_api_fastapi/apis/platform/v1/api.py

@@ -73,7 +73,7 @@ async def get_resource(uid: str,
                        response: Response,
                        session: Session = Depends(get_db)):
     try:
-        resource = session.query(Resource).get(uid)
+        resource = session.get(Resource, uid)
         if not resource:
             response.status_code = 404
             return StatusSchema(code=404, msg='The resource was not found')
@@ -124,15 +124,15 @@ async def create_resource(data: ResourceInputSchema,
 async def modify_resource(uid: str,
                           data: ResourceInputSchema,
                           response: Response,
-                          db: Session = Depends(get_db)):
+                          session: Session = Depends(get_db)):
     try:
-        resource = db.query(Resource).get(uid)
+        resource = session.get(Resource, uid)
         if not resource:
             response.status_code = 404
             return StatusSchema(code=404, msg='Not found')
         resource.name = data.name
-        db.add(resource)
-        db.commit()
+        session.add(resource)
+        session.commit()
         return ResourceSchema(uid=resource.uid,
                               owner_uid=resource.owner_uid,
                               name=resource.name)
@@ -158,7 +158,7 @@ async def remove_resource(uid: str,
                           response: Response,
                           session: Session = Depends(get_db)):
     try:
-        resource = session.query(Resource).get(uid)
+        resource = session.get(Resource, uid)
         if not resource:
             response.status_code = 410
             return StatusSchema(code=410, msg='The resource was already gone')
@@ -203,7 +203,7 @@ async def get_owner(uid: str,
                     response: Response,
                     session: Session = Depends(get_db)):
     try:
-        owner = session.query(Owner).get(uid)
+        owner = session.get(Owner, uid)
         if not owner:
             response.status_code = 404
             return StatusSchema(code=404, msg='The owner was not found')
@@ -250,15 +250,15 @@ async def create_owner(data: OwnerInputSchema,
 async def modify_owner(uid: str,
                        data: OwnerInputSchema,
                        response: Response,
-                       db: Session = Depends(get_db)):
+                       session: Session = Depends(get_db)):
     try:
-        owner = db.query(Owner).get(uid)
+        owner = session.get(Owner, uid)
         if not owner:
             response.status_code = 404
             return StatusSchema(code=404, msg='The owner was not found')
         owner.name = data.name
-        db.add(owner)
-        db.commit()
+        session.add(owner)
+        session.commit()
         return OwnerSchema(uid=owner.uid, name=owner.name)
     except SQLAlchemyError as e:
         raise HTTPException(status_code=500, detail="A database error occurred") from e
@@ -280,11 +280,14 @@ async def modify_owner(uid: str,
                })
 async def remove_owner(uid: str,
                        response: Response,
-                       db: Session = Depends(get_db)):
-    owner = db.query(Owner).get(uid)
-    if not owner:
-        response.status_code = status.HTTP_410_GONE
-        return
-    db.delete(owner)
-    db.commit()
-    response.status_code = status.HTTP_204_NO_CONTENT
+                       session: Session = Depends(get_db)):
+    try:
+        owner = session.get(Owner, uid)
+        if not owner:
+            response.status_code = status.HTTP_410_GONE
+            return
+        session.delete(owner)
+        session.commit()
+        response.status_code = status.HTTP_204_NO_CONTENT
+    except SQLAlchemyError as e:
+        raise HTTPException(status_code=500, detail="A database error occurred") from e

src/mrmat_python_api_fastapi/apis/platform/v1/schema.py

@@ -22,31 +22,25 @@
 
 import typing
 
-from pydantic import BaseModel
+from mrmat_python_api_fastapi import BaseSchema
 
-class OwnerInputSchema(BaseModel):
+
+class OwnerInputSchema(BaseSchema):
     name: str
 
 class OwnerSchema(OwnerInputSchema):
     uid: str
 
-    class Config:
-        from_attributes = True
-
-class OwnerListSchema(BaseModel):
+class OwnerListSchema(BaseSchema):
     owners: typing.List[OwnerSchema]
 
-class ResourceInputSchema(BaseModel):
+class ResourceInputSchema(BaseSchema):
     name: str
     owner_uid: str
 
-
 class ResourceSchema(ResourceInputSchema):
     uid: str
     name: str
 
-    class Config:
-        from_attributes = True
-
-class ResourceListSchema(BaseModel):
-    resources: typing.List[ResourceSchema]
+class ResourceListSchema(BaseSchema):
+    resources: typing.List[ResourceSchema]

src/mrmat_python_api_fastapi/db.py

@@ -31,7 +31,7 @@
 @lru_cache
 def get_db() -> Session:
     if app_config.db_url.startswith('sqlite'):
-        engine = create_engine(url=app_config.db_url, connect_args={'check_same_thread': False}, echo=True)
+        engine = create_engine(url=app_config.db_url, connect_args={'check_same_thread': False})
     else:
         engine = create_engine(url=app_config.db_url)
     session_local = sessionmaker(bind=engine)