Clippy cleanup

SilasMarvin · SilasMarvin · commit dad8c12d6294 · 2024-05-20T10:29:08.000-07:00
diff --git a/pgml-sdks/pgml/src/builtins.rs b/pgml-sdks/pgml/src/builtins.rs
@@ -84,7 +84,7 @@ impl Builtins {
             query.bind(task.0)
         };
         let results = query.bind(inputs).bind(args).fetch_all(&pool).await?;
-        let results = results.get(0).unwrap().get::<serde_json::Value, _>(0);
+        let results = results.first().unwrap().get::<serde_json::Value, _>(0);
         Ok(Json(results))
     }
 }
diff --git a/pgml-sdks/pgml/src/collection.rs b/pgml-sdks/pgml/src/collection.rs
@@ -1126,7 +1126,7 @@ impl Collection {
     }
 
     #[instrument(skip(self))]
-    pub async fn rag(&self, query: Json, pipeline: &Pipeline) -> anyhow::Result<Json> {
+    pub async fn rag(&self, query: Json, pipeline: &mut Pipeline) -> anyhow::Result<Json> {
         let pool = get_or_initialize_pool(&self.database_url).await?;
         let (built_query, values) = build_rag_query(query.clone(), self, pipeline, false).await?;
         let mut results: Vec<(Json,)> = sqlx::query_as_with(&built_query, values)
@@ -1136,7 +1136,11 @@ impl Collection {
     }
 
     #[instrument(skip(self))]
-    pub async fn rag_stream(&self, query: Json, pipeline: &Pipeline) -> anyhow::Result<RAGStream> {
+    pub async fn rag_stream(
+        &self,
+        query: Json,
+        pipeline: &mut Pipeline,
+    ) -> anyhow::Result<RAGStream> {
         let pool = get_or_initialize_pool(&self.database_url).await?;
 
         let (built_query, values) = build_rag_query(query.clone(), self, pipeline, true).await?;
diff --git a/pgml-sdks/pgml/src/transformer_pipeline.rs b/pgml-sdks/pgml/src/transformer_pipeline.rs
@@ -32,7 +32,7 @@ impl TransformerPipeline {
         a.insert("model".to_string(), model.into());
 
         // We must convert any floating point values to integers or our extension will get angry
-        for field in vec!["gpu_layers"] {
+        for field in ["gpu_layers"] {
             if let Some(v) = a.remove(field) {
                 let x: u64 = CustomU64Convertor(v).into();
                 a.insert(field.to_string(), x.into());
@@ -62,7 +62,7 @@ impl TransformerPipeline {
         }
 
         // We must convert any floating point values to integers or our extension will get angry
-        for field in vec!["max_tokens", "n"] {
+        for field in ["max_tokens", "n"] {
             if let Some(v) = a.remove(field) {
                 let x: u64 = CustomU64Convertor(v).into();
                 a.insert(field.to_string(), x.into());
@@ -95,7 +95,7 @@ impl TransformerPipeline {
                 .fetch_all(&pool)
                 .await?
         };
-        let results = results.get(0).unwrap().get::<serde_json::Value, _>(0);
+        let results = results.first().unwrap().get::<serde_json::Value, _>(0);
         Ok(Json(results))
     }
 
@@ -121,7 +121,7 @@ impl TransformerPipeline {
         }
 
         // We must convert any floating point values to integers or our extension will get angry
-        for field in vec!["max_tokens", "n"] {
+        for field in ["max_tokens", "n"] {
             if let Some(v) = a.remove(field) {
                 let x: u64 = CustomU64Convertor(v).into();
                 a.insert(field.to_string(), x.into());

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ impl Builtins {`
`84`	`84`	`query.bind(task.0)`
`85`	`85`	`};`
`86`	`86`	`let results = query.bind(inputs).bind(args).fetch_all(&pool).await?;`
`87`		`- let results = results.get(0).unwrap().get::<serde_json::Value, _>(0);`
	`87`	`+ let results = results.first().unwrap().get::<serde_json::Value, _>(0);`
`88`	`88`	`Ok(Json(results))`
`89`	`89`	`}`
`90`	`90`	`}`