diff --git a/.gitignore b/.gitignore index 72b259b..04d7fce 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ .direnv +sql_app.db .coverage.* **/qubeclan **/testdir diff --git a/pkgs/clan-cli/clan_cli/webui/app.py b/pkgs/clan-cli/clan_cli/webui/app.py index 0d463bf..5a32a31 100644 --- a/pkgs/clan-cli/clan_cli/webui/app.py +++ b/pkgs/clan-cli/clan_cli/webui/app.py @@ -2,22 +2,18 @@ import logging from contextlib import asynccontextmanager from typing import Any +#import for sql from fastapi import FastAPI from fastapi.middleware.cors import CORSMiddleware from fastapi.routing import APIRoute from fastapi.staticfiles import StaticFiles from ..errors import ClanError +from . import sql_models from .assets import asset_path from .error_handlers import clan_error_handler -from .routers import health, root, sql_connect, socket_manager2 # sql router hinzufügen - -#import for sql -from fastapi import Depends, FastAPI, HTTPException -from sqlalchemy.orm import Session -from . import sql_crud, sql_models, sql_schemas -from .sql_db import SessionLocal, engine - +from .routers import health, root, socket_manager2, sql_connect # sql router hinzufügen +from .sql_db import engine origins = [ "http://localhost:3000", diff --git a/pkgs/clan-cli/clan_cli/webui/routers/health.py b/pkgs/clan-cli/clan_cli/webui/routers/health.py index 3714c36..8332b5b 100644 --- a/pkgs/clan-cli/clan_cli/webui/routers/health.py +++ b/pkgs/clan-cli/clan_cli/webui/routers/health.py @@ -1,4 +1,5 @@ from fastapi import APIRouter + from ..api_outputs import Machine, Status router = APIRouter() @@ -7,4 +8,4 @@ router = APIRouter() @router.get("/health", include_in_schema=True) async def health() -> Machine: #str: return Machine(name="test", status=Status.ONLINE) -# return "OK" \ No newline at end of file +# return "OK" diff --git a/pkgs/clan-cli/clan_cli/webui/routers/sql_connect.py b/pkgs/clan-cli/clan_cli/webui/routers/sql_connect.py index f61ab91..eee564f 100644 --- a/pkgs/clan-cli/clan_cli/webui/routers/sql_connect.py +++ b/pkgs/clan-cli/clan_cli/webui/routers/sql_connect.py @@ -1,6 +1,7 @@ -from fastapi import APIRouter, Request, Depends +from fastapi import APIRouter, Depends from sqlalchemy.orm import Session -from .. import sql_crud, sql_models, sql_schemas, sql_db + +from .. import sql_crud, sql_db, sql_schemas router = APIRouter() diff --git a/pkgs/clan-cli/clan_cli/webui/sql_crud.py b/pkgs/clan-cli/clan_cli/webui/sql_crud.py index c8ff904..8371b8f 100644 --- a/pkgs/clan-cli/clan_cli/webui/sql_crud.py +++ b/pkgs/clan-cli/clan_cli/webui/sql_crud.py @@ -1,6 +1,8 @@ from sqlalchemy.orm import Session + from . import sql_models, sql_schemas + def get_producers(db: Session, skip: int = 0, limit: int = 100): return db.query(sql_models.Producer).offset(skip).limit(limit).all() diff --git a/pkgs/clan-cli/clan_cli/webui/sql_db.py b/pkgs/clan-cli/clan_cli/webui/sql_db.py index cc59363..1c8d62b 100644 --- a/pkgs/clan-cli/clan_cli/webui/sql_db.py +++ b/pkgs/clan-cli/clan_cli/webui/sql_db.py @@ -17,4 +17,4 @@ def get_db(): try: yield db finally: - db.close() \ No newline at end of file + db.close() diff --git a/pkgs/clan-cli/clan_cli/webui/sql_models.py b/pkgs/clan-cli/clan_cli/webui/sql_models.py index d8d7cea..0cdb873 100644 --- a/pkgs/clan-cli/clan_cli/webui/sql_models.py +++ b/pkgs/clan-cli/clan_cli/webui/sql_models.py @@ -17,4 +17,4 @@ class Repository(Base): jsonblob = Column(JSON) prod_id = Column(Integer, ForeignKey("producers.id")) - producer = relationship("Producer", back_populates="repos") \ No newline at end of file + producer = relationship("Producer", back_populates="repos") diff --git a/pkgs/clan-cli/clan_cli/webui/sql_schemas.py b/pkgs/clan-cli/clan_cli/webui/sql_schemas.py index 1fcd4c3..25ba889 100644 --- a/pkgs/clan-cli/clan_cli/webui/sql_schemas.py +++ b/pkgs/clan-cli/clan_cli/webui/sql_schemas.py @@ -1,5 +1,6 @@ from pydantic import BaseModel, Field + class RepositoryBase(BaseModel): title: str description: str | None = None