query-cache-common 1.2.0__tar.gz → 1.3.0__tar.gz

{query_cache_common-1.2.0 → query_cache_common-1.3.0}/.gitignore

@@ -226,3 +226,6 @@ tests/integration/dbt_run_cache_turbo/corpus_catalog.json
 
 # Superpowers (AI agent plans/specs)
 docs/superpowers/
+
+# Git worktrees
+.worktrees/

{query_cache_common-1.2.0 → query_cache_common-1.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: query-cache-common
-Version: 1.2.0
+Version: 1.3.0
 Summary: Common code for Query Cache shared across client and server
 License: Copyright (c) 2026 Fivetran, Inc.
         
@@ -32,5 +32,6 @@ License: Copyright (c) 2026 Fivetran, Inc.
         FROM USE OF THIS SOFTWARE, INCLUDING DIRECT, INDIRECT, INCIDENTAL,
         PUNITIVE, AND CONSEQUENTIAL DAMAGES.
 Requires-Python: >=3.9
+Requires-Dist: humanize
 Requires-Dist: query-cache-protobuf
 Requires-Dist: typing-extensions>=4.0.0

{query_cache_common-1.2.0 → query_cache_common-1.3.0}/pyproject.toml

@@ -7,6 +7,7 @@ requires-python = ">=3.9"
 dependencies = [
     "typing-extensions>=4.0.0",
     "query-cache-protobuf",
+    "humanize",
 ]
 
 [tool.hatch.version]

query_cache_common-1.3.0/src/query_cache_common/auth.py

@@ -0,0 +1,106 @@
+from __future__ import annotations
+
+import typing as t
+from functools import cached_property
+
+
+RUNCACHE_ORG_SCOPE_PREFIX = "runcache:scope:org"
+LEGACY_ORG_SCOPE_PREFIX = "conway:scope:org"
+ORG_SCOPE_PREFIXES = (RUNCACHE_ORG_SCOPE_PREFIX, LEGACY_ORG_SCOPE_PREFIX)
+RUNCACHE_APP_SCOPE_PREFIX = "runcache:scope:app"
+
+
+def _extract_org_id_and_level(scope: str) -> t.Optional[t.Tuple[str, str]]:
+    # scope looks something like 'runcache:scope:app:tues_test:developer'
+    # that is, SCOPE_PREFIX:{org_id}:{level}
+    scope_parts = scope.split(":")
+    org_id = scope_parts[3]
+    return (org_id, scope_parts[4]) if org_id else None
+
+
+def _org_id_to_level(scopes: t.List[str]) -> t.Dict[str, str]:
+    mapping = filter(None, [_extract_org_id_and_level(scope) for scope in scopes])
+    return {org_id: level for org_id, level in mapping}
+
+
+class Scope:
+    def __init__(self, org_scopes: t.List[str], app_scopes: t.List[str]) -> None:
+        self._org_scopes = org_scopes
+        self._app_scopes = app_scopes
+
+        for scope in org_scopes + app_scopes:
+            if scope.count(":") < 4:
+                raise ValueError(f"Invalid scope format: '{scope}'.")
+
+    @classmethod
+    def from_string(cls, scope: str) -> Scope:
+        """Create a Scope instance from a scope string.
+
+        Supports both the current ``runcache:`` prefix and the legacy ``conway:`` prefix.
+
+        Args:
+            scope: The scope string to parse.
+
+        Returns:
+            A Scope instance.
+        """
+        scopes = [s.strip() for s in scope.split(" ")]
+
+        org_scopes = [s for s in scopes if any(s.startswith(p) for p in ORG_SCOPE_PREFIXES)]
+        app_scopes = [s for s in scopes if s.startswith(RUNCACHE_APP_SCOPE_PREFIX)]
+
+        return cls(org_scopes=org_scopes, app_scopes=app_scopes)
+
+    @property
+    def org_id(self) -> str:
+        """Extract the organization ID from a given scope string.
+
+        This method raises ValueError if the scope is not associated with exactly one organization ID.
+
+        Returns:
+            The extracted organization ID.
+        """
+        org_ids = self.org_ids
+        if not org_ids:
+            raise ValueError("No organization scope found.")
+        if len(org_ids) > 1:
+            raise ValueError(f"Only one organization scope is supported, got multiple: {org_ids}.")
+        org_id = org_ids[0]
+        if org_id == "*":
+            raise ValueError(f"Wildcard organization ID is not allowed.")
+        return org_id
+
+    @cached_property
+    def org_ids(self) -> t.List[str]:
+        """Returns all organization IDs from the scope, including wildcards."""
+        return list(_org_id_to_level(self._org_scopes))
+
+    def is_org_id_in_scope(self, org_id: str) -> bool:
+        """Check if the given organization ID is included in the scope.
+
+        Args:
+            org_id: The organization ID to check.
+
+        Returns:
+            True if the org_id is in the scope or if a wildcard "*" is present; False otherwise.
+        """
+        return org_id in self.org_ids or "*" in self.org_ids
+
+    def is_org_id_disabled(self, org_id: str) -> bool:
+        """Check if the user's access has been disabled for the given organization.
+
+        Args:
+            org_id: The organization ID to check.
+
+        Returns:
+            True if the user's access to the organization has been disabled,
+            False if the user is either not a member of the organization or is still an active member
+        """
+
+        # if we have an :app: scope containing the org id, but not an :org: scope, the organization has been disabled for the user
+        org_ids_in_app_scopes = _org_id_to_level(self._app_scopes)
+
+        if self.is_org_id_in_scope(org_id):
+            return False
+
+        return org_id in org_ids_in_app_scopes

{query_cache_common-1.2.0 → query_cache_common-1.3.0}/src/query_cache_common/models/services/explain_service_models.py

@@ -57,3 +57,7 @@ class GetExplainMessagesRequest(BaseSerDeModel):
 @proto_dataclass(explain_service_pb2.GetExplainMessagesResponse)
 class GetExplainMessagesResponse(BaseSerDeModel):
     messages: t.List[ExplainMessageEntry]
+
+    @property
+    def by_id(self) -> t.Dict[str, ExplainMessageEntry]:
+        return {m.execution_decision_id: m for m in self.messages}

{query_cache_common-1.2.0 → query_cache_common-1.3.0}/src/query_cache_common/utils.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+import datetime
+import humanize
 import time
 import typing as t
 
@@ -114,3 +116,16 @@ def extract_fqn_parts(fqn: str, dialect: str) -> t.Tuple[str, str, str]:
         raise ValueError(f"Expecting SQLGlot expression for name, got: {name}")
 
     return catalog.sql(dialect=dialect), schema.sql(dialect=dialect), name.sql(dialect=dialect)
+
+
+def format_as_localtime(dt: datetime.datetime) -> str:
+    local_dt = dt.astimezone()  # convert to localtime
+    return local_dt.strftime("%Y-%m-%d %H:%M:%S %Z")
+
+
+def format_epoch_relative(epoch: t.Optional[int]) -> str:
+    if epoch is None:
+        return "no data"
+
+    as_dt = datetime.datetime.fromtimestamp(epoch / 1000, tz=datetime.timezone.utc)
+    return f"{humanize.naturaltime(as_dt)}, {format_as_localtime(as_dt)}"

query_cache_common-1.2.0/src/query_cache_common/auth.py

@@ -1,73 +0,0 @@
-from __future__ import annotations
-
-from functools import cached_property
-
-
-RUNCACHE_ORG_SCOPE_PREFIX = "runcache:scope:org"
-LEGACY_ORG_SCOPE_PREFIX = "conway:scope:org"
-ORG_SCOPE_PREFIXES = (RUNCACHE_ORG_SCOPE_PREFIX, LEGACY_ORG_SCOPE_PREFIX)
-
-
-class Scope:
-    def __init__(self, org_id_to_level: dict[str, str]) -> None:
-        self._org_id_to_level: dict[str, str] = org_id_to_level
-
-    @classmethod
-    def from_string(cls, scope: str) -> Scope:
-        """Create a Scope instance from a scope string.
-
-        Supports both the current ``runcache:`` prefix and the legacy ``conway:`` prefix.
-
-        Args:
-            scope: The scope string to parse.
-
-        Returns:
-            A Scope instance.
-        """
-        scopes = scope.split(" ")
-        org_scopes = [s for s in scopes if any(s.strip().startswith(p) for p in ORG_SCOPE_PREFIXES)]
-
-        org_id_to_level = {}
-        for org_scope in org_scopes:
-            scope_parts = org_scope.split(":")
-            if len(scope_parts) < 5:
-                raise ValueError(f"Invalid scope format: '{scope}'.")
-            org_id = scope_parts[3]
-            if org_id:
-                org_id_to_level[org_id] = scope_parts[4]
-        return cls(org_id_to_level=org_id_to_level)
-
-    @property
-    def org_id(self) -> str:
-        """Extract the organization ID from a given scope string.
-
-        This method raises ValueError if the scope is not associated with exactly one organization ID.
-
-        Returns:
-            The extracted organization ID.
-        """
-        org_ids = self.org_ids
-        if not org_ids:
-            raise ValueError("No organization scope found.")
-        if len(org_ids) > 1:
-            raise ValueError(f"Only one organization scope is supported, got multiple: {org_ids}.")
-        org_id = org_ids[0]
-        if org_id == "*":
-            raise ValueError(f"Wildcard organization ID is not allowed.")
-        return org_id
-
-    @cached_property
-    def org_ids(self) -> list[str]:
-        """Returns all organization IDs from the scope, including wildcards."""
-        return list(self._org_id_to_level)
-
-    def is_org_id_in_scope(self, org_id: str) -> bool:
-        """Check if the given organization ID is included in the scope.
-
-        Args:
-            org_id: The organization ID to check.
-
-        Returns:
-            True if the org_id is in the scope or if a wildcard "*" is present; False otherwise.
-        """
-        return org_id in self._org_id_to_level or "*" in self._org_id_to_level