Cargo Upgrade (#27)

Upgrading dependencies and ensuring CI still passes. Required some updates on field expectations and dune date parsing.

Author: bh2smith

Cargo.toml

@@ -11,11 +11,11 @@ license = "MIT OR Apache-2.0"
 keywords = ["dune", "ethereum", "api-client", "web3", "dune-analytics"]
 
 [dependencies]
-chrono = { version = "0.4.37", features = ["serde"] }
+chrono = { version = "0.4.42", features = ["serde"] }
 dotenv = "0.15.0"
-log = "0.4.21"
-reqwest = { version = "0.12.3", features = ["json"] }
-serde = { version = "1.0.197", features = ["derive"] }
-serde_json = "1.0.115"
-serde_with = "3.7.0"
-tokio = { version = "1.37.0", features = ["full"] }
+log = "0.4.28"
+reqwest = { version = "0.12.24", features = ["json"] }
+serde = { version = "1.0.228", features = ["derive"] }
+serde_json = "1.0.145"
+serde_with = "3.15.1"
+tokio = { version = "1.48.0", features = ["full"] }

src/client.rs

@@ -24,8 +24,8 @@ const BASE_URL: &str = "https://api.dune.com/api/v1";
 /// - GET
 ///     - get_status
 ///     - get_results
-/// Furthermore, this interface also implements a convenience method `refresh`
-/// which acts as follows:
+///
+/// Furthermore, this interface also implements a convenience method `refresh` which acts as follows:
 /// 1. Execute query
 /// 2. While execution status is not in a terminal state, sleep and check again
 /// 3. Get and return execution results.
@@ -149,12 +149,12 @@ impl DuneClient {
     /// 3. fetch and return query results.
     /// # Arguments
     /// * `query_id` - an integer representing query ID
-    ///             (found at the end of a Dune Query URL: [https://dune.com/queries/971694](https://dune.com/queries/971694))
+    ///   (found at the end of a Dune Query URL: [https://dune.com/queries/971694](https://dune.com/queries/971694))
     /// * `parameters` - an optional list of query `Parameter`
-    ///             (cf. [https://dune.xyz/queries/3238619](https://dune.xyz/queries/3238619))
+    ///   (cf. [https://dune.xyz/queries/3238619](https://dune.xyz/queries/3238619))
     /// * `ping_frequency` - how frequently (in seconds) should the loop check execution status.
-    ///             Default is 5 seconds. Too frequently could result in rate limiting
-    ///             (i.e. Too Many Requests) especially when executing multiple queries in parallel.
+    ///   Default is 5 seconds. Too frequently could result in rate limiting
+    ///   (i.e. Too Many Requests) especially when executing multiple queries in parallel.
     ///
     /// # Examples
     /// ```
@@ -222,7 +222,7 @@ mod tests {
     use serde::Deserialize;
 
     const QUERY_ID: u32 = 971694;
-    const JOB_ID: &str = "01GMZ8R4NPPQZCWYJRY2K03MH0";
+    const JOB_ID: &str = "01K9QTN27XQTXQV59BKBJ4GKFW";
 
     #[tokio::test]
     async fn invalid_api_key() {
@@ -304,7 +304,7 @@ mod tests {
         let rows = results.result.rows;
         assert_eq!(1, rows.len());
         assert_eq!(rows[0].symbol, "WETH");
-        assert_eq!(rows[0].token, "\\xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2");
+        assert_eq!(rows[0].token, "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2");
         assert!(rows[0].max_price > 4148.0)
     }
 

src/parse_utils.rs

@@ -14,7 +14,9 @@ pub fn date_parse(date_str: &str) -> Result<DateTime<Utc>, ParseError> {
 
 /// The Date format returned from data fields of type timestamp.
 pub fn dune_date(date_str: &str) -> Result<DateTime<Utc>, ParseError> {
+    // Try with microseconds first
     date_string_parser(date_str, "%Y-%m-%d %H:%M:%S.%f")
+        .or_else(|_| date_string_parser(date_str, "%Y-%m-%d %H:%M:%S"))
 }
 
 pub fn datetime_from_str<'de, D>(deserializer: D) -> Result<DateTime<Utc>, D::Error>
@@ -81,4 +83,13 @@ mod tests {
             "2022-05-04 00:00:00 UTC"
         )
     }
+
+    #[test]
+    fn dune_date_without_microseconds() {
+        let date_str = "2022-05-04 00:00:00";
+        assert_eq!(
+            dune_date(date_str).unwrap().to_string(),
+            "2022-05-04 00:00:00 UTC"
+        )
+    }
 }

src/response.rs

@@ -66,7 +66,13 @@ pub struct CancellationResponse {
 #[derive(Deserialize, Debug)]
 pub struct ResultMetaData {
     pub column_names: Vec<String>,
+    #[serde(default)]
+    pub column_types: Option<Vec<String>>,
+    #[serde(default)]
+    pub row_count: Option<u32>,
     pub result_set_bytes: u64,
+    #[serde(default)]
+    pub total_result_set_bytes: Option<u64>,
     pub total_row_count: u32,
     pub datapoint_count: u32,
     pub pending_time_millis: Option<u32>,
@@ -129,6 +135,8 @@ pub struct ExecutionResult<T> {
 pub struct GetResultResponse<T> {
     pub execution_id: String,
     pub query_id: u32,
+    #[serde(default)]
+    pub is_execution_finished: Option<bool>,
     pub state: ExecutionStatus,
     // TODO - this `flatten` isn't what I had hoped for.
     //  I want the `times` field to disappear
@@ -222,7 +230,10 @@ mod tests {
                     queue_position: Some(10),
                     result_metadata: Some(ResultMetaData {
                         column_names: vec![],
+                        column_types: None,
+                        row_count: None,
                         result_set_bytes: 0,
+                        total_result_set_bytes: None,
                         total_row_count: 0,
                         datapoint_count: 0,
                         pending_time_millis: None,
@@ -244,7 +255,10 @@ mod tests {
                 queue_position: Some(10), \
                 result_metadata: Some(ResultMetaData { \
                         column_names: [], \
+                        column_types: None, \
+                        row_count: None, \
                         result_set_bytes: 0, \
+                        total_result_set_bytes: None, \
                         total_row_count: 0, \
                         datapoint_count: 0, \
                         pending_time_millis: None, \
@@ -258,6 +272,7 @@ mod tests {
                 GetResultResponse {
                     execution_id: execution_id.to_string(),
                     query_id,
+                    is_execution_finished: None,
                     state: ExecutionStatus::Complete,
                     times: ExecutionTimes {
                         submitted_at: Default::default(),
@@ -270,7 +285,10 @@ mod tests {
                         rows: vec![],
                         metadata: ResultMetaData {
                             column_names: vec![],
+                            column_types: None,
+                            row_count: None,
                             result_set_bytes: 0,
+                            total_result_set_bytes: None,
                             total_row_count: 0,
                             datapoint_count: 0,
                             pending_time_millis: None,
@@ -282,6 +300,7 @@ mod tests {
             "GetResultResponse { \
                 execution_id: \"jerb ID\", \
                 query_id: 71, \
+                is_execution_finished: None, \
                 state: Complete, \
                 times: ExecutionTimes { \
                     submitted_at: 1970-01-01T00:00:00Z, \
@@ -294,7 +313,10 @@ mod tests {
                     rows: [], \
                     metadata: ResultMetaData { \
                         column_names: [], \
+                        column_types: None, \
+                        row_count: None, \
                         result_set_bytes: 0, \
+                        total_result_set_bytes: None, \
                         total_row_count: 0, \
                         datapoint_count: 0, \
                         pending_time_millis: None, \