From 10ad6f4637161b4788a22c693dfab53ff509b133 Mon Sep 17 00:00:00 2001 From: gplessm Date: Wed, 21 Jun 2017 11:56:12 +0200 Subject: [PATCH 1/4] Adapt database connection creator --- dataprocessing/eGo_data_processing.py | 4 ++-- dataprocessing/eGo_preprocessing.py | 2 +- .../python_scripts/ego_dp_loadarea_peakload.py | 2 +- .../ego_dp_powerflow_griddistrict_demand.py | 2 +- dataprocessing/tools/io.py | 10 +++++----- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dataprocessing/eGo_data_processing.py b/dataprocessing/eGo_data_processing.py index 4421bfff..038d3164 100644 --- a/dataprocessing/eGo_data_processing.py +++ b/dataprocessing/eGo_data_processing.py @@ -14,7 +14,7 @@ import time import os import codecs -from tools import io +from dataprocessing.tools import io def data_processing(): # Configure logging @@ -120,7 +120,7 @@ def data_processing(): ] # get database connection - conn = io.oedb_session(section='oedb') + conn = io.oedb_session(section='oep') # iterate over list of sql- and python-snippets and execute them for snippet in snippets: diff --git a/dataprocessing/eGo_preprocessing.py b/dataprocessing/eGo_preprocessing.py index b97234ce..082fbbbc 100644 --- a/dataprocessing/eGo_preprocessing.py +++ b/dataprocessing/eGo_preprocessing.py @@ -42,7 +42,7 @@ def preprocessing(): snippets = ['ego_pre_slp_parameters.sql'] # get database connection - conn = io.oedb_session(section='oedb') + conn = io.oedb_session(section='oep') # iterate over list of sql- and python-snippets and execute them for snippet in snippets: diff --git a/dataprocessing/python_scripts/ego_dp_loadarea_peakload.py b/dataprocessing/python_scripts/ego_dp_loadarea_peakload.py index f24a9c62..5b991053 100755 --- a/dataprocessing/python_scripts/ego_dp_loadarea_peakload.py +++ b/dataprocessing/python_scripts/ego_dp_loadarea_peakload.py @@ -113,7 +113,7 @@ def add_sectoral_peak_load(load_areas, **kwargs): holidays = dict(cal.holidays(2011)) # get database connection object - conn = io.oedb_session(section='oedb') + conn = io.oedb_session(section='oep') Session = sessionmaker(bind=conn) session = Session() diff --git a/dataprocessing/python_scripts/ego_dp_powerflow_griddistrict_demand.py b/dataprocessing/python_scripts/ego_dp_powerflow_griddistrict_demand.py index d1657e1f..b5986ed4 100644 --- a/dataprocessing/python_scripts/ego_dp_powerflow_griddistrict_demand.py +++ b/dataprocessing/python_scripts/ego_dp_powerflow_griddistrict_demand.py @@ -46,7 +46,7 @@ def demand_per_mv_grid_district(): # retrieve sectoral demand from oedb # get database connection - conn = io.oedb_session(section='oedb') + conn = io.oedb_session(section='oep') Session = sessionmaker(bind=conn) session = Session() diff --git a/dataprocessing/tools/io.py b/dataprocessing/tools/io.py index e1cbbb75..4a830c8f 100644 --- a/dataprocessing/tools/io.py +++ b/dataprocessing/tools/io.py @@ -1,14 +1,14 @@ from sqlalchemy import create_engine +from egoio.tools.db import connection import getpass import sys -def oedb_session(section='oedb'): +def oedb_session(section='oep'): """Get SQLAlchemy session object with valid connection to OEDB""" - # get session object by oemof.db tools (requires .oemof/config.ini + # get session object by oemof.db tools (requires ~/.egoio/config.ini try: - from oemof import db - conn = db.connection(section=section) + conn = connection(section=section) except: print('Please provide connection parameters to database:\n' + @@ -16,7 +16,7 @@ def oedb_session(section='oedb'): host = input('host (default 141.44.24.88): ') or 'oe.iws.cs.ovgu.de' port = input('port (default 5432): ') or '5432' - database = input("database name (default 'oedb'): ") or 'oedb' + database = input("database name (default 'oep'): ") or 'oep' user = input('user (default postgres): ') # password = input('password: ') password = getpass.getpass(prompt='password: ', From b6ac9a4c4c1d386212a3799343739ee1d892904a Mon Sep 17 00:00:00 2001 From: Ludwig Huelk Date: Thu, 22 Jun 2017 14:24:33 +0200 Subject: [PATCH 2/4] fix typo in documentation --- dataprocessing/eGo_data_processing.py | 2 +- dataprocessing/tools/io.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dataprocessing/eGo_data_processing.py b/dataprocessing/eGo_data_processing.py index 038d3164..3f9e79a0 100644 --- a/dataprocessing/eGo_data_processing.py +++ b/dataprocessing/eGo_data_processing.py @@ -115,7 +115,7 @@ def data_processing(): # # ## VERSIONING - 'ego_dp_versioning.sql' # Versioning + # 'ego_dp_versioning.sql' # Versioning ] diff --git a/dataprocessing/tools/io.py b/dataprocessing/tools/io.py index 4a830c8f..47b77bdf 100644 --- a/dataprocessing/tools/io.py +++ b/dataprocessing/tools/io.py @@ -6,7 +6,7 @@ def oedb_session(section='oep'): """Get SQLAlchemy session object with valid connection to OEDB""" - # get session object by oemof.db tools (requires ~/.egoio/config.ini + # get session object by oemof.db tools (requires ~/.egoio/config.ini) try: conn = connection(section=section) From 50d24c0982e023940c0c6b0aff65d539cbdeb8de Mon Sep 17 00:00:00 2001 From: Ludwig Huelk Date: Thu, 22 Jun 2017 15:42:04 +0200 Subject: [PATCH 3/4] change tab for testing --- dataprocessing/tools/io.py | 42 +++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/dataprocessing/tools/io.py b/dataprocessing/tools/io.py index 47b77bdf..64bc4b9a 100644 --- a/dataprocessing/tools/io.py +++ b/dataprocessing/tools/io.py @@ -4,28 +4,28 @@ import sys def oedb_session(section='oep'): - """Get SQLAlchemy session object with valid connection to OEDB""" + """Get SQLAlchemy session object with valid connection to OEDB""" - # get session object by oemof.db tools (requires ~/.egoio/config.ini) - try: - conn = connection(section=section) + # get session object by oemof.db tools (requires ~/.egoio/config.ini) + try: + conn = connection(section=section) - except: - print('Please provide connection parameters to database:\n' + - 'Hit [Enter] to take defaults') + except: + print('Please provide connection parameters to database:\n' + + 'Hit [Enter] to take defaults') - host = input('host (default 141.44.24.88): ') or 'oe.iws.cs.ovgu.de' - port = input('port (default 5432): ') or '5432' - database = input("database name (default 'oep'): ") or 'oep' - user = input('user (default postgres): ') - # password = input('password: ') - password = getpass.getpass(prompt='password: ', - stream=sys.stderr) - conn = create_engine( - 'postgresql://' + '%s:%s@%s:%s/%s' % (user, - password, - host, - port, - database)).connect() + host = input('host (default 141.44.24.88): ') or 'oe.iws.cs.ovgu.de' + port = input('port (default 5432): ') or '5432' + database = input("database name (default 'oep'): ") or 'oep' + user = input('user (default postgres): ') + # password = input('password: ') + password = getpass.getpass(prompt='password: ', + stream=sys.stderr) + conn = create_engine( + 'postgresql://' + '%s:%s@%s:%s/%s' % (user, + password, + host, + port, + database)).connect() - return conn + return conn From 31872ea43b3b8e6a7d40319747969c3511a05b20 Mon Sep 17 00:00:00 2001 From: Ludwig Huelk Date: Thu, 22 Jun 2017 15:44:58 +0200 Subject: [PATCH 4/4] change tabs back to points --- dataprocessing/tools/io.py | 42 +++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/dataprocessing/tools/io.py b/dataprocessing/tools/io.py index 64bc4b9a..44df3282 100644 --- a/dataprocessing/tools/io.py +++ b/dataprocessing/tools/io.py @@ -4,28 +4,28 @@ import sys def oedb_session(section='oep'): - """Get SQLAlchemy session object with valid connection to OEDB""" + """Get SQLAlchemy session object with valid connection to OEDB""" - # get session object by oemof.db tools (requires ~/.egoio/config.ini) - try: - conn = connection(section=section) + # get session object by oemof.db tools (requires ~/.egoio/config.ini) + try: + conn = connection(section=section) - except: - print('Please provide connection parameters to database:\n' + - 'Hit [Enter] to take defaults') + except: + print('Please provide connection parameters to database:\n' + + 'Hit [Enter] to take defaults') - host = input('host (default 141.44.24.88): ') or 'oe.iws.cs.ovgu.de' - port = input('port (default 5432): ') or '5432' - database = input("database name (default 'oep'): ") or 'oep' - user = input('user (default postgres): ') - # password = input('password: ') - password = getpass.getpass(prompt='password: ', - stream=sys.stderr) - conn = create_engine( - 'postgresql://' + '%s:%s@%s:%s/%s' % (user, - password, - host, - port, - database)).connect() + host = input('host (default 141.44.24.88): ') or 'oe.iws.cs.ovgu.de' + port = input('port (default 5432): ') or '5432' + database = input("database name (default 'oep'): ") or 'oep' + user = input('user (default postgres): ') + # password = input('password: ') + password = getpass.getpass(prompt='password: ', + stream=sys.stderr) + conn = create_engine( + 'postgresql://' + '%s:%s@%s:%s/%s' % (user, + password, + host, + port, + database)).connect() - return conn + return conn