Modified: yield_config > get_config (#66)

signebedi · Mar 25, 2024 · e98f53e · e98f53e
1 parent 4b60ff6
commit e98f53e
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/libreforms_fastapi/app/__init__.py b/libreforms_fastapi/app/__init__.py
@@ -44,7 +44,7 @@
 from libreforms_fastapi.utils.logging import set_logger
 
 from libreforms_fastapi.utils.config import (
-    yield_config,
+    get_config,
     validate_and_write_configs,
 )
 
@@ -84,7 +84,7 @@
 
 # Here we set the application config
 _env = os.environ.get('ENVIRONMENT', 'development')
-config = yield_config(_env)
+config = get_config(_env)
 
 if config.DEBUG:
     print(config)

diff --git a/libreforms_fastapi/cli/__init__.py b/libreforms_fastapi/cli/__init__.py
@@ -17,7 +17,7 @@
     KeyExpired,
 )
 
-from libreforms_fastapi.utils.config import yield_config
+from libreforms_fastapi.utils.config import get_config
 
 from libreforms_fastapi.utils.sqlalchemy_models import (
     Base,
@@ -407,7 +407,7 @@ def cli_useradd(username, password, email, opt_out, site_admin, environment):
     """Add a new user to the application."""
 
     # Set ENVIRONMENT  
-    config = yield_config(environment)
+    config = get_config(environment)
 
     # Run our assumptions check
     assert check_configuration_assumptions(config=config)
@@ -485,7 +485,7 @@ def cli_usermod(username, password, new_email, opt_out, active, site_admin, head
 
 
     # Set ENVIRONMENT  
-    config = yield_config(environment)
+    config = get_config(environment)
 
     # Run our assumptions check
     assert check_configuration_assumptions(config=config)
@@ -572,7 +572,7 @@ def cli_id(username, environment):
 
 
     # Set ENVIRONMENT  
-    config = yield_config(environment)
+    config = get_config(environment)
 
     # Run our assumptions check
     assert check_configuration_assumptions(config=config)

diff --git a/libreforms_fastapi/utils/config.py b/libreforms_fastapi/utils/config.py
@@ -51,7 +51,7 @@
 
 else: env_file_path=""
 
-def yield_config(_env=env):
+def get_config(_env=env):
     if _env == 'production':
         return ProductionConfig()
     elif _env == 'testing':

diff --git a/libreforms_fastapi/utils/pydantic_models.py b/libreforms_fastapi/utils/pydantic_models.py
@@ -15,10 +15,10 @@
 
 from pydantic.functional_validators import field_validator, model_validator
 
-from libreforms_fastapi.utils.config import yield_config
+from libreforms_fastapi.utils.config import get_config
 
 _env = os.environ.get('ENVIRONMENT', 'development')
-config = yield_config(_env)
+config = get_config(_env)
 
 class ImproperUsernameFormat(Exception):
     """Raised when the username does not meet the regular expression defined in the app config"""

diff --git a/libreforms_fastapi/utils/sqlalchemy_models.py b/libreforms_fastapi/utils/sqlalchemy_models.py
@@ -16,10 +16,10 @@
 
 from sqlalchemy_signing import create_signing_class
 
-from libreforms_fastapi.utils.config import yield_config
+from libreforms_fastapi.utils.config import get_config
 
 _env = os.environ.get('ENVIRONMENT', 'development')
-config = yield_config(_env)
+config = get_config(_env)
 
 Base = declarative_base()
 

diff --git a/tests/test_api.py b/tests/test_api.py
@@ -4,10 +4,10 @@
 from sqlalchemy.orm import sessionmaker
 from sqlalchemy_signing import Signatures
 from libreforms_fastapi.utils.sqlalchemy_models import Base, User, Signing, TransactionLog, Group
-from libreforms_fastapi.utils.config import yield_config
+from libreforms_fastapi.utils.config import get_config
 
 # os.environ["ENVIRONMENT"] = "testing"
-config = yield_config(_env="testing")
+config = get_config(_env="testing")
 
 # Define a session-scoped fixture for the TestClient and Signatures
 @pytest.fixture(scope="session")