surpress waring

Author: yasstake

exchanges/binance/src/config.rs

@@ -2,9 +2,9 @@
 // Copyright(c) 2022-2024. yasstake. All rights reserved.
 
 use pyo3::{pyclass, pymethods};
-use rust_decimal_macros::dec;
 
-use rbot_lib::common::{env_api_key, env_api_secret, FeeType, MarketConfig, SecretString, ExchangeConfig};
+use rbot_lib::common::MarketConfig;
+use rbot_lib::common::ExchangeConfig;
 
 use crate::BINANCE;
 

exchanges/binance/src/ws.rs

@@ -18,8 +18,7 @@ use tokio::time::sleep;
 use crate::BinanceRestApi;
 use crate::BinanceUserWsMessage;
 use crate::BinanceWsRawMessage;
-use crate::{BinancePublicWsMessage, BinanceServerConfig};
-
+use crate::BinancePublicWsMessage;
 use serde_derive::{Deserialize, Serialize};
 
 use anyhow::anyhow;
@@ -280,6 +279,7 @@ impl BinancePrivateWsClient {
 mod tests {
     use super::*;
     use crate::BinanceConfig;
+    use crate::BinanceServerConfig;
     use rbot_lib::common::init_debug_log;
 
     #[tokio::test]
@@ -315,6 +315,7 @@ mod tests {
     }
 
     #[tokio::test]
+
     async fn test_make_connect_url() {
         let server = BinanceServerConfig::new(false);
         let api = BinanceRestApi::new(&server);

exchanges/bybit/src/config.rs

@@ -1,11 +1,7 @@
 #![allow(non_snake_case)]
-use std::env;
-
 use pyo3::prelude::*;
-use rust_decimal_macros::dec;
 use serde_derive::{Deserialize, Serialize};
-
-use rbot_lib::common::{FeeType, MarketConfig, ExchangeConfig};
+use rbot_lib::common::{MarketConfig, ExchangeConfig};
 
 use crate::BYBIT;
 

exchanges/bybit/src/market.rs

@@ -103,6 +103,7 @@ impl Bybit {
         self.get_enable_order_feature()
     }
 
+    #[pyo3(signature = (market_config, side, price, size, client_order_id=None))]
     pub fn limit_order(
         &self,
         market_config: &MarketConfig,
@@ -117,6 +118,7 @@ impl Bybit {
         })
     }
 
+    #[pyo3(signature = (market_config, side, size, client_order_id=None))]
     pub fn market_order(
         &self,
         market_config: &MarketConfig,
@@ -615,7 +617,7 @@ mod bybit_test {
         let mut bybit = Bybit::new(false);
         assert_eq!(bybit.get_enable_order_feature(), false);
 
-        bybit.set_enable_order_feature(true);
+        bybit.set_enable_order_with_my_own_risk(true);
         assert_eq!(bybit.get_enable_order_feature(), true);
     }
 

modules/rbot_lib/src/common/bar.rs

@@ -5,8 +5,9 @@ use std::{
 
 use pyo3::{
     types::{IntoPyDict as _, PyAnyMethods as _, PyModule},
-    Bound, Py, PyAny, Python,
+    Bound, Py, PyAny, Python, ffi::c_str,
 };
+use std::ffi::{CString, CStr};
 
 use super::{calc_class, is_notebook, MarketConfig};
 
@@ -49,9 +50,11 @@ impl PyRestBar {
             format!("{}{}", PY_TQDM_PYTHON, PY_BAR)
         };
 
+        let py_script = CString::new(py_script.as_str()).unwrap();
+
         Python::with_gil(|py| {
             let py_module =
-                PyModule::from_code_bound(py, &py_script, "py_file_bar.py", "py_file_bar");
+                PyModule::from_code(py, py_script.as_c_str(), c_str!("py_file_bar.py"), c_str!("py_file_bar"));
 
             if py_module.is_err() {
                 log::error!("py_file_bar tqdm bar class create error")
@@ -142,8 +145,10 @@ impl PyFileBar {
         };
 
         Python::with_gil(|py| {
+            let py_script = CString::new(py_script.as_str()).unwrap();
+
             let py_module =
-                PyModule::from_code_bound(py, &py_script, "py_file_bar.py", "py_file_bar");
+                PyModule::from_code(py, py_script.as_c_str(), c_str!("py_file_bar.py"), c_str!("py_file_bar"));
 
             if py_module.is_err() {
                 log::error!("py_file_bar tqdm bar class create error")
@@ -226,11 +231,6 @@ impl PyFileBar {
 }
 
 
-
-const PY_RUNNING_BAR: &str = r#"
-
-"#;
-
 pub struct PyRunningBar {
     bar: Py<PyAny>,
     enable: bool,
@@ -258,8 +258,10 @@ impl PyRunningBar {
         };
 
         Python::with_gil(|py| {
+            let py_script = CString::new(py_script.as_str()).unwrap();
+
             let py_module =
-                PyModule::from_code_bound(py, &py_script, "py_running_bar.py", "py_running_bar");
+                PyModule::from_code(py, &py_script, c_str!("py_running_bar.py"), c_str!("py_running_bar"));
 
             if py_module.is_err() {
                 log::error!("py progress tqdm bar class create error")

modules/rbot_lib/src/common/config.rs

@@ -123,7 +123,7 @@ impl ExchangeConfig {
     }
 }
 
-#[pyclass]
+#[pyclass(eq, eq_int)]
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
 pub enum FeeType {
     Home,

modules/rbot_lib/src/common/env.rs

@@ -7,8 +7,7 @@ use std::env::{self, VarError};
 
 use hmac::digest::{consts::False, typenum::NotEq};
 use pyo3::{
-    types::{PyAnyMethods, PyModule},
-    Python,
+    ffi::c_str, types::{PyAnyMethods, PyModule}, Python
 };
 
 use super::{SecretString, ExchangeConfig};
@@ -145,9 +144,9 @@ pub fn env_rbot_multicast_port() -> i64 {
 
 pub fn is_notebook() -> bool {
     Python::with_gil(|py| {
-        let notebook = PyModule::from_code_bound(
+        let notebook = PyModule::from_code(
             py,
-            r#"
+            c_str!(r#"
 import sys
 
 def is_notebook() -> bool:
@@ -163,9 +162,9 @@ def is_notebook() -> bool:
 
     except NameError:
         return False            
-            "#,
-            "notebook.py",
-            "notebook",
+        "#),
+            c_str!("notebook.py"),
+            c_str!("notebook"),
         );
 
         if notebook.is_err() {

modules/rbot_lib/src/common/order.rs

@@ -253,7 +253,7 @@ impl From<&String> for OrderType {
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, Display, Serialize, Deserialize)]
-#[pyclass]
+#[pyclass(eq, eq_int)]
 pub enum LogStatus {
     UnFixStart,       // WebSocketデータの取得開始ポイント
     UnFix,           // データはWebSocketなどから取得されたが、まだ確定していない

modules/rbot_lib/src/db/archive.rs

@@ -3,7 +3,7 @@ use crate::{
         date_string, parse_date, time_string, MarketConfig, MicroSec, OrderSide, PyFileBar, Trade,
         DAYS, FLOOR_DAY, MIN, NOW, TODAY,
     },
-    db::{append_df, csv_to_df, df_to_parquet, parquet_to_df, KEY},
+    db::{append_df, parquet_to_df, KEY},
     net::{check_exist, RestApi},
 };
 use anyhow::{anyhow, Context};
@@ -15,10 +15,6 @@ use rust_decimal::{prelude::FromPrimitive, Decimal};
 use tokio::io::{AsyncWriteExt as _, BufWriter};
 // Import the `anyhow` crate and the `Result` type.
 use super::{db_path_root, select_df_lazy};
-use polars::lazy::{
-    dsl::{col, lit},
-    frame::IntoLazy,
-};
 use polars::prelude::{DataFrame, NamedFrom};
 use polars::series::Series;
 
@@ -28,7 +24,6 @@ use std::{
     str::FromStr,
     vec,
 };
-use tempfile::tempdir;
 
 const EXTENSION: &str = "parquet";
 
@@ -732,7 +727,7 @@ where
 mod archive_test {
     use std::{path::PathBuf, str::FromStr};
 
-    use crate::{common::{init_debug_log, NOW}, db::TradeArchive};
+    use crate::{common::{init_debug_log, NOW}};
 
     use super::log_download_tmp;
 

modules/rbot_lib/src/db/df.rs

@@ -2,7 +2,7 @@
 
 use std::fs::File;
 use std::io::{BufReader, Cursor, Read};
-use std::path::{Path, PathBuf};
+use std::path::PathBuf;
 
 use crate::common::{OrderSide, Trade};
 use crate::common::{time_string, MicroSec, SEC};
@@ -25,8 +25,6 @@ use anyhow::anyhow;
 #[allow(non_upper_case_globals)]
 #[allow(non_snake_case)]
 pub mod KEY {
-    use polars::prelude::PlSmallStr;
-
     pub const timestamp: &str = "timestamp";
 
     // for trade
@@ -616,8 +614,7 @@ pub fn vap_df(df: &DataFrame, start_time: MicroSec, end_time: MicroSec, size: i6
         .fill_null(FillNullStrategy::Zero)
         .unwrap();
 
-    buy_vol.rename(KEY::buy_volume.into()).clone();
-
+    buy_vol.rename(KEY::buy_volume.into());
 
     let mut sell_vol = vap
         .column("false")
@@ -757,7 +754,6 @@ pub fn convert_timems_to_datetime(df: &mut DataFrame) -> anyhow::Result<()> {
     Ok(())
 }
 
-use tokio::time::error::Elapsed;
 use ::zip::ZipArchive;
 use polars::prelude::*;
 use rust_decimal::prelude::ToPrimitive;