0.3.12

src/main.rs

@@ -36,24 +36,29 @@ use util::*;
 //     }
 // }
 
-fn main() {
+fn main() -> Result<(), Box<dyn std::error::Error>> {
-    let read = Ark::new(Source::Read, Ticker::ARKK, None)
+    // let csv = Ark::merge_old_csv_to_parquet(Ticker::ARKK, None)
-        .unwrap()
+    //     .unwrap()
-        .collect()
+    //     .format()
-        .unwrap();
+    //     .unwrap()
-    println!("{:#?}", read.dtypes());
+    //     .write_parquet()
-    println!("{:#?}", read);
-
-    let api = Ark::new(Source::ApiFull, Ticker::ARKK, None)
-        .unwrap()
-        .collect()
-        .unwrap();
-    println!("{:#?}", api);
-
-    // let ark = Ark::new(Source::Ark, Ticker::ARKK, None)
     //     .unwrap()
     //     .collect()
     //     .unwrap();
+    // println!("{:#?}", csv);
+
+    let read = Ark::new(Source::Read, Ticker::ARKK, None)?.collect()?;
+    println!("{:#?}", read.dtypes());
+    println!("{:#?}", read.get_column_names());
+    println!("{:#?}", read);
+
+    // let api = Ark::new(Source::ApiFull, Ticker::ARKK, None)
+    //     .unwrap()
+    //     .collect()
+    //     .unwrap();
+    // println!("{:#?}", api);
+
+    // let ark = Ark::new(Source::Ark, Ticker::ARKK, None)?.collect()?;
     // println!("{:#?}", ark);
 
     // let ark = Ark::new(Source::Ark, Ticker::ARKVC, None)
@@ -61,4 +66,5 @@ fn main() {
     //     .collect()
     //     .unwrap();
     // println!("{:#?}", ark);
+    Ok(())
 }

src/util.rs

@@ -1,14 +1,14 @@
 use chrono::NaiveDate;
 use glob::glob;
 use polars::datatypes::DataType;
+use polars::lazy::dsl::StrptimeOptions;
 use polars::prelude::*;
-use polars::prelude::{DataFrame, StrptimeOptions, UniqueKeepStrategy};
 use reqwest::blocking::Client;
 use serde_json::Value;
 use std::error::Error;
 use std::fs::{create_dir_all, File};
 use std::io::Cursor;
-use std::path::{Path, PathBuf};
+use std::path::Path;
 use std::result::Result;
 use strum_macros::EnumIter;
 
@@ -249,20 +249,37 @@ impl Ark {
         if df.get_column_names().contains(&"weight_rank") {
             _ = df.drop_in_place("weight_rank");
         }
-
+        if df.get_column_names().contains(&"") {
-        let mut expressions: Vec<Expr> = vec![];
+            let mut cols = df.get_column_names();
+            cols.retain(|&item| !item.is_empty());
+            df = df.select(cols)?;
+        }
 
         if !df.fields().contains(&Field::new("date", DataType::Date)) {
-            expressions.push(col("date").str().strptime(
+            let date_format = |df: DataFrame, format: &str| -> Result<DataFrame, Box<dyn Error>> {
+                Ok(df
+                    .lazy()
+                    .with_column(col("date").str().strptime(
                         DataType::Date,
                         StrptimeOptions {
-                    format: Some("%m/%d/%Y".into()),
+                            format: Some(format.into()),
                             strict: false,
                             exact: true,
                             cache: true,
                         },
-            ));
+                    ))
+                    .collect()?)
+            };
+
+            if let Ok(x) = date_format(df.clone(), "%m/%d/%Y") {
+                df = x
             }
+            if let Ok(x) = date_format(df.clone(), "%Y/%m/%d") {
+                df = x
+            }
+        }
+
+        let mut expressions: Vec<Expr> = vec![];
 
         if df.fields().contains(&Field::new("weight", DataType::Utf8)) {
             expressions.push(

tests/integration.rs

@@ -25,8 +25,7 @@ fn get_api_arkk() -> Result<(), Box<dyn Error>> {
             "share_price",
             "shares",
             "ticker",
-            "weight",
+            "weight"
-            "weight_rank"
         ]
     );
     Ok(())