variphx commited on
Commit
8aa62f1
·
1 Parent(s): 68fc6df

fix: change schema of some dtos and remove unused methods accordingly

Browse files
src/models/dtos/keyframes/mod.rs CHANGED
@@ -3,21 +3,23 @@ use crate::models::entities::{keyframes::KeyframeEntity, videos::VideoEntity};
3
  #[derive(Debug, Clone, serde::Serialize, utoipa::ToSchema)]
4
  pub struct KeyframeDto {
5
  id: i64,
6
- path: String,
 
7
  frame_index: i64,
8
  frame_timestamp: f32,
9
  }
10
 
11
  impl From<(KeyframeEntity, VideoEntity)> for KeyframeDto {
12
- fn from((keyframe, video): (KeyframeEntity, VideoEntity)) -> Self {
13
  let id = keyframe.id();
 
 
14
  let frame_index = keyframe.frame_index();
15
  let frame_timestamp = keyframe.frame_timestamp();
16
- let video_id = video.id();
17
- let path = format!("/static/keyframes/{}/{:0>3}.jpg", video_id, keyframe.name());
18
  Self {
19
  id,
20
- path,
 
21
  frame_index,
22
  frame_timestamp,
23
  }
 
3
  #[derive(Debug, Clone, serde::Serialize, utoipa::ToSchema)]
4
  pub struct KeyframeDto {
5
  id: i64,
6
+ name: String,
7
+ video_name: String,
8
  frame_index: i64,
9
  frame_timestamp: f32,
10
  }
11
 
12
  impl From<(KeyframeEntity, VideoEntity)> for KeyframeDto {
13
+ fn from((mut keyframe, mut video): (KeyframeEntity, VideoEntity)) -> Self {
14
  let id = keyframe.id();
15
+ let name = std::mem::take(keyframe.name_mut());
16
+ let video_name = std::mem::take(video.name_mut());
17
  let frame_index = keyframe.frame_index();
18
  let frame_timestamp = keyframe.frame_timestamp();
 
 
19
  Self {
20
  id,
21
+ name,
22
+ video_name,
23
  frame_index,
24
  frame_timestamp,
25
  }
src/models/dtos/vectors/keyframes/requests/mod.rs CHANGED
@@ -2,7 +2,7 @@
2
  pub struct VectorizedKeyframeRequestDto {
3
  prompt: String,
4
  top_k: u64,
5
- object_threshold: f64,
6
  }
7
 
8
  impl VectorizedKeyframeRequestDto {
@@ -14,7 +14,7 @@ impl VectorizedKeyframeRequestDto {
14
  self.top_k
15
  }
16
 
17
- pub fn object_threshold(&self) -> f64 {
18
- self.object_threshold
19
- }
20
  }
 
2
  pub struct VectorizedKeyframeRequestDto {
3
  prompt: String,
4
  top_k: u64,
5
+ // object_threshold: f64,
6
  }
7
 
8
  impl VectorizedKeyframeRequestDto {
 
14
  self.top_k
15
  }
16
 
17
+ // pub fn object_threshold(&self) -> f64 {
18
+ // self.object_threshold
19
+ // }
20
  }
src/models/dtos/videos/mod.rs CHANGED
@@ -3,6 +3,7 @@ use crate::models::entities::videos::VideoEntity;
3
  #[derive(Debug, Clone, serde::Serialize, utoipa::ToSchema)]
4
  pub struct VideoDto {
5
  id: i64,
 
6
  watch_url: String,
7
  }
8
 
@@ -10,6 +11,7 @@ impl From<VideoEntity> for VideoDto {
10
  fn from(mut value: VideoEntity) -> Self {
11
  Self {
12
  id: value.id(),
 
13
  watch_url: std::mem::take(value.watch_url_mut()),
14
  }
15
  }
 
3
  #[derive(Debug, Clone, serde::Serialize, utoipa::ToSchema)]
4
  pub struct VideoDto {
5
  id: i64,
6
+ name: String,
7
  watch_url: String,
8
  }
9
 
 
11
  fn from(mut value: VideoEntity) -> Self {
12
  Self {
13
  id: value.id(),
14
+ name: std::mem::take(value.name_mut()),
15
  watch_url: std::mem::take(value.watch_url_mut()),
16
  }
17
  }
src/models/entities/keyframes/mod.rs CHANGED
@@ -13,10 +13,6 @@ impl KeyframeEntity {
13
  self.id
14
  }
15
 
16
- pub fn name(&self) -> &str {
17
- &self.name
18
- }
19
-
20
  pub fn frame_index(&self) -> i64 {
21
  self.frame_index
22
  }
 
13
  self.id
14
  }
15
 
 
 
 
 
16
  pub fn frame_index(&self) -> i64 {
17
  self.frame_index
18
  }