great-expectations-cloud 20250917.0__py3-none-any.whl → 20250918.0.dev1__py3-none-any.whl

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/agent/actions/draft_datasource_config_action.py

@@ -40,9 +40,7 @@ class DraftDatasourceConfigAction(AgentAction[DraftDatasourceConfigEvent]):
     def check_draft_datasource_config(
         self, event: DraftDatasourceConfigEvent, id: str
     ) -> ActionResult:
-        draft_config = self.get_draft_config(
-            config_id=event.config_id, workspace_id=event.workspace_id
-        )
+        draft_config = self.get_draft_config(config_id=event.config_id)
         datasource_type = draft_config.get("type", None)
         if datasource_type is None:
             raise TypeError(  # noqa: TRY003 # one off error
@@ -60,9 +58,7 @@ class DraftDatasourceConfigAction(AgentAction[DraftDatasourceConfigEvent]):
 
         if isinstance(datasource, SQLDatasource):
             asset_names = get_asset_names(datasource)
-            self._update_asset_names_list(
-                config_id=event.config_id, workspace_id=event.workspace_id, asset_names=asset_names
-            )
+            self._update_asset_names_list(config_id=event.config_id, asset_names=asset_names)
 
         return ActionResult(
             id=id,
@@ -70,13 +66,11 @@ class DraftDatasourceConfigAction(AgentAction[DraftDatasourceConfigEvent]):
             created_resources=[],
         )
 
-    def _update_asset_names_list(
-        self, config_id: UUID, workspace_id: UUID, asset_names: list[str]
-    ) -> None:
+    def _update_asset_names_list(self, config_id: UUID, asset_names: list[str]) -> None:
         with create_session(access_token=self._auth_key) as session:
             url = urljoin(
                 base=self._base_url,
-                url=f"/api/v1/organizations/{self._organization_id}/workspaces/{workspace_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,
@@ -90,10 +84,10 @@ class DraftDatasourceConfigAction(AgentAction[DraftDatasourceConfigEvent]):
                 f"={config_id}.",
             )
 
-    def get_draft_config(self, config_id: UUID, workspace_id: UUID) -> dict[str, Any]:
+    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}/workspaces/{workspace_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/agent/actions/generate_data_quality_check_expectations_action.py

@@ -43,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 (
@@ -83,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)
@@ -100,8 +101,6 @@ class GenerateDataQualityCheckExpectationsAction(
 
     @override
     def run(self, event: GenerateDataQualityCheckExpectationsEvent, id: str) -> ActionResult:
-        self._workspace_id = event.workspace_id
-
         created_resources: list[CreatedResource] = []
         assets_with_errors: list[str] = []
         selected_dqis: Sequence[DataQualityIssues] = event.selected_data_quality_issues or []
@@ -225,7 +224,7 @@ class GenerateDataQualityCheckExpectationsAction(
         """
         url = urljoin(
             base=self._base_url,
-            url=f"/api/v1/organizations/{self._organization_id}/workspaces/{self._workspace_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(
@@ -527,7 +526,7 @@ class GenerateDataQualityCheckExpectationsAction(
     ) -> UUID:
         url = urljoin(
             base=self._base_url,
-            url=f"/api/v1/organizations/{self._organization_id}/workspaces/{self._workspace_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/agent/actions/list_asset_names.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 from urllib.parse import urljoin
-from uuid import UUID
 
 from great_expectations.core.http import create_session
 from great_expectations.datasource.fluent import SQLDatasource
@@ -34,7 +33,6 @@ class ListAssetNamesAction(AgentAction[ListAssetNamesEvent]):
 
         self._add_or_update_asset_names_list(
             datasource_id=str(datasource.id),
-            workspace_id=event.workspace_id,
             asset_names=asset_names,
         )
 
@@ -44,13 +42,11 @@ class ListAssetNamesAction(AgentAction[ListAssetNamesEvent]):
             created_resources=[],
         )
 
-    def _add_or_update_asset_names_list(
-        self, datasource_id: str, workspace_id: UUID, asset_names: list[str]
-    ) -> None:
+    def _add_or_update_asset_names_list(self, datasource_id: str, asset_names: list[str]) -> None:
         with create_session(access_token=self._auth_key) as session:
             url = urljoin(
                 base=self._base_url,
-                url=f"/api/v1/organizations/{self._organization_id}/workspaces/{workspace_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/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/agent/actions/run_scheduled_checkpoint.py

@@ -24,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}/workspaces/{event.workspace_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,

great_expectations_cloud/agent/actions/run_window_checkpoint.py

@@ -24,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}/workspaces/{event.workspace_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/agent/agent.py

@@ -65,6 +65,7 @@ from great_expectations_cloud.agent.models import (
     AgentBaseExtraForbid,
     CreateScheduledJobAndSetJobStarted,
     CreateScheduledJobAndSetJobStartedRequest,
+    DomainContext,
     JobCompleted,
     JobStarted,
     JobStatus,
@@ -363,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
 

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/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

{great_expectations_cloud-20250917.0.dist-info → great_expectations_cloud-20250918.0.dev1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: great_expectations_cloud
-Version: 20250917.0
+Version: 20250918.0.dev1
 Summary: Great Expectations Cloud
 License: Proprietary
 Author: The Great Expectations Team

{great_expectations_cloud-20250917.0.dist-info → great_expectations_cloud-20250918.0.dev1.dist-info}/RECORD

@@ -1,34 +1,34 @@
 great_expectations_cloud/__init__.py,sha256=1mr5RDyA2N38eynvEfVbuYIbjFadeJfqZ-X9CrqYiVo,150
 great_expectations_cloud/agent/__init__.py,sha256=FqDFYbGefmNhwlvJwJbNovkwzny6mwaYH5LtTi6VlSU,464
 great_expectations_cloud/agent/actions/__init__.py,sha256=TYPe2j8EgaziXXgSLEdgjnbHKL56O6cQL1kjPnGbRFI,949
-great_expectations_cloud/agent/actions/agent_action.py,sha256=mGAovvT4CDaQlZaeNcz5tqfMIt6cul2anzxPwFrSxeA,1186
-great_expectations_cloud/agent/actions/draft_datasource_config_action.py,sha256=eFiv3Mm7IavSvag8ctD6yooIT8b4n1LQFsKrRzX-lMM,5341
-great_expectations_cloud/agent/actions/generate_data_quality_check_expectations_action.py,sha256=WBAgt0AvJ7T0AqdLZqYsaj-afj4J8K4jSa6u_9TXka0,23635
-great_expectations_cloud/agent/actions/list_asset_names.py,sha256=KNuYgV7fPmL5yTq3lKgEenHBZHoi4h6QMAmbkmHulNQ,2641
+great_expectations_cloud/agent/actions/agent_action.py,sha256=F9zOgVmNJ_V2RhRbDXNMjd46-QVNFN8Lp_bmPvh5cwU,1189
+great_expectations_cloud/agent/actions/draft_datasource_config_action.py,sha256=NVN2GBSty-XvCW7pHDkLImHd3V0iJzpUNIh8rNGDuzs,5241
+great_expectations_cloud/agent/actions/generate_data_quality_check_expectations_action.py,sha256=X-YAgJQ6wL2GPJOaSR2g78AyNYY0_gIegS0t8DFxNr8,23671
+great_expectations_cloud/agent/actions/list_asset_names.py,sha256=pOL5ip8ZZJbZhDNSp44rjYkx93rKdf3U6f4fY-JLhvg,2576
 great_expectations_cloud/agent/actions/run_checkpoint.py,sha256=N2d07JDCG06kMve7yjPZQFlaGKoJw5dCbpKuBWw6Ssg,3751
-great_expectations_cloud/agent/actions/run_metric_list_action.py,sha256=tW64pNYJElkUmcd9baKllTSyR-NYyU-40QvMwSwwLqQ,3234
-great_expectations_cloud/agent/actions/run_scheduled_checkpoint.py,sha256=_7IYfMhIBlXzanvl627e83c79ecDlk_bMQAQaQHhdx8,2427
-great_expectations_cloud/agent/actions/run_window_checkpoint.py,sha256=_pseC6tytSiAXsqJVf0Jjirpga8I1IAPEWazPWZ8iJg,2287
+great_expectations_cloud/agent/actions/run_metric_list_action.py,sha256=69nyR0vXjz_lKAHYczuEMQtbNIv0lf-DMiOBXmkwpuQ,3237
+great_expectations_cloud/agent/actions/run_scheduled_checkpoint.py,sha256=_aYXRsqmiuUOxX1aLppBbJCyBvo0gxZJ1fS6-W-uV1s,2457
+great_expectations_cloud/agent/actions/run_window_checkpoint.py,sha256=MCMbgY3dNUx546sNpXg5p3rCWNzDa6EQOUt20Nr5udo,2317
 great_expectations_cloud/agent/actions/unknown.py,sha256=mtWw9tDZqGZSiUWj7PtIlLFJ1dM-7AHBX3SO16-u2EM,739
 great_expectations_cloud/agent/actions/utils.py,sha256=0lzeASN1TYWJ35-H-sCRkcPMHzWU05SzKIyTv0CzvA8,1665
-great_expectations_cloud/agent/agent.py,sha256=JXZTtExQ-gMM6KPiqSH0xa95ugQC4F-fxclzO4bS4Jc,30961
+great_expectations_cloud/agent/agent.py,sha256=GtN-9t5yUZ7JBfKhZZaEqiDtwP8bRp-9XiiYgwVG_Do,31037
 great_expectations_cloud/agent/agent_warnings.py,sha256=9-xl_AI2V9Py4o7KzFOQjG3lYx-vZ36fq4w2iiPNiUw,362
 great_expectations_cloud/agent/cli.py,sha256=a_HmPxBMlVD59BEmkZnlbOOAFlezVMx9djZ2XIW-3W0,2885
 great_expectations_cloud/agent/config.py,sha256=c1BOr-TrxZnciWNRuu4atGtfRh-XSmwIS0osDCzQa04,1348
 great_expectations_cloud/agent/constants.py,sha256=SAEtcOwI-SxZiZSVoCFfEC5oCtYdgmyUmK7for_zg_Q,246
-great_expectations_cloud/agent/event_handler.py,sha256=kePpZ4EMIY0YWKeYH4W7lKY8C8OeER_Dkhwwadf3nTc,6069
+great_expectations_cloud/agent/event_handler.py,sha256=wcvAM0i6pnIsWlYstnZ2ThpByJYCyKrRmh0solC02bk,6091
 great_expectations_cloud/agent/exceptions.py,sha256=XIDBVSmBfFpVQA5i9rZqEtORIdi5E4_lwup0jP90TUk,1506
 great_expectations_cloud/agent/message_service/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 great_expectations_cloud/agent/message_service/asyncio_rabbit_mq_client.py,sha256=B2EwgG_Qdm1s_xkxbGPQxdRBkDSuhkKyT6rGFpXuqQ0,12391
 great_expectations_cloud/agent/message_service/subscriber.py,sha256=K8szy9uM1MUBkMaMZt9o5ExnjqEn1hw6zYaH7pQkjoM,5975
-great_expectations_cloud/agent/models.py,sha256=ea3d6eul8ECvsIubVSEJzeJbX6X9M40oEhaWhj4yuVI,10007
+great_expectations_cloud/agent/models.py,sha256=jgCDUJRDdCrXoU3NzfaJXmL8Y9gUqR3cO14nMsXFUDA,10298
 great_expectations_cloud/agent/run.py,sha256=V33RLoB1PFmJ0h0RfHG4SB5lN_Za8tW2Dua6GUpN9yY,639
 great_expectations_cloud/agent/utils.py,sha256=3OvdcXeK1gk2oJgqG4jPvBRwlMCn8LioULW3YgRtj98,2950
 great_expectations_cloud/logging/README.md,sha256=vbwU689x8SkGjzoBYQzZOzAvh28fR0RCa1XY5WD-Dgs,1762
 great_expectations_cloud/logging/logging_cfg.py,sha256=W6mlm4_Z2bjzM5TuKmFg_WZor2XoJm4DAoLGaf2O__I,6579
 great_expectations_cloud/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-great_expectations_cloud-20250917.0.dist-info/LICENSE,sha256=_JJnoX6N_OkrAwlCRizCwil0tIjDAy2TG3GiJ50sM6k,2084
-great_expectations_cloud-20250917.0.dist-info/METADATA,sha256=KjXiNHZS3Cd9HvW_0PkBp1W7nBZIMhgR8-ME5R1jDH4,12352
-great_expectations_cloud-20250917.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-great_expectations_cloud-20250917.0.dist-info/entry_points.txt,sha256=ofJgdeS2gSzxXLyCAjfNhIaN1wmSyR7EAMs5qhVaXE4,68
-great_expectations_cloud-20250917.0.dist-info/RECORD,,
+great_expectations_cloud-20250918.0.dev1.dist-info/LICENSE,sha256=_JJnoX6N_OkrAwlCRizCwil0tIjDAy2TG3GiJ50sM6k,2084
+great_expectations_cloud-20250918.0.dev1.dist-info/METADATA,sha256=eCwrOvbQ3uyzciXQxmjSNaf12_4rA3JI-wQmTgQ-IiQ,12357
+great_expectations_cloud-20250918.0.dev1.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+great_expectations_cloud-20250918.0.dev1.dist-info/entry_points.txt,sha256=ofJgdeS2gSzxXLyCAjfNhIaN1wmSyR7EAMs5qhVaXE4,68
+great_expectations_cloud-20250918.0.dev1.dist-info/RECORD,,

{great_expectations_cloud-20250917.0.dist-info → great_expectations_cloud-20250918.0.dev1.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.1.3
+Generator: poetry-core 2.1.1
 Root-Is-Purelib: true
 Tag: py3-none-any