[BUGFIX] Make workspaces optional for cloud_user_info (#11378)

Co-authored-by: Bill Dirks <bill@greatexpectations.io>

Author: gyermich

great_expectations/data_context/data_context/cloud_data_context.py

@@ -76,19 +76,7 @@
 
 class NoUserIdError(Exception):
     def __init__(self):
-        super().__init__("No user id in /account/me response")
-
-
-class NoWorkspacesError(Exception):
-    def __init__(self):
-        super().__init__("No workspaces in /account/me response")
-
-
-class WorkspacesKeyError(Exception):
-    def __init__(self):
-        super().__init__(
-            "Workspaces returned in /account/me response don't have required keys: (id, role)"
-        )
+        super().__init__("No user id in /accounts/me response")
 
 
 class WorkspaceNotSetError(Exception):
@@ -223,16 +211,11 @@ def _get_cloud_user_info(self) -> CloudUserInfo:
         user_id = data.get("user_id") or data.get("id")
         if not user_id:
             raise NoUserIdError()
-        response_workspaces = data.get("workspaces")
-        if not response_workspaces:
-            raise NoWorkspacesError()
-        workspaces = []
-        for response_workspace in response_workspaces:
-            if "id" not in response_workspace or "role" not in response_workspace:
-                raise WorkspacesKeyError()
-            workspaces.append(
-                Workspace(id=response_workspace["id"], role=response_workspace["role"])
-            )
+        response_workspaces = data.get("workspaces", [])
+        workspaces = [
+            Workspace(id=response_workspace["id"], role=response_workspace["role"])
+            for response_workspace in response_workspaces
+        ]
         return CloudUserInfo(user_id=uuid.UUID(user_id), workspaces=workspaces)
 
     def cloud_user_info(self, force_refresh: bool = False) -> CloudUserInfo:

requirements.txt

@@ -15,7 +15,7 @@ pandas<2.2; python_version >= "3.12"
 posthog>3
 # patch version updates `typing_extensions` to the needed version
 pydantic>=1.10.7
-pyparsing>=2.4
+pyparsing>=2.4,!=3.2.4
 python-dateutil>=2.8.1
 requests>=2.20
 ruamel.yaml>=0.16

tests/analytics/test_analytics.py

@@ -1,6 +1,6 @@
 from typing import Optional
 from unittest import mock
-from uuid import UUID
+from uuid import UUID, uuid4
 
 import pytest
 
@@ -317,6 +317,87 @@ def test_analytics_enabled_after_setting_explicitly(
         )
 
 
+@pytest.mark.unit
+def test_cloud_context_init_with_system_user_no_workspaces(
+    unset_gx_env_variables: None,
+    monkeypatch,
+    mocker,
+):
+    monkeypatch.setattr(ENV_CONFIG, "gx_analytics_enabled", True)  # Enable usage stats
+
+    user_id = uuid4()
+    organization_id = uuid4()
+    workspace_id = uuid4()
+
+    # Mock cloud API response for system user with no workspaces
+    def mock_request_cloud_backend(*args, **kwargs):
+        mock_response = mocker.MagicMock()
+        mock_response.json.return_value = {
+            "user_id": str(user_id),
+            "workspaces": [],
+        }
+        return mock_response
+
+    mock_config = {
+        "cloud_base_url": "https://api.test.greatexpectations.io",
+        "cloud_access_token": "test_token_123",
+        "cloud_organization_id": str(organization_id),
+        "cloud_workspace_id": str(workspace_id),
+    }
+
+    mock_data_context_config = {
+        "config_version": 4.0,
+        "datasources": {},
+        "stores": {},
+        "expectations_store_name": "expectations_store",
+        "validation_results_store_name": "validation_results_store",
+        "checkpoint_store_name": "checkpoint_store",
+        "data_docs_sites": {},
+        "analytics_enabled": True,
+    }
+
+    with (
+        mock.patch(
+            "great_expectations.data_context.data_context.cloud_data_context.CloudDataContext.retrieve_data_context_config_from_cloud",
+            return_value=mock_data_context_config,
+        ),
+        mock.patch(
+            "great_expectations.data_context.data_context.cloud_data_context.CloudDataContext._save_project_config"
+        ),
+        mock.patch(
+            "great_expectations.data_context.data_context.cloud_data_context.CloudDataContext._check_if_latest_version"
+        ),
+        mock.patch(
+            "great_expectations.data_context.data_context.cloud_data_context.CloudDataContext._request_cloud_backend",
+            side_effect=mock_request_cloud_backend,
+        ),
+        mock.patch(
+            "great_expectations.data_context.data_context.cloud_data_context.init_analytics"
+        ) as mock_init,
+        mock.patch("posthog.capture"),
+    ):
+        # This should not raise an error for system users with no workspaces
+        gx.get_context(
+            mode="cloud",
+            cloud_base_url=mock_config["cloud_base_url"],
+            cloud_access_token=mock_config["cloud_access_token"],
+            cloud_organization_id=mock_config["cloud_organization_id"],
+            cloud_workspace_id=mock_config["cloud_workspace_id"],
+        )
+
+    # Verify analytics initialization was called with the system user's ID
+    mock_init.assert_called_once_with(
+        enable=True,
+        user_id=user_id,
+        data_context_id=mock.ANY,
+        organization_id=organization_id,
+        oss_id=mock.ANY,
+        cloud_mode=True,
+        mode="cloud",
+        user_agent_str=None,
+    )
+
+
 @pytest.mark.parametrize("initial_user_agent_str", [None, "old user agent string"])
 @pytest.mark.parametrize("new_user_agent_str", [None, "new user agent string"])
 @pytest.mark.unit