*/}
- {/* setShowConfigModal(false)}*/}
- {/* aria-label="Close"*/}
- {/* >*/}
- {/* ×*/}
- {/* */}
- {/*
*/}
- {/* {selectedVideo && Video Configurations
*/} - {/*Configuring Video: {selectedVideo.id}
}*/} - {/* {selectedVideo?.video_config?.id ?*/} - {/* selectedVideo?.video_config?.sample_video_id === selectedVideo?.id ? (*/} - {/*{`This is the reference video for config: ${selectedVideo.video_config.id}: ${selectedVideo.video_config.name}. Click edit to modify.`}
{`Current selected config: ${selectedVideo.video_config.id}: ${selectedVideo.video_config.name}`}
No config selected. Select one below or start editing a new config.
Select an Existing Config:
*/} - {/**/}
- {/*
*/}
- {/* */}
- {/*
*/}
- {/**/}
-
{/* modal for video log file display */}
Create new or edit existing config:
*/} - {/* */} - {/*
- {/*
+ {modalState.type === "run" && modalState.video && (
+
)}
);
diff --git a/dashboard/src/views/videoComponents/timeSeriesChangeModal.jsx b/dashboard/src/views/videoComponents/timeSeriesChangeModal.jsx
index 88a413e..89e751a 100644
--- a/dashboard/src/views/videoComponents/timeSeriesChangeModal.jsx
+++ b/dashboard/src/views/videoComponents/timeSeriesChangeModal.jsx
@@ -11,7 +11,7 @@ import { getFrameUrl, useDebouncedImageUrl, PolygonDrawer } from "../../utils/im
import {FaSpinner} from "react-icons/fa";
-export const TimeSeriesChangeModal = ({setShowModal, video, setVideo}) => {
+export const TimeSeriesChangeModal = ({video, setVideo, closeModal}) => {
const [loading, setLoading] = useState(false);
const [loadingConfig, setLoadingConfig] = useState(false);
const [saving, setSaving] = useState(false);
@@ -54,7 +54,13 @@ export const TimeSeriesChangeModal = ({setShowModal, video, setVideo}) => {
return getFrameUrl(video, frameNr, rotate);
},
onUrlReady: (url, { cached }) => {
- setLoading(true)
+ if (cached) {
+ // If the image is cached, we can set loading to false immediately
+ setLoading(false);
+ } else {
+ // Otherwise, we'll wait for the onLoad event of the image
+ setLoading(true)
+ }
},
delayMs: 300
});
@@ -103,6 +109,31 @@ export const TimeSeriesChangeModal = ({setShowModal, video, setVideo}) => {
}
}, [crossSection, imageRef.current, imgDims, videoConfig?.camera_config?.gcps])
+ // useEffect(() => {
+ // // If the image URL is already loaded from cache, the */}
-
-
{/*Modal for editing / analyzing video */}
- {showModal && selectedVideo && (
+ {modalState.type === "view" && modalState.video && (
- {selectedVideo &&
Log for video: {selectedVideo.id}
} + {modalState.video &&Log for video: {modalState.video.id} - {modalState.video.timestamp.toLocaleString()}
}
@@ -36,7 +37,7 @@ export const VideoDetailsModal = ({selectedVideo, setSelectedVideo, setShowModal
diff --git a/orc_api/crud/generic.py b/orc_api/crud/generic.py
index 1f43299..4f3304b 100644
--- a/orc_api/crud/generic.py
+++ b/orc_api/crud/generic.py
@@ -1,19 +1,17 @@
"""Generic CRUD operations, used in multiple CRUD modules."""
from datetime import datetime
-from typing import Optional
+from typing import Any, Optional
from sqlalchemy.orm.query import Query
-from orc_api.db import Base
-
def get_closest(
query: Query,
- model: Base,
+ model: Any,
timestamp: datetime,
allowed_dt: Optional[float] = None,
-):
+) -> Optional[Any]:
"""Fetch the model instance closest to the given timestamp.
This function queries to find the model instance that is closest
diff --git a/orc_api/crud/video.py b/orc_api/crud/video.py
index b36297c..5f5f43d 100644
--- a/orc_api/crud/video.py
+++ b/orc_api/crud/video.py
@@ -29,19 +29,19 @@ def filter_status(query: Query, status: Optional[models.VideoStatus] = None):
return query
-def filter_sync_status(query: Query, sync_status: Optional[models.VideoStatus] = None):
+def filter_sync_status(query: Query, sync_status: Optional[models.SyncStatus] = None):
"""Filter query by start and stop datetime."""
if sync_status:
query = query.where(models.Video.sync_status == sync_status)
return query
-def get_query_by_id(db: Session, id: int):
+def get_query_by_id(db: Session, id: int) -> Query:
"""Get a single video in a query (e.g. for updating."""
return db.query(models.Video).filter(models.Video.id == id)
-def get(db: Session, id: int):
+def get(db: Session, id: int) -> Optional[models.Video]:
"""Get a single video."""
query = get_query_by_id(db=db, id=id)
if query.count() == 0:
@@ -53,7 +53,7 @@ def get_closest(
db: Session,
timestamp: datetime,
allowed_dt: Optional[float] = None,
-):
+) -> Optional[models.Video]:
"""Fetch the video closest to the given timestamp (None if further away than allowed_dt)."""
return generic.get_closest(db.query(models.Video), models.Video, timestamp, allowed_dt)
@@ -70,7 +70,7 @@ def get_closest_no_ts(
return generic.get_closest(q, models.Video, timestamp, allowed_dt)
-def get_ids(db: Session, ids: List[int] = None) -> List[models.Video]:
+def get_ids(db: Session, ids: Optional[List[int]] = None) -> List[models.Video]:
"""List videos from provided ids."""
ids = [] if ids is None else ids
query = db.query(models.Video).filter(models.Video.id.in_(ids))
diff --git a/orc_api/log.py b/orc_api/log.py
index 3430f45..a8c2fb8 100644
--- a/orc_api/log.py
+++ b/orc_api/log.py
@@ -5,6 +5,7 @@
import logging.handlers
import os
import sys
+from typing import Optional
import anyio
from fastapi import WebSocket
@@ -28,7 +29,7 @@ def filter(self, record: logging.LogRecord) -> bool:
def setuplog(
name: str = "orc-os",
- path: str = None,
+ path: Optional[str] = None,
log_level: int = 20,
fmt: str = FMT,
append: bool = True,
@@ -105,7 +106,7 @@ def remove_file_handler(logger, name_contains="hello_world"):
logger.debug(f"Removed file handler to {handler.baseFilename} from logger.")
-def start_logger(verbose, quiet, log_path=None):
+def start_logger(verbose, quiet, log_path=None) -> logging.Logger:
if not log_path:
# set it here to a fixed location
log_path = os.path.join(__home__, "log")
@@ -164,9 +165,9 @@ async def stream_new_lines(websocket: WebSocket, fn: str):
await asyncio.sleep(0.1) # Wait before trying to read more lines
-if "ALEMBIC_RUNNING" not in os.environ:
- logger = start_logger(True, False, log_path=LOG_DIRECTORY)
-else:
- logger = None
+# if "ALEMBIC_RUNNING" not in os.environ:
+logger = start_logger(True, False, log_path=LOG_DIRECTORY)
+# else:
+# logger = None
__all__ = ["logger", "get_last_lines", "stream_new_lines"]
diff --git a/orc_api/main.py b/orc_api/main.py
index 23775f0..0c7fa51 100644
--- a/orc_api/main.py
+++ b/orc_api/main.py
@@ -18,6 +18,7 @@
)
from orc_api.database import get_session
from orc_api.db import VideoStatus
+from orc_api.log import logger
from orc_api.routers import (
auth,
callback_url,
@@ -51,8 +52,6 @@
@asynccontextmanager
async def lifespan(app: FastAPI):
"""Start the scheduler and logger."""
- from orc_api.log import logger
-
logger.info("Starting ORC-OS API")
scheduler = BackgroundScheduler()
scheduler.start()
diff --git a/orc_api/schemas/cross_section.py b/orc_api/schemas/cross_section.py
index c114727..71495de 100644
--- a/orc_api/schemas/cross_section.py
+++ b/orc_api/schemas/cross_section.py
@@ -213,6 +213,13 @@ def get_bbox_dry_wet(self, h: float, camera: bool = True, dry: bool = False):
pols = self.obj.get_bbox_dry_wet(h=h, camera=camera, dry=dry)
return [list(map(list, pol.exterior.coords)) for pol in pols.geoms]
+ def validate_h_a(self, h_a: float) -> bool:
+ """Validate if the water level is above the lowest point in the cross section."""
+ # convert to coordinate datum
+ z_a = self.camera_config.obj.h_to_z(h_a)
+ # check if z_a is above the lowest point in the cross section
+ return z_a > np.array(self.z).min()
+
class CrossSectionUpdate(CrossSectionBase):
"""Update model with several input fields from user."""
diff --git a/orc_api/schemas/video.py b/orc_api/schemas/video.py
index c315f6c..80f8558 100644
--- a/orc_api/schemas/video.py
+++ b/orc_api/schemas/video.py
@@ -1,7 +1,6 @@
"""Video schema."""
import glob
-import json
import os
import subprocess
import time
@@ -11,14 +10,14 @@
import numpy as np
import xarray as xr
from pydantic import BaseModel, ConfigDict, Field, computed_field
-from pyorc.service import velocity_flow
+from pyorc.service import velocity_flow_subprocess
from sqlalchemy.orm import Session
from orc_api import crud, timeout_before_shutdown
from orc_api import db as models
from orc_api.database import get_session
from orc_api.db import Video
-from orc_api.log import add_filehandler, logger, remove_file_handler
+from orc_api.log import logger
from orc_api.schemas.base import RemoteModel
from orc_api.schemas.time_series import TimeSeriesResponse
from orc_api.schemas.video_config import VideoConfigBase, VideoConfigResponse, VideoConfigUpdate
@@ -200,13 +199,14 @@ def run(self, base_path: str, prefix: str = "", shutdown_after_task: bool = Fals
with get_session() as session:
try:
# set up a temporary additional log file handler
- print(f"Adding log file handler for video {self.id} {self.get_log_file(base_path=base_path)}")
rec = crud.video.get(session, id=self.id)
+ if not rec:
+ raise ValueError(f"Video with id {self.id} does not exist in database.")
rec.status = models.VideoStatus.TASK
session.commit()
session.refresh(rec)
# now also show the state PROCESSING in web socket
- filename = os.path.split(self.file)[1]
+ filename = os.path.split(self.file)[1] if self.file else None
video_run_state.update(
video_id=self.id,
video_file=filename,
@@ -223,7 +223,7 @@ def run(self, base_path: str, prefix: str = "", shutdown_after_task: bool = Fals
# check for h_a
h_a = None if self.time_series is None else self.time_series.h
- logger.debug(f"Checked for water level in time series, found {h_a}")
+ logger.debug(f"Checked for water level in time series, found {h_a:.3f} m.")
# overrule with set level if the video configuration is made with the current video
if self.video_config.sample_video_id == self.id:
@@ -231,21 +231,21 @@ def run(self, base_path: str, prefix: str = "", shutdown_after_task: bool = Fals
h_a = self.video_config.camera_config.gcps.h_ref
# assemble all information
- logger.info(f"Water level set to {h_a}")
+ logger.info(f"Water level set to {h_a:.3f} m.")
+ # check if h_a is above lowest point in cross section
+ validate_h_a_cross = self.video_config.cross_section_wl_rt.validate_h_a(h_a=h_a)
+ if not validate_h_a_cross:
+ raise Exception(
+ f"Provided water level {h_a:.3f} m is not above the lowest point in the cross section. "
+ f"Please provide a higher water level, or adjust the cross section."
+ )
output = os.path.join(self.get_path(base_path=base_path), "output")
cameraconfig = self.video_config.camera_config.data.model_dump()
# get the rotated/translated cross-section
- cross_section_feats = self.video_config.cross_section_rt.features
- # dump the used features in the output path of the video
- cross = os.path.join(self.get_path(base_path=base_path), "cross_section.geojson")
- with open(cross, "w") as f:
- json.dump(cross_section_feats, f)
+ cross = self.video_config.cross_section_rt.features
# if h_a is not available and a cross section is available, make cross section file for water level
if h_a is None and self.video_config.cross_section_wl:
- cross_section_wl_feats = self.video_config.cross_section_wl_rt.features
- cross_wl = os.path.join(self.get_path(base_path=base_path), "cross_section_wl.geojson")
- with open(cross_wl, "w") as f:
- json.dump(cross_section_wl_feats, f)
+ cross_wl = self.video_config.cross_section_wl_rt.features
else:
cross_wl = None
# get the recipe with any required fields filled
@@ -266,10 +266,11 @@ def run(self, base_path: str, prefix: str = "", shutdown_after_task: bool = Fals
f"{self.get_output_path(base_path=base_path).split(base_path)[-1]}"
)
# run the video with pyorc with an additional logger handler
- add_filehandler(
- logger=logger, path=self.get_log_file(base_path=base_path), function="velocimetry", log_level=10
+ logger.info(
+ "Starting video processing with pyorc. You can check logs per video record after running in "
+ "the video view."
)
- velocity_flow(
+ res = velocity_flow_subprocess(
recipe=recipe,
videofile=videofile,
cameraconfig=cameraconfig,
@@ -280,7 +281,12 @@ def run(self, base_path: str, prefix: str = "", shutdown_after_task: bool = Fals
cross_wl=cross_wl,
logger=logger,
)
- remove_file_handler(logger, name_contains="pyorc.log")
+ if res.returncode != 0:
+ raise Exception(
+ f"Error running video, pyorc returned non-zero exit code: {res.returncode} and error output "
+ f"{res.stderr}"
+ "Please check the log belonging to video"
+ )
self.image = rel_img_fn
# update time series (before video, in case time series with optical water level is added in the process
logger.info("Updating time series belonging to video.")
@@ -289,16 +295,14 @@ def run(self, base_path: str, prefix: str = "", shutdown_after_task: bool = Fals
self.status = models.VideoStatus.DONE
video_run_state.update(status=VideoRunStatus.SUCCESS, message="Processing successful.")
except Exception as e:
- # ensure the file handler is removed, even if an error occurs
- remove_file_handler(logger, name_contains="pyorc.log")
# ensure status is ERROR, but continue afterwards
self.status = models.VideoStatus.ERROR
# also show this state in the web socket
video_run_state.update(status=VideoRunStatus.ERROR, message=f"Error running video: {filename}: {e}")
logger.error(f"Error running video, response: {e}, VideoStatus set to ERROR.")
- finally:
- # the last handler should be our file handler.
- remove_file_handler(logger, name_contains="pyorc.log")
+ # finally:
+ # # the last handler should be our file handler.
+ # remove_file_handler(logger, name_contains="pyorc.log")
update_data = self.serialize_for_db()
if self.time_series:
diff --git a/tests/test_schemas/test_video_schemas.py b/tests/test_schemas/test_video_schemas.py
index a59bfff..e1da09e 100644
--- a/tests/test_schemas/test_video_schemas.py
+++ b/tests/test_schemas/test_video_schemas.py
@@ -62,7 +62,7 @@ def test_video_run_daemon_shutdown(tmpdir, video_response_no_ts, session_video_c
class ShutdownException(Exception):
pass
- def mock_velocity_flow(**kwargs):
+ def mock_velocity_flow_subprocess(**kwargs):
return None
def mock_update_timeseries(self, *args, **kwargs):
@@ -83,7 +83,7 @@ def mock_subprocess_call(*args, **kwargs):
mock_shutdown = mock.Mock(side_effect=mock_subprocess_call)
monkeypatch.setattr("subprocess.call", mock_shutdown)
monkeypatch.setattr("time.sleep", mock_timeout)
- monkeypatch.setattr("orc_api.schemas.video.velocity_flow", mock_velocity_flow)
+ monkeypatch.setattr("orc_api.schemas.video.velocity_flow_subprocess", mock_velocity_flow_subprocess)
monkeypatch.setattr("orc_api.schemas.video.VideoResponse.update_timeseries", mock_update_timeseries)
monkeypatch.setattr("orc_api.schemas.video.VideoResponse.sync_remote", mock_update_timeseries)
with pytest.raises(ShutdownException):