Skip to content

Commit

Permalink
fix mypy issues
Browse files Browse the repository at this point in the history
  • Loading branch information
@thmsobrmlr
thmsobrmlr committed Mar 27, 2024
1 parent 7c8323b commit ce3b487
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 60 deletions.
56 changes: 0 additions & 56 deletions mypy-baseline.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -468,63 +468,7 @@ posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py:0: error
posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py:0: error: Need type annotation for "properties_3" (hint: "properties_3: Dict[<type>, <type>] = ...") [var-annotated]
posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py:0: error: Need type annotation for "filter" (hint: "filter: Dict[<type>, <type>] = ...") [var-annotated]
posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py:0: error: Need type annotation for "filter" (hint: "filter: Dict[<type>, <type>] = ...") [var-annotated]
posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py:0: error: Item "None" of "DateRange | None" has no attribute "date_from" [union-attr]
posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py:0: error: Item "None" of "DateRange | None" has no attribute "date_to" [union-attr]
posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py:0: error: Item "RetentionQuery" of "TrendsQuery | FunnelsQuery | RetentionQuery | PathsQuery | StickinessQuery | LifecycleQuery" has no attribute "interval" [union-attr]
posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py:0: error: Item "PathsQuery" of "TrendsQuery | FunnelsQuery | RetentionQuery | PathsQuery | StickinessQuery | LifecycleQuery" has no attribute "interval" [union-attr]
posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py:0: error: Need type annotation for "filter" (hint: "filter: Dict[<type>, <type>] = ...") [var-annotated]
posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py:0: error: Item "RetentionQuery" of "TrendsQuery | FunnelsQuery | RetentionQuery | PathsQuery | StickinessQuery | LifecycleQuery" has no attribute "series" [union-attr]
posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py:0: error: Item "PathsQuery" of "TrendsQuery | FunnelsQuery | RetentionQuery | PathsQuery | StickinessQuery | LifecycleQuery" has no attribute "series" [union-attr]
posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py:0: error: Item "RetentionQuery" of "TrendsQuery | FunnelsQuery | RetentionQuery | PathsQuery | StickinessQuery | LifecycleQuery" has no attribute "series" [union-attr]
posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py:0: error: Item "PathsQuery" of "TrendsQuery | FunnelsQuery | RetentionQuery | PathsQuery | StickinessQuery | LifecycleQuery" has no attribute "series" [union-attr]
posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py:0: error: Item "RetentionQuery" of "TrendsQuery | FunnelsQuery | RetentionQuery | PathsQuery | StickinessQuery | LifecycleQuery" has no attribute "series" [union-attr]
posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py:0: error: Item "PathsQuery" of "TrendsQuery | FunnelsQuery | RetentionQuery | PathsQuery | StickinessQuery | LifecycleQuery" has no attribute "series" [union-attr]
posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py:0: error: Item "RetentionQuery" of "TrendsQuery | FunnelsQuery | RetentionQuery | PathsQuery | StickinessQuery | LifecycleQuery" has no attribute "series" [union-attr]
posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py:0: error: Item "PathsQuery" of "TrendsQuery | FunnelsQuery | RetentionQuery | PathsQuery | StickinessQuery | LifecycleQuery" has no attribute "series" [union-attr]
posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py:0: error: Item "RetentionQuery" of "TrendsQuery | FunnelsQuery | RetentionQuery | PathsQuery | StickinessQuery | LifecycleQuery" has no attribute "series" [union-attr]
posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py:0: error: Item "PathsQuery" of "TrendsQuery | FunnelsQuery | RetentionQuery | PathsQuery | StickinessQuery | LifecycleQuery" has no attribute "series" [union-attr]
posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py:0: error: Item "RetentionQuery" of "TrendsQuery | FunnelsQuery | RetentionQuery | PathsQuery | StickinessQuery | LifecycleQuery" has no attribute "breakdownFilter" [union-attr]
posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py:0: error: Item "PathsQuery" of "TrendsQuery | FunnelsQuery | RetentionQuery | PathsQuery | StickinessQuery | LifecycleQuery" has no attribute "breakdownFilter" [union-attr]
posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py:0: error: Item "StickinessQuery" of "TrendsQuery | FunnelsQuery | RetentionQuery | PathsQuery | StickinessQuery | LifecycleQuery" has no attribute "breakdownFilter" [union-attr]
posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py:0: error: Item "LifecycleQuery" of "TrendsQuery | FunnelsQuery | RetentionQuery | PathsQuery | StickinessQuery | LifecycleQuery" has no attribute "breakdownFilter" [union-attr]
posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py:0: error: Item "RetentionQuery" of "TrendsQuery | FunnelsQuery | RetentionQuery | PathsQuery | StickinessQuery | LifecycleQuery" has no attribute "breakdownFilter" [union-attr]
posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py:0: error: Item "PathsQuery" of "TrendsQuery | FunnelsQuery | RetentionQuery | PathsQuery | StickinessQuery | LifecycleQuery" has no attribute "breakdownFilter" [union-attr]
posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py:0: error: Item "StickinessQuery" of "TrendsQuery | FunnelsQuery | RetentionQuery | PathsQuery | StickinessQuery | LifecycleQuery" has no attribute "breakdownFilter" [union-attr]
posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py:0: error: Item "LifecycleQuery" of "TrendsQuery | FunnelsQuery | RetentionQuery | PathsQuery | StickinessQuery | LifecycleQuery" has no attribute "breakdownFilter" [union-attr]
posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py:0: error: Item "RetentionQuery" of "TrendsQuery | FunnelsQuery | RetentionQuery | PathsQuery | StickinessQuery | LifecycleQuery" has no attribute "breakdownFilter" [union-attr]
posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py:0: error: Item "PathsQuery" of "TrendsQuery | FunnelsQuery | RetentionQuery | PathsQuery | StickinessQuery | LifecycleQuery" has no attribute "breakdownFilter" [union-attr]
posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py:0: error: Item "StickinessQuery" of "TrendsQuery | FunnelsQuery | RetentionQuery | PathsQuery | StickinessQuery | LifecycleQuery" has no attribute "breakdownFilter" [union-attr]
posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py:0: error: Item "LifecycleQuery" of "TrendsQuery | FunnelsQuery | RetentionQuery | PathsQuery | StickinessQuery | LifecycleQuery" has no attribute "breakdownFilter" [union-attr]
posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py:0: error: Item "FunnelsQuery" of "TrendsQuery | FunnelsQuery | RetentionQuery | PathsQuery | StickinessQuery | LifecycleQuery" has no attribute "trendsFilter" [union-attr]
posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py:0: error: Item "RetentionQuery" of "TrendsQuery | FunnelsQuery | RetentionQuery | PathsQuery | StickinessQuery | LifecycleQuery" has no attribute "trendsFilter" [union-attr]
posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py:0: error: Item "PathsQuery" of "TrendsQuery | FunnelsQuery | RetentionQuery | PathsQuery | StickinessQuery | LifecycleQuery" has no attribute "trendsFilter" [union-attr]
posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py:0: error: Item "StickinessQuery" of "TrendsQuery | FunnelsQuery | RetentionQuery | PathsQuery | StickinessQuery | LifecycleQuery" has no attribute "trendsFilter" [union-attr]
posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py:0: error: Item "LifecycleQuery" of "TrendsQuery | FunnelsQuery | RetentionQuery | PathsQuery | StickinessQuery | LifecycleQuery" has no attribute "trendsFilter" [union-attr]
posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py:0: error: Item "TrendsQuery" of "TrendsQuery | FunnelsQuery | RetentionQuery | PathsQuery | StickinessQuery | LifecycleQuery" has no attribute "funnelsFilter" [union-attr]
posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py:0: error: Item "RetentionQuery" of "TrendsQuery | FunnelsQuery | RetentionQuery | PathsQuery | StickinessQuery | LifecycleQuery" has no attribute "funnelsFilter" [union-attr]
posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py:0: error: Item "PathsQuery" of "TrendsQuery | FunnelsQuery | RetentionQuery | PathsQuery | StickinessQuery | LifecycleQuery" has no attribute "funnelsFilter" [union-attr]
posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py:0: error: Item "StickinessQuery" of "TrendsQuery | FunnelsQuery | RetentionQuery | PathsQuery | StickinessQuery | LifecycleQuery" has no attribute "funnelsFilter" [union-attr]
posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py:0: error: Item "LifecycleQuery" of "TrendsQuery | FunnelsQuery | RetentionQuery | PathsQuery | StickinessQuery | LifecycleQuery" has no attribute "funnelsFilter" [union-attr]
posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py:0: error: Item "TrendsQuery" of "TrendsQuery | FunnelsQuery | RetentionQuery | PathsQuery | StickinessQuery | LifecycleQuery" has no attribute "retentionFilter" [union-attr]
posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py:0: error: Item "FunnelsQuery" of "TrendsQuery | FunnelsQuery | RetentionQuery | PathsQuery | StickinessQuery | LifecycleQuery" has no attribute "retentionFilter" [union-attr]
posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py:0: error: Item "PathsQuery" of "TrendsQuery | FunnelsQuery | RetentionQuery | PathsQuery | StickinessQuery | LifecycleQuery" has no attribute "retentionFilter" [union-attr]
posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py:0: error: Item "StickinessQuery" of "TrendsQuery | FunnelsQuery | RetentionQuery | PathsQuery | StickinessQuery | LifecycleQuery" has no attribute "retentionFilter" [union-attr]
posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py:0: error: Item "LifecycleQuery" of "TrendsQuery | FunnelsQuery | RetentionQuery | PathsQuery | StickinessQuery | LifecycleQuery" has no attribute "retentionFilter" [union-attr]
posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py:0: error: Item "TrendsQuery" of "TrendsQuery | FunnelsQuery | RetentionQuery | PathsQuery | StickinessQuery | LifecycleQuery" has no attribute "pathsFilter" [union-attr]
posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py:0: error: Item "FunnelsQuery" of "TrendsQuery | FunnelsQuery | RetentionQuery | PathsQuery | StickinessQuery | LifecycleQuery" has no attribute "pathsFilter" [union-attr]
posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py:0: error: Item "RetentionQuery" of "TrendsQuery | FunnelsQuery | RetentionQuery | PathsQuery | StickinessQuery | LifecycleQuery" has no attribute "pathsFilter" [union-attr]
posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py:0: error: Item "StickinessQuery" of "TrendsQuery | FunnelsQuery | RetentionQuery | PathsQuery | StickinessQuery | LifecycleQuery" has no attribute "pathsFilter" [union-attr]
posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py:0: error: Item "LifecycleQuery" of "TrendsQuery | FunnelsQuery | RetentionQuery | PathsQuery | StickinessQuery | LifecycleQuery" has no attribute "pathsFilter" [union-attr]
posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py:0: error: Item "TrendsQuery" of "TrendsQuery | FunnelsQuery | RetentionQuery | PathsQuery | StickinessQuery | LifecycleQuery" has no attribute "stickinessFilter" [union-attr]
posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py:0: error: Item "FunnelsQuery" of "TrendsQuery | FunnelsQuery | RetentionQuery | PathsQuery | StickinessQuery | LifecycleQuery" has no attribute "stickinessFilter" [union-attr]
posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py:0: error: Item "RetentionQuery" of "TrendsQuery | FunnelsQuery | RetentionQuery | PathsQuery | StickinessQuery | LifecycleQuery" has no attribute "stickinessFilter" [union-attr]
posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py:0: error: Item "PathsQuery" of "TrendsQuery | FunnelsQuery | RetentionQuery | PathsQuery | StickinessQuery | LifecycleQuery" has no attribute "stickinessFilter" [union-attr]
posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py:0: error: Item "LifecycleQuery" of "TrendsQuery | FunnelsQuery | RetentionQuery | PathsQuery | StickinessQuery | LifecycleQuery" has no attribute "stickinessFilter" [union-attr]
posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py:0: error: Item "TrendsQuery" of "TrendsQuery | FunnelsQuery | RetentionQuery | PathsQuery | StickinessQuery | LifecycleQuery" has no attribute "lifecycleFilter" [union-attr]
posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py:0: error: Item "FunnelsQuery" of "TrendsQuery | FunnelsQuery | RetentionQuery | PathsQuery | StickinessQuery | LifecycleQuery" has no attribute "lifecycleFilter" [union-attr]
posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py:0: error: Item "RetentionQuery" of "TrendsQuery | FunnelsQuery | RetentionQuery | PathsQuery | StickinessQuery | LifecycleQuery" has no attribute "lifecycleFilter" [union-attr]
posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py:0: error: Item "PathsQuery" of "TrendsQuery | FunnelsQuery | RetentionQuery | PathsQuery | StickinessQuery | LifecycleQuery" has no attribute "lifecycleFilter" [union-attr]
posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py:0: error: Item "StickinessQuery" of "TrendsQuery | FunnelsQuery | RetentionQuery | PathsQuery | StickinessQuery | LifecycleQuery" has no attribute "lifecycleFilter" [union-attr]
posthog/hogql_queries/insights/trends/test/test_aggregation_operations.py:0: error: Item "SelectUnionQuery" of "SelectQuery | SelectUnionQuery" has no attribute "select" [union-attr]
posthog/hogql_queries/insights/trends/test/test_aggregation_operations.py:0: error: Item "SelectUnionQuery" of "SelectQuery | SelectUnionQuery" has no attribute "select" [union-attr]
posthog/hogql_queries/insights/trends/test/test_aggregation_operations.py:0: error: Item "SelectUnionQuery" of "SelectQuery | SelectUnionQuery" has no attribute "group_by" [union-attr]
Expand Down
4 changes: 3 additions & 1 deletion posthog/hogql_queries/insights/paths_query_runner.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
from posthog.hogql.property import property_to_expr
from posthog.hogql.query import execute_hogql_query
from posthog.hogql.timings import HogQLTimings
from posthog.hogql_queries.insights.funnels.funnels_query_runner import FunnelsQueryRunner
from posthog.hogql_queries.insights.funnels.utils import funnel_window_interval_unit_to_sql
from posthog.hogql_queries.query_runner import QueryRunner
from posthog.hogql_queries.utils.query_date_range import QueryDateRange
Expand Down Expand Up @@ -204,6 +205,7 @@ def funnel_join(self) -> ast.JoinExpr:
limit_context=self.limit_context,
)

assert isinstance(actors_query_runner.source_runner, FunnelsQueryRunner)
assert actors_query_runner.source_runner.context is not None
actors_query_runner.source_runner.context.includeTimestamp = funnelPathType in (
FunnelPathType.funnel_path_after_step,
Expand Down Expand Up @@ -530,7 +532,7 @@ def get_session_threshold_clause(self) -> ast.Expr:
if funnelSourceFilter.funnelWindowInterval:
interval = funnelSourceFilter.funnelWindowInterval
unit = funnelSourceFilter.funnelWindowIntervalUnit
interval_unit = funnel_window_interval_unit_to_sql(unit)
interval_unit = funnel_window_interval_unit_to_sql(unit) # type: ignore

return parse_expr(
f"arraySplit(x -> if(toDateTime('2018-01-01') + toIntervalSecond(_toInt64(x.3)) < toDateTime('2018-01-01') + INTERVAL {interval} {interval_unit}, 0, 1), paths_tuple)"
Expand Down
6 changes: 3 additions & 3 deletions posthog/hogql_queries/legacy_compatibility/filter_to_query.py
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import copy
from enum import Enum
import json
from typing import List, Dict, Literal
from typing import Any, List, Dict, Literal
from posthog.models.entity.entity import Entity as LegacyEntity
from posthog.schema import (
ActionsNode,
Expand Down Expand Up @@ -453,7 +453,7 @@ def _insight_filter(filter: Dict):
minEdgeWeight=filter.get("min_edge_weight"),
maxEdgeWeight=filter.get("max_edge_weight"),
),
"funnelPathsFilter": filters_to_funnel_paths_query(filter),
"funnelPathsFilter": filters_to_funnel_paths_query(filter), # type: ignore
}
elif _insight_type(filter) == "LIFECYCLE":
insight_filter = {
Expand All @@ -480,7 +480,7 @@ def _insight_filter(filter: Dict):
return insight_filter


def filters_to_funnel_paths_query(filter: Dict) -> FunnelPathsFilter | None:
def filters_to_funnel_paths_query(filter: Dict[str, Any]) -> FunnelPathsFilter | None:
funnel_paths = filter.get("funnel_paths")
funnel_filter = filter.get("funnel_filter")

Expand Down

0 comments on commit ce3b487

Please sign in to comment.