Fixed config.pys and envs

Signed-off-by: Lalith Kota <kotalalith@gmail.com>

Author: lalithkota

openg2p-g2p-bridge-bank-connectors/src/openg2p_g2p_bridge_bank_connectors/app.py

@@ -1,9 +1,3 @@
-# ruff: noqa: E402
-
-from .config import Settings
-
-_config = Settings.get_config()
-
 from openg2p_fastapi_common.app import Initializer as BaseInitializer
 
 from .bank_connectors import BankConnectorFactory, ExampleBankConnector

openg2p-g2p-bridge-bank-connectors/src/openg2p_g2p_bridge_bank_connectors/bank_connectors/example_bank_connector.py

@@ -18,7 +18,7 @@
 )
 from ..config import Settings
 
-_config = Settings.get_config()
+_config = Settings.get_config(strict=False)
 _logger = logging.getLogger(_config.logging_default_logger_name)
 
 

openg2p-g2p-bridge-bank-connectors/src/openg2p_g2p_bridge_bank_connectors/config.py

@@ -3,11 +3,7 @@
 
 
 class Settings(BaseSettings):
-    model_config = SettingsConfigDict(
-        env_prefix="g2p_bridge_celery_producers_", env_file=".env", extra="allow"
-    )
-
-    db_dbname: str = "openg2p_g2p_bridge_db"
+    model_config = SettingsConfigDict(env_prefix="g2p_bridge_bank_connector_", env_file=".env", extra="allow")
 
     funds_available_check_url_example_bank: str = ""
     funds_block_url_example_bank: str = ""

openg2p-g2p-bridge-celery-beat-producers/.env.example

@@ -1,19 +1,8 @@
-G2P_BRIDGE_CELERY_TASKS_MAPPER_RESOLVE_API_URL="http://127.0.0.1:8003/sync/resolve"
-G2P_BRIDGE_CELERY_TASKS_MAPPER_RESOLVE_RETRIES=3
-G2P_BRIDGE_CELERY_TASKS_MAPPER_RESOLVE_RETRY_DELAY=5
-G2P_BRIDGE_CELERY_TASKS_DB_DBNAME=openg2p_g2p_bridge_db
-G2P_BRIDGE_CELERY_TASKS_BANK_DECONSTRUCT_STRATEGY="bank_(?P<account_number>\d+)_(?P<bank_code>\d+)_(?P<branch_code>\d+)_(?P<account_type>\w+)"
-G2P_BRIDGE_CELERY_TASKS_MOBILE_WALLET_DECONSTRUCT_STRATEGY="mobile_(?P<mobile_number>\d+)_(?P<mobile_wallet_provider>\w+)"
-G2P_BRIDGE_CELERY_TASKS_EMAIL_WALLET_DECONSTRUCT_STRATEGY="email_(?P<email_address>\w+)_(?P<email_wallet_provider>\w+)"
-G2P_BRIDGE_CELERY_TASKS_MAPPER_RESOLVE_ATTEMPTS=3
-G2P_BRIDGE_CELERY_TASKS_FUNDS_AVAILABLE_CHECK_ATTEMPTS=3
-G2P_BRIDGE_CELERY_TASKS_FUNDS_BLOCKED_ATTEMPTS=3
-G2P_BRIDGE_CELERY_TASKS_FUNDS_DISBURSEMENT_ATTEMPTS=3
-G2P_BRIDGE_CELERY_TASKS_STATEMENT_PROCESS_ATTEMPTS=3
-G2P_BRIDGE_CELERY_TASKS_MAPPER_RESOLVE_FREQUENCY=3600
-G2P_BRIDGE_CELERY_TASKS_FUNDS_AVAILABLE_CHECK_FREQUENCY=3600
-G2P_BRIDGE_CELERY_TASKS_FUNDS_BLOCKED_FREQUENCY=3600
-G2P_BRIDGE_CELERY_TASKS_FUNDS_DISBURSEMENT_FREQUENCY=3600
-G2P_BRIDGE_CELERY_TASKS_MT940_PROCESSOR_FREQUENCY=3600
-G2P_BRIDGE_CELERY_TASKS_CELERY_BROKER_URL="redis://localhost:6379/0"
-G2P_BRIDGE_CELERY_TASKS_CELERY_BACKEND_URL="redis://localhost:6379/0"
+G2P_BRIDGE_CELERY_BEAT_DB_HOSTNAME=localhost
+G2P_BRIDGE_CELERY_BEAT_DB_PORT=5432
+G2P_BRIDGE_CELERY_BEAT_DB_DBNAME=openg2p_g2p_bridge_db
+G2P_BRIDGE_CELERY_BEAT_DB_USERNAME=
+G2P_BRIDGE_CELERY_BEAT_DB_PASSWORD=
+
+G2P_BRIDGE_CELERY_BEAT_CELERY_BROKER_URL="redis://localhost:6379/0"
+G2P_BRIDGE_CELERY_BEAT_CELERY_BACKEND_URL="redis://localhost:6379/0"

openg2p-g2p-bridge-celery-beat-producers/src/openg2p_g2p_bridge_celery_beat_producers/config.py

@@ -1,4 +1,4 @@
-from openg2p_fastapi_common.config import Settings as BaseSettings
+from openg2p_g2p_bridge_bank_connectors.config import Settings as BaseSettings
 from pydantic_settings import SettingsConfigDict
 
 from . import __version__

openg2p-g2p-bridge-celery-workers/.env.example

@@ -1,12 +1,14 @@
-G2P_BRIDGE_CELERY_WORKERS_MAPPER_RESOLVE_API_URL="http://127.0.0.1:8003/sync/resolve"
-G2P_BRIDGE_CELERY_WORKERS_MAPPER_RESOLVE_RETRIES=3
-G2P_BRIDGE_CELERY_WORKERS_MAPPER_RESOLVE_RETRY_DELAY=5
+G2P_BRIDGE_CELERY_WORKERS_DB_HOSTNAME=localhost
+G2P_BRIDGE_CELERY_WORKERS_DB_PORT=5432
 G2P_BRIDGE_CELERY_WORKERS_DB_DBNAME=openg2p_g2p_bridge_db
-G2P_BRIDGE_CELERY_WORKERS_BANK_FA_DECONSTRUCT_STRATEGY="bank_(?P<account_number>\d+)_(?P<bank_code>\d+)_(?P<branch_code>\d+)_(?P<account_type>\w+)"
-G2P_BRIDGE_CELERY_WORKERS_MOBILE_WALLET_DECONSTRUCT_STRATEGY="mobile_(?P<mobile_number>\d+)_(?P<mobile_wallet_provider>\w+)"
-G2P_BRIDGE_CELERY_WORKERS_EMAIL_WALLET_DECONSTRUCT_STRATEGY="email_(?P<email_address>\w+)_(?P<email_wallet_provider>\w+)"
+G2P_BRIDGE_CELERY_WORKERS_DB_USERNAME=
+G2P_BRIDGE_CELERY_WORKERS_DB_PASSWORD=
+
 G2P_BRIDGE_CELERY_WORKERS_FUNDS_AVAILABLE_CHECK_URL_EXAMPLE_BANK="http://127.0.0.1:8003/check_funds"
 G2P_BRIDGE_CELERY_WORKERS_FUNDS_BLOCK_URL_EXAMPLE_BANK="http://127.0.0.1:8003/block_funds"
 G2P_BRIDGE_CELERY_WORKERS_FUNDS_DISBURSEMENT_URL_EXAMPLE_BANK="http://127.0.0.1:8003/initiate_payment"
+
 G2P_BRIDGE_CELERY_WORKERS_CELERY_BROKER_URL="redis://localhost:6379/0"
 G2P_BRIDGE_CELERY_WORKERS_CELERY_BACKEND_URL="redis://localhost:6379/0"
+
+G2P_BRIDGE_CELERY_WORKERS_MAPPER_API_URL="http://127.0.0.1:8003/sync"

openg2p-g2p-bridge-celery-workers/src/openg2p_g2p_bridge_celery_workers/config.py

@@ -1,10 +1,11 @@
-from openg2p_fastapi_common.config import Settings as BaseSettings
+from openg2p_g2p_bridge_bank_connectors.config import Settings as BankConnectorSettings
+from openg2p_g2pconnect_mapper_lib.config import Settings as BaseSettings
 from pydantic_settings import SettingsConfigDict
 
 from . import __version__
 
 
-class Settings(BaseSettings):
+class Settings(BankConnectorSettings, BaseSettings):
     model_config = SettingsConfigDict(env_prefix="g2p_bridge_celery_workers_", env_file=".env", extra="allow")
     openapi_title: str = "OpenG2P G2P Bridge Celery Workers"
     openapi_description: str = """
@@ -21,8 +22,6 @@ class Settings(BaseSettings):
     celery_broker_url: str = "redis://localhost:6379/0"
     celery_backend_url: str = "redis://localhost:6379/0"
 
-    mapper_resolve_api_url: str = ""
-
     bank_fa_deconstruct_strategy: str = r"^account_number:(?P<account_number>.*)\.branch_code:(?P<branch_code>.*)\.bank_code:(?P<bank_code>.*)\.mobile_number:(?P<mobile_number>.*)\.email_address:(?P<email_address>.*)\.fa_type:(?P<fa_type>.*)$"
     mobile_wallet_deconstruct_strategy: str = r"^mobile_number:(?P<mobile_number>.*)\.wallet_provider_name:(?P<wallet_provider_name>.*)\.wallet_provider_code:(?P<wallet_provider_code>.*)\.fa_type:(?P<fa_type>.*)$"
     email_wallet_deconstruct_strategy: str = r"^email_address:(?P<email_address>.*)\.wallet_provider_name:(?P<wallet_provider_name>.*)\.wallet_provider_code:(?P<wallet_provider_code>.*)\.fa_type:(?P<fa_type>.*)$"