Merge pull request #314 from SelfhostedPro/nightly

doing bytes formatting on the backend

backend/api/actions/__init__.py

@@ -1,3 +0,0 @@
-from .apps import *
-from .compose import *
-from .resources import *

backend/api/actions/apps.py

@@ -1,12 +1,21 @@
-from sqlalchemy.orm import Session
-from sqlalchemy.exc import IntegrityError
-from fastapi import HTTPException, BackgroundTasks
-from ..db import models, schemas
-from ..utils import *
-from ..utils import check_updates as _update_check
-from docker.errors import APIError
-
-from datetime import datetime
+from fastapi import HTTPException
+
+from api.db.schemas.apps import DeployLogs, DeployForm, AppLogs, Processes
+from api.utils.apps import (
+    conv_caps2data,
+    conv_devices2data,
+    conv_env2data,
+    conv_image2data,
+    conv_labels2data,
+    conv_portlabels2data,
+    conv_ports2data,
+    conv_restart2data,
+    conv_sysctls2data,
+    conv_volumes2data,
+    _check_updates,
+)
+from api.utils.templates import conv2dict
+
 import time
 import subprocess
 import docker
@@ -48,7 +57,7 @@ def check_app_update(app_name):
         )
 
     if app.attrs["Config"]["Image"]:
-        if _update_check(app.attrs["Config"]["Image"]):
+        if _check_updates(app.attrs["Config"]["Image"]):
             app.attrs.update(conv2dict("isUpdatable", True))
     app.attrs.update(conv2dict("name", app.name))
     app.attrs.update(conv2dict("ports", app.ports))
@@ -119,9 +128,7 @@ def get_app_processes(app_name):
     app = dclient.containers.get(app_name)
     if app.status == "running":
         processes = app.top()
-        return schemas.Processes(
-            Processes=processes["Processes"], Titles=processes["Titles"]
-        )
+        return Processes(Processes=processes["Processes"], Titles=processes["Titles"])
     else:
         return None
 
@@ -136,7 +143,7 @@ def get_app_logs(app_name):
     dclient = docker.from_env()
     app = dclient.containers.get(app_name)
     if app.status == "running":
-        return schemas.AppLogs(logs=app.logs())
+        return AppLogs(logs=app.logs())
     else:
         return None
 
@@ -147,7 +154,7 @@ def get_app_logs(app_name):
 """
 
 
-def deploy_app(template: schemas.DeployForm):
+def deploy_app(template: DeployForm):
     try:
         launch = launch_app(
             template.name,
@@ -164,7 +171,7 @@ def deploy_app(template: schemas.DeployForm):
             conv_sysctls2data(template.sysctls),
             conv_caps2data(template.cap_add),
             edit=template.edit or False,
-            id=template.id or None
+            _id=template.id or None,
         )
     except HTTPException as exc:
         raise HTTPException(status_code=exc.status_code, detail=exc.detail)
@@ -174,7 +181,7 @@ def deploy_app(template: schemas.DeployForm):
         )
     print("done deploying")
 
-    return schemas.DeployLogs(logs=launch.logs())
+    return DeployLogs(logs=launch.logs())
 
 
 """
@@ -218,14 +225,14 @@ def launch_app(
     sysctls,
     caps,
     edit,
-    id
+    _id,
 ):
     dclient = docker.from_env()
     if edit == True:
         try:
-            dclient.containers.get(id)
+            dclient.containers.get(_id)
             try:
-                running_app = dclient.containers.get(id)
+                running_app = dclient.containers.get(_id)
                 running_app.remove(force=True)
             except Exception as e:
                 raise e
@@ -416,4 +423,4 @@ def check_self_update():
         else:
             raise HTTPException(status_code=400, detail=exc.args)
 
-    return _update_check(yacht.image.tags[0])
+    return _check_updates(yacht.image.tags[0])

backend/api/actions/compose.py

@@ -1,4 +1,4 @@
-from fastapi import HTTPException, Response
+from fastapi import HTTPException
 from fastapi.responses import StreamingResponse
 from sh import docker_compose
 import os
@@ -9,8 +9,8 @@
 import io
 import zipfile
 
-from ..settings import Settings
-from ..utils.compose import find_yml_files, get_readme_file, get_logo_file
+from api.settings import Settings
+from api.utils.compose import find_yml_files
 
 settings = Settings()
 
@@ -356,4 +356,4 @@ def generate_support_bundle(project_name):
             },
         )
     else:
-        raise HTTPException(404, f"Project {project_name} not found.")
+        raise HTTPException(404, f"Project {project_name} not found.")

backend/api/actions/resources.py

@@ -1,5 +1,4 @@
 import docker
-import json
 from fastapi import HTTPException
 
 ### IMAGES ###

backend/api/auth/__init__.py

@@ -1 +0,0 @@
-from .auth import *

backend/api/auth/auth.py

@@ -1,9 +1,8 @@
 from typing import Tuple
 
-from ..settings import Settings
+from api.settings import Settings
 
-from fastapi import Depends, HTTPException
-from fastapi_jwt_auth import AuthJWT
+from fastapi import HTTPException
 from fastapi_jwt_auth.exceptions import JWTDecodeError
 
 from passlib import pwd

backend/api/db/crud/__init__.py

@@ -1,3 +0,0 @@
-from .templates import *
-from .settings import *
-from .users import *

backend/api/db/crud/settings.py

@@ -1,12 +1,7 @@
 from sqlalchemy.orm import Session
-from sqlalchemy.exc import IntegrityError
-from sqlalchemy.orm.session import make_transient
-
-from .. import models, schemas
 
+from api.db.models import containers as models
 from datetime import datetime
-import urllib.request
-import sqlite3
 import json
 
 

backend/api/db/crud/templates.py

@@ -1,11 +1,10 @@
 from sqlalchemy.orm import Session
 from sqlalchemy.exc import IntegrityError
-from sqlalchemy.orm.session import make_transient
 
 from fastapi import HTTPException
 
-from .. import models, schemas
-from ...utils import conv_ports2dict, conv_sysctls2dict
+from api.db.models import containers as models
+from api.utils.templates import conv_sysctls2dict, conv_ports2dict
 
 from datetime import datetime
 import urllib.request
@@ -46,12 +45,12 @@ def delete_template(db: Session, template_id: int):
     return _template
 
 
-def add_template(db: Session, template: models.containers.Template):
+def add_template(db: Session, template: models.Template):
     try:
         _template_path = urlparse(template.url).path
         ext = os.path.splitext(_template_path)[1]
         # Opens the JSON and iterate over the content.
-        _template = models.containers.Template(title=template.title, url=template.url)
+        _template = models.Template(title=template.title, url=template.url)
         with urllib.request.urlopen(template.url) as file:
             if ext.rstrip() in (".yml", ".yaml"):
                 loaded_file = yaml.load(file, Loader=yaml.SafeLoader)
@@ -67,7 +66,7 @@ def add_template(db: Session, template: models.containers.Template):
 
                     # Optional use classmethod from_dict
                     try:
-                        template_content = models.containers.TemplateItem(
+                        template_content = models.TemplateItem(
                             type=int(entry.get("type", 1)),
                             title=entry["title"],
                             platform=entry["platform"],
@@ -100,7 +99,7 @@ def add_template(db: Session, template: models.containers.Template):
                 sysctls = conv_sysctls2dict(entry.get("sysctls", []))
 
                 # Optional use classmethod from_dict
-                template_content = models.containers.TemplateItem(
+                template_content = models.TemplateItem(
                     type=int(entry.get("type", 1)),
                     title=entry["title"],
                     platform=entry["platform"],
@@ -134,7 +133,6 @@ def add_template(db: Session, template: models.containers.Template):
         # TODO raises IntegrityError on duplicates (uniqueness)
         #       status
         db.rollback()
-        pass
 
     return get_template(db=db, url=template.url)
 
@@ -192,7 +190,7 @@ def refresh_template(db: Session, template_id: id):
                 sysctls = conv_sysctls2dict(entry.get("sysctls", []))
 
                 # Optional use classmethod from_dict
-                template_content = models.containers.TemplateItem(
+                template_content = models.TemplateItem(
                     type=int(entry["type"]),
                     title=entry["title"],
                     platform=entry["platform"],

backend/api/db/crud/users.py

@@ -1,6 +1,7 @@
 from sqlalchemy.orm import Session
 from passlib.context import CryptContext
-from . import models, schemas
+from api.db.models import users as models
+from api.db.schemas import users as schemas
 from fastapi.exceptions import HTTPException
 
 pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")

backend/api/db/database.py

@@ -1,20 +1,18 @@
 from sqlalchemy import create_engine
 from sqlalchemy.ext.declarative import declarative_base
-from sqlalchemy.orm import sessionmaker, session
+from sqlalchemy.orm import sessionmaker
 from ..settings import Settings
 
 settings = Settings()
 
 SQLALCHEMY_DATABASE_URL = settings.SQLALCHEMY_DATABASE_URI
 
-if 'sqlite:///' in SQLALCHEMY_DATABASE_URL:
+if "sqlite:///" in SQLALCHEMY_DATABASE_URL:
     engine = create_engine(
         SQLALCHEMY_DATABASE_URL, connect_args={"check_same_thread": False}
     )
 else:
-    engine = create_engine(
-        SQLALCHEMY_DATABASE_URL
-    )
+    engine = create_engine(SQLALCHEMY_DATABASE_URL)
 SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
 
 Base = declarative_base()

backend/api/db/models/__init__.py

@@ -1,2 +0,0 @@
-from .containers import *
-from .users import *

backend/api/db/models/containers.py

@@ -1,5 +1,4 @@
 from sqlalchemy import (
-    Boolean,
     Column,
     ForeignKey,
     Integer,
@@ -10,7 +9,7 @@
 )
 from sqlalchemy.orm import relationship
 
-from ..database import Base
+from api.db.database import Base
 
 from datetime import datetime
 

backend/api/db/models/users.py

@@ -1,12 +1,14 @@
-from sqlalchemy import Boolean, Column, ForeignKey, Integer, String
-from ..database import Base
+from sqlalchemy import Boolean, Column, Integer, String
+from api.db.database import Base
 
 
 class User(Base):
     __tablename__ = "user"
 
     id = Column(Integer, primary_key=True, index=True)
-    username = Column("email", String(length=264), unique=True, index=True, nullable=False)
+    username = Column(
+        "email", String(length=264), unique=True, index=True, nullable=False
+    )
     hashed_password = Column(String(length=72), nullable=False)
     is_active = Column(Boolean, default=True, nullable=False)
     is_superuser = Column(Boolean, default=False, nullable=False)

backend/api/db/schemas/__init__.py

@@ -1,4 +0,0 @@
-from .apps import *
-from .templates import *
-from .users import *
-from .compose import *

backend/api/db/schemas/resources.py

@@ -1,4 +1,3 @@
-from fastapi import FastAPI
 from pydantic import BaseModel
 from typing import Optional
 

backend/api/db/schemas/templates.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
-from typing import List, Optional, Union
+from typing import List, Optional
 from datetime import datetime
-from pydantic import BaseModel, Json
+from pydantic import BaseModel
 
 
 class TemplateItem(BaseModel):

backend/api/db/schemas/users.py

@@ -17,4 +17,4 @@ class User(UserBase):
     authDisabled: Optional[bool]
 
     class Config:
-        orm_mode = True
+        orm_mode = True

backend/api/main.py

@@ -1,26 +1,19 @@
 import uvicorn
-from fastapi import Depends, FastAPI, Header, HTTPException, Request
-from fastapi.responses import JSONResponse, RedirectResponse
-from .routers import apps, templates, app_settings, resources, compose, users
-import uuid
-
+from fastapi import Depends, FastAPI, Request
+from fastapi.responses import JSONResponse
 from fastapi_jwt_auth import AuthJWT
 from fastapi_jwt_auth.exceptions import AuthJWTException
 from pydantic import BaseModel
 from sqlalchemy.orm import Session
 
-from .db.crud.templates import (
-    read_template_variables,
-    set_template_variables,
-)
-from .settings import Settings
-
-from .utils import get_db
-
-from .db.crud import create_user, get_users
-from .db.models import User, TemplateVariables
-from .db.database import SessionLocal
-from .db.schemas import UserCreate
+from api.settings import Settings
+from api.utils.auth import get_db
+from api.db.models.containers import TemplateVariables
+from api.db.database import SessionLocal
+from api.db.schemas.users import UserCreate
+from api.db.crud.users import create_user, get_users
+from api.routers import apps, app_settings, compose, resources, templates, users
+from api.db.crud.templates import read_template_variables, set_template_variables
 
 app = FastAPI(root_path="/api")