diff options
Diffstat (limited to 'python')
| -rw-r--r-- | python/risk/__main__.py | 8 | ||||
| -rw-r--r-- | python/risk/indices.py | 3 | ||||
| -rw-r--r-- | python/risk/swaptions.py | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/python/risk/__main__.py b/python/risk/__main__.py index 7099a2c9..5607999b 100644 --- a/python/risk/__main__.py +++ b/python/risk/__main__.py @@ -1,7 +1,8 @@ import serenitas.analytics import argparse import datetime -from serenitas.utils.db import dbconn, dbengine +from serenitas.utils.db import dbengine +from serenitas.utils.db2 import dawn_pool, dbconn from .bonds import subprime_risk, clo_risk, crt_risk, insert_subprime_risk from serenitas.analytics import init_ontr from serenitas.analytics.dates import prev_business_day @@ -27,7 +28,7 @@ serenitas.analytics._local = False mysql_engine = dbengine("rmbs_model") mysqlcrt_engine = dbengine("crt") -with dbconn("dawndb") as conn: +with dawn_pool.connection() as conn: for fund in ("SERCGMAST", "BOWDST", "BRINKER"): portf = get_swaption_portfolio(workdate, conn, source_list=["MS"], fund=fund) insert_swaption_portfolio(portf, conn) @@ -40,8 +41,7 @@ with dbconn("dawndb") as conn: ("SER_IGCURVE", "SER_ITRXCURVE", "XCURVE", "SER_HYCURVE"), ) - -with dbconn("etdb") as etconn, dbconn("dawndb") as dawnconn: +with dbconn("etdb") as etconn, dawn_pool.connection() as dawnconn: subprime = subprime_risk(workdate, dawnconn, mysql_engine) insert_subprime_risk(subprime, dawnconn) clo = clo_risk(workdate, dawnconn, etconn) diff --git a/python/risk/indices.py b/python/risk/indices.py index 243ea6e6..ef97d306 100644 --- a/python/risk/indices.py +++ b/python/risk/indices.py @@ -34,7 +34,8 @@ def get_index_portfolio( folder_filter = [] if strategies != (): if isinstance(strategies, tuple): - folder_filter.append("folder IN %s") + folder_filter.append("folder::text = ANY(%s)") + strategies = list(strategies) else: folder_filter.append("folder = %s") params += (strategies,) diff --git a/python/risk/swaptions.py b/python/risk/swaptions.py index e7ed1a67..e91543ba 100644 --- a/python/risk/swaptions.py +++ b/python/risk/swaptions.py @@ -1,7 +1,7 @@ import logging from serenitas.analytics import Portfolio, BlackSwaption, DataError -from psycopg2 import sql +from psycopg import sql logger = logging.getLogger(__name__) |