From c74841f26825f27c82a13aee5069f42f07d998fc Mon Sep 17 00:00:00 2001 From: george haff Date: Wed, 24 May 2023 12:35:25 -0400 Subject: [PATCH 1/2] optionally use alternate db connection for orm stuff (users/roles) --- src/server/_config.py | 1 + src/server/_db.py | 11 ++++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/server/_config.py b/src/server/_config.py index eee49c3aa..7ac4949ad 100644 --- a/src/server/_config.py +++ b/src/server/_config.py @@ -13,6 +13,7 @@ MAX_COMPATIBILITY_RESULTS = int(3650) SQLALCHEMY_DATABASE_URI = os.environ.get("SQLALCHEMY_DATABASE_URI", "sqlite:///test.db") +SQLALCHEMY_DATABASE_URI_PRIMARY = os.environ.get("SQLALCHEMY_DATABASE_URI_PRIMARY") # defaults SQLALCHEMY_ENGINE_OPTIONS = { diff --git a/src/server/_db.py b/src/server/_db.py index 9057b8181..53e632cdf 100644 --- a/src/server/_db.py +++ b/src/server/_db.py @@ -2,7 +2,7 @@ from sqlalchemy.engine import Engine from sqlalchemy.orm import sessionmaker -from ._config import SQLALCHEMY_DATABASE_URI, SQLALCHEMY_ENGINE_OPTIONS +from ._config import SQLALCHEMY_DATABASE_URI, SQLALCHEMY_DATABASE_URI_PRIMARY, SQLALCHEMY_ENGINE_OPTIONS # _db.py exists so that we dont have a circular dependency: @@ -11,8 +11,13 @@ engine: Engine = create_engine(SQLALCHEMY_DATABASE_URI, **SQLALCHEMY_ENGINE_OPTIONS) -metadata = MetaData(bind=engine) +if SQLALCHEMY_DATABASE_URI_PRIMARY: + user_engine: Engine = create_engine(SQLALCHEMY_DATABASE_URI_PRIMARY, **SQLALCHEMY_ENGINE_OPTIONS) +else: + user_engine: Engine = engine -Session = sessionmaker(bind=engine) +metadata = MetaData(bind=user_engine) + +Session = sessionmaker(bind=user_engine) From 2d88e468a1693c36818e1932e6af7f2a145d06af Mon Sep 17 00:00:00 2001 From: melange396 Date: Wed, 24 May 2023 18:20:14 +0000 Subject: [PATCH 2/2] chore: release delphi-epidata 4.1.1 --- .bumpversion.cfg | 2 +- dev/local/setup.cfg | 2 +- src/client/delphi_epidata.R | 2 +- src/client/delphi_epidata.js | 2 +- src/client/packaging/npm/package.json | 2 +- src/client/packaging/pypi/delphi_epidata/__init__.py | 2 +- src/client/packaging/pypi/setup.py | 2 +- src/server/_config.py | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 026a069ae..2ee2721e5 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 4.1.0 +current_version = 4.1.1 commit = False tag = False diff --git a/dev/local/setup.cfg b/dev/local/setup.cfg index bcd652ffe..bfafec85f 100644 --- a/dev/local/setup.cfg +++ b/dev/local/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = Delphi Development -version = 4.1.0 +version = 4.1.1 [options] packages = diff --git a/src/client/delphi_epidata.R b/src/client/delphi_epidata.R index 04df39aaf..8bd319f9a 100644 --- a/src/client/delphi_epidata.R +++ b/src/client/delphi_epidata.R @@ -15,7 +15,7 @@ Epidata <- (function() { # API base url BASE_URL <- getOption('epidata.url', default = 'https://api.delphi.cmu.edu/epidata/') - client_version <- '4.1.0' + client_version <- '4.1.1' auth <- getOption("epidata.auth", default = NA) diff --git a/src/client/delphi_epidata.js b/src/client/delphi_epidata.js index f0c837624..e8bb696a9 100644 --- a/src/client/delphi_epidata.js +++ b/src/client/delphi_epidata.js @@ -22,7 +22,7 @@ } })(this, function (exports, fetchImpl, jQuery) { const BASE_URL = "https://api.delphi.cmu.edu/epidata/"; - const client_version = "4.1.0"; + const client_version = "4.1.1"; // Helper function to cast values and/or ranges to strings function _listitem(value) { diff --git a/src/client/packaging/npm/package.json b/src/client/packaging/npm/package.json index 012f1335f..30dd96845 100644 --- a/src/client/packaging/npm/package.json +++ b/src/client/packaging/npm/package.json @@ -2,7 +2,7 @@ "name": "delphi_epidata", "description": "Delphi Epidata API Client", "authors": "Delphi Group", - "version": "4.1.0", + "version": "4.1.1", "license": "MIT", "homepage": "https://github.com/cmu-delphi/delphi-epidata", "bugs": { diff --git a/src/client/packaging/pypi/delphi_epidata/__init__.py b/src/client/packaging/pypi/delphi_epidata/__init__.py index 733831d2d..725c9b24b 100644 --- a/src/client/packaging/pypi/delphi_epidata/__init__.py +++ b/src/client/packaging/pypi/delphi_epidata/__init__.py @@ -1,4 +1,4 @@ from .delphi_epidata import Epidata name = 'delphi_epidata' -__version__ = '4.1.0' +__version__ = '4.1.1' diff --git a/src/client/packaging/pypi/setup.py b/src/client/packaging/pypi/setup.py index 8f16ffbd1..6ab5e69c3 100644 --- a/src/client/packaging/pypi/setup.py +++ b/src/client/packaging/pypi/setup.py @@ -5,7 +5,7 @@ setuptools.setup( name="delphi_epidata", - version="4.1.0", + version="4.1.1", author="David Farrow", author_email="dfarrow0@gmail.com", description="A programmatic interface to Delphi's Epidata API.", diff --git a/src/server/_config.py b/src/server/_config.py index 7ac4949ad..6f6887c74 100644 --- a/src/server/_config.py +++ b/src/server/_config.py @@ -7,7 +7,7 @@ load_dotenv() -VERSION = "4.1.0" +VERSION = "4.1.1" MAX_RESULTS = int(10e6) MAX_COMPATIBILITY_RESULTS = int(3650)