great-expectations-cloud 20250811.0__tar.gz → 20251118.0.dev0__tar.gz

{great_expectations_cloud-20250811.0 → great_expectations_cloud-20251118.0.dev0}/PKG-INFO

@@ -1,8 +1,9 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: great_expectations_cloud
-Version: 20250811.0
+Version: 20251118.0.dev0
 Summary: Great Expectations Cloud
 License: Proprietary
+License-File: LICENSE
 Author: The Great Expectations Team
 Author-email: team@greatexpectations.io
 Requires-Python: >=3.11,<3.12
@@ -16,7 +17,7 @@ Classifier: Topic :: Scientific/Engineering
 Classifier: Topic :: Scientific/Engineering :: Information Analysis
 Classifier: Topic :: Software Development :: Quality Assurance
 Classifier: Topic :: Software Development :: Testing
-Requires-Dist: great-expectations[databricks,gx-redshift,postgresql,snowflake] (==1.5.8)
+Requires-Dist: great-expectations[databricks,gx-redshift,mssql,postgresql,snowflake,trino] (==1.9.0)
 Requires-Dist: orjson (>=3.9.7,<4.0.0,!=3.9.10)
 Requires-Dist: packaging (>=21.3,<26.0)
 Requires-Dist: pika (>=1.3.1,<2.0.0)
@@ -127,6 +128,8 @@ The dependencies installed in our CI and the Docker build step are determined by
 poetry update great_expectations
 ```
 
+**Note:** If `poetry update` does not find the latest version of `great_expectations`, you can manually update the version in `pyproject.toml`, and then update the lockfile using `poetry lock`.
+
 [To resolve and update all dependencies ...](https://python-poetry.org/docs/cli/#lock)
 
 ```console

{great_expectations_cloud-20250811.0 → great_expectations_cloud-20251118.0.dev0}/README.md

@@ -97,6 +97,8 @@ The dependencies installed in our CI and the Docker build step are determined by
 poetry update great_expectations
 ```
 
+**Note:** If `poetry update` does not find the latest version of `great_expectations`, you can manually update the version in `pyproject.toml`, and then update the lockfile using `poetry lock`.
+
 [To resolve and update all dependencies ...](https://python-poetry.org/docs/cli/#lock)
 
 ```console

{great_expectations_cloud-20250811.0 → great_expectations_cloud-20251118.0.dev0}/great_expectations_cloud/agent/actions/agent_action.py

@@ -4,7 +4,6 @@ import datetime
 from abc import abstractmethod
 from collections.abc import Sequence
 from typing import TYPE_CHECKING, Generic, Optional, TypeVar, Union
-from uuid import UUID
 
 from pydantic.v1 import BaseModel
 
@@ -12,6 +11,7 @@ from great_expectations_cloud.agent.models import (
     AgentBaseExtraForbid,
     AgentBaseExtraIgnore,
     CreatedResource,
+    DomainContext,
 )
 
 if TYPE_CHECKING:
@@ -32,11 +32,11 @@ _EventT = TypeVar("_EventT", bound=Union[AgentBaseExtraForbid, AgentBaseExtraIgn
 
 class AgentAction(Generic[_EventT]):
     def __init__(
-        self, context: CloudDataContext, base_url: str, organization_id: UUID, auth_key: str
+        self, context: CloudDataContext, base_url: str, domain_context: DomainContext, auth_key: str
     ):
         self._context = context
         self._base_url = base_url
-        self._organization_id = organization_id
+        self._domain_context = domain_context
         self._auth_key = auth_key
 
     @abstractmethod

{great_expectations_cloud-20250811.0 → great_expectations_cloud-20251118.0.dev0}/great_expectations_cloud/agent/actions/draft_datasource_config_action.py

@@ -70,7 +70,7 @@ class DraftDatasourceConfigAction(AgentAction[DraftDatasourceConfigEvent]):
         with create_session(access_token=self._auth_key) as session:
             url = urljoin(
                 base=self._base_url,
-                url=f"/api/v1/organizations/{self._organization_id}/draft-table-names/{config_id}",
+                url=f"/api/v1/organizations/{self._domain_context.organization_id}/workspaces/{self._domain_context.workspace_id}/draft-table-names/{config_id}",
             )
             response = session.put(
                 url=url,
@@ -87,7 +87,7 @@ class DraftDatasourceConfigAction(AgentAction[DraftDatasourceConfigEvent]):
     def get_draft_config(self, config_id: UUID) -> dict[str, Any]:
         resource_url = urljoin(
             base=self._base_url,
-            url=f"/api/v1/organizations/{self._organization_id}/draft-datasources/{config_id}",
+            url=f"/api/v1/organizations/{self._domain_context.organization_id}/workspaces/{self._domain_context.workspace_id}/draft-datasources/{config_id}",
         )
         with create_session(access_token=self._auth_key) as session:
             response = session.get(resource_url)

{great_expectations_cloud-20250811.0 → great_expectations_cloud-20251118.0.dev0}/great_expectations_cloud/agent/actions/generate_data_quality_check_expectations_action.py

@@ -10,9 +10,13 @@ from uuid import UUID
 
 import great_expectations.expectations as gx_expectations
 from great_expectations.core.http import create_session
-from great_expectations.exceptions import GXCloudError, InvalidExpectationConfigurationError
+from great_expectations.exceptions import (
+    GXCloudError,
+    InvalidExpectationConfigurationError,
+)
 from great_expectations.expectations.metadata_types import (
     DataQualityIssues,
+    FailureSeverity,
 )
 from great_expectations.expectations.window import Offset, Window
 from great_expectations.experimental.metric_repository.batch_inspector import (
@@ -39,6 +43,7 @@ from great_expectations_cloud.agent.event_handler import register_event_action
 from great_expectations_cloud.agent.exceptions import GXAgentError
 from great_expectations_cloud.agent.models import (
     CreatedResource,
+    DomainContext,
     GenerateDataQualityCheckExpectationsEvent,
 )
 from great_expectations_cloud.agent.utils import (
@@ -48,9 +53,7 @@ from great_expectations_cloud.agent.utils import (
 )
 
 if TYPE_CHECKING:
-    from great_expectations.core.suite_parameters import (
-        SuiteParameterDict,
-    )
+    from great_expectations.core.suite_parameters import SuiteParameterDict
     from great_expectations.data_context import CloudDataContext
     from great_expectations.datasource.fluent import DataAsset
 
@@ -81,13 +84,13 @@ class GenerateDataQualityCheckExpectationsAction(
         self,
         context: CloudDataContext,
         base_url: str,
-        organization_id: UUID,
+        domain_context: DomainContext,
         auth_key: str,
         metric_repository: MetricRepository | None = None,
         batch_inspector: BatchInspector | None = None,
     ):
         super().__init__(
-            context=context, base_url=base_url, organization_id=organization_id, auth_key=auth_key
+            context=context, base_url=base_url, domain_context=domain_context, auth_key=auth_key
         )
         self._metric_repository = metric_repository or MetricRepository(
             data_store=CloudDataStore(self._context)
@@ -155,6 +158,7 @@ class GenerateDataQualityCheckExpectationsAction(
                             asset_id=data_asset.id,
                             pre_existing_completeness_change_expectations=pre_existing_completeness_change_expectations,
                             created_via=created_via,
+                            use_forecast=event.use_forecast,
                         )
                         for exp_id in completeness_change_expectation_ids:
                             created_resources.append(
@@ -201,7 +205,7 @@ class GenerateDataQualityCheckExpectationsAction(
             metric_list=[
                 MetricTypes.TABLE_COLUMNS,
                 MetricTypes.TABLE_COLUMN_TYPES,
-                MetricTypes.COLUMN_NULL_COUNT,
+                MetricTypes.COLUMN_NON_NULL_COUNT,
                 MetricTypes.TABLE_ROW_COUNT,
             ],
         )
@@ -220,7 +224,7 @@ class GenerateDataQualityCheckExpectationsAction(
         """
         url = urljoin(
             base=self._base_url,
-            url=f"/api/v1/organizations/{self._organization_id}/expectations/",
+            url=f"/api/v1/organizations/{self._domain_context.organization_id}/workspaces/{self._domain_context.workspace_id}/expectations/",
         )
         with create_session(access_token=self._auth_key) as session:
             response = session.get(
@@ -316,6 +320,7 @@ class GenerateDataQualityCheckExpectationsAction(
             strict_max=strict_max,
             min_value=min_value,
             max_value=max_value,
+            severity=FailureSeverity.WARNING,
         )
         expectation_id = self._create_expectation_for_asset(
             expectation=expectation, asset_id=asset_id, created_via=created_via
@@ -338,7 +343,8 @@ class GenerateDataQualityCheckExpectationsAction(
             raise RuntimeError("missing TABLE_COLUMNS metric")  # noqa: TRY003
 
         expectation = gx_expectations.ExpectTableColumnsToMatchSet(
-            column_set=table_columns_metric.value
+            column_set=table_columns_metric.value,
+            severity=FailureSeverity.WARNING,
         )
         expectation_id = self._create_expectation_for_asset(
             expectation=expectation, asset_id=asset_id, created_via=created_via
@@ -353,6 +359,7 @@ class GenerateDataQualityCheckExpectationsAction(
             dict[Any, Any]
         ],  # list of ExpectationConfiguration dicts
         created_via: str | None,
+        use_forecast: bool = False,
     ) -> list[UUID]:
         table_row_count = next(
             metric
@@ -367,11 +374,11 @@ class GenerateDataQualityCheckExpectationsAction(
             metric
             for metric in metric_run.metrics
             if isinstance(metric, ColumnMetric)
-            and metric.metric_name == MetricTypes.COLUMN_NULL_COUNT
+            and metric.metric_name == MetricTypes.COLUMN_NON_NULL_COUNT
         ]
 
         if not column_null_values_metric or len(column_null_values_metric) == 0:
-            raise RuntimeError("missing COLUMN_NULL_COUNT metrics")  # noqa: TRY003
+            raise RuntimeError("missing COLUMN_NON_NULL_COUNT metrics")  # noqa: TRY003
 
         expectation_ids = []
         # Single-expectation approach using ExpectColumnProportionOfNonNullValuesToBeBetween
@@ -382,7 +389,7 @@ class GenerateDataQualityCheckExpectationsAction(
         )
         for column in columns_missing_completeness_coverage:
             column_name = column.column
-            null_count = column.value
+            non_null_count = column.value
             row_count = table_row_count.value
             expectation: gx_expectations.Expectation
 
@@ -392,18 +399,42 @@ class GenerateDataQualityCheckExpectationsAction(
             max_param_name = f"{unique_id}_proportion_max"
 
             # Calculate non-null proportion
-            non_null_count = row_count - null_count if row_count > 0 else 0
             non_null_proportion = non_null_count / row_count if row_count > 0 else 0
 
-            if non_null_proportion == 0:
+            if use_forecast:
+                expectation = gx_expectations.ExpectColumnProportionOfNonNullValuesToBeBetween(
+                    windows=[
+                        Window(
+                            constraint_fn=ExpectationConstraintFunction.FORECAST,
+                            parameter_name=min_param_name,
+                            range=1,
+                            offset=Offset(positive=0.0, negative=0.0),
+                            strict=True,
+                        ),
+                        Window(
+                            constraint_fn=ExpectationConstraintFunction.FORECAST,
+                            parameter_name=max_param_name,
+                            range=1,
+                            offset=Offset(positive=0.0, negative=0.0),
+                            strict=True,
+                        ),
+                    ],
+                    column=column_name,
+                    min_value={"$PARAMETER": min_param_name},
+                    max_value={"$PARAMETER": max_param_name},
+                    severity=FailureSeverity.WARNING,
+                )
+            elif non_null_proportion == 0:
                 expectation = gx_expectations.ExpectColumnProportionOfNonNullValuesToBeBetween(
                     column=column_name,
                     max_value=0,
+                    severity=FailureSeverity.WARNING,
                 )
             elif non_null_proportion == 1:
                 expectation = gx_expectations.ExpectColumnProportionOfNonNullValuesToBeBetween(
                     column=column_name,
                     min_value=1,
+                    severity=FailureSeverity.WARNING,
                 )
             else:
                 # Use triangular interpolation to compute min/max values
@@ -435,6 +466,7 @@ class GenerateDataQualityCheckExpectationsAction(
                     column=column_name,
                     min_value={"$PARAMETER": min_param_name},
                     max_value={"$PARAMETER": max_param_name},
+                    severity=FailureSeverity.WARNING,
                 )
 
             expectation_id = self._create_expectation_for_asset(
@@ -493,7 +525,7 @@ class GenerateDataQualityCheckExpectationsAction(
     ) -> UUID:
         url = urljoin(
             base=self._base_url,
-            url=f"/api/v1/organizations/{self._organization_id}/expectations/{asset_id}",
+            url=f"/api/v1/organizations/{self._domain_context.organization_id}/workspaces/{self._domain_context.workspace_id}/expectations/{asset_id}",
         )
 
         expectation_payload = expectation.configuration.to_json_dict()

{great_expectations_cloud-20250811.0 → great_expectations_cloud-20251118.0.dev0}/great_expectations_cloud/agent/actions/list_asset_names.py

@@ -13,9 +13,7 @@ from great_expectations_cloud.agent.actions.agent_action import (
 )
 from great_expectations_cloud.agent.actions.utils import get_asset_names
 from great_expectations_cloud.agent.event_handler import register_event_action
-from great_expectations_cloud.agent.models import (
-    ListAssetNamesEvent,
-)
+from great_expectations_cloud.agent.models import ListAssetNamesEvent
 
 
 class ListAssetNamesAction(AgentAction[ListAssetNamesEvent]):
@@ -34,7 +32,8 @@ class ListAssetNamesAction(AgentAction[ListAssetNamesEvent]):
         asset_names = get_asset_names(datasource)
 
         self._add_or_update_asset_names_list(
-            datasource_id=str(datasource.id), asset_names=asset_names
+            datasource_id=str(datasource.id),
+            asset_names=asset_names,
         )
 
         return ActionResult(
@@ -47,7 +46,7 @@ class ListAssetNamesAction(AgentAction[ListAssetNamesEvent]):
         with create_session(access_token=self._auth_key) as session:
             url = urljoin(
                 base=self._base_url,
-                url=f"/api/v1/organizations/{self._organization_id}/table-names/{datasource_id}",
+                url=f"/api/v1/organizations/{self._domain_context.organization_id}/workspaces/{self._domain_context.workspace_id}/table-names/{datasource_id}",
             )
             response = session.put(
                 url=url,

{great_expectations_cloud-20250811.0 → great_expectations_cloud-20251118.0.dev0}/great_expectations_cloud/agent/actions/run_metric_list_action.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 from typing import TYPE_CHECKING
-from uuid import UUID
 
 from great_expectations.experimental.metric_repository.batch_inspector import (
     BatchInspector,
@@ -21,6 +20,7 @@ from great_expectations_cloud.agent.actions import ActionResult, AgentAction
 from great_expectations_cloud.agent.event_handler import register_event_action
 from great_expectations_cloud.agent.models import (
     CreatedResource,
+    DomainContext,
     RunMetricsListEvent,
 )
 
@@ -34,13 +34,13 @@ class MetricListAction(AgentAction[RunMetricsListEvent]):
         self,
         context: CloudDataContext,
         base_url: str,
-        organization_id: UUID,
+        domain_context: DomainContext,
         auth_key: str,
         metric_repository: MetricRepository | None = None,
         batch_inspector: BatchInspector | None = None,
     ):
         super().__init__(
-            context=context, base_url=base_url, organization_id=organization_id, auth_key=auth_key
+            context=context, base_url=base_url, domain_context=domain_context, auth_key=auth_key
         )
         self._metric_repository = metric_repository or MetricRepository(
             data_store=CloudDataStore(self._context)

{great_expectations_cloud-20250811.0 → great_expectations_cloud-20251118.0.dev0}/great_expectations_cloud/agent/actions/run_scheduled_checkpoint.py

@@ -13,9 +13,7 @@ from great_expectations_cloud.agent.actions.agent_action import (
 )
 from great_expectations_cloud.agent.actions.run_checkpoint import run_checkpoint
 from great_expectations_cloud.agent.event_handler import register_event_action
-from great_expectations_cloud.agent.models import (
-    RunScheduledCheckpointEvent,
-)
+from great_expectations_cloud.agent.models import RunScheduledCheckpointEvent
 
 if TYPE_CHECKING:
     from great_expectations.data_context import CloudDataContext
@@ -26,7 +24,7 @@ class RunScheduledCheckpointAction(AgentAction[RunScheduledCheckpointEvent]):
     def run(self, event: RunScheduledCheckpointEvent, id: str) -> ActionResult:
         expectation_parameters_url = urljoin(
             base=self._base_url,
-            url=f"/api/v1/organizations/{self._organization_id}/checkpoints/{event.checkpoint_id}/expectation-parameters",
+            url=f"/api/v1/organizations/{self._domain_context.organization_id}/workspaces/{self._domain_context.workspace_id}/checkpoints/{event.checkpoint_id}/expectation-parameters",
         )
         return run_scheduled_checkpoint(
             context=self._context,
@@ -50,6 +48,7 @@ def run_scheduled_checkpoint(
             response=response,
         )
     data = response.json()
+
     try:
         expectation_parameters = (
             data["data"]["expectation_parameters"]

{great_expectations_cloud-20250811.0 → great_expectations_cloud-20251118.0.dev0}/great_expectations_cloud/agent/actions/run_window_checkpoint.py

@@ -13,9 +13,7 @@ from great_expectations_cloud.agent.actions.agent_action import (
 )
 from great_expectations_cloud.agent.actions.run_checkpoint import run_checkpoint
 from great_expectations_cloud.agent.event_handler import register_event_action
-from great_expectations_cloud.agent.models import (
-    RunWindowCheckpointEvent,
-)
+from great_expectations_cloud.agent.models import RunWindowCheckpointEvent
 
 if TYPE_CHECKING:
     from great_expectations.data_context import CloudDataContext
@@ -26,7 +24,7 @@ class RunWindowCheckpointAction(AgentAction[RunWindowCheckpointEvent]):
     def run(self, event: RunWindowCheckpointEvent, id: str) -> ActionResult:
         expectation_parameters_url = urljoin(
             base=self._base_url,
-            url=f"/api/v1/organizations/{self._organization_id}/checkpoints/{event.checkpoint_id}/expectation-parameters",
+            url=f"/api/v1/organizations/{self._domain_context.organization_id}/workspaces/{self._domain_context.workspace_id}/checkpoints/{event.checkpoint_id}/expectation-parameters",
         )
         return run_window_checkpoint(
             self._context,

{great_expectations_cloud-20250811.0 → great_expectations_cloud-20251118.0.dev0}/great_expectations_cloud/agent/actions/utils.py

@@ -7,10 +7,13 @@ from sqlalchemy import inspect
 
 if TYPE_CHECKING:
     from sqlalchemy.engine import Inspector
+    from sqlalchemy.sql.compiler import IdentifierPreparer
 
 
 def get_asset_names(datasource: SQLDatasource) -> list[str]:
     inspector: Inspector = inspect(datasource.get_engine())
+    identifier_preparer: IdentifierPreparer = inspector.dialect.identifier_preparer
+
     if isinstance(datasource, SnowflakeDatasource) and datasource.schema_:
         # Snowflake-SQLAlchemy uses the default_schema if no schema is provided to get_table_names
         # Or if the role does not have access to the schema (it silently fails and defaults to using default_schema)
@@ -19,8 +22,14 @@ def get_asset_names(datasource: SQLDatasource) -> list[str]:
         # Also converting to list to ensure JSON serializable
         tables = list(inspector.get_table_names(schema=datasource.schema_))
         views = list(inspector.get_view_names(schema=datasource.schema_))
-        return tables + views
+        asset_names = tables + views
+    else:
+        tables = list(inspector.get_table_names())
+        views = list(inspector.get_view_names())
+        asset_names = tables + views
 
-    tables = list(inspector.get_table_names())
-    views = list(inspector.get_view_names())
-    return tables + views
+    # the identifier preparer adds quotes when they are necessary
+    quoted_asset_names: list[str] = [
+        identifier_preparer.quote(asset_name) for asset_name in asset_names
+    ]
+    return quoted_asset_names

{great_expectations_cloud-20250811.0 → great_expectations_cloud-20251118.0.dev0}/great_expectations_cloud/agent/agent.py

@@ -2,7 +2,8 @@ from __future__ import annotations
 
 import asyncio
 import logging
-import sys
+import os
+import signal
 import traceback
 import warnings
 from collections import defaultdict
@@ -16,13 +17,12 @@ from uuid import UUID
 
 import orjson
 import requests
+from great_expectations import __version__, get_context
+from great_expectations.core import http
 from great_expectations.core.http import create_session
 from great_expectations.data_context.cloud_constants import CLOUD_DEFAULT_BASE_URL
-from great_expectations.data_context.data_context.context_factory import get_context
 from great_expectations.data_context.types.base import ProgressBarsConfig
-from pika.adapters.utils.connection_workflow import (
-    AMQPConnectorException,
-)
+from pika.adapters.utils.connection_workflow import AMQPConnectorException
 from pika.exceptions import (
     AMQPConnectionError,
     AMQPError,
@@ -45,9 +45,7 @@ from great_expectations_cloud.agent.config import (
     generate_config_validation_error_text,
 )
 from great_expectations_cloud.agent.constants import USER_AGENT_HEADER, HeaderName
-from great_expectations_cloud.agent.event_handler import (
-    EventHandler,
-)
+from great_expectations_cloud.agent.event_handler import EventHandler
 from great_expectations_cloud.agent.exceptions import (
     GXAgentConfigError,
     GXAgentError,
@@ -67,6 +65,7 @@ from great_expectations_cloud.agent.models import (
     AgentBaseExtraForbid,
     CreateScheduledJobAndSetJobStarted,
     CreateScheduledJobAndSetJobStartedRequest,
+    DomainContext,
     JobCompleted,
     JobStarted,
     JobStatus,
@@ -150,19 +149,6 @@ class GXAgent:
                 "great_expectations_version": great_expectations_version,
             },
         )
-        LOGGER.debug("Loading a DataContext - this might take a moment.")
-
-        with warnings.catch_warnings():
-            # suppress warnings about GX version
-            warnings.filterwarnings("ignore", message="You are using great_expectations version")
-            self._context: CloudDataContext = get_context(
-                cloud_mode=True,
-                user_agent_str=self.user_agent_str,
-            )
-            self._configure_progress_bars(data_context=self._context)
-        LOGGER.debug("DataContext is ready.")
-
-        self._set_http_session_headers(data_context=self._context)
 
         # Create a thread pool with a single worker, so we can run long-lived
         # GX processes and maintain our connection to the broker. Note that
@@ -218,7 +204,7 @@ class GXAgent:
             LOGGER.exception("The connection to GX Cloud has encountered an error.")
         except GXAgentUnrecoverableConnectionError:
             LOGGER.exception("The connection to GX Cloud has encountered an unrecoverable error.")
-            sys.exit(1)
+            os.kill(os.getpid(), signal.SIGTERM)
         except (
             AuthenticationError,
             ProbableAuthenticationError,
@@ -263,6 +249,7 @@ class GXAgent:
                     "event_type": event_context.event.type,
                     "correlation_id": event_context.correlation_id,
                     "organization_id": self.get_organization_id(event_context),
+                    "workspace_id": str(self.get_workspace_id(event_context)),
                     "schedule_id": event_context.event.schedule_id
                     if isinstance(event_context.event, ScheduledEventBase)
                     else None,
@@ -287,8 +274,23 @@ class GXAgent:
             self._current_task.add_done_callback(on_exit_callback)
 
     def get_data_context(self, event_context: EventContext) -> CloudDataContext:
-        """Helper method to get a DataContext Agent. Overridden in GX-Runner."""
-        return self._context
+        """Create a new CloudDataContext for each job using the event's workspace_id."""
+        with warnings.catch_warnings():
+            warnings.filterwarnings("ignore", message="You are using great_expectations version")
+            workspace_id = self.get_workspace_id(event_context)
+
+            LOGGER.debug("Loading a DataContext - this might take a moment.")
+
+            context: CloudDataContext = get_context(
+                cloud_mode=True,
+                user_agent_str=self.user_agent_str,
+                cloud_workspace_id=str(workspace_id),
+            )
+            self._configure_progress_bars(data_context=context)
+
+            LOGGER.debug("DataContext is ready.")
+
+        return context
 
     def get_organization_id(self, event_context: EventContext) -> UUID:
         """Helper method to get the organization ID. Overridden in GX-Runner."""
@@ -298,6 +300,13 @@ class GXAgent:
         """Helper method to get the auth key. Overridden in GX-Runner."""
         return self._get_config().gx_cloud_access_token
 
+    def get_workspace_id(self, event_context: EventContext) -> UUID:
+        """Helper method to get the workspace ID from the event."""
+        workspace_id: UUID | None = getattr(event_context.event, "workspace_id", None)
+        if workspace_id is None:
+            raise GXAgentError()
+        return workspace_id
+
     def _set_sentry_tags(self, even_context: EventContext) -> None:
         """Used by GX-Runner to set tags for Sentry logging. No-op in the Agent."""
         pass
@@ -320,14 +329,18 @@ class GXAgent:
         )
 
         org_id = self.get_organization_id(event_context)
+        workspace_id = self.get_workspace_id(event_context)
         base_url = self._get_config().gx_cloud_base_url
         auth_key = self.get_auth_key()
 
         if isinstance(event_context.event, ScheduledEventBase):
-            self._create_scheduled_job_and_set_started(event_context, org_id)
+            self._create_scheduled_job_and_set_started(event_context, org_id, workspace_id)
         else:
             self._update_status(
-                correlation_id=event_context.correlation_id, status=JobStarted(), org_id=org_id
+                correlation_id=event_context.correlation_id,
+                status=JobStarted(),
+                org_id=org_id,
+                workspace_id=workspace_id,
             )
         LOGGER.info(
             "Starting job",
@@ -335,6 +348,7 @@ class GXAgent:
                 "event_type": event_context.event.type,
                 "correlation_id": event_context.correlation_id,
                 "organization_id": str(org_id),
+                "workspace_id": str(workspace_id),
                 "schedule_id": event_context.event.schedule_id
                 if isinstance(event_context.event, ScheduledEventBase)
                 else None,
@@ -350,7 +364,7 @@ class GXAgent:
             id=event_context.correlation_id,
             base_url=base_url,
             auth_key=auth_key,
-            organization_id=org_id,
+            domain_context=DomainContext(organization_id=org_id, workspace_id=workspace_id),
         )
         return result
 
@@ -366,6 +380,7 @@ class GXAgent:
         # warning:  this method will not be executed in the main thread
 
         org_id = self.get_organization_id(event_context)
+        workspace_id = self.get_workspace_id(event_context)
 
         # get results or errors from the thread
         error = future.exception()
@@ -385,6 +400,7 @@ class GXAgent:
                         "event_type": event_context.event.type,
                         "id": event_context.correlation_id,
                         "organization_id": str(org_id),
+                        "workspace_id": str(workspace_id),
                         "schedule_id": event_context.event.schedule_id
                         if isinstance(event_context.event, ScheduledEventBase)
                         else None,
@@ -405,6 +421,7 @@ class GXAgent:
                             result.job_duration.total_seconds() if result.job_duration else None
                         ),
                         "organization_id": str(org_id),
+                        "workspace_id": str(workspace_id),
                         "schedule_id": event_context.event.schedule_id
                         if isinstance(event_context.event, ScheduledEventBase)
                         else None,
@@ -419,12 +436,16 @@ class GXAgent:
                     "event_type": event_context.event.type,
                     "correlation_id": event_context.correlation_id,
                     "organization_id": str(org_id),
+                    "workspace_id": str(workspace_id),
                 },
             )
 
         try:
             self._update_status(
-                correlation_id=event_context.correlation_id, status=status, org_id=org_id
+                correlation_id=event_context.correlation_id,
+                status=status,
+                org_id=org_id,
+                workspace_id=workspace_id,
             )
         except Exception:
             LOGGER.exception(
@@ -433,6 +454,7 @@ class GXAgent:
                     "correlation_id": event_context.correlation_id,
                     "status": str(status),
                     "organization_id": str(org_id),
+                    "workspace_id": str(workspace_id),
                 },
             )
             # We do not want to cause an infinite loop of errors
@@ -552,7 +574,9 @@ class GXAgent:
                 )
             )
 
-    def _update_status(self, correlation_id: str, status: JobStatus, org_id: UUID) -> None:
+    def _update_status(
+        self, correlation_id: str, status: JobStatus, org_id: UUID, workspace_id: UUID
+    ) -> None:
         """Update GX Cloud on the status of a job.
 
         Args:
@@ -565,11 +589,12 @@ class GXAgent:
                 "correlation_id": correlation_id,
                 "status": str(status),
                 "organization_id": str(org_id),
+                "workspace_id": str(workspace_id),
             },
         )
         agent_sessions_url = urljoin(
             self._get_config().gx_cloud_base_url,
-            f"/api/v1/organizations/{org_id}/agent-jobs/{correlation_id}",
+            f"/api/v1/organizations/{org_id}/workspaces/{workspace_id}/agent-jobs/{correlation_id}",
         )
         with create_session(access_token=self.get_auth_key()) as session:
             data = UpdateJobStatusRequest(data=status).json()
@@ -580,6 +605,7 @@ class GXAgent:
                     "correlation_id": correlation_id,
                     "status": str(status),
                     "organization_id": str(org_id),
+                    "workspace_id": str(workspace_id),
                 },
             )
             GXAgent._log_http_error(
@@ -587,7 +613,7 @@ class GXAgent:
             )
 
     def _create_scheduled_job_and_set_started(
-        self, event_context: EventContext, org_id: UUID
+        self, event_context: EventContext, org_id: UUID, workspace_id: UUID
     ) -> None:
         """Create a job in GX Cloud for scheduled events.
 
@@ -609,13 +635,14 @@ class GXAgent:
                 "correlation_id": str(event_context.correlation_id),
                 "event_type": str(event_context.event.type),
                 "organization_id": str(org_id),
+                "workspace_id": str(workspace_id),
                 "schedule_id": str(event_context.event.schedule_id),
             },
         )
 
         agent_sessions_url = urljoin(
             self._get_config().gx_cloud_base_url,
-            f"/api/v1/organizations/{org_id}/agent-jobs",
+            f"/api/v1/organizations/{org_id}/workspaces/{workspace_id}/agent-jobs",
         )
         data = CreateScheduledJobAndSetJobStarted(
             type="run_scheduled_checkpoint.received",
@@ -636,6 +663,7 @@ class GXAgent:
                     "event_type": str(event_context.event.type),
                     "organization_id": str(org_id),
                     "schedule_id": str(event_context.event.schedule_id),
+                    "workspace_id": str(workspace_id),
                 },
             )
             GXAgent._log_http_error(
@@ -658,7 +686,9 @@ class GXAgent:
         """
         Sets headers on all stores in the data context.
         """
-        from great_expectations.data_context.store.gx_cloud_store_backend import GXCloudStoreBackend  # noqa: I001, PLC0415
+        from great_expectations.data_context.store.gx_cloud_store_backend import (  # noqa: PLC0415
+            GXCloudStoreBackend,
+        )
 
         # OSS doesn't use the same session for all requests, so we need to set the header for each store
         stores = list(data_context.stores.values())
@@ -686,8 +716,6 @@ class GXAgent:
         Note: the Agent-Job-Id header value will be set for all GX Cloud request until this method is
         called again.
         """
-        from great_expectations import __version__  # noqa: PLC0415
-        from great_expectations.core import http  # noqa: PLC0415
 
         header_name = self.get_header_name()
         user_agent_header_value = self.user_agent_str

{great_expectations_cloud-20250811.0 → great_expectations_cloud-20251118.0.dev0}/great_expectations_cloud/agent/event_handler.py

@@ -15,6 +15,7 @@ from pydantic import v1 as pydantic_v1
 from great_expectations_cloud.agent.actions.unknown import UnknownEventAction
 from great_expectations_cloud.agent.exceptions import GXAgentError
 from great_expectations_cloud.agent.models import (
+    DomainContext,
     Event,
     EventType,
     UnknownEvent,
@@ -67,11 +68,11 @@ class EventHandler:
         self._context = context
 
     def get_event_action(
-        self, event: Event, base_url: str, auth_key: str, organization_id: UUID
+        self, event: Event, base_url: str, auth_key: str, domain_context: DomainContext
     ) -> AgentAction[Any]:
         """Get the action that should be run for the given event."""
 
-        if not self._check_event_organization_id(event, organization_id):
+        if not self._check_event_organization_id(event, domain_context.organization_id):
             # Making message more generic
             raise GXAgentError("Unable to process job. Invalid input.")  # noqa: TRY003
 
@@ -84,17 +85,17 @@ class EventHandler:
         return action_class(
             context=self._context,
             base_url=base_url,
-            organization_id=organization_id,
+            domain_context=domain_context,
             auth_key=auth_key,
         )
 
-    def handle_event(  # Refactor opportunity
-        self, event: Event, id: str, base_url: str, auth_key: str, organization_id: UUID
+    def handle_event(
+        self, event: Event, id: str, base_url: str, auth_key: str, domain_context: DomainContext
     ) -> ActionResult:
-        start_time = datetime.now(tz=timezone.utc)
         """Transform an Event into an ActionResult."""
+        start_time = datetime.now(tz=timezone.utc)
         action = self.get_event_action(
-            event=event, base_url=base_url, auth_key=auth_key, organization_id=organization_id
+            event=event, base_url=base_url, auth_key=auth_key, domain_context=domain_context
         )
         LOGGER.info(f"Handling event: {event.type} -> {action.__class__.__name__}")
         action_result = action.run(event=event, id=id)

{great_expectations_cloud-20250811.0 → great_expectations_cloud-20251118.0.dev0}/great_expectations_cloud/agent/models.py

@@ -24,6 +24,18 @@ def all_subclasses(cls: type) -> list[type]:
     return all_sub_cls
 
 
+class DomainContext(BaseModel):
+    """
+    Encapsulates domain-related context information.
+
+    This dataclass consolidates organization_id and workspace_id to reduce
+    parameter proliferation and improve code maintainability.
+    """
+
+    organization_id: UUID
+    workspace_id: UUID
+
+
 class AgentBaseExtraForbid(BaseModel):
     class Config:
         # 2024-03-04: ZEL-501 Strictly enforce models for handling outdated APIs
@@ -39,6 +51,7 @@ class AgentBaseExtraIgnore(BaseModel):
 class EventBase(AgentBaseExtraIgnore):
     type: str
     organization_id: Optional[UUID] = None  # noqa: UP045
+    workspace_id: UUID
 
 
 class ScheduledEventBase(EventBase):

{great_expectations_cloud-20250811.0 → great_expectations_cloud-20251118.0.dev0}/pyproject.toml

@@ -1,7 +1,6 @@
 [tool.poetry]
 name = "great_expectations_cloud"
-version = "20250811.0"
-
+version = "20251118.0.dev0"
 description = "Great Expectations Cloud"
 authors = ["The Great Expectations Team <team@greatexpectations.io>"]
 repository = "https://github.com/great-expectations/cloud"
@@ -24,7 +23,7 @@ include = [
 
 [tool.poetry.dependencies]
 python = ">=3.11,<3.12"
-great-expectations = { version = "1.5.8", extras = ["gx-redshift", "snowflake", "postgresql", "databricks"] }
+great-expectations = { version = "1.9.0", extras = ["gx-redshift", "snowflake", "postgresql", "databricks", "mssql", "trino"] }
 pydantic = ">=2.8.1,<3"
 pika = "^1.3.1"
 setuptools = "80.9.0"
@@ -38,16 +37,16 @@ sqlalchemy = ">=2.0"
 [tool.poetry.group.dev.dependencies]
 coverage = { extras = ["toml"], version = "^7.5.1" }
 freezegun = "^1.4.0"
-invoke = "^2.2.0"
-mypy = "1.17.1"
+invoke = "^2.2.1"
+mypy = "1.18.2"
 pre-commit = ">=3.3.3,<5.0.0"
 pyfakefs = "^5.4.1"
-pytest = ">=7.4,<9.0"
+pytest = ">=7.4,<10.0"
 pytest-cov = ">=5"
 pytest-icdiff = "*"
 pytest-mock = "*"
 responses = ">=0.23.1,<0.26.0"
-ruff = "0.12.8"
+ruff = "0.14.5"
 tenacity = ">=8.2.3,<10.0.0"
 tomlkit = ">=0.12.1,<0.14.0"
 types-requests = "^2.31"