Skip to content

Commit 8d89715

Browse files
Copilotasukaminato0721autofix-ci[bot]laipz8200
authored
[Chore/Refactor] Apply @console_ns.route decorators to RAG pipeline controllers (#26348)
Co-authored-by: copilot-swe-agent[bot] <[email protected]> Co-authored-by: asukaminato0721 <[email protected]> Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> Co-authored-by: -LAN- <[email protected]>
1 parent 2e91480 commit 8d89715

File tree

4 files changed

+42
-161
lines changed

4 files changed

+42
-161
lines changed

api/controllers/console/datasets/rag_pipeline/rag_pipeline_datasets.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from werkzeug.exceptions import Forbidden
55

66
import services
7-
from controllers.console import api
7+
from controllers.console import console_ns
88
from controllers.console.datasets.error import DatasetNameDuplicateError
99
from controllers.console.wraps import (
1010
account_initialization_required,
@@ -32,6 +32,7 @@ def _validate_description_length(description):
3232
return description
3333

3434

35+
@console_ns.route("/rag/pipeline/dataset")
3536
class CreateRagPipelineDatasetApi(Resource):
3637
@setup_required
3738
@login_required
@@ -84,6 +85,7 @@ def post(self):
8485
return import_info, 201
8586

8687

88+
@console_ns.route("/rag/pipeline/empty-dataset")
8789
class CreateEmptyRagPipelineDatasetApi(Resource):
8890
@setup_required
8991
@login_required
@@ -108,7 +110,3 @@ def post(self):
108110
),
109111
)
110112
return marshal(dataset, dataset_detail_fields), 201
111-
112-
113-
api.add_resource(CreateRagPipelineDatasetApi, "/rag/pipeline/dataset")
114-
api.add_resource(CreateEmptyRagPipelineDatasetApi, "/rag/pipeline/empty-dataset")

api/controllers/console/datasets/rag_pipeline/rag_pipeline_draft_variable.py

Lines changed: 7 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from sqlalchemy.orm import Session
77
from werkzeug.exceptions import Forbidden
88

9-
from controllers.console import api
9+
from controllers.console import console_ns
1010
from controllers.console.app.error import (
1111
DraftWorkflowNotExist,
1212
)
@@ -111,6 +111,7 @@ def wrapper(*args, **kwargs):
111111
return wrapper
112112

113113

114+
@console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflows/draft/variables")
114115
class RagPipelineVariableCollectionApi(Resource):
115116
@_api_prerequisite
116117
@marshal_with(_WORKFLOW_DRAFT_VARIABLE_LIST_WITHOUT_VALUE_FIELDS)
@@ -168,6 +169,7 @@ def validate_node_id(node_id: str) -> NoReturn | None:
168169
return None
169170

170171

172+
@console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflows/draft/nodes/<string:node_id>/variables")
171173
class RagPipelineNodeVariableCollectionApi(Resource):
172174
@_api_prerequisite
173175
@marshal_with(_WORKFLOW_DRAFT_VARIABLE_LIST_FIELDS)
@@ -190,6 +192,7 @@ def delete(self, pipeline: Pipeline, node_id: str):
190192
return Response("", 204)
191193

192194

195+
@console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflows/draft/variables/<uuid:variable_id>")
193196
class RagPipelineVariableApi(Resource):
194197
_PATCH_NAME_FIELD = "name"
195198
_PATCH_VALUE_FIELD = "value"
@@ -284,6 +287,7 @@ def delete(self, pipeline: Pipeline, variable_id: str):
284287
return Response("", 204)
285288

286289

290+
@console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflows/draft/variables/<uuid:variable_id>/reset")
287291
class RagPipelineVariableResetApi(Resource):
288292
@_api_prerequisite
289293
def put(self, pipeline: Pipeline, variable_id: str):
@@ -325,13 +329,15 @@ def _get_variable_list(pipeline: Pipeline, node_id) -> WorkflowDraftVariableList
325329
return draft_vars
326330

327331

332+
@console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflows/draft/system-variables")
328333
class RagPipelineSystemVariableCollectionApi(Resource):
329334
@_api_prerequisite
330335
@marshal_with(_WORKFLOW_DRAFT_VARIABLE_LIST_FIELDS)
331336
def get(self, pipeline: Pipeline):
332337
return _get_variable_list(pipeline, SYSTEM_VARIABLE_NODE_ID)
333338

334339

340+
@console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflows/draft/environment-variables")
335341
class RagPipelineEnvironmentVariableCollectionApi(Resource):
336342
@_api_prerequisite
337343
def get(self, pipeline: Pipeline):
@@ -364,26 +370,3 @@ def get(self, pipeline: Pipeline):
364370
)
365371

366372
return {"items": env_vars_list}
367-
368-
369-
api.add_resource(
370-
RagPipelineVariableCollectionApi,
371-
"/rag/pipelines/<uuid:pipeline_id>/workflows/draft/variables",
372-
)
373-
api.add_resource(
374-
RagPipelineNodeVariableCollectionApi,
375-
"/rag/pipelines/<uuid:pipeline_id>/workflows/draft/nodes/<string:node_id>/variables",
376-
)
377-
api.add_resource(
378-
RagPipelineVariableApi, "/rag/pipelines/<uuid:pipeline_id>/workflows/draft/variables/<uuid:variable_id>"
379-
)
380-
api.add_resource(
381-
RagPipelineVariableResetApi, "/rag/pipelines/<uuid:pipeline_id>/workflows/draft/variables/<uuid:variable_id>/reset"
382-
)
383-
api.add_resource(
384-
RagPipelineSystemVariableCollectionApi, "/rag/pipelines/<uuid:pipeline_id>/workflows/draft/system-variables"
385-
)
386-
api.add_resource(
387-
RagPipelineEnvironmentVariableCollectionApi,
388-
"/rag/pipelines/<uuid:pipeline_id>/workflows/draft/environment-variables",
389-
)

api/controllers/console/datasets/rag_pipeline/rag_pipeline_import.py

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from sqlalchemy.orm import Session
66
from werkzeug.exceptions import Forbidden
77

8-
from controllers.console import api
8+
from controllers.console import console_ns
99
from controllers.console.datasets.wraps import get_rag_pipeline
1010
from controllers.console.wraps import (
1111
account_initialization_required,
@@ -20,6 +20,7 @@
2020
from services.rag_pipeline.rag_pipeline_dsl_service import RagPipelineDslService
2121

2222

23+
@console_ns.route("/rag/pipelines/imports")
2324
class RagPipelineImportApi(Resource):
2425
@setup_required
2526
@login_required
@@ -66,6 +67,7 @@ def post(self):
6667
return result.model_dump(mode="json"), 200
6768

6869

70+
@console_ns.route("/rag/pipelines/imports/<string:import_id>/confirm")
6971
class RagPipelineImportConfirmApi(Resource):
7072
@setup_required
7173
@login_required
@@ -90,6 +92,7 @@ def post(self, import_id):
9092
return result.model_dump(mode="json"), 200
9193

9294

95+
@console_ns.route("/rag/pipelines/imports/<string:pipeline_id>/check-dependencies")
9396
class RagPipelineImportCheckDependenciesApi(Resource):
9497
@setup_required
9598
@login_required
@@ -107,6 +110,7 @@ def get(self, pipeline: Pipeline):
107110
return result.model_dump(mode="json"), 200
108111

109112

113+
@console_ns.route("/rag/pipelines/<string:pipeline_id>/exports")
110114
class RagPipelineExportApi(Resource):
111115
@setup_required
112116
@login_required
@@ -128,22 +132,3 @@ def get(self, pipeline: Pipeline):
128132
)
129133

130134
return {"data": result}, 200
131-
132-
133-
# Import Rag Pipeline
134-
api.add_resource(
135-
RagPipelineImportApi,
136-
"/rag/pipelines/imports",
137-
)
138-
api.add_resource(
139-
RagPipelineImportConfirmApi,
140-
"/rag/pipelines/imports/<string:import_id>/confirm",
141-
)
142-
api.add_resource(
143-
RagPipelineImportCheckDependenciesApi,
144-
"/rag/pipelines/imports/<string:pipeline_id>/check-dependencies",
145-
)
146-
api.add_resource(
147-
RagPipelineExportApi,
148-
"/rag/pipelines/<string:pipeline_id>/exports",
149-
)

0 commit comments

Comments
 (0)