Merge branch 'main' into feature/update-secret-key-check

catalog/dags/common/ingestion_server.py

@@ -6,7 +6,7 @@
 
 from airflow.decorators import task
 from airflow.exceptions import AirflowSkipException
-from airflow.providers.http.operators.http import SimpleHttpOperator
+from airflow.providers.http.operators.http import HttpOperator
 from airflow.providers.http.sensors.http import HttpSensor
 from requests import Response
 
@@ -95,8 +95,8 @@ def generate_index_suffix(default_suffix: str | None = None) -> str:
 
 def get_current_index(
     target_alias: str, http_conn_id: str = "data_refresh"
-) -> SimpleHttpOperator:
-    return SimpleHttpOperator(
+) -> HttpOperator:
+    return HttpOperator(
         task_id="get_current_index",
         http_conn_id=http_conn_id,
         endpoint=f"stat/{target_alias}",
@@ -111,13 +111,13 @@ def trigger_task(
     model: str,
     data: dict | None = None,
     http_conn_id: str = "data_refresh",
-) -> SimpleHttpOperator:
+) -> HttpOperator:
     data = {
         **(data or {}),
         "model": model,
         "action": action.upper(),
     }
-    return SimpleHttpOperator(
+    return HttpOperator(
         task_id=f"trigger_{action.lower()}",
         http_conn_id=http_conn_id,
         endpoint="task",
@@ -129,7 +129,7 @@ def trigger_task(
 
 def wait_for_task(
     action: str,
-    task_trigger: SimpleHttpOperator,
+    task_trigger: HttpOperator,
     timeout: timedelta,
     poke_interval: int = REFRESH_POKE_INTERVAL,
     http_conn_id: str = "data_refresh",
@@ -153,7 +153,7 @@ def trigger_and_wait_for_task(
     data: dict | None = None,
     poke_interval: int = REFRESH_POKE_INTERVAL,
     http_conn_id: str = "data_refresh",
-) -> tuple[SimpleHttpOperator, HttpSensor]:
+) -> tuple[HttpOperator, HttpSensor]:
     trigger = trigger_task(action, model, data, http_conn_id)
     waiter = wait_for_task(action, trigger, timeout, poke_interval, http_conn_id)
     trigger >> waiter

catalog/env.template

@@ -106,6 +106,9 @@ AIRFLOW_VAR_CATCHUP_ENABLED=false
 # Number of records to expect in a healthy ES index. Used during the data refresh to verify that
 # a new index is healthy before promoting.
 ES_INDEX_READINESS_RECORD_COUNT=1000
+# Warning in dependency, nothing we can do
+# https://docs.sqlalchemy.org/en/20/errors.html#error-b8d9
+SQLALCHEMY_SILENCE_UBER_WARNING=1
 
 AIRFLOW_VAR_AIRFLOW_RDS_ARN=unset
 AIRFLOW_VAR_AIRFLOW_RDS_SNAPSHOTS_TO_RETAIN=7

catalog/pytest.ini

@@ -18,20 +18,13 @@ addopts =
     --disable-socket
     --allow-unix-socket
 
-# sqlalchemy
-#   Warning in dependency, nothing we can do
-#   https://docs.sqlalchemy.org/en/20/errors.html#error-b8d9
-# airflow
-#   Warning within Airflow for an internal call, nothing we can do
 # flask
 #   https://docs.sqlalchemy.org/en/20/errors.html#error-b8d9
 #   Warning in dependency, nothing we can do
 #   "removed"/"remoevd" is due to https://github.com/pallets/flask
 # distutils
 #   Warning in dependency, nothing we can do
 filterwarnings=
-    ignore::sqlalchemy.exc.MovedIn20Warning
-    ignore:Calling `DAG.create_dagrun\(\)` without an explicit data interval is deprecated:airflow.exceptions.RemovedInAirflow3Warning
     ignore:.*is deprecated and will be (remoevd|removed) in Flask 2.3.:DeprecationWarning
     ignore:distutils Version classes are deprecated. Use packaging.version instead:DeprecationWarning
 

frontend/package.json

@@ -112,7 +112,7 @@
     "@testing-library/vue": "^5.8.2",
     "@types/express-useragent": "^1.0.2",
     "@types/jest": "^29.5.4",
-    "@types/node": "18.19.0",
+    "@types/node": "18.19.4",
     "@types/throttle-debounce": "^5.0.0",
     "@types/uuid": "^9.0.6",
     "@vue/test-utils": "^1.1.3",