robusta-api 0.48.0__tar.gz → 0.49.0__tar.gz

{robusta_api-0.48.0 → robusta_api-0.49.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: robusta-api
-Version: 0.48.0
+Version: 0.49.0
 Summary: 
 Author: Arik Alon
 Author-email: arikalon1@users.noreply.github.com
@@ -38,12 +38,11 @@ Requires-Dist: markdown2 (==2.4.13)
 Requires-Dist: opsgenie-sdk (>=2.1.5,<3.0.0)
 Requires-Dist: pillow (>=12.3.0,<13.0.0)
 Requires-Dist: poetry-core (==1.1.0a7) ; extra == "all"
-Requires-Dist: postgrest (==0.16.8)
 Requires-Dist: prometheus-api-client (==0.5.4) ; extra == "all"
 Requires-Dist: prometheus-client (>=0.12.0,<0.13.0)
 Requires-Dist: prometrix (==0.2.11)
 Requires-Dist: pyasn1 (>=0.6.4)
-Requires-Dist: pydantic (>=1.8.1,<2.0.0)
+Requires-Dist: pydantic (>=2.11.7,<3.0.0)
 Requires-Dist: pydash (==8.0.0)
 Requires-Dist: pygal (>=3.0.0,<4.0.0)
 Requires-Dist: pyjwt (>=2.13.0,<3.0.0)
@@ -59,7 +58,7 @@ Requires-Dist: rocketchat-api (>=1.30.0,<2.0.0)
 Requires-Dist: sentry-sdk[flask] (>=2.13.0,<3.0.0) ; extra == "all"
 Requires-Dist: setuptools (>=80.9.0,<81.0.0)
 Requires-Dist: slack-sdk (>=3.23.0,<4.0.0)
-Requires-Dist: supabase (==2.5.1) ; extra == "all"
+Requires-Dist: supabase (==2.28.1) ; extra == "all"
 Requires-Dist: tabulate (>=0.8.10,<0.9.0) ; extra == "all"
 Requires-Dist: tenacity (>=9.1.2,<10.0.0)
 Requires-Dist: toml (>=0.10.2,<0.11.0)
@@ -69,4 +68,5 @@ Requires-Dist: watchdog (>=2.1.0,<3.0.0) ; extra == "all"
 Requires-Dist: watchgod (>=0.7,<0.8)
 Requires-Dist: webexteamssdk (>=1.6.1,<2.0.0)
 Requires-Dist: websocket-client (==1.3.3)
+Requires-Dist: websockets (>=13)
 Requires-Dist: werkzeug (>=3.1.6)

{robusta_api-0.48.0 → robusta_api-0.49.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "robusta-api"
-version = "0.48.0"
+version = "0.49.0"
 description = ""
 authors = ["Arik Alon <arikalon1@users.noreply.github.com>"]
 packages = [
@@ -21,13 +21,13 @@ python = ">=3.10, <3.12"
 setuptools = "^80.9.0"
 colorlog = "^5.0.1"
 python-json-logger = "^3.0.0"
-pydantic = "^1.8.1"
+pydantic = "^2.11.7"
 kubernetes = "^26.1.0"
 pymsteams = "^0.1.16"
 # Bump to fix CVE-2026-45409 / GHSA-65pc-fj4g-8rjx (Moderate, GHSA published
 # 2026-05-19, older than 60 days): idna.encode() bypass of the CVE-2024-3651 fix
 idna= { version = ">=3.15", optional = true }
-supabase = "2.5.1"
+supabase = "2.28.1"
 tabulate = { version = "^0.8.10" }
 slack-sdk = { version = "^3.23.0" }
 Flask = { version = "^3.1.3", optional = true }
@@ -88,7 +88,8 @@ regex = "2024.5.15"
 pyjwt = "^2.13.0"
 urllib3 = "^2.7.0"
 httpx = "0.27.2"
-postgrest = "0.16.8"
+# realtime (supabase dependency) requires websockets.asyncio, added in websockets 13
+websockets = ">=13"
 # Pin to fix cve https://github.com/robusta-dev/robusta/security/dependabot/85
 h2 = "^4.3.0"
 # Pin to fix CVE-2026-30922 (transitive via google-auth)

{robusta_api-0.48.0 → robusta_api-0.49.0}/src/robusta/_version.py

@@ -1,2 +1,2 @@
 # this is updated by .github/workflows/release.yaml
-__version__ = "0.48.0"
+__version__ = "0.49.0"

{robusta_api-0.48.0 → robusta_api-0.49.0}/src/robusta/core/discovery/discovery.py

@@ -38,7 +38,7 @@ from kubernetes.client import (
     V1StatefulSetList,
     V1Volume,
 )
-from pydantic import BaseModel
+from pydantic.v1 import BaseModel
 
 from robusta.core.discovery import utils
 from robusta.core.model.cluster_status import ClusterStats

{robusta_api-0.48.0 → robusta_api-0.49.0}/src/robusta/core/discovery/resource_names.py

@@ -1,7 +1,7 @@
 from typing import Callable, List, Optional
 
 from kubernetes import client
-from pydantic import BaseModel
+from pydantic.v1 import BaseModel
 
 from robusta.integrations.kubernetes.custom_models import DeploymentConfig, Rollout
 from robusta.utils.error_codes import ActionException, ErrorCodes

{robusta_api-0.48.0 → robusta_api-0.49.0}/src/robusta/core/discovery/top_service_resolver.py

@@ -3,7 +3,7 @@ import time
 from collections import defaultdict
 from typing import Dict, List, Optional
 
-from pydantic.main import BaseModel
+from pydantic.v1.main import BaseModel
 
 from robusta.core.model.env_vars import RESOURCE_UPDATES_CACHE_TTL_SEC
 

{robusta_api-0.48.0 → robusta_api-0.49.0}/src/robusta/core/model/base_params.py

@@ -2,7 +2,7 @@ import logging
 from enum import Enum, auto
 from typing import Any, Dict, List, Optional, Union
 
-from pydantic import BaseModel, SecretStr, validator, Field
+from pydantic.v1 import BaseModel, SecretStr, validator, Field
 
 from robusta.integrations import openshift
 from robusta.utils.documented_pydantic import DocumentedModel
@@ -213,6 +213,10 @@ class HolmesChatParams(HolmesParams):
     source_ref: Optional[str] = None
     conversation_id: Optional[str] = None
     conversation_source: Optional[str] = None
+    # URL of the surface the chat originated from (Slack thread permalink,
+    # Teams message link, platform chat/workflow-run URL). Holmes renders it
+    # into the system prompt so PRs/issues it creates link back to it.
+    conversation_link: Optional[str] = None
     is_internal: Optional[bool] = None
     meta: Optional[Dict[str, Any]] = None
 

{robusta_api-0.48.0 → robusta_api-0.49.0}/src/robusta/core/model/cluster_status.py

@@ -1,4 +1,6 @@
-from pydantic.main import BaseModel, List, Optional
+from typing import List, Optional
+
+from pydantic.v1 import BaseModel
 
 
 class ClusterStats(BaseModel):

{robusta_api-0.48.0 → robusta_api-0.49.0}/src/robusta/core/model/env_vars.py

@@ -144,6 +144,8 @@ RESOURCE_YAML_BLOCK_LIST = json.loads(os.environ.get("RESOURCE_YAML_BLOCK_LIST",
 
 NAMESPACE_DATA_TTL = int(os.environ.get("NAMESPACE_DATA_TTL", 30 * 60))  # in seconds
 
+NODE_IP_CACHE_TTL_SEC = int(os.environ.get("NODE_IP_CACHE_TTL_SEC", 15 * 60))
+
 PROCESSED_ALERTS_CACHE_TTL = int(os.environ.get("PROCESSED_ALERT_CACHE_TTL", 2 * 3600))
 PROCESSED_ALERTS_CACHE_MAX_SIZE = int(os.environ.get("PROCESSED_ALERTS_CACHE_MAX_SIZE", 100_000))
 

{robusta_api-0.48.0 → robusta_api-0.49.0}/src/robusta/core/model/events.py

@@ -6,7 +6,7 @@ from dataclasses import dataclass, field
 from enum import Enum
 from typing import Any, Dict, List, Optional, Callable
 
-from pydantic import BaseModel
+from pydantic.v1 import BaseModel
 
 from robusta.core.pubsub.event_emitter import EventEmitter
 from robusta.core.reporting.base import (

{robusta_api-0.48.0 → robusta_api-0.49.0}/src/robusta/core/model/helm_release.py

@@ -1,5 +1,5 @@
 from typing import Optional, List, Any, Dict
-from pydantic import BaseModel
+from pydantic.v1 import BaseModel
 from base64 import b64decode
 from datetime import datetime
 import gzip

{robusta_api-0.48.0 → robusta_api-0.49.0}/src/robusta/core/model/jobs.py

@@ -3,7 +3,7 @@ from typing import Dict, List, Optional, Union
 
 from hikaru.model.rel_1_26 import Job
 from kubernetes.client import V1Container, V1Job, V1JobSpec, V1JobStatus, V1PodSpec
-from pydantic import BaseModel
+from pydantic.v1 import BaseModel
 
 from robusta.core.discovery import utils
 from robusta.core.model.pods import ContainerResources, ResourceAttributes

{robusta_api-0.48.0 → robusta_api-0.49.0}/src/robusta/core/model/namespaces.py

@@ -1,5 +1,5 @@
 from typing import Optional, List
-from pydantic import BaseModel
+from pydantic.v1 import BaseModel
 from kubernetes.client import V1Namespace
 import json
 

{robusta_api-0.48.0 → robusta_api-0.49.0}/src/robusta/core/model/nodes.py

@@ -1,6 +1,6 @@
 from typing import Dict
 
-from pydantic.main import BaseModel, Field
+from pydantic.v1 import BaseModel, Field
 
 
 class NodeInfo(BaseModel):

{robusta_api-0.48.0 → robusta_api-0.49.0}/src/robusta/core/model/openshift_group.py

@@ -1,6 +1,6 @@
 from typing import Dict, Optional
 
-from pydantic import BaseModel
+from pydantic.v1 import BaseModel
 
 
 class OpenshiftGroup(BaseModel):

{robusta_api-0.48.0 → robusta_api-0.49.0}/src/robusta/core/model/pods.py

@@ -5,7 +5,7 @@ from typing import Dict, List, Optional, Union
 from hikaru.model.rel_1_26 import Container, ContainerState, ContainerStatus, Pod
 from kubernetes.client.models import V1Container, V1ContainerStatus, V1PodStatus, V1Pod, V1PodSpec, V1ResourceRequirements
 
-from pydantic import BaseModel
+from pydantic.v1 import BaseModel
 
 from robusta.integrations.kubernetes.api_client_utils import parse_kubernetes_datetime_to_ms
 

{robusta_api-0.48.0 → robusta_api-0.49.0}/src/robusta/core/model/runner_config.py

@@ -1,7 +1,7 @@
 import base64
 from typing import Dict, List, Optional, Union, cast
 
-from pydantic import BaseModel, SecretStr, root_validator, validator
+from pydantic.v1 import BaseModel, SecretStr, root_validator, validator
 
 from robusta.core.playbooks.playbook_utils import get_env_replacement, replace_env_vars_values
 from robusta.core.sinks.datadog.datadog_sink_params import DataDogSinkConfigWrapper

{robusta_api-0.48.0 → robusta_api-0.49.0}/src/robusta/core/model/services.py

@@ -2,7 +2,7 @@ from typing import Dict, List, Optional, Union
 
 from hikaru.model.rel_1_26 import Container, Volume
 from kubernetes.client import V1Container, V1Volume
-from pydantic import BaseModel
+from pydantic.v1 import BaseModel
 
 
 class EnvVar(BaseModel):

{robusta_api-0.48.0 → robusta_api-0.49.0}/src/robusta/core/persistency/in_memory.py

@@ -2,7 +2,7 @@
 from contextlib import contextmanager
 from typing import ContextManager, Dict, Type, TypeVar
 
-from pydantic import BaseModel
+from pydantic.v1 import BaseModel
 
 persistent_data: Dict[str, BaseModel] = {}
 

{robusta_api-0.48.0 → robusta_api-0.49.0}/src/robusta/core/playbooks/actions_registry.py

@@ -1,7 +1,7 @@
 import inspect
 from typing import Callable, Dict, List, Optional, Tuple, Type, cast
 
-from pydantic.main import BaseModel
+from pydantic.v1.main import BaseModel
 
 from robusta.core.model.events import ExecutionBaseEvent, ExecutionEventBaseParams
 from robusta.utils.decorators import doublewrap

{robusta_api-0.48.0 → robusta_api-0.49.0}/src/robusta/core/playbooks/base_trigger.py

@@ -1,7 +1,7 @@
 import abc
 from typing import Any, Dict, List, Optional, Type
 
-from pydantic import BaseModel
+from pydantic.v1 import BaseModel
 
 from robusta.core.model.events import ExecutionBaseEvent
 from robusta.core.reporting.base import Finding

{robusta_api-0.48.0 → robusta_api-0.49.0}/src/robusta/core/playbooks/playbook_utils.py

@@ -3,8 +3,8 @@ import os
 import re
 from typing import Dict, Optional
 
-from pydantic.main import BaseModel
-from pydantic.types import SecretStr
+from pydantic.v1.main import BaseModel
+from pydantic.v1.types import SecretStr
 
 
 def get_env_replacement(value: str) -> Optional[str]:

{robusta_api-0.48.0 → robusta_api-0.49.0}/src/robusta/core/playbooks/prometheus_enrichment_utils.py

@@ -9,7 +9,7 @@ import humanize
 import pygal
 from hikaru.model.rel_1_26 import Node
 from prometrix import PrometheusQueryResult
-from pydantic import BaseModel
+from pydantic.v1 import BaseModel
 
 from robusta.core.model.base_params import (
     ChartValuesFormat,

{robusta_api-0.48.0 → robusta_api-0.49.0}/src/robusta/core/playbooks/trigger.py

@@ -1,4 +1,4 @@
-from pydantic import PrivateAttr
+from pydantic.v1 import PrivateAttr
 
 from robusta.core.playbooks.base_trigger import BaseTrigger
 from robusta.core.triggers.custom_triggers import CustomTriggers

{robusta_api-0.48.0 → robusta_api-0.49.0}/src/robusta/core/reporting/action_requests.py

@@ -5,7 +5,7 @@ from typing import List, Optional
 from uuid import UUID
 
 import requests
-from pydantic import BaseModel
+from pydantic.v1 import BaseModel
 
 from robusta.core.model.env_vars import RELAY_EXTERNAL_ACTIONS_URL
 

{robusta_api-0.48.0 → robusta_api-0.49.0}/src/robusta/core/reporting/base.py

@@ -9,7 +9,7 @@ from enum import Enum
 from typing import Any, Dict, List, Optional, Union
 from urllib.parse import urlencode
 
-from pydantic.main import BaseModel
+from pydantic.v1.main import BaseModel
 from strenum import StrEnum
 
 from robusta.core.discovery.top_service_resolver import TopServiceResolver

{robusta_api-0.48.0 → robusta_api-0.49.0}/src/robusta/core/reporting/blocks.py

@@ -16,7 +16,7 @@ from typing import Any, Callable, Dict, List, Literal, Optional, Sequence, Tuple
 import hikaru
 from hikaru import DiffDetail, DiffType
 from hikaru.model.rel_1_26 import HikaruDocumentBase
-from pydantic import BaseModel
+from pydantic.v1 import BaseModel
 
 from robusta.core.model.base_params import ChartValuesFormat
 

{robusta_api-0.48.0 → robusta_api-0.49.0}/src/robusta/core/reporting/callbacks.py

@@ -1,6 +1,6 @@
 import time
 
-from pydantic import BaseModel
+from pydantic.v1 import BaseModel
 
 from robusta.core.playbooks.actions_registry import Action
 from robusta.core.reporting import CallbackChoice

{robusta_api-0.48.0 → robusta_api-0.49.0}/src/robusta/core/reporting/custom_rendering.py

@@ -37,6 +37,15 @@ def charts_style(
         opacity_hover=".9",
         transition="400ms ease-in",
         colors=graph_colors,
+        # pygal's own default font stack ("Consolas, Liberation Mono, Menlo, Courier,
+        # monospace") has no match in our chart-rendering image (only fonts-dejavu-core is
+        # installed there), and resvg does exact font-family matching with no fontconfig-style
+        # generic-family fallback - so with the default, resvg silently drops every
+        # title/axis/legend text element while still drawing the plotted lines. "DejaVu Sans
+        # Mono" is the font we know that package provides. Setting it here propagates to every
+        # *_font_family Style attribute (title/legend/label/tooltip/...), since pygal's
+        # Style.__init__ defaults each of those to font_family when unset.
+        font_family="DejaVu Sans Mono",
     )
 
 
@@ -50,15 +59,15 @@ class PlotCustomCSS:
                   {{ id }}.title {
                     fill: #11383A;
                   }
-    
+
                   {{ id }}.legends .legend text {
                     fill: #3f3f3f;
                   }
-              
+
                   {{ id }}.axis.y text {
                     fill: #3f3f3f;
                   }
-    
+
                   {{ id }}.axis.x text {
                     fill: #3f3f3f;
                   }

{robusta_api-0.48.0 → robusta_api-0.49.0}/src/robusta/core/reporting/holmes.py

@@ -1,6 +1,6 @@
 from typing import Any, Dict, List, Optional, Union
 
-from pydantic import BaseModel, Field
+from pydantic.v1 import BaseModel, Field
 
 from robusta.core.model.base_params import (
     ConversationType,
@@ -57,6 +57,10 @@ class HolmesChatRequest(BaseModel):
     source_ref: Optional[str] = None
     conversation_id: Optional[str] = None
     conversation_source: Optional[str] = None
+    # URL of the surface the chat originated from (Slack thread permalink,
+    # Teams message link, platform chat/workflow-run URL). Holmes renders it
+    # into the system prompt so PRs/issues it creates link back to it.
+    conversation_link: Optional[str] = None
     is_internal: Optional[bool] = None
     meta: Optional[Dict[str, Any]] = None
 

{robusta_api-0.48.0 → robusta_api-0.49.0}/src/robusta/core/schedule/model.py

@@ -1,7 +1,7 @@
 from enum import Enum
 from typing import List, Union
 
-from pydantic import BaseModel
+from pydantic.v1 import BaseModel
 
 
 class JobStatus(Enum):

{robusta_api-0.48.0 → robusta_api-0.49.0}/src/robusta/core/sinks/google_chat/google_chat_params.py

@@ -1,4 +1,4 @@
-from pydantic import SecretStr
+from pydantic.v1 import SecretStr
 
 from robusta.core.sinks.sink_base_params import SinkBaseParams
 from robusta.core.sinks.sink_config import SinkConfigBase

{robusta_api-0.48.0 → robusta_api-0.49.0}/src/robusta/core/sinks/incidentio/incidentio_sink_params.py

@@ -3,7 +3,7 @@ from typing import Optional
 from urllib.parse import urlparse
 from robusta.core.playbooks.playbook_utils import get_env_replacement
 
-from pydantic import validator
+from pydantic.v1 import validator
 
 from robusta.core.sinks.sink_base_params import SinkBaseParams
 from robusta.core.sinks.sink_config import SinkConfigBase

{robusta_api-0.48.0 → robusta_api-0.49.0}/src/robusta/core/sinks/mail/mail_sink_params.py

@@ -1,6 +1,6 @@
 from typing import Optional
 
-from pydantic import validator, root_validator
+from pydantic.v1 import validator, root_validator
 
 from robusta.core.sinks.sink_base_params import SinkBaseParams
 from robusta.core.sinks.sink_config import SinkConfigBase

{robusta_api-0.48.0 → robusta_api-0.49.0}/src/robusta/core/sinks/mattermost/mattermost_sink_params.py

@@ -1,7 +1,7 @@
 from typing import Optional
 from urllib.parse import urlparse
 
-from pydantic import validator
+from pydantic.v1 import validator
 
 from robusta.core.sinks.sink_base_params import SinkBaseParams
 from robusta.core.sinks.sink_config import SinkConfigBase

{robusta_api-0.48.0 → robusta_api-0.49.0}/src/robusta/core/sinks/msteams/msteams_sink_params.py

@@ -1,6 +1,6 @@
 from typing import Optional
 
-from pydantic import validator
+from pydantic.v1 import validator
 
 from robusta.core.sinks.msteams.msteams_webhook_tranformer import MsTeamsWebhookUrlTransformer
 from robusta.core.sinks.sink_base_params import SinkBaseParams

{robusta_api-0.48.0 → robusta_api-0.49.0}/src/robusta/core/sinks/robusta/dal/supabase_dal.py

@@ -9,19 +9,21 @@ from uuid import uuid4
 from cachetools import TTLCache
 import httpx
 import requests
-from gotrue.errors import AuthRetryableError
+from supabase_auth.errors import AuthRetryableError
 from postgrest._sync.request_builder import SyncQueryRequestBuilder
 from postgrest.base_request_builder import BaseFilterRequestBuilder, QueryArgs
 from postgrest.exceptions import APIError as PostgrestAPIError
 from postgrest.types import ReturnMethod
 from postgrest.utils import sanitize_param
 from supabase import create_client
-from supabase.lib.client_options import ClientOptions
-from tenacity import RetryCallState, Retrying, retry_if_exception_type, stop_after_attempt, wait_exponential
+from supabase.lib.client_options import SyncClientOptions as ClientOptions
+from tenacity import RetryCallState, Retrying, retry, retry_if_exception_type, stop_after_attempt, wait_exponential
 
 from robusta.core.model.cluster_status import ClusterStatus
 from robusta.core.exceptions import SupabaseDnsException
 from robusta.core.model.env_vars import (
+    ROBUSTA_API_ENDPOINT,
+    RUNNER_VERSION,
     SUPABASE_CONNECT_TIMEOUT_SECONDS,
     SUPABASE_LOGIN_RETRIES,
     SUPABASE_LOGIN_RETRY_BACKOFF_SEC,
@@ -78,6 +80,36 @@ def pre_select_patched(*args, **kwargs) -> QueryArgs:
 supabase_request_builder.pre_select = pre_select_patched
 
 
+KEY_CACHE = TTLCache(maxsize=1, ttl=24 * 60 * 60)
+
+
+@retry(
+    stop=stop_after_attempt(3),
+    wait=wait_exponential(multiplier=1, max=4),
+    retry=retry_if_exception_type((requests.ConnectionError, requests.Timeout)),
+    reraise=True,
+)
+def _request_supabase_api_key(params: dict) -> Optional[str]:
+    url = f"{ROBUSTA_API_ENDPOINT}/api/config/supabase-keys"
+    response = requests.get(url, params=params, timeout=10)
+    response.raise_for_status()
+    return response.json().get("api_key")
+
+
+def fetch_supabase_api_key(account_id: str, cluster: str) -> Optional[str]:
+    params = {
+        "account_id": account_id,
+        "cluster": cluster,
+        "component": "runner",
+        "component_version": RUNNER_VERSION,
+    }
+    try:
+        return _request_supabase_api_key(params)
+    except Exception as e:
+        logging.warning(f"Failed to fetch the api key from relay: {e}")
+        return None
+
+
 class _AuthHttpClient(httpx.Client):
     """The httpx client we hand to Supabase's auth (GoTrue) sub-client.
 
@@ -111,12 +143,10 @@ class SupabaseDal(AccountResourceFetcher):
         self.account_id = account_id
         self.cluster = cluster_name
         options = ClientOptions(postgrest_client_timeout=SUPABASE_TIMEOUT_SECONDS, auto_refresh_token=True)
-        self.client = create_client(url, key, options)
-        self.__apply_auth_client_timeout()
-        self.patch_postgrest_execute()
         self.email = email
         self.password = password
-        self.user_id = self.sign_in()
+        self.__connect(options)
+        self.patch_postgrest_execute()
         self.client.auth.on_auth_state_change(self.__update_token_patch)
         self.sink_name = sink_name
         self.persist_events = persist_events
@@ -125,6 +155,23 @@ class SupabaseDal(AccountResourceFetcher):
         self.token_cache = TTLCache(maxsize=1, ttl=ttl)
         self.lock = threading.Lock()
 
+    def __connect(self, options: ClientOptions):
+        self.options = options
+        relay_key = fetch_supabase_api_key(self.account_id, self.cluster)
+        for key in filter(None, (KEY_CACHE.pop("key", None), relay_key)):
+            try:
+                self.__login(key, options)
+                KEY_CACHE["key"] = key
+                return
+            except Exception as e:
+                logging.warning(f"Supabase login with the relay api key failed: {e}")
+        self.__login(self.key, options)
+
+    def __login(self, api_key: str, options: ClientOptions):
+        self.client = create_client(self.url, api_key, options)
+        self.__apply_auth_client_timeout()
+        self.user_id = self.sign_in()
+
     def __apply_auth_client_timeout(self) -> None:
         """Give the auth (GoTrue) client the configured timeout, over HTTP/1.1.
 
@@ -182,7 +229,7 @@ class SupabaseDal(AccountResourceFetcher):
                 if exc.code == "PGRST301" or "expired" in message.lower():
                     # JWT expired. Sign in again and retry the query
                     logging.error("JWT token expired/invalid, signing in to Supabase again")
-                    self.sign_in()
+                    self.__connect(self.options)
                     return self._original_execute(_self)
                 else:
                     raise
@@ -468,7 +515,8 @@ class SupabaseDal(AccountResourceFetcher):
         frq: BaseFilterRequestBuilder, operator: str, criteria: str
     ) -> BaseFilterRequestBuilder:
         key, val = sanitize_param(operator), f"{criteria}"
-        frq.params = frq.params.set(key, val)
+        target = frq.request if hasattr(frq, "request") else frq
+        target.params = target.params.set(key, val)
 
         return frq
 

{robusta_api-0.48.0 → robusta_api-0.49.0}/src/robusta/core/sinks/robusta/prometheus_discovery_utils.py

@@ -5,7 +5,7 @@ import time
 from typing import Optional
 
 from prometrix import PrometheusFlagsConnectionError, PrometheusNotFound, VictoriaMetricsNotFound
-from pydantic import BaseModel
+from pydantic.v1 import BaseModel
 
 from robusta.core.exceptions import AlertsManagerNotFound, NoAlertManagerUrlFound, NoPrometheusUrlFound
 from robusta.core.model.base_params import PrometheusParams

{robusta_api-0.48.0 → robusta_api-0.49.0}/src/robusta/core/sinks/robusta/robusta_sink_params.py

@@ -1,4 +1,4 @@
-from pydantic.main import BaseModel
+from pydantic.v1.main import BaseModel
 from typing import List, Optional
 from robusta.core.sinks.sink_base_params import SinkBaseParams
 from robusta.core.sinks.sink_config import SinkConfigBase

{robusta_api-0.48.0 → robusta_api-0.49.0}/src/robusta/core/sinks/robusta/rrm/types.py

@@ -1,7 +1,7 @@
 from datetime import datetime
 from enum import Enum
 from typing import List, Optional
-from pydantic import BaseModel
+from pydantic.v1 import BaseModel
 
 
 class AccountResourceStatusInfo(BaseModel):

{robusta_api-0.48.0 → robusta_api-0.49.0}/src/robusta/core/sinks/rocketchat/rocketchat_sink_params.py

@@ -1,6 +1,6 @@
 from typing import Dict, Optional
 
-from pydantic import validator
+from pydantic.v1 import validator
 
 from robusta.core.sinks.sink_base_params import SinkBaseParams
 from robusta.core.sinks.sink_config import SinkConfigBase

{robusta_api-0.48.0 → robusta_api-0.49.0}/src/robusta/core/sinks/servicenow/servicenow_sink_params.py

@@ -1,6 +1,6 @@
 from typing import Optional
 
-from pydantic import SecretStr
+from pydantic.v1 import SecretStr
 
 from robusta.core.sinks.sink_base_params import SinkBaseParams
 from robusta.core.sinks.sink_config import SinkConfigBase

{robusta_api-0.48.0 → robusta_api-0.49.0}/src/robusta/core/sinks/sink_base.py

@@ -4,7 +4,7 @@ from abc import abstractmethod, ABC
 from collections import defaultdict
 from typing import Any, List, Dict, Tuple, DefaultDict, Optional
 
-from pydantic import BaseModel, Field
+from pydantic.v1 import BaseModel, Field
 
 from robusta.core.model.k8s_operation_type import K8sOperationType
 from robusta.core.reporting.base import Finding

{robusta_api-0.48.0 → robusta_api-0.49.0}/src/robusta/core/sinks/sink_base_params.py

@@ -3,8 +3,8 @@ import re
 from abc import ABC, abstractmethod
 from typing import Dict, List, Optional, Union
 
-from pydantic import BaseModel, root_validator, validator
-from pydantic.types import PositiveInt
+from pydantic.v1 import BaseModel, root_validator, validator
+from pydantic.v1.types import PositiveInt
 import pytz
 
 from robusta.core.playbooks.playbook_utils import replace_env_vars_values

{robusta_api-0.48.0 → robusta_api-0.49.0}/src/robusta/core/sinks/sink_config.py

@@ -1,6 +1,6 @@
 import abc
 
-from pydantic import BaseModel
+from pydantic.v1 import BaseModel
 
 from robusta.core.sinks.sink_base_params import SinkBaseParams