diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index f79697c73fbfd..b479c28e5f4f1 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -48,8 +48,6 @@ services: - ./docker/clickhouse/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d - ./docker/clickhouse/config.xml:/etc/clickhouse-server/config.xml - ./docker/clickhouse/users-dev.xml:/etc/clickhouse-server/users.xml - extra_hosts: - - 'host.docker.internal:host-gateway' depends_on: - kafka - zookeeper diff --git a/posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py b/posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py index 8c6f30c6639f5..a0a659b413eac 100644 --- a/posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py +++ b/posthog/temporal/tests/batch_exports/test_s3_batch_export_workflow.py @@ -265,7 +265,7 @@ async def assert_clickhouse_records_in_s3( assert s3_data == expected_records -TEST_S3_MODELS: list[BatchExportModel, BatchExportSchema | None] = [ +TEST_S3_MODELS: list[BatchExportModel | BatchExportSchema | None] = [ BatchExportModel( name="a-custom-model", schema={ @@ -886,7 +886,7 @@ async def test_s3_export_workflow_with_minio_bucket_and_custom_key_prefix( assert run.records_completed == events_to_export_created or run.records_completed == persons_to_export_created expected_key_prefix = s3_key_prefix.format( - table=model.name if model is not None else "events", + table=batch_export_model.name if batch_export_model is not None else "events", year=data_interval_end.year, # All of these must include leading 0s. month=data_interval_end.strftime("%m"), diff --git a/posthog/temporal/tests/utils/persons.py b/posthog/temporal/tests/utils/persons.py index 1e7b54c2a85e4..0a63a96d98fe5 100644 --- a/posthog/temporal/tests/utils/persons.py +++ b/posthog/temporal/tests/utils/persons.py @@ -44,7 +44,7 @@ def generate_test_persons( persons: list[PersonValues] = [] for _ in range(start, count + start): timestamp = timestamps.pop() - person = { + person: PersonValues = { "id": str(person_id) if person_id else str(uuid.uuid4()), "created_at": timestamp.strftime("%Y-%m-%d %H:%M:%S.%f"), "team_id": team_id, @@ -160,7 +160,7 @@ def generate_test_person_distinct_id2( person_id: uuid.UUID | None = None, version: int = 1, is_deleted: bool = False, -) -> list[PersonDistinctId2Values]: +) -> PersonDistinctId2Values: """Generate a row of person_distinct_id2 values for testing.""" person: PersonDistinctId2Values = { "team_id": team_id, @@ -212,7 +212,7 @@ async def generate_test_person_distinct_id2_in_clickhouse( person_id: uuid.UUID | None = None, version: int = 1, is_deleted: bool = False, -) -> tuple[list[PersonDistinctId2Values], list[PersonDistinctId2Values]]: +) -> tuple[PersonDistinctId2Values, PersonDistinctId2Values]: person = generate_test_person_distinct_id2( count=1, team_id=team_id,