Merge branch 'web/bugfix/language-picker-mobile' of https://github.com/Couchers-org/couchers into web/bugfix/language-picker-mobile

Author: christiansaavedra

.github/autoreviewers.yml

@@ -0,0 +1,21 @@
+# Defines PR reviewers based on modified file paths.
+# This is an input to the dorny/paths-filter GitHub action,
+# configured to match rules if EVERY glob applies (to support exclusions).
+# Filter names are a label plus a comma-delimited people/teams to assign.
+backend Couchers-org/backend:
+  - 'app/backend/**'
+  - '!app/backend/**/locales/*.json'
+media Couchers-org/backend:
+  - 'app/media/**'
+web Couchers-org/web:
+  - 'app/web/**'
+  - '!app/web/**/locales/*.json'
+mobile Couchers-org/mobile:
+  - 'app/mobile/**'
+  - '!app/mobile/**/locales/*.json'
+locales tristanlabelle:
+  - 'app/**/locales/*.json'
+i18n tristanlabelle:
+  - 'app/**/i18n/**'
+docs aapeliv,nabramow:
+  - 'docs/**'

.github/pull_request_template.md

@@ -29,6 +29,7 @@ Fill applicable checklists below, or remove those that don't apply.
 - [x] Maintainers can merge this PR for me
 
 <!--
-Remember to request review from couchers-org/web, couchers-org/backend or an individual.
+Create the code review as a draft if still iterating or validating via CI.
+Once published, reviewers will be added based on changes, but feel free to add more.
 Once your code is approved, you can merge it if you have write access.
 --->

.github/workflows/add-reviewers.yml

@@ -0,0 +1,88 @@
+# [WIP] Currently fails to add team reviewers
+# Adds reviewers upon publishing a PR based on changed files.
+# Works around limitations of GitHub's CODEOWNERS, which can only match one rule,
+# whereas our changes can straddle frontend and backend, for example.
+name: Add reviewers
+
+# on:
+#   pull_request:
+#     types: [opened, ready_for_review, reopened]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+  pull-requests: write
+
+jobs:
+  add-reviewers:
+    name: Add reviewers
+    runs-on: ubuntu-latest
+    if: "!github.event.pull_request.draft"
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          sparse-checkout: .github/autoreviewers.yml
+
+      - name: Match rules from autoreviewers.yml
+        uses: dorny/paths-filter@v4
+        id: filter
+        with:
+          filters: .github/autoreviewers.yml
+          # Require every glob to match for a rule to match,
+          # otherwise we cannot express exclusions.
+          # e.g. 'app/web/**' + '!**/en.json' needs to be AND, not OR
+          predicate-quantifier: every
+
+      - name: Collect reviewers from matched rules
+        id: collect-reviewers
+        env:
+          PR_AUTHOR: ${{ github.event.pull_request.user.login }}
+          # The "changes" output is a JSON array of filter names.
+          FILTER_CHANGES: ${{ steps.filter.outputs.changes }}
+        run: |
+          # Filter keys are "<name> <reviewer1,reviewer2,...>"; process matched filters.
+          REVIEWERS=()
+          while IFS= read -r entry; do
+            [[ -n "$entry" ]] || continue
+            RULE_NAME="${entry%% *}"
+            REVIEWERS_STR="${entry#* }"
+
+            echo "Matched rule \"$RULE_NAME\" with reviewers: $REVIEWERS_STR"
+            IFS=',' read -ra reviewers <<< "$REVIEWERS_STR"
+            for reviewer in "${reviewers[@]}"; do
+              [[ -n "$reviewer" ]] || continue
+              # The PR author cannot be a reviewer on their own PR
+              [[ "$reviewer" == "$PR_AUTHOR" ]] && continue
+              # Avoid adding the same reviewer twice
+              [[ " ${REVIEWERS[*]} " == *" $reviewer "* ]] && continue
+              REVIEWERS+=("$reviewer")
+            done
+          done < <(echo "$FILTER_CHANGES" | jq -r '.[]')
+
+          if [[ ${#REVIEWERS[@]} -gt 0 ]]; then
+            echo "Collected reviewers: $(IFS=','; echo "${REVIEWERS[*]}")"
+          else
+            echo "No reviewers collected"
+          fi
+
+          echo "reviewers=$(IFS=','; echo "${REVIEWERS[*]}")" >> "$GITHUB_OUTPUT"
+
+      - name: Add reviewers
+        if: steps.collect-reviewers.outputs.reviewers != ''
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_REPO: ${{ github.repository }}
+          PR_NUMBER: ${{ github.event.pull_request.number }}
+          REVIEWERS: ${{ steps.collect-reviewers.outputs.reviewers }}
+        run: |
+          GH_PR_EDIT_ARGS=()
+          IFS=',' read -ra reviewers <<< "$REVIEWERS"
+          for reviewer in "${reviewers[@]}"; do
+            GH_PR_EDIT_ARGS+=(--add-reviewer "$reviewer")
+          done
+
+          echo "Adding reviewers: $REVIEWERS"
+          gh pr edit "$PR_NUMBER" "${GH_PR_EDIT_ARGS[@]}"

app/backend.dev.env

@@ -87,8 +87,8 @@ ACTIVENESS_PROBES_ENABLED=1
 # Experimentation (feature flags)
 EXPERIMENTATION_ENABLED=0
 EXPERIMENTATION_PASS_ALL_GATES=1
-STATSIG_SERVER_SECRET_KEY=secret-...
-STATSIG_ENVIRONMENT=development
+GROWTHBOOK_API_HOST=https://gbapi.couchershq.org
+GROWTHBOOK_CLIENT_KEY=sdk-cGmljeXu1BCzHffE
 
 # Moderation auto-approval deadline in seconds (0 to disable)
 MODERATION_AUTO_APPROVE_DEADLINE_SECONDS=10

app/backend/pyproject.toml

@@ -41,7 +41,7 @@ dependencies = [
     "stripe>=13.1.0",
     "ua-parser>=1.0.1",
     "user-agents>=2.2.0",
-    "statsig-python-core>=0.8.0",
+    "growthbook>=1.2.0",
 ]
 
 [project.scripts]
@@ -136,7 +136,7 @@ module = ["couchers.migrations.versions.*"]
 ignore_errors = true
 
 [[tool.mypy.overrides]]
-module = ["http_ece", "py_vapid", "luhn", "sqlalchemy_utils.*", "statsig_python_core", "user_agents"]
+module = ["http_ece", "py_vapid", "luhn", "sqlalchemy_utils.*", "growthbook", "user_agents"]
 # These libraries don't have type stubs or py.typed markers
 ignore_missing_imports = true
 

app/backend/src/app.py

@@ -96,8 +96,6 @@ def main() -> None:
     setup_tracing()
 
     # Initialize the experimentation framework for feature flags in the main process.
-    # IMPORTANT: This MUST be called AFTER worker processes are spawned (above).
-    # The underlying SDK uses internal threading that doesn't survive fork().
     # Worker processes initialize their own instance in _run_forever().
     setup_experimentation()
 

app/backend/src/couchers/config.py

@@ -115,13 +115,13 @@
     ("RECAPTHCA_SITE_KEY", str),
     # Whether we're in test
     ("IN_TEST", bool, "0"),
-    # Experimentation (feature flags via Statsig)
+    # Experimentation (feature flags via GrowthBook)
     ("EXPERIMENTATION_ENABLED", bool, "0"),
     # When enabled, all feature gates return True (useful for development/testing)
     ("EXPERIMENTATION_PASS_ALL_GATES", bool, "0"),
-    # Statsig SDK configuration
-    ("STATSIG_SERVER_SECRET_KEY", str, ""),
-    ("STATSIG_ENVIRONMENT", str, "development"),
+    # GrowthBook SDK configuration
+    ("GROWTHBOOK_API_HOST", str, "https://cdn.growthbook.io"),
+    ("GROWTHBOOK_CLIENT_KEY", str, ""),
     # Moderation auto-approval deadline in seconds (0 to disable auto-approval)
     ("MODERATION_AUTO_APPROVE_DEADLINE_SECONDS", int),
     # User ID of the bot user for automated moderation actions
@@ -171,8 +171,8 @@ def check_config(cfg: dict[str, Any]) -> None:
             raise Exception("MyPostcard API credentials not configured but postal verification enabled")
 
     if cfg["EXPERIMENTATION_ENABLED"]:
-        if not cfg["STATSIG_SERVER_SECRET_KEY"]:
-            raise Exception("No Statsig server secret key but experimentation enabled")
+        if not cfg["GROWTHBOOK_CLIENT_KEY"]:
+            raise Exception("No GrowthBook client key but experimentation enabled")
 
 
 def make_config() -> dict[str, Any]:

app/backend/src/couchers/context.py

@@ -1,9 +1,12 @@
-from typing import NoReturn, cast
+from typing import TYPE_CHECKING, NoReturn, cast
 
 import grpc
 
 from couchers.i18n import LocalizationContext
 
+if TYPE_CHECKING:
+    from growthbook import GrowthBook
+
 
 class NonInteractiveContextException(Exception):
     """If this exception is raised, it is a programming error"""
@@ -79,6 +82,7 @@ def __init__(
         self.__is_interactive = is_interactive
         self.__logged_in = self._user_id is not None
         self.__cookies: list[str] = []
+        self._growthbook: GrowthBook | None = None
 
         if self.__is_interactive:
             if not self._grpc_context:

app/backend/src/couchers/email/calendar_events.py

@@ -25,17 +25,23 @@ def create_host_request_ics(
     host_request: HostRequest, other_name: str, hosting: bool, loc_context: LocalizationContext
 ) -> str:
     event = create_host_request_event(host_request, other_name, hosting, loc_context)
-    return event_to_ics(event, loc_context)
+
+    # METHOD:PUBLISH means this is part of a stream of calendar event information.
+    # It allows for later cancellation, and doesn't expose accept/decline functionality.
+    return event_to_ics(event, "PUBLISH", loc_context)
 
 
 def create_host_request_event(
-    host_request: HostRequest, other_name: str, hosting: bool, loc_context: LocalizationContext
+    host_request: HostRequest, other_name: str, hosting: bool, loc_context: LocalizationContext, sequence: int = 0
 ) -> Event:
     """Creates an ics event for a host request."""
 
     event = Event()
     event.uid = get_host_request_event_uid(host_request.host_request_id)
 
+    # Explicitly allow later sequencing of a cancellation with SEQUENCE:1
+    event.extra.append(ContentLine(name="SEQUENCE", value=str(sequence)))
+
     if hosting:
         event.name = get_emails_i18next().localize(
             "calendar_events.host_requests.title_host", loc_context.locale, {"name": other_name}
@@ -70,23 +76,23 @@ def create_host_request_cancellation_attachment(
 def create_host_request_cancellation_ics(
     host_request: HostRequest, other_name: str, hosting: bool, loc_context: LocalizationContext
 ) -> str:
-    event = create_host_request_event(host_request, other_name, hosting, loc_context)
+    event = create_host_request_event(host_request, other_name, hosting, loc_context, sequence=1)
     event.name = get_emails_i18next().localize(
         "calendar_events.title_cancelled", loc_context.locale, {"title": event.name}
     )
     event.status = "CANCELLED"
 
-    # Cancellation is sequenced after creation (which defaults to sequence number 0)
-    event.extra.append(ContentLine(name="SEQUENCE", value="1"))
-
-    return event_to_ics(event, loc_context)
+    # METHOD:PUBLISH means this is part of a stream of calendar event information.
+    # Gmail™ will immediately remove the event from the user's calendar.
+    # METHOD:CANCEL might leave the event in cancelled state or not work.
+    return event_to_ics(event, "PUBLISH", loc_context)
 
 
-def event_to_ics(event: Event, loc_context: LocalizationContext) -> str:
+def event_to_ics(event: Event, method: str | None, loc_context: LocalizationContext) -> str:
     # PRODID is mandatory and generally follows "-//[Organization]//[Product Name]//[Language]"
     calendar = Calendar(creator=f"-//Couchers.org//Couchers//{loc_context.locale.upper()}")
-    if event.status == "CANCELLED":
-        calendar.method = "CANCEL"
+    if method:
+        calendar.method = method
     calendar.events.add(event)
     return cast(str, calendar.serialize())