Verifying on Python and JavaScript

SilasMarvin · SilasMarvin · commit 44cc8a0c063a · 2024-02-28T08:57:57.000-08:00
diff --git a/pgml-sdks/pgml/Cargo.lock b/pgml-sdks/pgml/Cargo.lock
diff --git a/pgml-sdks/pgml/Cargo.toml b/pgml-sdks/pgml/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pgml"
-version = "0.10.1"
+version = "0.11.0"
 edition = "2021"
 authors = ["PosgresML <team@postgresml.org>"]
 homepage = "https://postgresml.org/"
diff --git a/pgml-sdks/pgml/pyproject.toml b/pgml-sdks/pgml/pyproject.toml
@@ -5,7 +5,7 @@ build-backend = "maturin"
 [project]
 name = "pgml"
 requires-python = ">=3.7"
-version = "0.10.1"
+version = "0.11.0"
 description = "Python SDK is designed to facilitate the development of scalable vector search applications on PostgreSQL databases."
 authors = [
   {name = "PostgresML",  email = "team@postgresml.org"},
diff --git a/pgml-sdks/pgml/python/tests/test.py b/pgml-sdks/pgml/python/tests/test.py
@@ -66,6 +66,11 @@ def test_can_create_pipeline():
     assert pipeline is not None
 
 
+def test_can_create_multi_field_pipeline():
+    pipeline = pgml.MultiFieldPipeline("test_p_p_tccmfp_0", {})
+    assert pipeline is not None
+
+
 def test_can_create_builtins():
     builtins = pgml.Builtins()
     assert builtins is not None
diff --git a/pgml-sdks/pgml/src/languages/python.rs b/pgml-sdks/pgml/src/languages/python.rs
@@ -4,8 +4,6 @@ use pyo3::types::{PyDict, PyFloat, PyInt, PyList, PyString};
 use pyo3::{prelude::*, types::PyBool};
 use std::sync::Arc;
 
-use rust_bridge::python::CustomInto;
-
 use crate::types::{GeneralJsonAsyncIterator, GeneralJsonIterator, Json};
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/pgml-sdks/pgml/src/lib.rs b/pgml-sdks/pgml/src/lib.rs
@@ -47,7 +47,9 @@ pub use splitter::Splitter;
 pub use transformer_pipeline::TransformerPipeline;
 
 // This is use when inserting collections to set the sdk_version used during creation
-static SDK_VERSION: &str = "0.9.2";
+// This doesn't actually mean the verion of the SDK it was created on, it means the
+// version it is compatible with
+static SDK_VERSION: &str = "0.11.0";
 
 // Store the database(s) in a global variable so that we can access them from anywhere
 // This is not necessarily idiomatic Rust, but it is a good way to acomplish what we need
@@ -161,7 +163,8 @@ fn pgml(_py: pyo3::Python, m: &pyo3::types::PyModule) -> pyo3::PyResult<()> {
     m.add_function(pyo3::wrap_pyfunction!(init_logger, m)?)?;
     m.add_function(pyo3::wrap_pyfunction!(migrate, m)?)?;
     m.add_function(pyo3::wrap_pyfunction!(cli::cli, m)?)?;
-    m.add_class::<pipeline::PipelinePython>()?;
+    // m.add_class::<pipeline::PipelinePython>()?;
+    m.add_class::<multi_field_pipeline::MultiFieldPipelinePython>()?;
     m.add_class::<collection::CollectionPython>()?;
     m.add_class::<model::ModelPython>()?;
     m.add_class::<splitter::SplitterPython>()?;
diff --git a/pgml-sdks/pgml/src/multi_field_pipeline.rs b/pgml-sdks/pgml/src/multi_field_pipeline.rs
@@ -20,7 +20,7 @@ use crate::{
 };
 
 #[cfg(feature = "python")]
-use crate::{model::ModelPython, splitter::SplitterPython, types::JsonPython};
+use crate::types::JsonPython;
 
 type ParsedSchema = HashMap<String, FieldAction>;
 
diff --git a/pgml-sdks/pgml/src/pipeline.rs b/pgml-sdks/pgml/src/pipeline.rs
@@ -13,15 +13,15 @@ use crate::{
 
 /// A pipeline that processes documents
 /// This has been deprecated in favor of [MultiFieldPipeline]
-#[derive(alias, Debug, Clone)]
+// #[derive(alias, Debug, Clone)]
 pub struct Pipeline {
     pub name: String,
     pub model: Option<Model>,
     pub splitter: Option<Splitter>,
     pub parameters: Option<Json>,
 }
 
-#[alias_methods(new)]
+// #[alias_methods(new)]
 impl Pipeline {
     /// Creates a new [Pipeline]
     ///
diff --git a/pgml-sdks/rust-bridge/rust-bridge-macros/src/python.rs b/pgml-sdks/rust-bridge/rust-bridge-macros/src/python.rs
@@ -221,8 +221,9 @@ pub fn generate_python_methods(
                 let st = r.to_string();
                 Some(if st.contains('&') {
                     let st = st.replace("self", &wrapped_type_ident.to_string());
-                    let s = syn::parse_str::<syn::Type>(&st).unwrap_or_else(|_| panic!("Error converting self type to necessary syn type: {:?}",
-                        r));
+                    let s = syn::parse_str::<syn::Type>(&st).unwrap_or_else(|_| {
+                        panic!("Error converting self type to necessary syn type: {:?}", r)
+                    });
                     s.to_token_stream()
                 } else {
                     quote! { #wrapped_type_ident }
@@ -265,6 +266,7 @@ pub fn generate_python_methods(
         };
 
         // The new function for pyO3 requires some unique syntax
+        // The way we use the #convert_from assumes that new has a return type
         let (signature, middle) = if method_ident == "new" {
             let signature = quote! {
                 #[new]
@@ -296,7 +298,7 @@ pub fn generate_python_methods(
                 use rust_bridge::python::CustomInto;
                 #prepared_wrapper_arguments
                 #middle
-                let x: Self = x.custom_into();
+                let x: #convert_from = x.custom_into();
                 Ok(x)
             };
             (signature, middle)
