From e52e041a0b5995c6e18616f7e32dc28e1468e638 Mon Sep 17 00:00:00 2001
From: Jon Mease <jonmmease@gmail.com>
Date: Wed, 27 Sep 2023 07:28:14 -0400
Subject: [PATCH 1/2] remove panics in planning

---
 .../src/planning/split_domain_data.rs         | 12 +++-----
 vegafusion-core/src/planning/stitch.rs        | 28 ++++---------------
 2 files changed, 10 insertions(+), 30 deletions(-)

diff --git a/vegafusion-core/src/planning/split_domain_data.rs b/vegafusion-core/src/planning/split_domain_data.rs
index d2019f6a9..5f13d7752 100644
--- a/vegafusion-core/src/planning/split_domain_data.rs
+++ b/vegafusion-core/src/planning/split_domain_data.rs
@@ -248,8 +248,7 @@ impl<'a> SplitScaleDomainVisitor<'a> {
                         }
                     ]
                 }
-            ))
-            .unwrap();
+            ))?;
 
             // Create new domain specification that uses the new dataset
             let new_domain: ScaleDomainSpec = serde_json::from_value(serde_json::json!([
@@ -267,8 +266,7 @@ impl<'a> SplitScaleDomainVisitor<'a> {
                             escape_field(&new_data_name)
                         )
                 }
-            ]))
-            .unwrap();
+            ]))?;
 
             (new_data, new_domain)
         } else {
@@ -324,8 +322,7 @@ impl<'a> SplitScaleDomainVisitor<'a> {
                         }
                     ]
                }
-            ))
-            .unwrap()
+            ))?
         } else {
             // Will sort by the grouped field values
             serde_json::from_value(serde_json::json!(
@@ -346,8 +343,7 @@ impl<'a> SplitScaleDomainVisitor<'a> {
                         }
                     ]
                }
-            ))
-            .unwrap()
+            ))?
         })
     }
 }
diff --git a/vegafusion-core/src/planning/stitch.rs b/vegafusion-core/src/planning/stitch.rs
index 10516f06d..fa34ec7af 100644
--- a/vegafusion-core/src/planning/stitch.rs
+++ b/vegafusion-core/src/planning/stitch.rs
@@ -21,30 +21,14 @@ pub fn stitch_specs(
     keep_variables: &[ScopedVariable],
 ) -> Result<CommPlan> {
     // Get client spec variable types
-    let client_defs: HashSet<_> = client_spec.definition_vars().unwrap().into_iter().collect();
-    let client_inputs: HashSet<_> = client_spec
-        .input_vars(task_scope)
-        .unwrap()
-        .into_iter()
-        .collect();
-    let client_updates: HashSet<_> = client_spec
-        .update_vars(task_scope)
-        .unwrap()
-        .into_iter()
-        .collect();
+    let client_defs: HashSet<_> = client_spec.definition_vars()?.into_iter().collect();
+    let client_inputs: HashSet<_> = client_spec.input_vars(task_scope)?.into_iter().collect();
+    let client_updates: HashSet<_> = client_spec.update_vars(task_scope)?.into_iter().collect();
 
     // Get server spec variable types
-    let server_defs: HashSet<_> = server_spec.definition_vars().unwrap().into_iter().collect();
-    let server_inputs: HashSet<_> = server_spec
-        .input_vars(task_scope)
-        .unwrap()
-        .into_iter()
-        .collect();
-    let server_updates: HashSet<_> = server_spec
-        .update_vars(task_scope)
-        .unwrap()
-        .into_iter()
-        .collect();
+    let server_defs: HashSet<_> = server_spec.definition_vars()?.into_iter().collect();
+    let server_inputs: HashSet<_> = server_spec.input_vars(task_scope)?.into_iter().collect();
+    let server_updates: HashSet<_> = server_spec.update_vars(task_scope)?.into_iter().collect();
 
     // Determine communication requirements
     let mut server_to_client: HashSet<_> = client_inputs

From 8495e0996271f3dce08c256ca9d3e91c45c3c0ec Mon Sep 17 00:00:00 2001
From: Jon Mease <jonmmease@gmail.com>
Date: Wed, 27 Sep 2023 08:56:41 -0400
Subject: [PATCH 2/2] pin polars due to
 https://github.com/pola-rs/polars/issues/11355

---
 .github/workflows/build_test.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
index 799c3efe3..53ab7a346 100644
--- a/.github/workflows/build_test.yml
+++ b/.github/workflows/build_test.yml
@@ -311,7 +311,7 @@ jobs:
           ls -la
           python -m pip install vegafusion-*.whl
           python -m pip install vegafusion_python_embed-*manylinux_2_17_x86_64*.whl
-          python -m pip install pytest vega-datasets polars duckdb vl-convert-python scikit-image pandas==2.0
+          python -m pip install pytest vega-datasets polars==0.19.3 duckdb vl-convert-python scikit-image pandas==2.0
       - name: Test vegafusion
         working-directory: python/vegafusion/
         run: pytest
@@ -342,7 +342,7 @@ jobs:
           ls -la
           python -m pip install vegafusion-*.whl
           python -m pip install vegafusion_python_embed-*macosx_10_7_x86_64.whl
-          python -m pip install pytest vega-datasets polars duckdb altair vl-convert-python scikit-image pandas==2.0
+          python -m pip install pytest vega-datasets polars==0.19.3 duckdb altair vl-convert-python scikit-image pandas==2.0
           
           # Downgrade pyarrow to 10.0.1
           python -m pip install pyarrow==10.0.1
@@ -380,7 +380,7 @@ jobs:
 
           python -m pip install $vegafusion
           python -m pip install $vegafusion_python_embed
-          python -m pip install pytest vega-datasets polars duckdb vl-convert-python scikit-image
+          python -m pip install pytest vega-datasets polars==0.19.3 duckdb vl-convert-python scikit-image
       - name: Test vegafusion
         working-directory: python/vegafusion/
         run: pytest