Compare commits
8 Commits
project/sh
...
92c91c2594
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
92c91c2594 | ||
|
|
2e623c3a93 | ||
|
|
edd2360d88 | ||
|
|
8e9dcb50c1 | ||
|
|
e2c3cda458 | ||
|
|
780855c93f | ||
|
|
86d7b1aaf8 | ||
|
|
d627836e47 |
@@ -7,5 +7,6 @@ CREATE TABLE processed_agent_data (
|
|||||||
z FLOAT,
|
z FLOAT,
|
||||||
latitude FLOAT,
|
latitude FLOAT,
|
||||||
longitude FLOAT,
|
longitude FLOAT,
|
||||||
timestamp TIMESTAMP
|
timestamp TIMESTAMP,
|
||||||
|
visible BOOLEAN
|
||||||
);
|
);
|
||||||
@@ -8,12 +8,13 @@ from sqlalchemy import (
|
|||||||
Integer,
|
Integer,
|
||||||
String,
|
String,
|
||||||
Float,
|
Float,
|
||||||
|
Boolean,
|
||||||
DateTime,
|
DateTime,
|
||||||
)
|
)
|
||||||
from sqlalchemy.sql import select
|
from sqlalchemy.sql import select
|
||||||
|
|
||||||
from database import metadata, SessionLocal
|
from database import metadata, SessionLocal
|
||||||
from schemas import ProcessedAgentData, ProcessedAgentDataInDB
|
from schemas import ProcessedAgentData, ProcessedAgentDataInDB, WebSocketData
|
||||||
|
|
||||||
# FastAPI app setup
|
# FastAPI app setup
|
||||||
app = FastAPI()
|
app = FastAPI()
|
||||||
@@ -30,6 +31,7 @@ processed_agent_data = Table(
|
|||||||
Column("latitude", Float),
|
Column("latitude", Float),
|
||||||
Column("longitude", Float),
|
Column("longitude", Float),
|
||||||
Column("timestamp", DateTime),
|
Column("timestamp", DateTime),
|
||||||
|
Column("visible", Boolean),
|
||||||
)
|
)
|
||||||
|
|
||||||
# WebSocket subscriptions
|
# WebSocket subscriptions
|
||||||
@@ -57,7 +59,24 @@ async def websocket_endpoint(websocket: WebSocket, user_id: int):
|
|||||||
|
|
||||||
# receive forever
|
# receive forever
|
||||||
while True:
|
while True:
|
||||||
await websocket.receive_text()
|
data = await websocket.receive_text()
|
||||||
|
try:
|
||||||
|
if (data):
|
||||||
|
ws_data = WebSocketData.model_validate(json.loads(data))
|
||||||
|
session = SessionLocal()
|
||||||
|
update_query = (
|
||||||
|
processed_agent_data.update()
|
||||||
|
.where(processed_agent_data.c.id == ws_data.id)
|
||||||
|
.values(visible=False)
|
||||||
|
).returning(processed_agent_data)
|
||||||
|
res = session.execute(update_query).fetchone()
|
||||||
|
if (not res):
|
||||||
|
session.rollback()
|
||||||
|
raise Exception("Error while websocket PUT")
|
||||||
|
session.commit()
|
||||||
|
finally:
|
||||||
|
session.close()
|
||||||
|
|
||||||
except WebSocketDisconnect:
|
except WebSocketDisconnect:
|
||||||
subscriptions.remove(websocket)
|
subscriptions.remove(websocket)
|
||||||
|
|
||||||
@@ -81,6 +100,7 @@ def ProcessedAgentData_to_td(data: List[ProcessedAgentData]):
|
|||||||
"latitude": item.agent_data.gps.latitude,
|
"latitude": item.agent_data.gps.latitude,
|
||||||
"longitude": item.agent_data.gps.longitude,
|
"longitude": item.agent_data.gps.longitude,
|
||||||
"timestamp": item.agent_data.timestamp,
|
"timestamp": item.agent_data.timestamp,
|
||||||
|
"visible": True,
|
||||||
}
|
}
|
||||||
for item in data
|
for item in data
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -49,3 +49,7 @@ class AgentData(BaseModel):
|
|||||||
class ProcessedAgentData(BaseModel):
|
class ProcessedAgentData(BaseModel):
|
||||||
road_state: str
|
road_state: str
|
||||||
agent_data: AgentData
|
agent_data: AgentData
|
||||||
|
|
||||||
|
class WebSocketData(BaseModel):
|
||||||
|
id: int
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user