Skip to content

Commit b7ba9fd

Browse files
committed
fix: change HitTest action methods from GET to PUT in API views
1 parent bca56af commit b7ba9fd

File tree

4 files changed

+31
-33
lines changed

4 files changed

+31
-33
lines changed

apps/application/views/application_views.py

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,6 @@
77
@desc:
88
"""
99

10-
from django.core import cache
11-
from django.http import HttpResponse
12-
from django.utils.translation import gettext_lazy as _, gettext
13-
from drf_yasg.utils import swagger_auto_schema
14-
from langchain_core.prompts import PromptTemplate
15-
from rest_framework.decorators import action
16-
from rest_framework.parsers import MultiPartParser
17-
from rest_framework.request import Request
18-
from rest_framework.views import APIView
19-
2010
from application.serializers.application_serializers import ApplicationSerializer
2111
from application.serializers.application_statistics_serializers import ApplicationStatisticsSerializer
2212
from application.swagger_api.application_api import ApplicationApi
@@ -31,6 +21,14 @@
3121
from common.swagger_api.common_api import CommonApi
3222
from common.util.common import query_params_to_single_dict
3323
from dataset.serializers.dataset_serializers import DataSetSerializers
24+
from django.core import cache
25+
from django.http import HttpResponse
26+
from django.utils.translation import gettext_lazy as _
27+
from drf_yasg.utils import swagger_auto_schema
28+
from rest_framework.decorators import action
29+
from rest_framework.parsers import MultiPartParser
30+
from rest_framework.request import Request
31+
from rest_framework.views import APIView
3432

3533
chat_cache = cache.caches['chat_cache']
3634

@@ -494,7 +492,7 @@ def get(self, request: Request):
494492
class HitTest(APIView):
495493
authentication_classes = [TokenAuth]
496494

497-
@action(methods="GET", detail=False)
495+
@action(methods="PUT", detail=False)
498496
@swagger_auto_schema(operation_summary=_("Hit Test List"), operation_id=_("Hit Test List"),
499497
manual_parameters=CommonApi.HitTestApi.get_request_params_api(),
500498
responses=result.get_api_array_response(CommonApi.HitTestApi.get_response_body_api()),
@@ -505,15 +503,15 @@ class HitTest(APIView):
505503
[lambda r, keywords: Permission(group=Group.APPLICATION, operate=Operate.USE,
506504
dynamic_tag=keywords.get('application_id'))],
507505
compare=CompareConstants.AND))
508-
def get(self, request: Request, application_id: str):
509-
return result.success(
510-
ApplicationSerializer.HitTest(data={'id': application_id, 'user_id': request.user.id,
511-
"query_text": request.query_params.get("query_text"),
512-
"top_number": request.query_params.get("top_number"),
513-
'similarity': request.query_params.get('similarity'),
514-
'search_mode': request.query_params.get(
515-
'search_mode')}).hit_test(
516-
))
506+
def put(self, request: Request, application_id: str):
507+
return result.success(ApplicationSerializer.HitTest(data={
508+
'id': application_id,
509+
'user_id': request.user.id,
510+
"query_text": request.data.get("query_text"),
511+
"top_number": request.data.get("top_number"),
512+
'similarity': request.data.get('similarity'),
513+
'search_mode': request.data.get('search_mode')}
514+
).hit_test())
517515

518516
class Publish(APIView):
519517
authentication_classes = [TokenAuth]

apps/dataset/views/dataset.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
@desc:
88
"""
99

10+
from django.utils.translation import gettext_lazy as _
1011
from drf_yasg.utils import swagger_auto_schema
1112
from rest_framework.decorators import action
1213
from rest_framework.parsers import MultiPartParser
1314
from rest_framework.views import APIView
1415
from rest_framework.views import Request
1516

16-
import dataset.models
1717
from common.auth import TokenAuth, has_permissions
1818
from common.constants.permission_constants import PermissionConstants, CompareConstants, Permission, Group, Operate, \
1919
ViewPermission, RoleConstants
@@ -25,7 +25,6 @@
2525
from dataset.serializers.dataset_serializers import DataSetSerializers
2626
from dataset.views.common import get_dataset_operation_object
2727
from setting.serializers.provider_serializers import ModelSerializer
28-
from django.utils.translation import gettext_lazy as _
2928

3029

3130
class Dataset(APIView):
@@ -141,21 +140,22 @@ def post(self, request: Request):
141140
class HitTest(APIView):
142141
authentication_classes = [TokenAuth]
143142

144-
@action(methods="GET", detail=False)
143+
@action(methods="PUT", detail=False)
145144
@swagger_auto_schema(operation_summary=_('Hit test list'), operation_id=_('Hit test list'),
146145
manual_parameters=CommonApi.HitTestApi.get_request_params_api(),
147146
responses=result.get_api_array_response(CommonApi.HitTestApi.get_response_body_api()),
148147
tags=[_('Knowledge Base')])
149148
@has_permissions(lambda r, keywords: Permission(group=Group.DATASET, operate=Operate.USE,
150149
dynamic_tag=keywords.get('dataset_id')))
151-
def get(self, request: Request, dataset_id: str):
152-
return result.success(
153-
DataSetSerializers.HitTest(data={'id': dataset_id, 'user_id': request.user.id,
154-
"query_text": request.query_params.get("query_text"),
155-
"top_number": request.query_params.get("top_number"),
156-
'similarity': request.query_params.get('similarity'),
157-
'search_mode': request.query_params.get('search_mode')}).hit_test(
158-
))
150+
def put(self, request: Request, dataset_id: str):
151+
return result.success(DataSetSerializers.HitTest(data={
152+
'id': dataset_id,
153+
'user_id': request.user.id,
154+
"query_text": request.data.get("query_text"),
155+
"top_number": request.data.get("top_number"),
156+
'similarity': request.data.get('similarity'),
157+
'search_mode': request.data.get('search_mode')}
158+
).hit_test())
159159

160160
class Embedding(APIView):
161161
authentication_classes = [TokenAuth]

ui/src/api/application.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ const getApplicationHitTest: (
227227
data: any,
228228
loading?: Ref<boolean>
229229
) => Promise<Result<Array<any>>> = (application_id, data, loading) => {
230-
return get(`${prefix}/${application_id}/hit_test`, data, loading)
230+
return put(`${prefix}/${application_id}/hit_test`, data, undefined, loading)
231231
}
232232

233233
/**

ui/src/api/dataset.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ const getDatasetHitTest: (
186186
data: any,
187187
loading?: Ref<boolean>
188188
) => Promise<Result<Array<any>>> = (dataset_id, data, loading) => {
189-
return get(`${prefix}/${dataset_id}/hit_test`, data, loading)
189+
return put(`${prefix}/${dataset_id}/hit_test`, data, undefined, loading)
190190
}
191191

192192
/**

0 commit comments

Comments
 (0)