salla-gitpuller 1.2.0__tar.gz → 1.2.2__tar.gz

{salla_gitpuller-1.2.0 → salla_gitpuller-1.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: salla_gitpuller
-Version: 1.2.0
+Version: 1.2.2
 Summary: A lightweight utility to git pull a repository using SSH deploy keys stored in environment variables
 Author-email: Mohammed Junaid <safijunaid.ss@gmail.com>, Muhammad Zahid <zahidmuhammad127@gmail.com>
 License: MIT

{salla_gitpuller-1.2.0 → salla_gitpuller-1.2.2}/gitpuller/__init__.py

@@ -5,7 +5,7 @@ from .slack_notifier import SlackNotifier
 from .utils import transform_custom, get_repo_path, get_env_base_path
 
 
-__version__ = "1.2.0"
+__version__ = "1.2.2"
 __all__ = [
     "GitPullExecutor",
     "AlertManager",

{salla_gitpuller-1.2.0 → salla_gitpuller-1.2.2}/gitpuller/gitpull.py

@@ -270,8 +270,8 @@ class GitPullExecutor:
         ``suppression_hours`` caps how often the *same* error is alerted on,
         avoiding Slack spam when a broken state persists across many runs.
         """
-        # webhook_url is a fallback only; CDM_PROD_SLACK_BOT_TOKEN still wins
-        # so Mage callers that pass CDM_SLACK_WEBHOOK_URL stay on the daily thread.
+        # webhook_url is a fallback only; WP_SLACK_DB_ALERTS_TOKEN still wins
+        # so Mage callers that pass a webhook stay on the daily thread.
         if webhook_url and not self.slack_notifier.bot_token:
             notifier = SlackNotifier(webhook_url=webhook_url)
         else:

{salla_gitpuller-1.2.0 → salla_gitpuller-1.2.2}/gitpuller/slack_notifier.py

@@ -10,6 +10,7 @@ import requests
 SLACK_POST_MESSAGE_URL = "https://slack.com/api/chat.postMessage"
 SLACK_CONVERSATIONS_HISTORY_URL = "https://slack.com/api/conversations.history"
 DEFAULT_SLACK_CHANNEL = "C05MLHR55JT"
+SLACK_WEBHOOK_MAP_KEY = "db-ops-log"
 
 # Unified across every Mage deployment — do not prefix with MAGE_WORKSPACE_NAME.
 # One hash per channel per day; field = gitpuller workspace, value = Slack thread_ts.
@@ -22,8 +23,33 @@ _redis_client = None
 _redis_init_attempted = False
 
 
+def _env(*names: str, default: str = "") -> str:
+    for name in names:
+        value = (os.environ.get(name) or "").strip()
+        if value:
+            return value
+    return default
+
+
+def _resolve_slack_webhook(explicit: Optional[str] = None) -> Optional[str]:
+    """Prefer an explicit URL, then CDM_SLACK_WEBHOOKS['db-ops-log']."""
+    if explicit and str(explicit).strip():
+        return str(explicit).strip()
+    raw = os.environ.get("CDM_SLACK_WEBHOOKS")
+    if raw and str(raw).strip():
+        try:
+            webhooks = json.loads(str(raw).strip())
+            if isinstance(webhooks, dict):
+                entry = webhooks.get(SLACK_WEBHOOK_MAP_KEY)
+                if entry and str(entry).strip():
+                    return str(entry).strip()
+        except json.JSONDecodeError as exc:
+            print(f"⚠️ CDM_SLACK_WEBHOOKS is not valid JSON ({exc})")
+    return _env("CDM_SLACK_WEBHOOK_URL") or None
+
+
 def _get_redis_client():
-    """Mage io_config.yaml first, then REDIS_HOST / REDIS_PORT / REDIS_PASSWORD."""
+    """WP_REDIS_* env vars first, then Mage io_config.yaml, then REDIS_*."""
     global _redis_client, _redis_init_attempted
     if _redis_client is not None:
         return _redis_client
@@ -37,27 +63,32 @@ def _get_redis_client():
         print("⚠️ redis package not installed; Slack thread_ts will not persist across pods")
         return None
 
-    host = None
-    password = None
-    port = 6379
-    try:
-        from mage_ai.io.config import ConfigFileLoader
-        from mage_ai.settings.repo import get_repo_path
+    host = _env("WP_REDIS_HOST")
+    password = _env("WP_REDIS_PASSWORD") or None
+    port = int(_env("WP_REDIS_PORT") or "6379")
 
-        loader = ConfigFileLoader(os.path.join(get_repo_path(), "io_config.yaml"), "default")
-        host = loader["REDIS_HOST"]
-        password = loader["REDIS_PASSWORD"] or None
-        port = int(loader["REDIS_PORT"])
-    except Exception:
-        host = None
+    if not host:
+        try:
+            from mage_ai.io.config import ConfigFileLoader
+            from mage_ai.settings.repo import get_repo_path
+
+            loader = ConfigFileLoader(os.path.join(get_repo_path(), "io_config.yaml"), "default")
+            host = loader["REDIS_HOST"]
+            password = loader["REDIS_PASSWORD"] or None
+            port = int(loader["REDIS_PORT"])
+        except Exception:
+            host = None
 
     if not host:
-        host = (os.environ.get("REDIS_HOST") or "").strip() or None
-        password = (os.environ.get("REDIS_PASSWORD") or "").strip() or None
-        port = int(os.environ.get("REDIS_PORT") or 6379)
+        host = _env("REDIS_HOST") or None
+        password = _env("REDIS_PASSWORD") or None
+        port = int(_env("REDIS_PORT") or "6379")
 
     if not host:
-        print("⚠️ Redis is not configured; Slack thread_ts will not persist across pods")
+        print(
+            "⚠️ Redis is not configured; Slack thread_ts will not persist across pods "
+            "(set WP_REDIS_HOST / WP_REDIS_PORT / WP_REDIS_PASSWORD)"
+        )
         return None
 
     try:
@@ -94,22 +125,26 @@ class SlackNotifier:
         bot_token: Optional[str] = None,
         channel: Optional[str] = None,
     ):
-        self.bot_token = (bot_token or os.environ.get("CDM_PROD_SLACK_BOT_TOKEN") or "").strip() or None
+        self.bot_token = (
+            bot_token
+            or _env("WP_SLACK_DB_ALERTS_TOKEN", "CDM_PROD_SLACK_BOT_TOKEN")
+            or None
+        )
         self.channel = (
             (channel or os.environ.get("CDM_PROD_DB_SLACK_CHANNEL") or "").strip()
             or DEFAULT_SLACK_CHANNEL
         )
-        self.webhook_url = (webhook_url or os.environ.get("CDM_SLACK_WEBHOOK_URL") or "").strip() or None
+        self.webhook_url = _resolve_slack_webhook(webhook_url)
         self._thread_ts_cache: Dict[str, str] = {}
 
         if not self.bot_token and not self.webhook_url:
             print(
                 "⚠️ Slack not configured; skipping alerts "
-                "(set CDM_PROD_SLACK_BOT_TOKEN, or CDM_SLACK_WEBHOOK_URL as fallback)"
+                "(set WP_SLACK_DB_ALERTS_TOKEN, or CDM_SLACK_WEBHOOKS['db-ops-log'])"
             )
         elif not self.bot_token:
             print(
-                "⚠️ CDM_PROD_SLACK_BOT_TOKEN is not set; using webhook "
+                "⚠️ WP_SLACK_DB_ALERTS_TOKEN is not set; using webhook "
                 "(alerts will not be threaded)"
             )
 

{salla_gitpuller-1.2.0 → salla_gitpuller-1.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "salla_gitpuller"
-version = "1.2.0"
+version = "1.2.2"
 description = "A lightweight utility to git pull a repository using SSH deploy keys stored in environment variables"
 readme = "README.md"
 authors = [

{salla_gitpuller-1.2.0 → salla_gitpuller-1.2.2}/salla_gitpuller.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: salla_gitpuller
-Version: 1.2.0
+Version: 1.2.2
 Summary: A lightweight utility to git pull a repository using SSH deploy keys stored in environment variables
 Author-email: Mohammed Junaid <safijunaid.ss@gmail.com>, Muhammad Zahid <zahidmuhammad127@gmail.com>
 License: MIT