This commit is contained in:
2023-11-26 13:12:14 +01:00
parent 9580c9591e
commit 530b397592
8 changed files with 15 additions and 13 deletions

1
.gitignore vendored
View File

@@ -1,4 +1,5 @@
.direnv .direnv
sql_app.db
.coverage.* .coverage.*
**/qubeclan **/qubeclan
**/testdir **/testdir

View File

@@ -2,22 +2,18 @@ import logging
from contextlib import asynccontextmanager from contextlib import asynccontextmanager
from typing import Any from typing import Any
#import for sql
from fastapi import FastAPI from fastapi import FastAPI
from fastapi.middleware.cors import CORSMiddleware from fastapi.middleware.cors import CORSMiddleware
from fastapi.routing import APIRoute from fastapi.routing import APIRoute
from fastapi.staticfiles import StaticFiles from fastapi.staticfiles import StaticFiles
from ..errors import ClanError from ..errors import ClanError
from . import sql_models
from .assets import asset_path from .assets import asset_path
from .error_handlers import clan_error_handler from .error_handlers import clan_error_handler
from .routers import health, root, sql_connect, socket_manager2 # sql router hinzufügen from .routers import health, root, socket_manager2, sql_connect # sql router hinzufügen
from .sql_db import engine
#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
origins = [ origins = [
"http://localhost:3000", "http://localhost:3000",

View File

@@ -1,4 +1,5 @@
from fastapi import APIRouter from fastapi import APIRouter
from ..api_outputs import Machine, Status from ..api_outputs import Machine, Status
router = APIRouter() router = APIRouter()
@@ -7,4 +8,4 @@ router = APIRouter()
@router.get("/health", include_in_schema=True) @router.get("/health", include_in_schema=True)
async def health() -> Machine: #str: async def health() -> Machine: #str:
return Machine(name="test", status=Status.ONLINE) return Machine(name="test", status=Status.ONLINE)
# return "OK" # return "OK"

View File

@@ -1,6 +1,7 @@
from fastapi import APIRouter, Request, Depends from fastapi import APIRouter, Depends
from sqlalchemy.orm import Session 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() router = APIRouter()

View File

@@ -1,6 +1,8 @@
from sqlalchemy.orm import Session from sqlalchemy.orm import Session
from . import sql_models, sql_schemas from . import sql_models, sql_schemas
def get_producers(db: Session, skip: int = 0, limit: int = 100): def get_producers(db: Session, skip: int = 0, limit: int = 100):
return db.query(sql_models.Producer).offset(skip).limit(limit).all() return db.query(sql_models.Producer).offset(skip).limit(limit).all()

View File

@@ -17,4 +17,4 @@ def get_db():
try: try:
yield db yield db
finally: finally:
db.close() db.close()

View File

@@ -17,4 +17,4 @@ class Repository(Base):
jsonblob = Column(JSON) jsonblob = Column(JSON)
prod_id = Column(Integer, ForeignKey("producers.id")) prod_id = Column(Integer, ForeignKey("producers.id"))
producer = relationship("Producer", back_populates="repos") producer = relationship("Producer", back_populates="repos")

View File

@@ -1,5 +1,6 @@
from pydantic import BaseModel, Field from pydantic import BaseModel, Field
class RepositoryBase(BaseModel): class RepositoryBase(BaseModel):
title: str title: str
description: str | None = None description: str | None = None