great-expectations-cloud 20250903.0.dev0__tar.gz → 20250904.0.dev1__tar.gz

{great_expectations_cloud-20250903.0.dev0 → great_expectations_cloud-20250904.0.dev1}/PKG-INFO

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

{great_expectations_cloud-20250903.0.dev0 → great_expectations_cloud-20250904.0.dev1}/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-20250903.0.dev0 → great_expectations_cloud-20250904.0.dev1}/great_expectations_cloud/agent/agent.py

@@ -16,8 +16,6 @@ from uuid import UUID
 
 import orjson
 import requests
-from great_expectations import __version__
-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
@@ -152,7 +150,19 @@ class GXAgent:
                 "great_expectations_version": great_expectations_version,
             },
         )
-        # DataContext is created per job in get_data_context
+        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
@@ -253,7 +263,6 @@ 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,
@@ -278,19 +287,8 @@ class GXAgent:
             self._current_task.add_done_callback(on_exit_callback)
 
     def get_data_context(self, event_context: EventContext) -> CloudDataContext:
-        """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")
-            # Validate presence of workspace_id (required), even if not passed directly to get_context
-            if getattr(event_context.event, "workspace_id", None) is None:
-                raise GXAgentError()
-
-            context: CloudDataContext = get_context(
-                cloud_mode=True,
-                user_agent_str=self.user_agent_str,
-            )
-            self._configure_progress_bars(data_context=context)
-        return context
+        """Helper method to get a DataContext Agent. Overridden in GX-Runner."""
+        return self._context
 
     def get_organization_id(self, event_context: EventContext) -> UUID:
         """Helper method to get the organization ID. Overridden in GX-Runner."""
@@ -300,13 +298,6 @@ 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
@@ -329,18 +320,14 @@ 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, workspace_id)
+            self._create_scheduled_job_and_set_started(event_context, org_id)
         else:
             self._update_status(
-                correlation_id=event_context.correlation_id,
-                status=JobStarted(),
-                org_id=org_id,
-                workspace_id=workspace_id,
+                correlation_id=event_context.correlation_id, status=JobStarted(), org_id=org_id
             )
         LOGGER.info(
             "Starting job",
@@ -348,7 +335,6 @@ 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,
@@ -380,7 +366,6 @@ 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()
@@ -400,7 +385,6 @@ 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,
@@ -421,7 +405,6 @@ 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,
@@ -436,16 +419,12 @@ 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,
-                workspace_id=workspace_id,
+                correlation_id=event_context.correlation_id, status=status, org_id=org_id
             )
         except Exception:
             LOGGER.exception(
@@ -454,7 +433,6 @@ 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
@@ -574,9 +552,7 @@ class GXAgent:
                 )
             )
 
-    def _update_status(
-        self, correlation_id: str, status: JobStatus, org_id: UUID, workspace_id: UUID
-    ) -> None:
+    def _update_status(self, correlation_id: str, status: JobStatus, org_id: UUID) -> None:
         """Update GX Cloud on the status of a job.
 
         Args:
@@ -589,12 +565,11 @@ 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}/workspaces/{workspace_id}/agent-jobs/{correlation_id}",
+            f"/api/v1/organizations/{org_id}/agent-jobs/{correlation_id}",
         )
         with create_session(access_token=self.get_auth_key()) as session:
             data = UpdateJobStatusRequest(data=status).json()
@@ -605,7 +580,6 @@ class GXAgent:
                     "correlation_id": correlation_id,
                     "status": str(status),
                     "organization_id": str(org_id),
-                    "workspace_id": str(workspace_id),
                 },
             )
             GXAgent._log_http_error(
@@ -613,7 +587,7 @@ class GXAgent:
             )
 
     def _create_scheduled_job_and_set_started(
-        self, event_context: EventContext, org_id: UUID, workspace_id: UUID
+        self, event_context: EventContext, org_id: UUID
     ) -> None:
         """Create a job in GX Cloud for scheduled events.
 
@@ -635,14 +609,13 @@ 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}/workspaces/{workspace_id}/agent-jobs",
+            f"/api/v1/organizations/{org_id}/agent-jobs",
         )
         data = CreateScheduledJobAndSetJobStarted(
             type="run_scheduled_checkpoint.received",
@@ -663,7 +636,6 @@ 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(
@@ -714,6 +686,8 @@ 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-20250903.0.dev0 → great_expectations_cloud-20250904.0.dev1}/great_expectations_cloud/agent/models.py

@@ -39,7 +39,6 @@ class AgentBaseExtraIgnore(BaseModel):
 class EventBase(AgentBaseExtraIgnore):
     type: str
     organization_id: Optional[UUID] = None  # noqa: UP045
-    workspace_id: UUID
 
 
 class ScheduledEventBase(EventBase):

{great_expectations_cloud-20250903.0.dev0 → great_expectations_cloud-20250904.0.dev1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "great_expectations_cloud"
-version = "20250903.0.dev0"
+version = "20250904.0.dev1"
 
 description = "Great Expectations Cloud"
 authors = ["The Great Expectations Team <team@greatexpectations.io>"]
@@ -47,7 +47,7 @@ pytest-cov = ">=5"
 pytest-icdiff = "*"
 pytest-mock = "*"
 responses = ">=0.23.1,<0.26.0"
-ruff = "0.12.11"
+ruff = "0.12.12"
 tenacity = ">=8.2.3,<10.0.0"
 tomlkit = ">=0.12.1,<0.14.0"
 types-requests = "^2.31"