Refactoring and cleanup

vidformer-igni/src/main.rs

@@ -3,7 +3,7 @@ use rand::Rng;
 use sqlx::postgres::PgPoolOptions;
 use tabled::{Table, Tabled};
 
-mod frame_block;
+mod feb;
 mod ops;
 mod schema;
 mod segment;

vidformer-igni/src/server.rs

@@ -491,11 +491,7 @@ async fn igni_http_req_api(
         .get("Authorization")
         .and_then(|header| header.to_str().ok())
         .and_then(|header| {
-            if header.starts_with("Bearer ") {
-                Some(header[7..].to_string())
-            } else {
-                None
-            }
+            header.strip_prefix("Bearer ")
         });
 
     let api_key = match api_key {
@@ -510,7 +506,7 @@ async fn igni_http_req_api(
     };
 
     let user: Option<schema::UserRow> = sqlx::query_as("SELECT * FROM \"user\" WHERE api_key = $1")
-        .bind(&api_key)
+        .bind(api_key)
         .fetch_optional(&global.pool)
         .await?;
 

vidformer-igni/src/server/api.rs

@@ -135,7 +135,7 @@ pub(crate) async fn search_source(
                     "Error reading request body",
                 )))?);
         }
-        Ok(req) => match serde_json::from_slice(&req.to_bytes().to_vec()) {
+        Ok(req) => match serde_json::from_slice(&req.to_bytes()) {
             Err(err) => {
                 error!("Error parsing request body");
                 return Ok(hyper::Response::builder()
@@ -758,7 +758,7 @@ pub(crate) async fn push_part_block(
             }
         };
 
-        let frame_block: crate::frame_block::FrameBlock =
+        let frame_block: crate::feb::FrameBlock =
             match serde_json::from_slice(&body_uncompresed) {
                 Err(err) => {
                     return Ok(hyper::Response::builder()
@@ -815,7 +815,7 @@ async fn push_frame_req(
             )))?);
     }
 
-    let pos = req.0 as i32;
+    let pos = req.0;
     let n_frames = req.2.len();
 
     // Check if we're pushing too many framesreq
@@ -837,7 +837,7 @@ async fn push_frame_req(
 
         insert_pos.push(pos + frame_idx as i32);
         if let Some(expr) = frame {
-            let mut feb = crate::frame_block::FrameBlock::new();
+            let mut feb = crate::feb::FrameBlock::new();
             feb.insert_frame(expr).map_err(|err| {
                 IgniError::General(format!("Error inserting value to FEB: {:?}", err))
             })?;

vidformer-igni/src/server/vod.rs

@@ -277,7 +277,7 @@ pub(crate) async fn get_segment(
         for (_, frame) in rows {
             let frame_reader = std::io::Cursor::new(frame);
             let frame_uncompressed = zstd::stream::decode_all(frame_reader).unwrap();
-            let feb: crate::frame_block::FrameBlock =
+            let feb: crate::feb::FrameBlock =
                 serde_json::from_slice(&frame_uncompressed).unwrap();
             let mut f_collection = feb.frames().map_err(|err| {
                 IgniError::General(format!("Error decoding frame block: {:?}", err))

vidformer-py/vidformer/__init__.py

@@ -1330,15 +1330,9 @@ def _json_arg(arg, skip_data_anot=False):
 class Filter:
     """A video filter."""
 
-    def __init__(self, name: str, tl_func=None, **kwargs):
+    def __init__(self, name: str, **kwargs):
         self._name = name
 
-        # tl_func is the top level func, which is the true implementation, not just a pretty name
-        if tl_func is None:
-            self._func = name
-        else:
-            self._func = tl_func
-
         # filter infra args, not invocation args
         for k, v in kwargs.items():
             if type(v) is not str:
@@ -1416,9 +1410,7 @@ def into_filter(self):
             target=_run_udf_host, args=(self, self._socket_path)
         )
         self._p.start()
-        return Filter(
-            name=self._name, tl_func="IPC", socket=self._socket_path, func=self._name
-        )
+        return Filter(name=self._name, socket=self._socket_path, func=self._name)
 
     def _handle_connection(self, connection):
         try: