Skip to content

Commit

Permalink
Rename views to routes for FastAPI apps
Browse files Browse the repository at this point in the history
This is part of the change I want to do for #43015 but going to break it down to keep it manageable.
  • Loading branch information
kaxil committed Oct 15, 2024
1 parent 2899e5f commit 7228168
Show file tree
Hide file tree
Showing 22 changed files with 18 additions and 18 deletions.
4 changes: 2 additions & 2 deletions airflow/api_fastapi/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ def create_app() -> FastAPI:

def init_views(app: FastAPI) -> None:
"""Init views by registering the different routers."""
from airflow.api_fastapi.views.public import public_router
from airflow.api_fastapi.views.ui import ui_router
from airflow.api_fastapi.routes.public import public_router
from airflow.api_fastapi.routes.ui import ui_router

app.include_router(ui_router)
app.include_router(public_router)
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@

from __future__ import annotations

from airflow.api_fastapi.views.public.connections import connections_router
from airflow.api_fastapi.views.public.dag_run import dag_run_router
from airflow.api_fastapi.views.public.dags import dags_router
from airflow.api_fastapi.views.public.monitor import monitor_router
from airflow.api_fastapi.views.public.variables import variables_router
from airflow.api_fastapi.views.router import AirflowRouter
from airflow.api_fastapi.routes.public.connections import connections_router
from airflow.api_fastapi.routes.public.dag_run import dag_run_router
from airflow.api_fastapi.routes.public.dags import dags_router
from airflow.api_fastapi.routes.public.monitor import monitor_router
from airflow.api_fastapi.routes.public.variables import variables_router
from airflow.api_fastapi.routes.router import AirflowRouter

public_router = AirflowRouter(prefix="/public")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
from airflow.api_fastapi.db.common import get_session, paginated_select
from airflow.api_fastapi.openapi.exceptions import create_openapi_http_exception_doc
from airflow.api_fastapi.parameters import QueryLimit, QueryOffset, SortParam
from airflow.api_fastapi.routes.router import AirflowRouter
from airflow.api_fastapi.serializers.connections import ConnectionCollectionResponse, ConnectionResponse
from airflow.api_fastapi.views.router import AirflowRouter
from airflow.models import Connection

connections_router = AirflowRouter(tags=["Connection"], prefix="/connections")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@

from airflow.api_fastapi.db.common import get_session
from airflow.api_fastapi.openapi.exceptions import create_openapi_http_exception_doc
from airflow.api_fastapi.routes.router import AirflowRouter
from airflow.api_fastapi.serializers.dag_run import DAGRunResponse
from airflow.api_fastapi.views.router import AirflowRouter
from airflow.models import DagRun

dag_run_router = AirflowRouter(tags=["DagRun"], prefix="/dags/{dag_id}/dagRuns")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@
QueryTagsFilter,
SortParam,
)
from airflow.api_fastapi.routes.router import AirflowRouter
from airflow.api_fastapi.serializers.dags import (
DAGCollectionResponse,
DAGDetailsResponse,
DAGPatchBody,
DAGResponse,
)
from airflow.api_fastapi.views.router import AirflowRouter
from airflow.exceptions import AirflowException, DagNotFound
from airflow.models import DAG, DagModel

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
from __future__ import annotations

from airflow.api.common.airflow_health import get_airflow_health
from airflow.api_fastapi.routes.router import AirflowRouter
from airflow.api_fastapi.serializers.monitor import HealthInfoSchema
from airflow.api_fastapi.views.router import AirflowRouter

monitor_router = AirflowRouter(tags=["Monitor"], prefix="/monitor")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@

from airflow.api_fastapi.db.common import get_session
from airflow.api_fastapi.openapi.exceptions import create_openapi_http_exception_doc
from airflow.api_fastapi.routes.router import AirflowRouter
from airflow.api_fastapi.serializers.variables import VariableBody, VariableResponse
from airflow.api_fastapi.views.router import AirflowRouter
from airflow.models.variable import Variable

variables_router = AirflowRouter(tags=["Variable"], prefix="/variables")
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
# under the License.
from __future__ import annotations

from airflow.api_fastapi.views.router import AirflowRouter
from airflow.api_fastapi.views.ui.assets import assets_router
from airflow.api_fastapi.views.ui.dashboard import dashboard_router
from airflow.api_fastapi.routes.router import AirflowRouter
from airflow.api_fastapi.routes.ui.assets import assets_router
from airflow.api_fastapi.routes.ui.dashboard import dashboard_router

ui_router = AirflowRouter(prefix="/ui")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
from typing_extensions import Annotated

from airflow.api_fastapi.db.common import get_session
from airflow.api_fastapi.views.router import AirflowRouter
from airflow.api_fastapi.routes.router import AirflowRouter
from airflow.models import DagModel
from airflow.models.asset import AssetDagRunQueue, AssetEvent, AssetModel, DagScheduleAssetReference

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
if TYPE_CHECKING:
from sqlalchemy.orm import Session
from airflow.api_fastapi.db.common import get_session
from airflow.api_fastapi.views.router import AirflowRouter
from airflow.api_fastapi.routes.router import AirflowRouter
from airflow.utils import timezone

dashboard_router = AirflowRouter(tags=["Dashboard"])
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 7228168

Please sign in to comment.