Added create_entity

2023-11-26 20:54:57 +01:00
parent 80ccaa83d3
commit d1a3a5381a
8 changed files with 200 additions and 128 deletions
--- a/pkgs/clan-cli/clan_cli/webui/routers/health.py
+++ b/pkgs/clan-cli/clan_cli/webui/routers/health.py
@@ -1,6 +1,6 @@
 from fastapi import APIRouter

-from ..api_outputs import Machine, Status
+from ..schemas import Machine, Status

 router = APIRouter()

--- a/pkgs/clan-cli/clan_cli/webui/routers/socket_manager.py
+++ b/pkgs/clan-cli/clan_cli/webui/routers/socket_manager.py
@@ -1,79 +0,0 @@
-from fastapi import FastAPI, WebSocket, WebSocketDisconnect
-from fastapi.responses import HTMLResponse
-from fastapi import APIRouter, Response
-
-router = APIRouter()
-
-html = """
-<!DOCTYPE html>
-<html>
-    <head>
-        <title>Chat</title>
-    </head>
-    <body>
-        <h1>WebSocket Chat</h1>
-        <h2>Your ID: <span id="ws-id"></span></h2>
-        <form action="" onsubmit="sendMessage(event)">
-            <input type="text" id="messageText" autocomplete="off"/>
-            <button>Send</button>
-        </form>
-        <ul id='messages'>
-        </ul>
-        <script>
-            var client_id = Date.now()
-            document.querySelector("#ws-id").textContent = client_id;
-            var ws = new WebSocket(`ws://localhost:2979/ws/${client_id}`);
-            ws.onmessage = function(event) {
-                var messages = document.getElementById('messages')
-                var message = document.createElement('li')
-                var content = document.createTextNode(event.data)
-                message.appendChild(content)
-                messages.appendChild(message)
-            };
-            function sendMessage(event) {
-                var input = document.getElementById("messageText")
-                ws.send(input.value)
-                input.value = ''
-                event.preventDefault()
-            }
-        </script>
-    </body>
-</html>
-"""
-
-class ConnectionManager:
-    def __init__(self) -> None:
-        self.active_connections: list[WebSocket] = []
-
-    async def connect(self, websocket: WebSocket) -> None:
-        await websocket.accept()
-        self.active_connections.append(websocket)
-
-    def disconnect(self, websocket: WebSocket) -> None:
-        self.active_connections.remove(websocket)
-
-    async def send_personal_message(self, message: str, websocket: WebSocket) -> None:
-        await websocket.send_text(message)
-
-    async def broadcast(self, message: str) -> None:
-        for connection in self.active_connections:
-            await connection.send_text(message)
-
-
-manager = ConnectionManager()
-
-@router.get("/ws_example")
-async def get() -> HTMLResponse:
-    return HTMLResponse(html)
-
-@router.websocket("/ws/{client_id}")
-async def websocket_endpoint(websocket: WebSocket, client_id: int) -> None:
-    await manager.connect(websocket)
-    try:
-        while True:
-            data = await websocket.receive_text()
-            await manager.send_personal_message(f"You wrote: {data}", websocket)
-            await manager.broadcast(f"Client #{client_id} says: {data}")
-    except WebSocketDisconnect:
-        manager.disconnect(websocket)
-        await manager.broadcast(f"Client #{client_id} left the chat")
--- a/pkgs/clan-cli/clan_cli/webui/routers/sql_connect.py
+++ b/pkgs/clan-cli/clan_cli/webui/routers/sql_connect.py
@@ -4,22 +4,39 @@ from fastapi import APIRouter, Depends
 from sqlalchemy.orm import Session

 from .. import sql_crud, sql_db, sql_models
-from ..api_outputs import Producer, ProducerCreate
+from ..schemas import Entity, EntityCreate
+from ..tags import Tags

 router = APIRouter()


-@router.get("/get_producers", response_model=List[Producer])
-def get_producers(
-    skip: int = 0, limit: int = 100, db: Session = Depends(sql_db.get_db)
-) -> List[sql_models.Producer]:
-    producers = sql_crud.get_producers(db, skip=skip, limit=limit)
-    return producers
+# @router.get("/api/v1/get_producers", response_model=List[Producer], tags=[Tags.producers])
+# def get_producers(
+#     skip: int = 0, limit: int = 100, db: Session = Depends(sql_db.get_db)
+# ) -> List[sql_models.Producer]:
+#     producers = sql_crud.get_producers(db, skip=skip, limit=limit)
+#     return producers


-@router.post("/create_producers", response_model=Producer)
-def create_producers(
-    producer: ProducerCreate, db: Session = Depends(sql_db.get_db)
-) -> Producer:
+# @router.post("/api/v1/create_producer", response_model=Producer, tags=[Tags.producers])
+# def create_producer(
+#     producer: ProducerCreate, db: Session = Depends(sql_db.get_db)
+# ) -> Producer:
+#     # todo checken ob schon da ...
+#     return sql_crud.create_producer(db=db, producer=producer)
+
+
+@router.post("/api/v1/create_entity", response_model=Entity, tags=[Tags.entities])
+def create_entity(
+    entity: EntityCreate, db: Session = Depends(sql_db.get_db)
+) -> EntityCreate:
    # todo checken ob schon da ...
-    return sql_crud.create_producer(db=db, producer=producer)
+    return sql_crud.create_entity(db, entity)
+
+
+@router.get("/api/v1/get_entities", response_model=List[Entity], tags=[Tags.entities])
+def get_entities(
+    skip: int = 0, limit: int = 100, db: Session = Depends(sql_db.get_db)
+) -> List[sql_models.Entity]:
+    entities = sql_crud.get_entities(db, skip=skip, limit=limit)
+    return entities