qis 3.1.2__tar.gz → 3.1.3__tar.gz

{qis-3.1.2 → qis-3.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: qis
-Version: 3.1.2
+Version: 3.1.3
 Summary: Implementation of visualisation and reporting analytics for Quantitative Investment Strategies
 License: LICENSE.txt
 Keywords: quantitative,investing,portfolio optimization,systematic strategies,volatility

{qis-3.1.2 → qis-3.1.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "qis"
-version = "3.1.2"
+version = "3.1.3"
 description = "Implementation of visualisation and reporting analytics for Quantitative Investment Strategies"
 license = "LICENSE.txt"
 authors = ["Artur Sepp <artursepp@gmail.com>"]

{qis-3.1.2 → qis-3.1.3}/qis/file_utils.py

@@ -535,7 +535,8 @@ def save_df_dict_to_sql(engine: Engine,
                         table_name: str,
                         dfs: Dict[Union[str, Enum, NamedTuple], pd.DataFrame],
                         schema: Optional[str] = None,
-                        index_col: Optional[str] = INDEX_COLUMN
+                        index_col: Optional[str] = INDEX_COLUMN,
+                        if_exists: Literal["fail", "replace", "append"] | Literal["truncate-append"] = "fail",
                         ) -> None:
     """
     save pandas dict to sql engine
@@ -544,7 +545,22 @@ def save_df_dict_to_sql(engine: Engine,
         if df is not None and isinstance(df, pd.DataFrame):
             if index_col is not None:
                 df = df.reset_index(names=index_col)
-            df.to_sql(f"{table_name}_{key}", engine, schema=schema, if_exists='replace')
+            if if_exists == "truncate-append":
+                schema_str = f"{schema}." if schema else ""
+                with engine.connect() as con:
+                    statement = text(f"TRUNCATE TABLE {schema_str}{table_name}_{key}")
+                    con.execute(statement)
+                    con.commit()
+                df.to_sql(
+                    f"{table_name}_{key}",
+                    engine,
+                    schema=schema,
+                    if_exists='append',
+                    method='multi',
+                    chunksize=1000
+                )
+            else:
+                df.to_sql(f"{table_name}_{key}", engine, schema=schema, if_exists=if_exists)
 
 
 @timer
@@ -553,19 +569,22 @@ def load_df_dict_from_sql(engine: Engine,
                           dataset_keys: List[Union[str, Enum, NamedTuple]],
                           schema: Optional[str] = None,
                           index_col: Optional[str] = INDEX_COLUMN,
-                          columns: Optional[List[str]] = None
+                          columns: Optional[List[str]] = None,
+                          drop_sql_index: bool = True
                           ) -> Dict[str, pd.DataFrame]:
     """
     pandas dict from csv files
     """
     pandas_dict = {}
     for key in dataset_keys:
+        # df will have index set by index_col with added column 'index' from sql
         df = pd.read_sql_table(table_name=f"{table_name}_{key}", con=engine, schema=schema,
                                index_col=index_col,
                                columns=columns)
-        if index_col is not None and index_col in df.columns:
-            df[index_col] = pd.to_datetime(df[index_col])
-            df = df.set_index(index_col)
+        if drop_sql_index:
+            df = df.drop('index', axis=1)
+            #  df[index_col] = pd.to_datetime(df[index_col])
+            #  df = df.set_index(index_col, drop=True)
         pandas_dict[key] = df
     return pandas_dict