gooddata-flexconnect 1.60.1.dev1__tar.gz → 1.60.1.dev2__tar.gz

{gooddata_flexconnect-1.60.1.dev1 → gooddata_flexconnect-1.60.1.dev2}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.4
 Name: gooddata-flexconnect
-Version: 1.60.1.dev1
+Version: 1.60.1.dev2
 Summary: Build your own data source for GoodData Cloud and GoodData Cloud Native.
-Project-URL: Documentation, https://gooddata-flexconnect.readthedocs.io/en/v1.60.1.dev1
+Project-URL: Documentation, https://gooddata-flexconnect.readthedocs.io/en/v1.60.1.dev2
 Project-URL: Source, https://github.com/gooddata/gooddata-python-sdk
 Author-email: GoodData <support@gooddata.com>
 License-Expression: MIT
@@ -21,8 +21,8 @@ Classifier: Topic :: Software Development
 Classifier: Typing :: Typed
 Requires-Python: >=3.10
 Requires-Dist: dynaconf<4.0.0,>=3.1.11
-Requires-Dist: gooddata-flight-server~=1.60.1.dev1
-Requires-Dist: gooddata-sdk~=1.60.1.dev1
+Requires-Dist: gooddata-flight-server~=1.60.1.dev2
+Requires-Dist: gooddata-sdk~=1.60.1.dev2
 Requires-Dist: orjson<4.0.0,>=3.9.15
 Requires-Dist: pyarrow>=16.1.0
 Requires-Dist: structlog<25.0.0,>=24.0.0

{gooddata_flexconnect-1.60.1.dev1 → gooddata_flexconnect-1.60.1.dev2}/json_schemas/execution-context/execution-context.json

@@ -52,6 +52,61 @@
             "items": {
                 "$ref": "filter.json"
             }
+        },
+        "executionInitiator": {
+            "type": "object",
+            "description": "Information about what triggered this execution.",
+            "required": ["type"],
+            "discriminator": {
+                "propertyName": "type",
+                "mapping": {
+                    "display": "#/properties/executionInitiator/oneOf/0",
+                    "adhocExport": "#/properties/executionInitiator/oneOf/1",
+                    "automation": "#/properties/executionInitiator/oneOf/2",
+                    "alert": "#/properties/executionInitiator/oneOf/3"
+                }
+            },
+            "oneOf": [
+                {
+                    "description": "Execution triggered by displaying data in the UI.",
+                    "properties": {
+                        "type": { "const": "display" },
+                        "dashboardId": { "type": "string" },
+                        "visualizationId": { "type": "string" },
+                        "widgetId": { "type": "string" }
+                    },
+                    "additionalProperties": false
+                },
+                {
+                    "description": "Execution triggered by an ad-hoc export from the UI.",
+                    "properties": {
+                        "type": { "const": "adhocExport" },
+                        "dashboardId": { "type": "string" },
+                        "visualizationId": { "type": "string" },
+                        "widgetId": { "type": "string" },
+                        "exportType": { "type": "string" }
+                    },
+                    "additionalProperties": false
+                },
+                {
+                    "description": "Execution triggered by an automation.",
+                    "properties": {
+                        "type": { "const": "automation" },
+                        "automationId": { "type": "string" }
+                    },
+                    "additionalProperties": false
+                },
+                {
+                    "description": "Execution triggered by an alert evaluation.",
+                    "properties": {
+                        "type": { "const": "alert" },
+                        "dashboardId": { "type": "string" },
+                        "visualizationId": { "type": "string" },
+                        "widgetId": { "type": "string" }
+                    },
+                    "additionalProperties": false
+                }
+            ]
         }
     },
     "allOf": [

{gooddata_flexconnect-1.60.1.dev1 → gooddata_flexconnect-1.60.1.dev2}/pyproject.toml

@@ -1,7 +1,7 @@
 # (C) 2025 GoodData Corporation
 [project]
 name = "gooddata-flexconnect"
-version = "1.60.1.dev1"
+version = "1.60.1.dev2"
 description = "Build your own data source for GoodData Cloud and GoodData Cloud Native."
 readme = "README.md"
 license = "MIT"
@@ -29,8 +29,8 @@ keywords = [
 requires-python = ">=3.10"
 dependencies = [
     "dynaconf>=3.1.11,<4.0.0",
-    "gooddata-flight-server~=1.60.1.dev1",
-    "gooddata-sdk~=1.60.1.dev1",
+    "gooddata-flight-server~=1.60.1.dev2",
+    "gooddata-sdk~=1.60.1.dev2",
     "orjson>=3.9.15,<4.0.0",
     "pyarrow>=16.1.0",
     "structlog>=24.0.0,<25.0.0",
@@ -50,7 +50,7 @@ classifiers = [
 ]
 
 [project.urls]
-Documentation = "https://gooddata-flexconnect.readthedocs.io/en/v1.60.1.dev1"
+Documentation = "https://gooddata-flexconnect.readthedocs.io/en/v1.60.1.dev2"
 Source = "https://github.com/gooddata/gooddata-python-sdk"
 
 [dependency-groups]
@@ -67,6 +67,15 @@ allowed-unresolved-imports = ["jsonschema.**", "referencing"]
 [tool.hatch.build.targets.wheel]
 packages = ["src/gooddata_flexconnect"]
 
+[tool.coverage.run]
+source = ["gooddata_flexconnect"]
+
+[tool.coverage.paths]
+source = [
+    "src/gooddata_flexconnect",
+    "**/site-packages/gooddata_flexconnect",
+]
+
 [build-system]
 requires = ["hatchling"]
 build-backend = "hatchling.build"

{gooddata_flexconnect-1.60.1.dev1 → gooddata_flexconnect-1.60.1.dev2}/src/gooddata_flexconnect/__init__.py

@@ -14,6 +14,11 @@ from gooddata_flexconnect.function.execution_context import (
     ExecutionContextNegativeAttributeFilter,
     ExecutionContextPositiveAttributeFilter,
     ExecutionContextRelativeDateFilter,
+    ExecutionInitiator,
+    ExecutionInitiatorAdHocExport,
+    ExecutionInitiatorAlert,
+    ExecutionInitiatorAutomation,
+    ExecutionInitiatorDisplay,
     ExecutionRequest,
     ExecutionType,
     LabelElementsExecutionRequest,

{gooddata_flexconnect-1.60.1.dev1 → gooddata_flexconnect-1.60.1.dev2}/src/gooddata_flexconnect/function/data_source_messages.py

@@ -1,7 +1,7 @@
 # (C) 2025 GoodData Corporation
 from collections.abc import Iterable
 from dataclasses import dataclass
-from typing import Any, Optional
+from typing import Any
 
 import orjson
 import pyarrow
@@ -33,7 +33,7 @@ class DataSourceMessage:
     Type of the message, currently free-form, we might define some enum for these in the future.
     """
 
-    data: Optional[Any] = None
+    data: Any | None = None
     """
     Optional message-specific data. This can be anything that can be JSON-serialized.
     Try to keep this as small as possible: the backend has a quite strict size limit on the messages.
@@ -47,7 +47,7 @@ class DataSourceMessage:
 
 
 def add_data_source_messages_metadata(
-    data_source_messages: Iterable[DataSourceMessage], original_metadata: Optional[dict] = None
+    data_source_messages: Iterable[DataSourceMessage], original_metadata: dict | None = None
 ) -> dict[bytes, bytes]:
     """
     Given a list of DataSourceMessages, creates a PyArrow-compatible metadata dictionary.

{gooddata_flexconnect-1.60.1.dev1 → gooddata_flexconnect-1.60.1.dev2}/src/gooddata_flexconnect/function/execution_context.py

@@ -21,13 +21,13 @@ TInput = TypeVar("TInput")
 TResult = TypeVar("TResult")
 
 
-def none_safe(func: Callable[[TInput], TResult]) -> Callable[[Optional[TInput]], Optional[TResult]]:
+def none_safe(func: Callable[[TInput], TResult]) -> Callable[[TInput | None], TResult | None]:
     """
     Decorator that makes the unary function safe for None input.
     If the only argument is None, the function returns None.
     """
 
-    def wrapper(arg: Optional[TInput]) -> Optional[TResult]:
+    def wrapper(arg: TInput | None) -> TResult | None:
         if arg is None:
             return None
         return func(arg)
@@ -114,18 +114,18 @@ class ExecutionContextAttribute:
     Title of the particular label used.
     """
 
-    date_granularity: Optional[str]
+    date_granularity: str | None
     """
     Date granularity of the attribute if it is a date attribute.
     """
 
-    sorting: Optional[ExecutionContextAttributeSorting]
+    sorting: ExecutionContextAttributeSorting | None
     """
     Sorting of the attribute. If not present, the attribute is not sorted.
     """
 
     @staticmethod
-    def from_dict(d: Optional[dict]) -> Optional["ExecutionContextAttribute"]:
+    def from_dict(d: dict | None) -> Optional["ExecutionContextAttribute"]:
         """
         Create ExecutionContextAttribute from a dictionary.
         :param d: the dictionary to parse
@@ -153,7 +153,7 @@ class ExecutionContextPositiveAttributeFilter:
     Identifier of the label used.
     """
 
-    values: list[Optional[str]]
+    values: list[str | None]
     """
     Values of the filter.
     """
@@ -170,7 +170,7 @@ class ExecutionContextNegativeAttributeFilter:
     Identifier of the label used.
     """
 
-    values: list[Optional[str]]
+    values: list[str | None]
     """
     Values of the filter.
     """
@@ -366,17 +366,17 @@ class LabelElementsExecutionRequest:
     The label to get the elements for.
     """
 
-    offset: Optional[int]
+    offset: int | None
     """
     The number of elements to skip before returning.
     """
 
-    limit: Optional[int]
+    limit: int | None
     """
     The maximum number of elements to return.
     """
 
-    exclude_primary_label: Optional[bool]
+    exclude_primary_label: bool | None
     """
     Excludes items from the result that differ only by primary label
 
@@ -384,33 +384,33 @@ class LabelElementsExecutionRequest:
     * true - return items with distinct requested label
     """
 
-    exact_filter: Optional[list[str]]
+    exact_filter: list[str] | None
     """
     Exact values to filter the elements by.
     """
 
-    pattern_filter: Optional[str]
+    pattern_filter: str | None
     """
     Filter the elements by a pattern. The pattern is matched against the element values in a case-insensitive way.
     """
 
-    complement_filter: Optional[bool]
+    complement_filter: bool | None
     """
     Whether to invert the effects of exact_filter amd pattern_filter.
     """
 
-    depends_on: Optional[list[DependsOn]]
+    depends_on: list[DependsOn] | None
     """
     Other labels or date filters that should be used to limit the elements.
     """
 
-    filter_by: Optional[CatalogFilterBy]
+    filter_by: CatalogFilterBy | None
     """
     Which label is used for filtering - primary or requested.
     If omitted the server will use the default value of "REQUESTED".
     """
 
-    validate_by: Optional[list[CatalogValidateByItem]]
+    validate_by: list[CatalogValidateByItem] | None
     """
     Other metrics, attributes, labels or facts used to validate the elements.
     """
@@ -436,6 +436,126 @@ class LabelElementsExecutionRequest:
         )
 
 
+@dataclass
+class ExecutionInitiatorDisplay:
+    """
+    Information about an execution being run in order to display the data in the UI.
+    """
+
+    dashboard_id: str | None
+    """
+    The id of the dashboard the execution was run as a part of.
+    """
+
+    visualization_id: str | None
+    """
+    The id of the visualization the execution was run as a part of.
+    """
+
+    widget_id: str | None
+    """
+    The id of the widget the execution was run as a part of.
+    """
+
+
+@dataclass
+class ExecutionInitiatorAdHocExport:
+    """
+    Information about an execution being run in order to export the data by a user in the UI.
+    """
+
+    dashboard_id: str | None
+    """
+    The id of the dashboard the execution was run as a part of.
+    """
+
+    visualization_id: str | None
+    """
+    The id of the visualization the execution was run as a part of.
+    """
+
+    widget_id: str | None
+    """
+    The id of the widget the execution was run as a part of.
+    """
+
+    export_type: str | None
+    """
+    The type of the exported file (CSV, RAW_CSV, etc.).
+    """
+
+
+@dataclass
+class ExecutionInitiatorAutomation:
+    """
+    Information about an execution being run because of an automation.
+    """
+
+    automation_id: str | None
+    """
+    The id of the automation initiating this execution.
+    """
+
+
+@dataclass
+class ExecutionInitiatorAlert:
+    """
+    Information about an execution being run in order to evaluate an alert.
+    """
+
+    dashboard_id: str | None
+    """
+    The id of the dashboard the execution was run as a part of.
+    """
+
+    visualization_id: str | None
+    """
+    The id of the visualization the execution was run as a part of.
+    """
+
+    widget_id: str | None
+    """
+    The id of the widget the execution was run as a part of.
+    """
+
+
+ExecutionInitiator: TypeAlias = Union[
+    ExecutionInitiatorDisplay,
+    ExecutionInitiatorAdHocExport,
+    ExecutionInitiatorAutomation,
+    ExecutionInitiatorAlert,
+]
+
+
+@none_safe
+def _dict_to_execution_initiator(d: dict) -> ExecutionInitiator:
+    initiator_type = d.get("type")
+    if initiator_type == "display":
+        return ExecutionInitiatorDisplay(
+            dashboard_id=d.get("dashboardId"),
+            visualization_id=d.get("visualizationId"),
+            widget_id=d.get("widgetId"),
+        )
+    if initiator_type == "adhocExport":
+        return ExecutionInitiatorAdHocExport(
+            export_type=d.get("exportType"),
+            dashboard_id=d.get("dashboardId"),
+            visualization_id=d.get("visualizationId"),
+            widget_id=d.get("widgetId"),
+        )
+    if initiator_type == "automation":
+        return ExecutionInitiatorAutomation(
+            automation_id=d.get("automationId"),
+        )
+    if initiator_type == "alert":
+        return ExecutionInitiatorAlert(
+            dashboard_id=d.get("dashboardId"),
+            visualization_id=d.get("visualizationId"),
+            widget_id=d.get("widgetId"),
+        )
+    raise ValueError(f"Unsupported execution initiator type: {initiator_type}")
+
+
 def _dict_to_filter(d: dict) -> ExecutionContextFilter:
     filter_type = d.get("filterType")
     if filter_type == "positiveAttributeFilter":
@@ -504,18 +624,18 @@ class ExecutionContext:
     The ID of the user that invoked the FlexConnect function.
     """
 
-    timestamp: Optional[str]
+    timestamp: str | None
     """
     The timestamp of the execution used as "now" in date filters.
     For example 2020-06-03T10:15:30+01:00.
     """
 
-    timezone: Optional[str]
+    timezone: str | None
     """
     The timezone of the execution.
     """
 
-    week_start: Optional[str]
+    week_start: str | None
     """
     The start of the week. Either "monday" or "sunday".
     """
@@ -530,18 +650,23 @@ class ExecutionContext:
     All the attribute and date filters that are part of the execution request.
     """
 
-    report_execution_request: Optional[ReportExecutionRequest]
+    report_execution_request: ReportExecutionRequest | None
     """
     The report execution request that the FlexConnect function should process.
     Only present if the execution type is "REPORT".
     """
 
-    label_elements_execution_request: Optional[LabelElementsExecutionRequest]
+    label_elements_execution_request: LabelElementsExecutionRequest | None
     """
     The label elements execution request that the FlexConnect function should process.
     Only present if the execution type is "LABEL_ELEMENTS".
     """
 
+    execution_initiator: ExecutionInitiator | None
+    """
+    Information about what triggered this execution (e.g. display, export, automation, alert).
+    """
+
     @staticmethod
     @none_safe
     def from_dict(d: dict) -> "ExecutionContext":
@@ -563,6 +688,7 @@ class ExecutionContext:
             ),
             attributes=_dict_to_attributes(d.get("attributes", [])),
             filters=_dict_to_filters(d.get("filters", [])),
+            execution_initiator=_dict_to_execution_initiator(d.get("executionInitiator")),
         )
 
     @staticmethod

{gooddata_flexconnect-1.60.1.dev1 → gooddata_flexconnect-1.60.1.dev2}/src/gooddata_flexconnect/function/flight_methods.py

@@ -1,7 +1,6 @@
 #  (C) 2024 GoodData Corporation
 import time
 from collections.abc import Generator
-from typing import Optional
 
 import orjson
 import pyarrow.flight
@@ -59,7 +58,7 @@ class _FlexConnectServerMethods(FlightServerMethods):
         self._poll_interval = poll_interval_ms / 1000
 
     @staticmethod
-    def _create_descriptor(fun_name: str, metadata: Optional[dict]) -> pyarrow.flight.FlightDescriptor:
+    def _create_descriptor(fun_name: str, metadata: dict | None) -> pyarrow.flight.FlightDescriptor:
         cmd = {
             "functionName": fun_name,
             "metadata": metadata,
@@ -97,9 +96,7 @@ class _FlexConnectServerMethods(FlightServerMethods):
             cmd=submit_invocation.command,
         )
 
-    def _prepare_flight_info(
-        self, task_id: str, task_result: Optional[TaskExecutionResult]
-    ) -> pyarrow.flight.FlightInfo:
+    def _prepare_flight_info(self, task_id: str, task_result: TaskExecutionResult | None) -> pyarrow.flight.FlightInfo:
         if task_result is None:
             raise ErrorInfo.for_reason(
                 ErrorCode.BAD_ARGUMENT, f"Task with id '{task_id}' does not exist."
@@ -142,7 +139,7 @@ class _FlexConnectServerMethods(FlightServerMethods):
         structlog.contextvars.bind_contextvars(peer=context.peer())
         invocation = extract_submit_invocation_from_descriptor(descriptor)
 
-        task: Optional[FlexConnectFunctionTask] = None
+        task: FlexConnectFunctionTask | None = None
 
         try:
             task = self._prepare_task(context, invocation)
@@ -192,7 +189,7 @@ class _FlexConnectServerMethods(FlightServerMethods):
         invocation = extract_pollable_invocation_from_descriptor(descriptor)
 
         task_id: str
-        fun_name: Optional[str] = None
+        fun_name: str | None = None
 
         if isinstance(invocation, CancelInvocation):
             # cancel the given task and raise cancellation exception

{gooddata_flexconnect-1.60.1.dev1 → gooddata_flexconnect-1.60.1.dev2}/src/gooddata_flexconnect/function/function.py

@@ -1,6 +1,5 @@
 #  (C) 2024 GoodData Corporation
 import abc
-from typing import Optional
 
 import pyarrow
 from gooddata_flight_server import ArrowData, ServerContext
@@ -37,17 +36,17 @@ class FlexConnectFunction(abc.ABC):
     for every call using the `create` method.
     """
 
-    Name: Optional[str] = None
+    Name: str | None = None
     """
     Function MUST define a unique name
     """
 
-    Schema: Optional[pyarrow.Schema] = None
+    Schema: pyarrow.Schema | None = None
     """
     Function MUST define schema describing its data.
     """
 
-    Metadata: Optional[dict] = None
+    Metadata: dict | None = None
     """
     Function MAY provide additional metadata about themselves. These then
     influence how the function is used by and called from GoodData Cloud & FlexQuery.
@@ -79,7 +78,7 @@ class FlexConnectFunction(abc.ABC):
     def call(
         self,
         parameters: dict,
-        columns: Optional[tuple[str, ...]],
+        columns: tuple[str, ...] | None,
         headers: dict[str, list[str]],
     ) -> ArrowData:
         """

{gooddata_flexconnect-1.60.1.dev1 → gooddata_flexconnect-1.60.1.dev2}/src/gooddata_flexconnect/function/function_invocation.py

@@ -1,6 +1,6 @@
 #  (C) 2025 GoodData Corporation
 from dataclasses import dataclass
-from typing import Optional, Union
+from typing import Union
 
 import orjson
 import pyarrow.flight
@@ -46,7 +46,7 @@ class SubmitInvocation:
     Parameters to pass to the FlexConnect function.
     """
 
-    columns: Optional[tuple[str, ...]]
+    columns: tuple[str, ...] | None
     """
     Columns to get from the FlexConnect function result.
     This may be used for column trimming by the function: the function must return at least those columns.

{gooddata_flexconnect-1.60.1.dev1 → gooddata_flexconnect-1.60.1.dev2}/src/gooddata_flexconnect/function/function_task.py

@@ -1,5 +1,5 @@
 #  (C) 2024 GoodData Corporation
-from typing import Optional, Union
+from typing import Union
 
 import structlog
 from gooddata_flight_server import FlightDataTaskResult, Task, TaskError, TaskResult
@@ -16,11 +16,11 @@ class FlexConnectFunctionTask(Task):
         self,
         fun: FlexConnectFunction,
         parameters: dict,
-        columns: Optional[tuple[str, ...]],
+        columns: tuple[str, ...] | None,
         headers: dict[str, list[str]],
         cmd: bytes,
         cancellable: bool = True,
-        task_id: Optional[str] = None,
+        task_id: str | None = None,
     ):
         super().__init__(cmd, cancellable, task_id)
 
@@ -32,7 +32,7 @@ class FlexConnectFunctionTask(Task):
         _LOGGER.info("flexconnect_task_created", fun=fun.Name, task_id=self._task_id)
 
     @property
-    def fun_name(self) -> Optional[str]:
+    def fun_name(self) -> str | None:
         return self._fun.Name
 
     def run(self) -> Union[TaskResult, TaskError]:

{gooddata_flexconnect-1.60.1.dev1 → gooddata_flexconnect-1.60.1.dev2}/tests/function/conftest.py

@@ -88,6 +88,12 @@ def sample_report_execution_context_dict():
             }
         ],
         "filters": [{"filterType": "negativeAttributeFilter", "labelIdentifier": "attribute1", "values": ["id1"]}],
+        "executionInitiator": {
+            "type": "display",
+            "dashboardId": "b2f2d436-9831-4fe0-81df-8c59fd33242b",
+            "visualizationId": "bf21d8ec-742c-48d7-8100-80663b43622b",
+            "widgetId": "453844a7-4aa8-4456-be23-ac62b9b3b98a",
+        },
     }
 
 

{gooddata_flexconnect-1.60.1.dev1 → gooddata_flexconnect-1.60.1.dev2}/tests/function/test_flex_fun_execution_context.py

@@ -1,9 +1,15 @@
 # (C) 2024 GoodData Corporation
+import pytest
 from gooddata_flexconnect.function.execution_context import (
     ExecutionContext,
     ExecutionContextAttribute,
     ExecutionContextNegativeAttributeFilter,
+    ExecutionInitiatorAdHocExport,
+    ExecutionInitiatorAlert,
+    ExecutionInitiatorAutomation,
+    ExecutionInitiatorDisplay,
     ExecutionType,
+    _dict_to_execution_initiator,
 )
 from gooddata_sdk import (
     Attribute,
@@ -35,6 +41,12 @@ def test_report_execution_context_deser(sample_report_execution_context_dict):
     assert isinstance(deserialized.attributes[0], ExecutionContextAttribute)
     assert isinstance(deserialized.filters[0], ExecutionContextNegativeAttributeFilter)
 
+    assert deserialized.execution_initiator is not None
+    assert isinstance(deserialized.execution_initiator, ExecutionInitiatorDisplay)
+    assert deserialized.execution_initiator.dashboard_id == "b2f2d436-9831-4fe0-81df-8c59fd33242b"
+    assert deserialized.execution_initiator.visualization_id == "bf21d8ec-742c-48d7-8100-80663b43622b"
+    assert deserialized.execution_initiator.widget_id == "453844a7-4aa8-4456-be23-ac62b9b3b98a"
+
 
 def test_label_elements_execution_context_deser(sample_label_execution_context_dict):
     """
@@ -58,3 +70,56 @@ def test_label_elements_execution_context_deser(sample_label_execution_context_d
 
     assert isinstance(deserialized.attributes[0], ExecutionContextAttribute)
     assert isinstance(deserialized.filters[0], ExecutionContextNegativeAttributeFilter)
+
+    assert deserialized.execution_initiator is None
+
+
+@pytest.mark.parametrize(
+    "initiator_dict, expected_type",
+    [
+        (
+            {
+                "type": "display",
+                "dashboardId": "d1",
+                "visualizationId": "v1",
+                "widgetId": "w1",
+            },
+            ExecutionInitiatorDisplay,
+        ),
+        (
+            {
+                "type": "adhocExport",
+                "dashboardId": "d1",
+                "visualizationId": "v1",
+                "widgetId": "w1",
+                "exportType": "CSV",
+            },
+            ExecutionInitiatorAdHocExport,
+        ),
+        (
+            {
+                "type": "automation",
+                "automationId": "a1",
+            },
+            ExecutionInitiatorAutomation,
+        ),
+        (
+            {
+                "type": "alert",
+                "dashboardId": "d1",
+                "visualizationId": "v1",
+                "widgetId": "w1",
+            },
+            ExecutionInitiatorAlert,
+        ),
+    ],
+    ids=["display", "adhocExport", "automation", "alert"],
+)
+def test_execution_initiator_deser(initiator_dict, expected_type):
+    result = _dict_to_execution_initiator(initiator_dict)
+    assert isinstance(result, expected_type)
+
+
+def test_execution_initiator_unknown_type():
+    with pytest.raises(ValueError, match="Unsupported execution initiator type"):
+        _dict_to_execution_initiator({"type": "unknown"})

{gooddata_flexconnect-1.60.1.dev1 → gooddata_flexconnect-1.60.1.dev2}/tests/function/testing_funs.py

@@ -1,5 +1,4 @@
 #  (C) 2024 GoodData Corporation
-from typing import Optional
 
 import pyarrow
 from gooddata_flexconnect.function.function import FlexConnectFunction
@@ -13,7 +12,7 @@ class Fun1(FlexConnectFunction):
     def call(
         self,
         parameters: dict,
-        columns: Optional[tuple[str, ...]],
+        columns: tuple[str, ...] | None,
         headers: dict[str, list[str]],
     ) -> ArrowData:
         pass
@@ -28,7 +27,7 @@ class Fun2(FlexConnectFunction):
     def call(
         self,
         parameters: dict,
-        columns: Optional[tuple[str, ...]],
+        columns: tuple[str, ...] | None,
         headers: dict[str, list[str]],
     ) -> ArrowData:
         pass

{gooddata_flexconnect-1.60.1.dev1 → gooddata_flexconnect-1.60.1.dev2}/tests/json_schemas/test_execution_context_schema.py

@@ -16,6 +16,69 @@ from jsonschema.exceptions import ValidationError
             "filters": [],
             "reportExecutionRequest": {},
         },
+        # REPORT with executionInitiator display
+        {
+            "executionType": "REPORT",
+            "organizationId": "org1",
+            "workspaceId": "ws1",
+            "userId": "user1",
+            "attributes": [],
+            "filters": [],
+            "reportExecutionRequest": {},
+            "executionInitiator": {
+                "type": "display",
+                "dashboardId": "d1",
+                "visualizationId": "v1",
+                "widgetId": "w1",
+            },
+        },
+        # REPORT with executionInitiator adhocExport
+        {
+            "executionType": "REPORT",
+            "organizationId": "org1",
+            "workspaceId": "ws1",
+            "userId": "user1",
+            "attributes": [],
+            "filters": [],
+            "reportExecutionRequest": {},
+            "executionInitiator": {
+                "type": "adhocExport",
+                "dashboardId": "d1",
+                "visualizationId": "v1",
+                "widgetId": "w1",
+                "exportType": "CSV",
+            },
+        },
+        # REPORT with executionInitiator automation
+        {
+            "executionType": "REPORT",
+            "organizationId": "org1",
+            "workspaceId": "ws1",
+            "userId": "user1",
+            "attributes": [],
+            "filters": [],
+            "reportExecutionRequest": {},
+            "executionInitiator": {
+                "type": "automation",
+                "automationId": "a1",
+            },
+        },
+        # REPORT with executionInitiator alert
+        {
+            "executionType": "REPORT",
+            "organizationId": "org1",
+            "workspaceId": "ws1",
+            "userId": "user1",
+            "attributes": [],
+            "filters": [],
+            "reportExecutionRequest": {},
+            "executionInitiator": {
+                "type": "alert",
+                "dashboardId": "d1",
+                "visualizationId": "v1",
+                "widgetId": "w1",
+            },
+        },
         # minimal valid schema for LABEL_ELEMENTS execution type
         {
             "executionType": "LABEL_ELEMENTS",
@@ -110,6 +173,49 @@ def test_valid_execution_context_schema(value, get_validator):
             "filters": [],
             "labelElementsExecutionRequest": {"label": "label2"},
         },
+        # invalid executionInitiator type
+        {
+            "executionType": "REPORT",
+            "organizationId": "org1",
+            "workspaceId": "ws1",
+            "userId": "user1",
+            "attributes": [],
+            "filters": [],
+            "reportExecutionRequest": {},
+            "executionInitiator": {
+                "type": "INVALID",
+            },
+        },
+        # automation initiator must not contain dashboardId
+        {
+            "executionType": "REPORT",
+            "organizationId": "org1",
+            "workspaceId": "ws1",
+            "userId": "user1",
+            "attributes": [],
+            "filters": [],
+            "reportExecutionRequest": {},
+            "executionInitiator": {
+                "type": "automation",
+                "automationId": "a1",
+                "dashboardId": "d1",
+            },
+        },
+        # display initiator must not contain exportType
+        {
+            "executionType": "REPORT",
+            "organizationId": "org1",
+            "workspaceId": "ws1",
+            "userId": "user1",
+            "attributes": [],
+            "filters": [],
+            "reportExecutionRequest": {},
+            "executionInitiator": {
+                "type": "display",
+                "dashboardId": "d1",
+                "exportType": "CSV",
+            },
+        },
     ],
 )
 def test_invalid_execution_context_schema(value, get_validator):

{gooddata_flexconnect-1.60.1.dev1 → gooddata_flexconnect-1.60.1.dev2}/tests/server/funs/fun1.py

@@ -1,5 +1,4 @@
 #  (C) 2024 GoodData Corporation
-from typing import Optional
 
 import pyarrow
 from gooddata_flexconnect.function.function import FlexConnectFunction
@@ -19,7 +18,7 @@ class _SimpleFun1(FlexConnectFunction):
     def call(
         self,
         parameters: dict,
-        columns: Optional[tuple[str, ...]],
+        columns: tuple[str, ...] | None,
         headers: dict[str, list[str]],
     ) -> ArrowData:
         return pyarrow.table(

{gooddata_flexconnect-1.60.1.dev1 → gooddata_flexconnect-1.60.1.dev2}/tests/server/funs/fun2.py

@@ -1,11 +1,10 @@
 #  (C) 2024 GoodData Corporation
-from typing import Optional
 
 import pyarrow
 from gooddata_flexconnect.function.function import FlexConnectFunction
 from gooddata_flight_server import ArrowData, ServerContext
 
-_DATA: Optional[pyarrow.Table] = None
+_DATA: pyarrow.Table | None = None
 
 
 class _SimpleFun2(FlexConnectFunction):
@@ -21,7 +20,7 @@ class _SimpleFun2(FlexConnectFunction):
     def call(
         self,
         parameters: dict,
-        columns: Optional[tuple[str, ...]],
+        columns: tuple[str, ...] | None,
         headers: dict[str, list[str]],
     ) -> ArrowData:
         assert _DATA is not None

{gooddata_flexconnect-1.60.1.dev1 → gooddata_flexconnect-1.60.1.dev2}/tests/server/funs/fun3.py

@@ -1,12 +1,11 @@
 #  (C) 2024 GoodData Corporation
 import time
-from typing import Optional
 
 import pyarrow
 from gooddata_flexconnect.function.function import FlexConnectFunction
 from gooddata_flight_server import ArrowData
 
-_DATA: Optional[pyarrow.Table] = None
+_DATA: pyarrow.Table | None = None
 
 
 class _LongRunningFun(FlexConnectFunction):
@@ -22,7 +21,7 @@ class _LongRunningFun(FlexConnectFunction):
     def call(
         self,
         parameters: dict,
-        columns: Optional[tuple[str, ...]],
+        columns: tuple[str, ...] | None,
         headers: dict[str, list[str]],
     ) -> ArrowData:
         # sleep is intentionally setup to be longer than the deadline for

{gooddata_flexconnect-1.60.1.dev1 → gooddata_flexconnect-1.60.1.dev2}/tests/server/funs/fun4.py

@@ -1,12 +1,11 @@
 #  (C) 2024 GoodData Corporation
 import time
-from typing import Optional
 
 import pyarrow
 from gooddata_flexconnect.function.function import FlexConnectFunction
 from gooddata_flight_server import ArrowData
 
-_DATA: Optional[pyarrow.Table] = None
+_DATA: pyarrow.Table | None = None
 
 
 class _PollableFun(FlexConnectFunction):
@@ -22,7 +21,7 @@ class _PollableFun(FlexConnectFunction):
     def call(
         self,
         parameters: dict,
-        columns: Optional[tuple[str, ...]],
+        columns: tuple[str, ...] | None,
         headers: dict[str, list[str]],
     ) -> ArrowData:
         # sleep is intentionally setup to be longer than one polling interval

{gooddata_flexconnect-1.60.1.dev1 → gooddata_flexconnect-1.60.1.dev2}/tox.ini

@@ -11,7 +11,7 @@ dependency_groups =
 setenv =
     COVERAGE_CORE=sysmon
 commands =
-    pytest -v --cov=src/gooddata_flexconnect --cov-report=xml tests {posargs} --json-report --json-report-file=.json-report-{envname}.json
+    pytest -v --cov --cov-report=xml tests {posargs} --json-report --json-report-file=.json-report-{envname}.json
 
 [testenv:docs]
 basepython = python3.14