openmetadata-ingestion 1.4.7.2__py3-none-any.whl → 1.5.0.0__py3-none-any.whl

metadata/ingestion/source/database/sample_data.py

@@ -24,6 +24,12 @@ from typing import Any, Dict, Iterable, List, Optional, Union
 from pydantic import ValidationError
 
 from metadata.generated.schema.analytics.reportData import ReportData, ReportDataType
+from metadata.generated.schema.api.data.createAPICollection import (
+    CreateAPICollectionRequest,
+)
+from metadata.generated.schema.api.data.createAPIEndpoint import (
+    CreateAPIEndpointRequest,
+)
 from metadata.generated.schema.api.data.createChart import CreateChartRequest
 from metadata.generated.schema.api.data.createContainer import CreateContainerRequest
 from metadata.generated.schema.api.data.createDashboard import CreateDashboardRequest
@@ -84,6 +90,7 @@ from metadata.generated.schema.entity.data.table import (
 )
 from metadata.generated.schema.entity.data.topic import Topic, TopicSampleData
 from metadata.generated.schema.entity.policies.policy import Policy
+from metadata.generated.schema.entity.services.apiService import ApiService
 from metadata.generated.schema.entity.services.connections.database.customDatabaseConnection import (
     CustomDatabaseConnection,
 )
@@ -104,7 +111,7 @@ from metadata.generated.schema.tests.basic import TestCaseResult, TestResultValu
 from metadata.generated.schema.tests.resolved import Resolved, TestCaseFailureReasonType
 from metadata.generated.schema.tests.testCase import TestCase, TestCaseParameterValue
 from metadata.generated.schema.tests.testSuite import TestSuite
-from metadata.generated.schema.type.basic import Timestamp
+from metadata.generated.schema.type.basic import FullyQualifiedEntityName, Timestamp
 from metadata.generated.schema.type.entityLineage import EntitiesEdge, LineageDetails
 from metadata.generated.schema.type.entityReference import EntityReference
 from metadata.generated.schema.type.lifeCycle import AccessDetails, LifeCycle
@@ -192,11 +199,11 @@ class SampleDataSource(
     def __init__(self, config: WorkflowSource, metadata: OpenMetadata):
         super().__init__()
         self.config = config
-        self.service_connection = config.serviceConnection.__root__.config
+        self.service_connection = config.serviceConnection.root.config
         self.metadata = metadata
         self.list_policies = []
 
-        sample_data_folder = self.service_connection.connectionOptions.__root__.get(
+        sample_data_folder = self.service_connection.connectionOptions.root.get(
             "sampleDataFolder"
         )
         if not sample_data_folder:
@@ -536,14 +543,64 @@ class SampleDataSource(
                 encoding=UTF_8,
             )
         )
+        self.api_service_json = json.load(
+            open(  # pylint: disable=consider-using-with
+                sample_data_folder + "/api_service/service.json",
+                "r",
+                encoding=UTF_8,
+            )
+        )
+        self.api_service = self.metadata.get_service_or_create(
+            entity=ApiService,
+            config=WorkflowSource(**self.api_service_json),
+        )
+        self.api_collection = json.load(
+            open(
+                sample_data_folder + "/api_service/api_collection.json",
+                "r",
+                encoding=UTF_8,
+            )
+        )
+        self.api_endpoint = json.load(
+            open(
+                sample_data_folder + "/api_service/api_endpoint.json",
+                "r",
+                encoding=UTF_8,
+            )
+        )
+        self.ometa_api_service_json = json.load(
+            open(  # pylint: disable=consider-using-with
+                sample_data_folder + "/ometa_api_service/service.json",
+                "r",
+                encoding=UTF_8,
+            )
+        )
+        self.ometa_api_service = self.metadata.get_service_or_create(
+            entity=ApiService,
+            config=WorkflowSource(**self.ometa_api_service_json),
+        )
+        self.ometa_api_collection = json.load(
+            open(
+                sample_data_folder + "/ometa_api_service/ometa_api_collection.json",
+                "r",
+                encoding=UTF_8,
+            )
+        )
+        self.ometa_api_endpoint = json.load(
+            open(
+                sample_data_folder + "/ometa_api_service/ometa_api_endpoint.json",
+                "r",
+                encoding=UTF_8,
+            )
+        )
 
     @classmethod
     def create(
         cls, config_dict, metadata: OpenMetadata, pipeline_name: Optional[str] = None
     ):
         """Create class instance"""
-        config: WorkflowSource = WorkflowSource.parse_obj(config_dict)
-        connection: CustomDatabaseConnection = config.serviceConnection.__root__.config
+        config: WorkflowSource = WorkflowSource.model_validate(config_dict)
+        connection: CustomDatabaseConnection = config.serviceConnection.root.config
         if not isinstance(connection, CustomDatabaseConnection):
             raise InvalidSourceException(
                 f"Expected CustomDatabaseConnection, but got {connection}"
@@ -578,6 +635,8 @@ class SampleDataSource(
         yield from self.ingest_logical_test_suite()
         yield from self.ingest_data_insights()
         yield from self.ingest_life_cycle()
+        yield from self.ingest_api_service()
+        yield from self.ingest_ometa_api_service()
 
     def ingest_teams(self) -> Iterable[Either[CreateTeamRequest]]:
         """
@@ -621,8 +680,8 @@ class SampleDataSource(
         database_entity = fqn.build(
             self.metadata,
             entity_type=Database,
-            service_name=self.glue_database_service.fullyQualifiedName.__root__,
-            database_name=db.name.__root__,
+            service_name=self.glue_database_service.fullyQualifiedName.root,
+            database_name=db.name.root,
         )
 
         database_object = self.metadata.get_by_name(
@@ -638,9 +697,9 @@ class SampleDataSource(
         database_schema_entity = fqn.build(
             self.metadata,
             entity_type=DatabaseSchema,
-            service_name=self.glue_database_service.fullyQualifiedName.__root__,
-            database_name=db.name.__root__,
-            schema_name=schema.name.__root__,
+            service_name=self.glue_database_service.fullyQualifiedName.root,
+            database_name=db.name.root,
+            schema_name=schema.name.root,
         )
 
         database_schema_object = self.metadata.get_by_name(
@@ -661,7 +720,7 @@ class SampleDataSource(
         database_schema_entity = fqn.build(
             self.metadata,
             entity_type=DatabaseSchema,
-            service_name=self.database_service.fullyQualifiedName.__root__,
+            service_name=self.database_service.fullyQualifiedName.root,
             database_name=self.database["name"],
             schema_name=self.database_schema["name"],
         )
@@ -687,15 +746,17 @@ class SampleDataSource(
         db = CreateDatabaseRequest(
             name=self.database["name"],
             description=self.database["description"],
-            service=self.database_service.fullyQualifiedName.__root__,
+            service=FullyQualifiedEntityName(
+                self.database_service.fullyQualifiedName.root
+            ),
         )
         yield Either(right=db)
 
         database_entity = fqn.build(
             self.metadata,
             entity_type=Database,
-            service_name=self.database_service.name.__root__,
-            database_name=db.name.__root__,
+            service_name=self.database_service.name.root,
+            database_name=db.name.root,
         )
 
         database_object = self.metadata.get_by_name(
@@ -712,9 +773,9 @@ class SampleDataSource(
         database_schema_entity = fqn.build(
             self.metadata,
             entity_type=DatabaseSchema,
-            service_name=self.database_service.name.__root__,
-            database_name=db.name.__root__,
-            schema_name=schema.name.__root__,
+            service_name=self.database_service.name.root,
+            database_name=db.name.root,
+            schema_name=schema.name.root,
         )
 
         database_schema_object = self.metadata.get_by_name(
@@ -742,10 +803,10 @@ class SampleDataSource(
                 table_fqn = fqn.build(
                     self.metadata,
                     entity_type=Table,
-                    service_name=self.database_service.name.__root__,
-                    database_name=db.name.__root__,
-                    schema_name=schema.name.__root__,
-                    table_name=table_and_db.name.__root__,
+                    service_name=self.database_service.name.root,
+                    database_name=db.name.root,
+                    schema_name=schema.name.root,
+                    table_name=table_and_db.name.root,
                 )
 
                 table_entity = self.metadata.get_by_name(entity=Table, fqn=table_fqn)
@@ -762,7 +823,7 @@ class SampleDataSource(
                 for custom_metric in table["customMetrics"]:
                     self.metadata.create_or_update_custom_metric(
                         CreateCustomMetricRequest(**custom_metric),
-                        table_entity.id.__root__,
+                        table_entity.id.root,
                     )
 
             for column in table.get("columns"):
@@ -770,7 +831,7 @@ class SampleDataSource(
                     for custom_metric in column["customMetrics"]:
                         self.metadata.create_or_update_custom_metric(
                             CreateCustomMetricRequest(**custom_metric),
-                            table_entity.id.__root__,
+                            table_entity.id.root,
                         )
 
     def ingest_stored_procedures(self) -> Iterable[Either[Entity]]:
@@ -779,15 +840,17 @@ class SampleDataSource(
         db = CreateDatabaseRequest(
             name=self.database["name"],
             description=self.database["description"],
-            service=self.database_service.fullyQualifiedName.__root__,
+            service=FullyQualifiedEntityName(
+                self.database_service.fullyQualifiedName.root
+            ),
         )
         yield Either(right=db)
 
         database_entity = fqn.build(
             self.metadata,
             entity_type=Database,
-            service_name=self.database_service.name.__root__,
-            database_name=db.name.__root__,
+            service_name=self.database_service.name.root,
+            database_name=db.name.root,
         )
 
         database_object = self.metadata.get_by_name(
@@ -804,9 +867,9 @@ class SampleDataSource(
         database_schema_entity = fqn.build(
             self.metadata,
             entity_type=DatabaseSchema,
-            service_name=self.database_service.name.__root__,
-            database_name=db.name.__root__,
-            schema_name=schema.name.__root__,
+            service_name=self.database_service.name.root,
+            database_name=db.name.root,
+            schema_name=schema.name.root,
         )
 
         database_schema_object = self.metadata.get_by_name(
@@ -843,13 +906,11 @@ class SampleDataSource(
             yield Either(
                 right=AddLineageRequest(
                     edge=EntitiesEdge(
-                        fromEntity=EntityReference(
-                            id=from_table.id.__root__, type="table"
-                        ),
-                        toEntity=EntityReference(id=to_table.id.__root__, type="table"),
+                        fromEntity=EntityReference(id=from_table.id.root, type="table"),
+                        toEntity=EntityReference(id=to_table.id.root, type="table"),
                         lineageDetails=LineageDetails(
                             pipeline=EntityReference(
-                                id=stored_procedure_entity.id.__root__,
+                                id=stored_procedure_entity.id.root,
                                 type="storedProcedure",
                             )
                         ),
@@ -897,7 +958,7 @@ class SampleDataSource(
                 topic_fqn = fqn.build(
                     self.metadata,
                     entity_type=Topic,
-                    service_name=self.kafka_service.name.__root__,
+                    service_name=self.kafka_service.name.root,
                     topic_name=topic["name"],
                 )
 
@@ -998,10 +1059,10 @@ class SampleDataSource(
             right=AddLineageRequest(
                 edge=EntitiesEdge(
                     fromEntity=EntityReference(
-                        id=orders_view.id.__root__, type="dashboardDataModel"
+                        id=orders_view.id.root, type="dashboardDataModel"
                     ),
                     toEntity=EntityReference(
-                        id=orders_explore.id.__root__, type="dashboardDataModel"
+                        id=orders_explore.id.root, type="dashboardDataModel"
                     ),
                 )
             )
@@ -1011,10 +1072,10 @@ class SampleDataSource(
             right=AddLineageRequest(
                 edge=EntitiesEdge(
                     fromEntity=EntityReference(
-                        id=operations_view.id.__root__, type="dashboardDataModel"
+                        id=operations_view.id.root, type="dashboardDataModel"
                     ),
                     toEntity=EntityReference(
-                        id=orders_explore.id.__root__, type="dashboardDataModel"
+                        id=orders_explore.id.root, type="dashboardDataModel"
                     ),
                 )
             )
@@ -1024,10 +1085,10 @@ class SampleDataSource(
             right=AddLineageRequest(
                 edge=EntitiesEdge(
                     fromEntity=EntityReference(
-                        id=orders_explore.id.__root__, type="dashboardDataModel"
+                        id=orders_explore.id.root, type="dashboardDataModel"
                     ),
                     toEntity=EntityReference(
-                        id=orders_dashboard.id.__root__, type="dashboard"
+                        id=orders_dashboard.id.root, type="dashboard"
                     ),
                 )
             )
@@ -1084,10 +1145,10 @@ class SampleDataSource(
 
     def ingest_pipelines(self) -> Iterable[Either[Pipeline]]:
         for pipeline in self.pipelines["pipelines"]:
-            owner = None
+            owners = None
             if pipeline.get("owner"):
-                owner = self.metadata.get_reference_by_email(
-                    email=pipeline.get("owner")
+                owners = self.metadata.get_reference_by_email(
+                    email=pipeline.get("owners")
                 )
             pipeline_ev = CreatePipelineRequest(
                 name=pipeline["name"],
@@ -1096,7 +1157,7 @@ class SampleDataSource(
                 sourceUrl=pipeline["sourceUrl"],
                 tasks=pipeline["tasks"],
                 service=self.pipeline_service.fullyQualifiedName,
-                owner=owner,
+                owners=owners,
                 scheduleInterval=pipeline.get("scheduleInterval"),
             )
             yield Either(right=pipeline_ev)
@@ -1184,7 +1245,7 @@ class SampleDataSource(
                     displayName=model["displayName"],
                     description=model["description"],
                     algorithm=model["algorithm"],
-                    dashboard=dashboard.fullyQualifiedName.__root__,
+                    dashboard=dashboard.fullyQualifiedName.root,
                     mlStore=MlStore(
                         storage=model["mlStore"]["storage"],
                         imageRepository=model["mlStore"]["imageRepository"],
@@ -1257,7 +1318,7 @@ class SampleDataSource(
                     parent_container: Container = (
                         self.metadata.get_by_name(
                             entity=Container,
-                            fqn=self.storage_service.fullyQualifiedName.__root__
+                            fqn=self.storage_service.fullyQualifiedName.root
                             + FQN_SEPARATOR
                             + FQN_SEPARATOR.join(parent_container_fqns),
                         )
@@ -1339,21 +1400,22 @@ class SampleDataSource(
                             createDateTime=profile.get("createDateTime"),
                             sizeInByte=profile.get("sizeInByte"),
                             customMetrics=profile.get("customMetrics"),
-                            timestamp=int(
-                                (
-                                    datetime.now(tz=timezone.utc) - timedelta(days=days)
-                                ).timestamp()
-                                * 1000
+                            timestamp=Timestamp(
+                                int(
+                                    (datetime.now() - timedelta(days=days)).timestamp()
+                                    * 1000
+                                )
                             ),
                         ),
                         columnProfile=[
                             ColumnProfile(
-                                timestamp=int(
-                                    (
-                                        datetime.now(tz=timezone.utc)
-                                        - timedelta(days=days)
-                                    ).timestamp()
-                                    * 1000
+                                timestamp=Timestamp(
+                                    int(
+                                        (
+                                            datetime.now() - timedelta(days=days)
+                                        ).timestamp()
+                                        * 1000
+                                    )
                                 ),
                                 **col_profile,
                             )
@@ -1361,14 +1423,16 @@ class SampleDataSource(
                         ],
                         systemProfile=[
                             SystemProfile(
-                                timestamp=int(
-                                    (
-                                        datetime.now(tz=timezone.utc)
-                                        - timedelta(
-                                            days=days, hours=random.randint(0, 24)
-                                        )
-                                    ).timestamp()
-                                    * 1000
+                                timestamp=Timestamp(
+                                    int(
+                                        (
+                                            datetime.now()
+                                            - timedelta(
+                                                days=days, hours=random.randint(0, 24)
+                                            )
+                                        ).timestamp()
+                                        * 1000
+                                    )
                                 ),
                                 **system_profile,
                             )
@@ -1431,11 +1495,12 @@ class SampleDataSource(
                         description=test_case["description"],
                         testDefinition=test_case["testDefinitionName"],
                         entityLink=test_case["entityLink"],
-                        testSuite=suite.fullyQualifiedName.__root__,
+                        testSuite=suite.fullyQualifiedName.root,
                         parameterValues=[
                             TestCaseParameterValue(**param_values)
                             for param_values in test_case["parameterValues"]
                         ],
+                        useDynamicAssertion=test_case.get("useDynamicAssertion", False),
                     )  # type: ignore
                 )
                 yield Either(right=test_case_req)
@@ -1467,10 +1532,10 @@ class SampleDataSource(
                             )
                             create_test_case_resolution.testCaseResolutionStatusDetails = Assigned(
                                 assignee=EntityReference(
-                                    id=user.id.__root__,
+                                    id=user.id.root,
                                     type="user",
-                                    name=user.name.__root__,
-                                    fullyQualifiedName=user.fullyQualifiedName.__root__,
+                                    name=user.name.root,
+                                    fullyQualifiedName=user.fullyQualifiedName.root,
                                 )
                             )
                         if resolution["testCaseResolutionStatusType"] == "Resolved":
@@ -1479,10 +1544,10 @@ class SampleDataSource(
                             )
                             create_test_case_resolution.testCaseResolutionStatusDetails = Resolved(
                                 resolvedBy=EntityReference(
-                                    id=user.id.__root__,
+                                    id=user.id.root,
                                     type="user",
-                                    name=user.name.__root__,
-                                    fullyQualifiedName=user.fullyQualifiedName.__root__,
+                                    name=user.name.root,
+                                    fullyQualifiedName=user.fullyQualifiedName.root,
                                 ),
                                 testCaseFailureReason=random.choice(
                                     list(TestCaseFailureReasonType)
@@ -1508,18 +1573,22 @@ class SampleDataSource(
                 for days, result in enumerate(test_case_results["results"]):
                     test_case_result_req = OMetaTestCaseResultsSample(
                         test_case_results=TestCaseResult(
-                            timestamp=int(
-                                (datetime.now() - timedelta(days=days)).timestamp()
-                                * 1000
+                            timestamp=Timestamp(
+                                int(
+                                    (datetime.now() - timedelta(days=days)).timestamp()
+                                    * 1000
+                                )
                             ),
                             testCaseStatus=result["testCaseStatus"],
                             result=result["result"],
                             testResultValue=[
-                                TestResultValue.parse_obj(res_value)
+                                TestResultValue.model_validate(res_value)
                                 for res_value in result["testResultValues"]
                             ],
+                            minBound=result.get("minBound"),
+                            maxBound=result.get("maxBound"),
                         ),
-                        test_case_name=case.fullyQualifiedName.__root__,
+                        test_case_name=case.fullyQualifiedName.root,
                     )
                     yield Either(right=test_case_result_req)
             if test_case_results.get("failedRowsSample"):
@@ -1529,6 +1598,9 @@ class SampleDataSource(
                         rows=test_case_results["failedRowsSample"]["rows"],
                         columns=test_case_results["failedRowsSample"]["columns"],
                     ),
+                    validate=test_case_results["failedRowsSample"].get(
+                        "validate", True
+                    ),
                 )
             if test_case_results.get("inspectionQuery"):
                 self.metadata.ingest_inspection_query(
@@ -1545,9 +1617,10 @@ class SampleDataSource(
             for report_datum in report_data:
                 if report_type == ReportDataType.rawCostAnalysisReportData.value:
                     start_ts = int(
-                        (datetime.utcnow() - timedelta(days=60)).timestamp() * 1000
+                        (datetime.now(timezone.utc) - timedelta(days=60)).timestamp()
+                        * 1000
                     )
-                    end_ts = int(datetime.utcnow().timestamp() * 1000)
+                    end_ts = int(datetime.now(timezone.utc).timestamp() * 1000)
                     tmstp = random.randint(start_ts, end_ts)
                     report_datum["data"]["lifeCycle"]["accessed"]["timestamp"] = tmstp
                 record = OMetaDataInsightSample(
@@ -1555,7 +1628,7 @@ class SampleDataSource(
                         id=report_datum["id"],
                         reportDataType=report_datum["reportDataType"],
                         timestamp=Timestamp(
-                            __root__=int(
+                            root=int(
                                 (datetime.now() - timedelta(days=i)).timestamp() * 1000
                             )
                         ),
@@ -1571,37 +1644,43 @@ class SampleDataSource(
             life_cycle = table_life_cycle["lifeCycle"]
             life_cycle_data = LifeCycle()
             life_cycle_data.created = AccessDetails(
-                timestamp=convert_timestamp_to_milliseconds(
+                timestamp=Timestamp(
                     int(
-                        (
-                            datetime.now()
-                            - timedelta(days=life_cycle["created"]["days"])
-                        ).timestamp()
+                        convert_timestamp_to_milliseconds(
+                            (
+                                datetime.now()
+                                - timedelta(days=life_cycle["created"]["days"])
+                            ).timestamp()
+                        )
                     )
                 ),
                 accessedByAProcess=life_cycle["created"].get("accessedByAProcess"),
             )
 
             life_cycle_data.updated = AccessDetails(
-                timestamp=convert_timestamp_to_milliseconds(
+                timestamp=Timestamp(
                     int(
-                        (
-                            datetime.now()
-                            - timedelta(days=life_cycle["updated"]["days"])
-                        ).timestamp()
-                    )
+                        convert_timestamp_to_milliseconds(
+                            (
+                                datetime.now()
+                                - timedelta(days=life_cycle["updated"]["days"])
+                            ).timestamp()
+                        )
+                    ),
                 ),
                 accessedByAProcess=life_cycle["updated"].get("accessedByAProcess"),
             )
 
             life_cycle_data.accessed = AccessDetails(
-                timestamp=convert_timestamp_to_milliseconds(
+                timestamp=Timestamp(
                     int(
-                        (
-                            datetime.now()
-                            - timedelta(days=life_cycle["accessed"]["days"])
-                        ).timestamp()
-                    )
+                        convert_timestamp_to_milliseconds(
+                            (
+                                datetime.now()
+                                - timedelta(days=life_cycle["accessed"]["days"])
+                            ).timestamp()
+                        )
+                    ),
                 ),
                 accessedByAProcess=life_cycle["accessed"].get("accessedByAProcess"),
             )
@@ -1636,3 +1715,24 @@ class SampleDataSource(
 
     def test_connection(self) -> None:
         """Custom sources don't support testing connections"""
+
+    def ingest_api_service(self) -> Iterable[Either[Entity]]:
+        """Ingest API services"""
+
+        collection_request = CreateAPICollectionRequest(**self.api_collection)
+        yield Either(right=collection_request)
+
+        for endpoint in self.api_endpoint.get("endpoints"):
+            endpoint_request = CreateAPIEndpointRequest(**endpoint)
+            yield Either(right=endpoint_request)
+
+    def ingest_ometa_api_service(self) -> Iterable[Either[Entity]]:
+        """Ingest users & tables ometa API services"""
+
+        for collection in self.ometa_api_collection.get("collections"):
+            collection_request = CreateAPICollectionRequest(**collection)
+            yield Either(right=collection_request)
+
+        for endpoint in self.ometa_api_endpoint.get("endpoints"):
+            endpoint_request = CreateAPIEndpointRequest(**endpoint)
+            yield Either(right=endpoint_request)

metadata/ingestion/source/database/sample_usage.py

@@ -26,6 +26,7 @@ from metadata.generated.schema.entity.services.databaseService import (
 from metadata.generated.schema.metadataIngestion.workflow import (
     Source as WorkflowSource,
 )
+from metadata.generated.schema.type.basic import DateTime
 from metadata.generated.schema.type.tableQuery import TableQueries, TableQuery
 from metadata.ingestion.api.steps import InvalidSourceException
 from metadata.ingestion.ometa.ometa_api import OpenMetadata
@@ -46,9 +47,9 @@ class SampleUsageSource(UsageSource):
 
     def __init__(self, config: WorkflowSource, metadata: OpenMetadata):
         super().__init__(config, metadata, False)
-        self.analysis_date = datetime.utcnow()
+        self.analysis_date = DateTime(datetime.now())
 
-        sample_data_folder = self.service_connection.connectionOptions.__root__.get(
+        sample_data_folder = self.service_connection.connectionOptions.root.get(
             "sampleDataFolder"
         )
         if not sample_data_folder:
@@ -73,8 +74,8 @@ class SampleUsageSource(UsageSource):
         cls, config_dict, metadata: OpenMetadata, pipeline_name: Optional[str] = None
     ):
         """Create class instance"""
-        config: WorkflowSource = WorkflowSource.parse_obj(config_dict)
-        connection: CustomDatabaseConnection = config.serviceConnection.__root__.config
+        config: WorkflowSource = WorkflowSource.model_validate(config_dict)
+        connection: CustomDatabaseConnection = config.serviceConnection.root.config
         if not isinstance(connection, CustomDatabaseConnection):
             raise InvalidSourceException(
                 f"Expected CustomDatabaseConnection, but got {connection}"
@@ -86,9 +87,6 @@ class SampleUsageSource(UsageSource):
             queries=[
                 TableQuery(
                     query=row["query"],
-                    userName="",
-                    startTime="",
-                    endTime="",
                     analysisDate=self.analysis_date,
                     aborted=False,
                     databaseName="ecommerce_db",