Browse Source

suhh-代码格式检查

‘suhuihui’ 2 months ago
parent
commit
6a66b8a095

+ 6 - 12
api/controllers/console/datasets/datasets.py

@@ -777,11 +777,7 @@ class DatasetCountApi(Resource):
         tenant_id = request.args.get("tenant_id", default=None, type=str)
         datasets_count = DatasetService.get_datasets_count(tenant_id, current_user)
         tags_count = DatasetService.get_tags_count(tenant_id)
-        response = {
-            'datasets_count': datasets_count,
-            'tags_count': tags_count,
-            'depts_count': 0
-        }
+        response = {"datasets_count": datasets_count, "tags_count": tags_count, "depts_count": 0}
         return {"data": response}, 200
 
 
@@ -802,7 +798,7 @@ class DatasetUpdateStatsApi(Resource):
                 {"period": "90天内", "count": stats["within_90_days"]},
                 {"period": "30天内", "count": stats["within_30_days"]},
                 {"period": "7天内", "count": stats["within_7_days"]},
-                {"period": "3天内", "count": stats["within_3_days"]}
+                {"period": "3天内", "count": stats["within_3_days"]},
             ]
         }
         return response, 200
@@ -815,9 +811,7 @@ class DatasetTypeStatsApi(Resource):
     def get(self):
         tenant_id = current_user.current_tenant_id
         response = DatasetService.get_dataset_type_stats(tenant_id)
-        return {
-            "data": response
-        }, 200
+        return {"data": response}, 200
 
 
 api.add_resource(DatasetListApi, "/datasets")
@@ -835,6 +829,6 @@ api.add_resource(DatasetRetrievalSettingApi, "/datasets/retrieval-setting")
 api.add_resource(DatasetRetrievalSettingMockApi, "/datasets/retrieval-setting/<string:vector_type>")
 api.add_resource(DatasetPermissionUserListApi, "/datasets/<uuid:dataset_id>/permission-part-users")
 api.add_resource(DatasetAutoDisableLogApi, "/datasets/<uuid:dataset_id>/auto-disable-logs")
-api.add_resource(DatasetCountApi, '/datasets/count')
-api.add_resource(DatasetUpdateStatsApi, '/datasets/update-stats')
-api.add_resource(DatasetTypeStatsApi, '/datasets/type-stats')
+api.add_resource(DatasetCountApi, "/datasets/count")
+api.add_resource(DatasetUpdateStatsApi, "/datasets/update-stats")
+api.add_resource(DatasetTypeStatsApi, "/datasets/type-stats")

+ 21 - 15
api/controllers/console/external_application.py

@@ -11,7 +11,6 @@ from services.external_application_service import ExternalApplicationService
 
 
 class ExternalApplicationListApi(Resource):
-
     @setup_required
     @login_required
     @account_initialization_required
@@ -24,11 +23,17 @@ class ExternalApplicationListApi(Resource):
         method = request.args.get("method", default=None, type=str)
 
         external_applications, total = ExternalApplicationService.get_external_applications(
-            page, limit, search, type, url, method)
+            page, limit, search, type, url, method
+        )
 
         data = marshal(external_applications, external_application_fields)
-        response = {"data": data, "has_more": len(external_applications) == limit, "limit": limit,
-                    "total": total, "page": page}
+        response = {
+            "data": data,
+            "has_more": len(external_applications) == limit,
+            "limit": limit,
+            "total": total,
+            "page": page,
+        }
         return response, 200
 
     @setup_required
@@ -41,12 +46,14 @@ class ExternalApplicationListApi(Resource):
             "name", location="json", nullable=False, required=True, help="Name must be between 1 to 50 characters."
         )
         parser.add_argument(
-            "type", type=str, location="json", choices=ExternalApplication.EXTERNAL_APPLICATION_TYPE_LIST,
-            nullable=False, help="Invalid external_application type."
-        )
-        parser.add_argument(
-            "url", type=str, location="json", nullable=False, help="Invalid external_application url."
+            "type",
+            type=str,
+            location="json",
+            choices=ExternalApplication.EXTERNAL_APPLICATION_TYPE_LIST,
+            nullable=False,
+            help="Invalid external_application type.",
         )
+        parser.add_argument("url", type=str, location="json", nullable=False, help="Invalid external_application url.")
         parser.add_argument(
             "method", type=str, location="json", nullable=False, help="Invalid external_application method."
         )
@@ -57,8 +64,8 @@ class ExternalApplicationListApi(Resource):
         external_application = ExternalApplicationService.save_external_application(args)
         return external_application, 200
 
-class ExternalApplicationApi(Resource):
 
+class ExternalApplicationApi(Resource):
     @setup_required
     @login_required
     @account_initialization_required
@@ -83,9 +90,7 @@ class ExternalApplicationApi(Resource):
         parser.add_argument(
             "type", type=str, location="json", nullable=False, help="Invalid external_application type."
         )
-        parser.add_argument(
-            "url", type=str, location="json", nullable=False, help="Invalid external_application url."
-        )
+        parser.add_argument("url", type=str, location="json", nullable=False, help="Invalid external_application url.")
         parser.add_argument(
             "method", type=str, location="json", nullable=False, help="Invalid external_application method."
         )
@@ -104,5 +109,6 @@ class ExternalApplicationApi(Resource):
         ExternalApplicationService.delete_external_application(external_application_id)
         return 200
 
-api.add_resource(ExternalApplicationListApi, '/external_applications')
-api.add_resource(ExternalApplicationApi, '/external_applications/<external_application_id>')
+
+api.add_resource(ExternalApplicationListApi, "/external_applications")
+api.add_resource(ExternalApplicationApi, "/external_applications/<external_application_id>")

+ 2 - 1
api/controllers/console/tag/tags.py

@@ -51,8 +51,8 @@ class TagListApi(Resource):
 
         return response, 200
 
-class TagPageListApi(Resource):
 
+class TagPageListApi(Resource):
     @setup_required
     @login_required
     @account_initialization_required
@@ -65,6 +65,7 @@ class TagPageListApi(Resource):
         response = {"data": data, "has_more": len(tags) == limit, "limit": limit, "total": total, "page": page}
         return response, 200
 
+
 class TagUpdateDeleteApi(Resource):
     @setup_required
     @login_required

+ 1 - 1
api/fields/external_application_fields.py

@@ -13,4 +13,4 @@ external_application_fields = {
     "updated_by": fields.String,
     "created_at": TimestampField,
     "created_by": fields.String,
-}
+}

+ 1 - 3
api/models/external_application.py

@@ -6,9 +6,7 @@ from .types import StringUUID
 
 class ExternalApplication(db.Model):
     __tablename__ = "external_applications"
-    __table_args__ = (
-        db.PrimaryKeyConstraint("id", name="external_application_pkey"),
-    )
+    __table_args__ = (db.PrimaryKeyConstraint("id", name="external_application_pkey"),)
 
     EXTERNAL_APPLICATION_TYPE_LIST = ["QUESTION_ANSWER", "SEARCH", "RECOMMEND"]
 

+ 0 - 1
api/services/account_service.py

@@ -482,7 +482,6 @@ class AccountService:
 
         return account
 
-
     @staticmethod
     def get_user_through_id(id: str) -> Optional[Account]:
         account: Optional[Account] = db.session.query(Account).filter(Account.id == id).first()

+ 1 - 1
api/services/errors/external_application.py

@@ -2,4 +2,4 @@ from services.errors.base import BaseServiceError
 
 
 class ExternalApplicationNameDuplicateError(BaseServiceError):
-    pass
+    pass

+ 1 - 1
api/services/errors/tag.py

@@ -2,4 +2,4 @@ from services.errors.base import BaseServiceError
 
 
 class TagNameDuplicateError(BaseServiceError):
-    pass
+    pass

+ 4 - 3
api/services/external_application_service.py

@@ -32,8 +32,9 @@ class ExternalApplicationService:
 
     @staticmethod
     def get_external_application(external_application_id: str) -> Optional[ExternalApplication]:
-        external_application = (ExternalApplication.query
-                                .filter(ExternalApplication.id == external_application_id).first())
+        external_application = ExternalApplication.query.filter(
+            ExternalApplication.id == external_application_id
+        ).first()
         return external_application
 
     @staticmethod
@@ -84,4 +85,4 @@ class ExternalApplicationService:
             raise NotFound("ExternalApplication not found")
         db.session.delete(external_application)
         db.session.commit()
-        return external_application
+        return external_application

+ 3 - 2
api/services/tag_service.py

@@ -27,8 +27,9 @@ class TagService:
 
     @staticmethod
     def get_tag_by_tag_name(tag_type: str, tenant_id: str, tag_name: str) -> Optional[Tag]:
-        tag: Optional[Tag] = db.session.query(Tag).filter(Tag.type == tag_type, Tag.tenant_id == tenant_id,
-                                                          Tag.name == tag_name).first()
+        tag: Optional[Tag] = (
+            db.session.query(Tag).filter(Tag.type == tag_type, Tag.tenant_id == tenant_id, Tag.name == tag_name).first()
+        )
         return tag
 
     @staticmethod