diff --git a/api/controllers/console/explore/trial.py b/api/controllers/console/explore/trial.py index c417967c88..4ae12cecf5 100644 --- a/api/controllers/console/explore/trial.py +++ b/api/controllers/console/explore/trial.py @@ -10,7 +10,7 @@ import services from controllers.common.fields import Parameters as ParametersResponse from controllers.common.fields import Site as SiteResponse from controllers.common.schema import get_or_create_model -from controllers.console import api, console_ns +from controllers.console import console_ns from controllers.console.app.error import ( AppUnavailableError, AudioTooLargeError, @@ -469,7 +469,7 @@ class TrialSitApi(Resource): """Resource for trial app sites.""" @trial_feature_enable - @get_app_model_with_trial + @get_app_model_with_trial(None) def get(self, app_model): """Retrieve app site info. @@ -491,7 +491,7 @@ class TrialAppParameterApi(Resource): """Resource for app variables.""" @trial_feature_enable - @get_app_model_with_trial + @get_app_model_with_trial(None) def get(self, app_model): """Retrieve app parameters.""" @@ -520,7 +520,7 @@ class TrialAppParameterApi(Resource): class AppApi(Resource): @trial_feature_enable - @get_app_model_with_trial + @get_app_model_with_trial(None) @marshal_with(app_detail_with_site_model) def get(self, app_model): """Get app detail""" @@ -533,7 +533,7 @@ class AppApi(Resource): class AppWorkflowApi(Resource): @trial_feature_enable - @get_app_model_with_trial + @get_app_model_with_trial(None) @marshal_with(workflow_model) def get(self, app_model): """Get workflow detail""" @@ -552,7 +552,7 @@ class AppWorkflowApi(Resource): class DatasetListApi(Resource): @trial_feature_enable - @get_app_model_with_trial + @get_app_model_with_trial(None) def get(self, app_model): page = request.args.get("page", default=1, type=int) limit = request.args.get("limit", default=20, type=int) @@ -570,27 +570,31 @@ class DatasetListApi(Resource): return response -api.add_resource(TrialChatApi, "/trial-apps//chat-messages", endpoint="trial_app_chat_completion") +console_ns.add_resource(TrialChatApi, "/trial-apps//chat-messages", endpoint="trial_app_chat_completion") -api.add_resource( +console_ns.add_resource( TrialMessageSuggestedQuestionApi, "/trial-apps//messages//suggested-questions", endpoint="trial_app_suggested_question", ) -api.add_resource(TrialChatAudioApi, "/trial-apps//audio-to-text", endpoint="trial_app_audio") -api.add_resource(TrialChatTextApi, "/trial-apps//text-to-audio", endpoint="trial_app_text") +console_ns.add_resource(TrialChatAudioApi, "/trial-apps//audio-to-text", endpoint="trial_app_audio") +console_ns.add_resource(TrialChatTextApi, "/trial-apps//text-to-audio", endpoint="trial_app_text") -api.add_resource(TrialCompletionApi, "/trial-apps//completion-messages", endpoint="trial_app_completion") +console_ns.add_resource( + TrialCompletionApi, "/trial-apps//completion-messages", endpoint="trial_app_completion" +) -api.add_resource(TrialSitApi, "/trial-apps//site") +console_ns.add_resource(TrialSitApi, "/trial-apps//site") -api.add_resource(TrialAppParameterApi, "/trial-apps//parameters", endpoint="trial_app_parameters") +console_ns.add_resource(TrialAppParameterApi, "/trial-apps//parameters", endpoint="trial_app_parameters") -api.add_resource(AppApi, "/trial-apps/", endpoint="trial_app") +console_ns.add_resource(AppApi, "/trial-apps/", endpoint="trial_app") -api.add_resource(TrialAppWorkflowRunApi, "/trial-apps//workflows/run", endpoint="trial_app_workflow_run") -api.add_resource(TrialAppWorkflowTaskStopApi, "/trial-apps//workflows/tasks//stop") +console_ns.add_resource( + TrialAppWorkflowRunApi, "/trial-apps//workflows/run", endpoint="trial_app_workflow_run" +) +console_ns.add_resource(TrialAppWorkflowTaskStopApi, "/trial-apps//workflows/tasks//stop") -api.add_resource(AppWorkflowApi, "/trial-apps//workflows", endpoint="trial_app_workflow") -api.add_resource(DatasetListApi, "/trial-apps//datasets", endpoint="trial_app_datasets") +console_ns.add_resource(AppWorkflowApi, "/trial-apps//workflows", endpoint="trial_app_workflow") +console_ns.add_resource(DatasetListApi, "/trial-apps//datasets", endpoint="trial_app_datasets") diff --git a/api/controllers/console/explore/wraps.py b/api/controllers/console/explore/wraps.py index 38f0a04904..03edb871e6 100644 --- a/api/controllers/console/explore/wraps.py +++ b/api/controllers/console/explore/wraps.py @@ -105,9 +105,9 @@ def trial_app_required(view: Callable[Concatenate[App, P], R] | None = None): return decorator -def trial_feature_enable(view: Callable[..., R]) -> Callable[..., R]: +def trial_feature_enable(view: Callable[P, R]): @wraps(view) - def decorated(*args, **kwargs): + def decorated(*args: P.args, **kwargs: P.kwargs): features = FeatureService.get_system_features() if not features.enable_trial_app: abort(403, "Trial app feature is not enabled.") @@ -116,9 +116,9 @@ def trial_feature_enable(view: Callable[..., R]) -> Callable[..., R]: return decorated -def explore_banner_enabled(view: Callable[..., R]) -> Callable[..., R]: +def explore_banner_enabled(view: Callable[P, R]): @wraps(view) - def decorated(*args, **kwargs): + def decorated(*args: P.args, **kwargs: P.kwargs): features = FeatureService.get_system_features() if not features.enable_explore_banner: abort(403, "Explore banner feature is not enabled.")