Merge branch 'microsoft:main' into fix-issue-1892

Author: fibers

pyproject.toml

@@ -23,6 +23,9 @@ description = "A Quantitative-research Platform"
 requires-python = ">=3.8.0"
 readme = {file = "README.md", content-type = "text/markdown"}
 
+# On 2025-04-02 osqp released version 1.0.2, osqp is used as a dependency for cvxpy. 
+# It would lead to errors installing qlib, so we limited the version of osqp.
+# refs: https://github.com/osqp/osqp/issues/728
 dependencies = [
   "pyyaml",
   "numpy",
@@ -39,6 +42,7 @@ dependencies = [
   "loguru",
   "lightgbm",
   "gym",
+  "osqp<1.0.2",
   "cvxpy",
   "joblib",
   "matplotlib",

qlib/data/dataset/loader.py

@@ -339,6 +339,10 @@ def load(self, instruments=None, start_time=None, end_time=None) -> pd.DataFrame
             if df_full is None:
                 df_full = df_current
             else:
+                current_columns = df_current.columns.tolist()
+                full_columns = df_full.columns.tolist()
+                columns_to_drop = [col for col in current_columns if col in full_columns]
+                df_full.drop(columns=columns_to_drop, inplace=True)
                 df_full = pd.merge(df_full, df_current, left_index=True, right_index=True, how=self.join)
         return df_full.sort_index(axis=1)