Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename views to routes for FastAPI apps #43057

Merged
merged 1 commit into from
Oct 15, 2024
Merged

Rename views to routes for FastAPI apps #43057

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions airflow/api_fastapi/app.py
View file
Open in desktop
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
0 airflow/api_fastapi/views/__init__.py → airflow/api_fastapi/routes/__init__.py
View file
Open in desktop
File renamed without changes.
12 changes: 6 additions & 6 deletions airflow/api_fastapi/views/public/__init__.py → ...low/api_fastapi/routes/public/__init__.py
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion ...w/api_fastapi/views/public/connections.py → .../api_fastapi/routes/public/connections.py
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion airflow/api_fastapi/views/public/dag_run.py → airflow/api_fastapi/routes/public/dag_run.py
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion airflow/api_fastapi/views/public/dags.py → airflow/api_fastapi/routes/public/dags.py
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion airflow/api_fastapi/views/public/monitor.py → airflow/api_fastapi/routes/public/monitor.py
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion ...low/api_fastapi/views/public/variables.py → ...ow/api_fastapi/routes/public/variables.py
View file
Open in desktop
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
0 airflow/api_fastapi/views/router.py → airflow/api_fastapi/routes/router.py
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions airflow/api_fastapi/views/ui/__init__.py → airflow/api_fastapi/routes/ui/__init__.py
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion airflow/api_fastapi/views/ui/assets.py → airflow/api_fastapi/routes/ui/assets.py
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion airflow/api_fastapi/views/ui/dashboard.py → airflow/api_fastapi/routes/ui/dashboard.py
View file
Open in desktop
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
0 tests/api_fastapi/views/__init__.py → tests/api_fastapi/routes/__init__.py
View file
Open in desktop
File renamed without changes.
0 tests/api_fastapi/views/public/__init__.py → tests/api_fastapi/routes/public/__init__.py
View file
Open in desktop
File renamed without changes.
0 ..._fastapi/views/public/test_connections.py → ...fastapi/routes/public/test_connections.py
View file
Open in desktop
File renamed without changes.
0 .../api_fastapi/views/public/test_dag_run.py → ...api_fastapi/routes/public/test_dag_run.py
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions tests/api_fastapi/views/public/test_dags.py → tests/api_fastapi/routes/public/test_dags.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ def test_dag_details(
"description": None,
"doc_md": "details",
"end_date": None,
"fileloc": "/opt/airflow/tests/api_fastapi/views/public/test_dags.py",
"fileloc": "/opt/airflow/tests/api_fastapi/routes/public/test_dags.py",
"file_token": file_token,
"has_import_errors": False,
"has_task_concurrency_limits": True,
Expand Down Expand Up @@ -358,7 +358,7 @@ def test_get_dag(self, test_client, query_params, dag_id, expected_status_code,
"dag_id": dag_id,
"dag_display_name": dag_display_name,
"description": None,
"fileloc": "/opt/airflow/tests/api_fastapi/views/public/test_dags.py",
"fileloc": "/opt/airflow/tests/api_fastapi/routes/public/test_dags.py",
"file_token": file_token,
"is_paused": False,
"is_active": True,
Expand Down
0 .../api_fastapi/views/public/test_monitor.py → ...api_fastapi/routes/public/test_monitor.py
View file
Open in desktop
File renamed without changes.
0 ...pi_fastapi/views/public/test_variables.py → ...i_fastapi/routes/public/test_variables.py
View file
Open in desktop
File renamed without changes.
0 tests/api_fastapi/views/ui/__init__.py → tests/api_fastapi/routes/ui/__init__.py
View file
Open in desktop
File renamed without changes.
0 tests/api_fastapi/views/ui/test_assets.py → tests/api_fastapi/routes/ui/test_assets.py
View file
Open in desktop
File renamed without changes.
0 tests/api_fastapi/views/ui/test_dashboard.py → ...s/api_fastapi/routes/ui/test_dashboard.py
View file
Open in desktop
File renamed without changes.