Sort imports

src/opencdeserver/api/app/api/bcf.py

@@ -1,19 +1,16 @@
 from uuid import UUID
-from fastapi import APIRouter, Depends, UploadFile, HTTPException
+
+from fastapi import APIRouter, Depends, HTTPException, UploadFile
 from fastapi.responses import FileResponse
-
-from security.secure import get_current_active_user
-
 from models.bcf_request import *
 from models.bcf_response import *
-from models.request import *
 from models.other import *
-
+from models.request import *
 from repository.bcf import bcf_db
+from security.secure import get_current_active_user
 
 from api.logging import LoggingRoute
 
-
 router = APIRouter(route_class=LoggingRoute)
 
 # ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ----

src/opencdeserver/api/app/api/documents.py

@@ -1,27 +1,22 @@
 import collections
 import os
 import shutil
-import traceback
 import sys
-
-from fastapi import HTTPException, status, APIRouter, Request, Depends
-from fastapi import UploadFile, Form
-from fastapi.responses import FileResponse, HTMLResponse
-from fastapi.templating import Jinja2Templates
-from fastapi.encoders import jsonable_encoder
-
+import traceback
 from typing import Union
 from uuid import UUID, uuid4
 
-from pydantic import ValidationError
-from security.secure import get_current_active_user
-
-from repository.documents import doc_db
-
-from models.documents_request import *
-from models.documents_response import *
+from fastapi import APIRouter, Depends, Form, HTTPException, Request, UploadFile, status
+from fastapi.encoders import jsonable_encoder
+from fastapi.responses import FileResponse, HTMLResponse
+from fastapi.templating import Jinja2Templates
 from models.documents_common import *
 from models.documents_other import *
+from models.documents_request import *
+from models.documents_response import *
+from pydantic import ValidationError
+from repository.documents import doc_db
+from security.secure import get_current_active_user
 
 from api.logging import LoggingRoute
 

src/opencdeserver/api/app/api/foundation.py

@@ -1,21 +1,16 @@
 import os
-
 from typing import Optional
-
-from fastapi import APIRouter, Request, Form
-from fastapi import Depends, HTTPException, status
-from fastapi.security import HTTPBasicCredentials, HTTPBasic
-from fastapi.responses import HTMLResponse
-from fastapi.templating import Jinja2Templates
-
-from models.request import *
-
-from repository.foundation import foundation_db
-from security.secure import authenticate_user, get_current_active_user
-
 from uuid import uuid4
+
+from fastapi import APIRouter, Depends, Form, HTTPException, Request, status
+from fastapi.responses import HTMLResponse
+from fastapi.security import HTTPBasic, HTTPBasicCredentials
+from fastapi.templating import Jinja2Templates
+from models.request import *
+from repository.foundation import foundation_db
+from security.secure import authenticate_user, get_current_active_user, get_secrets
+
 from api.logging import LoggingRoute
-from security.secure import get_secrets
 
 secrets = get_secrets()
 

src/opencdeserver/api/app/api/logging.py

@@ -1,11 +1,12 @@
-from fastapi import FastAPI, APIRouter, Response, Request
+import logging
+from collections.abc import Callable
+
+import httpx
+from fastapi import APIRouter, FastAPI, Request, Response
+from fastapi.routing import APIRoute
 from starlette.background import BackgroundTask
 from starlette.responses import StreamingResponse
-from fastapi.routing import APIRoute
 from starlette.types import Message
-from collections.abc import Callable
-import logging
-import httpx
 
 
 def log_info(req_body, res_body, route_url):

src/opencdeserver/api/app/api/user.py

@@ -1,23 +1,19 @@
 import collections
 import os
-import traceback
 import sys
-
-from fastapi import APIRouter, Request, Depends
-from fastapi.responses import FileResponse, HTMLResponse
-from fastapi.templating import Jinja2Templates
-from fastapi.encoders import jsonable_encoder
-
+import traceback
 from uuid import UUID
 
-from pydantic import ValidationError
-from security.secure import get_current_active_user
-
-from repository.documents import doc_db
-
+from fastapi import APIRouter, Depends, Request
+from fastapi.encoders import jsonable_encoder
+from fastapi.responses import FileResponse, HTMLResponse
+from fastapi.templating import Jinja2Templates
+from models.documents_other import *
 from models.documents_request import *
 from models.documents_response import *
-from models.documents_other import *
+from pydantic import ValidationError
+from repository.documents import doc_db
+from security.secure import get_current_active_user
 
 from api.logging import LoggingRoute
 

src/opencdeserver/api/app/database/neo4j.py

@@ -1,15 +1,12 @@
-import jsonpickle
 import os
-import pytz
-
-from dateutil import parser
-from uuid import uuid4, UUID
-
-from neo4j import GraphDatabase
-
 from datetime import datetime, timezone
+from uuid import UUID, uuid4
 
+import jsonpickle
+import pytz
+from dateutil import parser
 from models.request import UserInDB
+from neo4j import GraphDatabase
 from security.secrets import get_secrets
 
 get_secrets()

src/opencdeserver/api/app/ifcgraph/ifcgraph.py

@@ -18,11 +18,12 @@
 # Some modifications have been made to the code.
 #
 
-from py2neo.data import Node, Relationship
 from uuid import uuid4
+
 import ifcopenshell
 import ifcopenshell.util.schema
 from py2neo import Graph
+from py2neo.data import Node, Relationship
 
 
 # Create the basic node with literal attributes and the class hierarchy

src/opencdeserver/api/app/main.py

@@ -1,12 +1,9 @@
+from api import bcf, documents, foundation
 from fastapi import FastAPI, Request
-from fastapi.responses import HTMLResponse, FileResponse
 from fastapi.middleware.cors import CORSMiddleware
+from fastapi.responses import FileResponse, HTMLResponse
 from fastapi.templating import Jinja2Templates
 
-from api import foundation
-from api import bcf
-from api import documents
-
 endpoint_metadata = [
     {"name": "api_versions_get", "description": "/foundation/versions"},
     {"name": "foundation_auth_get", "description": "/foundation/1.0/auth"},

src/opencdeserver/api/app/models/bcf_common.py

@@ -1,6 +1,7 @@
-from pydantic import BaseModel
-from typing import Optional
 from enum import Enum
+from typing import Optional
+
+from pydantic import BaseModel
 
 
 class BimSnippet(BaseModel):

src/opencdeserver/api/app/models/bcf_request.py

@@ -1,7 +1,21 @@
-from pydantic import BaseModel
 from typing import Optional
-from models.bcf_common import BimSnippet, BitmapType, Location, Direction, SnapshotType, Component
-from models.bcf_common import Coloring, OrthogonalCamera, Visibility, PerspectiveCamera, Line, ClippingPlane
+
+from pydantic import BaseModel
+
+from models.bcf_common import (
+    BimSnippet,
+    BitmapType,
+    ClippingPlane,
+    Coloring,
+    Component,
+    Direction,
+    Line,
+    Location,
+    OrthogonalCamera,
+    PerspectiveCamera,
+    SnapshotType,
+    Visibility,
+)
 
 
 class ProjectPUT(BaseModel):

src/opencdeserver/api/app/models/documents_common.py

@@ -1,6 +1,6 @@
-from pydantic import BaseModel, Field, constr
 from typing import Optional
 
+from pydantic import BaseModel, Field, constr
 
 # This file contains models used in both requests and responses during upload and download of documents.
 

src/opencdeserver/api/app/models/documents_not_used.py

@@ -1,7 +1,8 @@
 from typing import Optional
-from pydantic import BaseModel
-from models.documents_common import Document, DocumentVersion
 
+from pydantic import BaseModel
+
+from models.documents_common import Document, DocumentVersion
 
 # This file contains models that are not used at all, at least not yet.
 

src/opencdeserver/api/app/models/documents_other.py

@@ -1,10 +1,10 @@
-from pydantic import BaseModel, Field
 from typing import Optional
 
-from models.documents_common import CallbackLink, Document
-from models.documents_request import FileToUpload, DocumentMetadataEntry
-from models.request import User
+from pydantic import BaseModel, Field
 
+from models.documents_common import CallbackLink, Document
+from models.documents_request import DocumentMetadataEntry, FileToUpload
+from models.request import User
 
 # This file contains models that are neither used in requests nor in responses,
 # and they can be used during both upload and download of documents.

src/opencdeserver/api/app/models/documents_request.py

@@ -1,10 +1,10 @@
-from pydantic import BaseModel, Field, constr
-from typing import Optional
 from enum import Enum
+from typing import Optional
+
+from pydantic import BaseModel, Field, constr
 
 from models.documents_common import CallbackLink
 
-
 # This file contains models used in requests during upload and download of documents.
 
 

src/opencdeserver/api/app/models/documents_response.py

@@ -1,10 +1,10 @@
-from pydantic import BaseModel, Field, constr
-from typing import Optional
 from enum import Enum
+from typing import Optional
+
+from pydantic import BaseModel, Field, constr
 
 from models.documents_common import DocumentVersion, LinkData
 
-
 # This file contains models used in responses during upload and download of documents.
 
 

src/opencdeserver/api/app/models/foundation_other.py

@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 from pydantic import BaseModel
 
 

src/opencdeserver/api/app/models/other.py

@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 from pydantic import BaseModel
 
 

src/opencdeserver/api/app/models/request.py

@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 from pydantic import BaseModel
 
 

src/opencdeserver/api/app/repository/bcf.py

@@ -1,13 +1,10 @@
 import base64
 import os
-import jsonpickle
-
-from fastapi import UploadFile, HTTPException
-
 from uuid import UUID, uuid4
 
+import jsonpickle
 from database.neo4j import MyDB, driver
-
+from fastapi import HTTPException, UploadFile
 from models.bcf_request import *
 from models.bcf_response import *
 from models.request import *

src/opencdeserver/api/app/repository/documents.py

@@ -1,22 +1,17 @@
-import os
 import math
-
-from uuid import UUID, uuid4
+import os
 from typing import Union
-
-from fastapi import HTTPException
-
-from database.neo4j import MyDB, driver
-
-from models.documents_request import *
-from models.documents_response import *
-from models.documents_common import *
-from models.documents_other import *
+from uuid import UUID, uuid4
 
 import ifcopenshell
-from py2neo import Graph
-
+from database.neo4j import MyDB, driver
+from fastapi import HTTPException
 from ifcgraph.ifcgraph import create_full_graph
+from models.documents_common import *
+from models.documents_other import *
+from models.documents_request import *
+from models.documents_response import *
+from py2neo import Graph
 
 
 class DOCDB(MyDB):

src/opencdeserver/api/app/repository/foundation.py

@@ -1,19 +1,14 @@
-import os
 import hashlib
-
+import os
 from datetime import timedelta
 
-from fastapi import HTTPException
-
 from database.neo4j import MyDB, driver
-from security.secure import create_access_token
+from fastapi import HTTPException
 from jose import jwt
-
-from security.secrets import get_secrets
-from security.secure import credentials_exception
-
 from models.foundation_other import *
 from models.other import *
+from security.secrets import get_secrets
+from security.secure import create_access_token, credentials_exception
 
 secrets = get_secrets()
 

src/opencdeserver/api/app/security/secure.py

@@ -1,17 +1,15 @@
 from __future__ import annotations
-from fastapi import Depends, HTTPException, status, Security
-from fastapi.security import OAuth2AuthorizationCodeBearer, SecurityScopes
 
+import os
 from datetime import datetime, timedelta
-from passlib.context import CryptContext
-from jose import jwt, JWTError
-
-from models.other import TokenData
-from models.request import User
 
 from database.neo4j import db
-import os
-
+from fastapi import Depends, HTTPException, Security, status
+from fastapi.security import OAuth2AuthorizationCodeBearer, SecurityScopes
+from jose import JWTError, jwt
+from models.other import TokenData
+from models.request import User
+from passlib.context import CryptContext
 from security.secrets import get_secrets
 
 secrets = get_secrets()