.

config.py

@@ -1,27 +1,20 @@
 # app/config.py
 import json
 import os
-import re
 from functools import lru_cache
 from urllib.parse import quote
 
+
 APPSETTINGS_PATH = os.environ.get("APPSETTINGS_JSON", "appsettings.json")
 
 
 class Settings:
-    """Simple settings object loaded from appsettings.json + env vars."""
+    """Settings object with attribute access."""
     def __init__(self, data: dict):
         for k, v in data.items():
             setattr(self, k, v)
 
 
-def _to_upper_snake(name: str) -> str:
-    """Convert CamelCase or mixedCase to UPPER_SNAKE_CASE."""
-    s1 = re.sub("(.)([A-Z][a-z]+)", r"\1_\2", name)
-    s2 = re.sub("([a-z0-9])([A-Z])", r"\1_\2", s1)
-    return s2.upper()
-
-
 def _load_json(path):
     if not os.path.exists(path):
         return {}
@@ -30,35 +23,27 @@ def _load_json(path):
 
 
 def _replace_env_vars(d, parent_key=None):
+    """
+    Replace ".env" values with env var lookups using uppercase key name.
+    """
     if isinstance(d, dict):
         return {k: _replace_env_vars(v, k) for k, v in d.items()}
     elif isinstance(d, str) and d.strip() == ".env":
-        env_key = _to_upper_snake(parent_key or "")
+        env_key = (parent_key or "").upper()
         return os.environ.get(env_key)
     else:
         return d
 
 
-def _normalize_keys(d):
-    """Recursively normalize dict keys to UPPER_SNAKE_CASE."""
-    if isinstance(d, dict):
-        return {_to_upper_snake(k): _normalize_keys(v) for k, v in d.items()}
-    elif isinstance(d, list):
-        return [_normalize_keys(i) for i in d]
-    else:
-        return d
-
-
-def build_amqp_url(cfg: dict):
-    local = cfg.get("LOCAL_SYSTEM_URL")
+def _build_amqp_url(local: dict):
     if not local:
         return None
-    scheme = "amqps" if local.get("USE_TLS", True) else "amqp"
-    host = local.get("RABBIT_HOST_NAME")
-    port = local.get("RABBIT_PORT") or (5671 if scheme == "amqps" else 5672)
-    user = local.get("RABBIT_USER_NAME")
-    pwd = local.get("RABBIT_PASSWORD") or os.environ.get("RABBIT_PASSWORD")
-    vhost = local.get("RABBIT_V_HOST") or "/"
+    scheme = "amqps" if local.get("UseTls", True) else "amqp"
+    host = local.get("RabbitHostName")
+    port = local.get("RabbitPort") or (5671 if scheme == "amqps" else 5672)
+    user = local.get("RabbitUserName")
+    pwd = local.get("RabbitPassword") or os.environ.get("RABBIT_PASSWORD")
+    vhost = local.get("RabbitVHost") or "/"
     vhost_enc = quote(vhost, safe="")
     if not (host and user and pwd):
         return None
@@ -69,11 +54,33 @@ def build_amqp_url(cfg: dict):
 def get_settings() -> Settings:
     cfg = _load_json(APPSETTINGS_PATH)
     cfg = _replace_env_vars(cfg)
-    cfg = _normalize_keys(cfg)  # normalize AFTER env replacement
+
+    # Flatten relevant LocalSystemUrl fields
+    local = cfg.get("LocalSystemUrl", {})
+    if local:
+        cfg["RABBIT_INSTANCE_NAME"] = local.get("RabbitInstanceName")
+        cfg["RABBIT_HOST_NAME"] = local.get("RabbitHostName")
+        cfg["RABBIT_PORT"] = local.get("RabbitPort")
+        cfg["RABBIT_USER_NAME"] = local.get("RabbitUserName")
+        cfg["RABBIT_PASSWORD"] = local.get("RabbitPassword") or os.environ.get("RABBIT_PASSWORD")
+        cfg["RABBIT_VHOST"] = local.get("RabbitVHost")
+        cfg["RABBIT_USE_TLS"] = local.get("UseTls")
+
+    # Map JSON keys to what Python code expects
+    cfg["SERVICE_ID"] = cfg.get("ServiceID")
+    cfg["RABBIT_ROUTING_KEY"] = cfg.get("RabbitRoutingKey")
+    cfg["RABBIT_EXCHANGE_TYPE"] = cfg.get("RabbitExhangeType") or "topic"
+    cfg["REDIS_URL"] = cfg.get("RedisUrl")
+    cfg["REDIS_SECRET"] = cfg.get("RedisSecret")
+    cfg["EXCHANGE_TYPES"] = cfg.get("EXCHANGE_TYPES", {})  # default empty dict
+    cfg["RABBIT_PREFETCH"] = cfg.get("RABBIT_PREFETCH", 1)
+
+    # Build AMQP_URL if not already provided
     if not cfg.get("AMQP_URL"):
-        amqp_url = build_amqp_url(cfg)
+        amqp_url = _build_amqp_url(local)
         if amqp_url:
             cfg["AMQP_URL"] = amqp_url
+
     return Settings(cfg)