diff --git a/api/core/indexing_runner.py b/api/core/indexing_runner.py index 305a9190d5..5bb1773d4c 100644 --- a/api/core/indexing_runner.py +++ b/api/core/indexing_runner.py @@ -672,7 +672,7 @@ class IndexingRunner: if extra_update_params: update_params.update(extra_update_params) - + # type: ignore db.session.query(DatasetDocument).filter_by(id=document_id).update(update_params) db.session.commit() diff --git a/api/core/rag/extractor/notion_extractor.py b/api/core/rag/extractor/notion_extractor.py index eca955ddd1..83734602f2 100644 --- a/api/core/rag/extractor/notion_extractor.py +++ b/api/core/rag/extractor/notion_extractor.py @@ -331,9 +331,10 @@ class NotionExtractor(BaseExtractor): last_edited_time = self.get_notion_last_edited_time() data_source_info = document_model.data_source_info_dict data_source_info["last_edited_time"] = last_edited_time - update_params = {DocumentModel.data_source_info: json.dumps(data_source_info)} - - db.session.query(DocumentModel).filter_by(id=document_model.id).update(update_params) + # type: ignore + db.session.query(DocumentModel).filter_by(id=document_model.id).update( + {DocumentModel.data_source_info: json.dumps(data_source_info)} + ) db.session.commit() def get_notion_last_edited_time(self) -> str: diff --git a/api/models/account.py b/api/models/account.py index 29acfdafc4..a42a962350 100644 --- a/api/models/account.py +++ b/api/models/account.py @@ -144,7 +144,7 @@ class Account(UserMixin, Base): return tenant, join = tenant_account_join - self.role = join.role + self.role = TenantAccountRole(join.role) self._current_tenant = tenant @property diff --git a/api/schedule/clean_unused_datasets_task.py b/api/schedule/clean_unused_datasets_task.py index c0cd42a226..1beb16ec7d 100644 --- a/api/schedule/clean_unused_datasets_task.py +++ b/api/schedule/clean_unused_datasets_task.py @@ -99,9 +99,8 @@ def clean_unused_datasets_task(): index_processor.clean(dataset, None) # update document - update_params = {Document.enabled: False} - - db.session.query(Document).filter_by(dataset_id=dataset.id).update(update_params) + # type: ignore + db.session.query(Document).filter_by(dataset_id=dataset.id).update({Document.enabled: False}) db.session.commit() click.echo(click.style("Cleaned unused dataset {} from db success!".format(dataset.id), fg="green")) except Exception as e: @@ -176,9 +175,8 @@ def clean_unused_datasets_task(): index_processor.clean(dataset, None) # update document - update_params = {Document.enabled: False} - - db.session.query(Document).filter_by(dataset_id=dataset.id).update(update_params) + # type: ignore + db.session.query(Document).filter_by(dataset_id=dataset.id).update({Document.enabled: False}) db.session.commit() click.echo( click.style("Cleaned unused dataset {} from db success!".format(dataset.id), fg="green") diff --git a/api/services/account_service.py b/api/services/account_service.py index 4d5366f47f..74d6092107 100644 --- a/api/services/account_service.py +++ b/api/services/account_service.py @@ -997,7 +997,7 @@ class TenantService: .filter(TenantAccountJoin.tenant_id == tenant.id, TenantAccountJoin.account_id == account.id) .first() ) - return join.role if join else None + return TenantAccountRole(join.role) if join else None @staticmethod def get_tenant_count() -> int: diff --git a/api/services/billing_service.py b/api/services/billing_service.py index d44483ad89..9fffde0739 100644 --- a/api/services/billing_service.py +++ b/api/services/billing_service.py @@ -82,7 +82,7 @@ class BillingService: if not join: raise ValueError("Tenant account join not found") - if not TenantAccountRole.is_privileged_role(join.role): + if not TenantAccountRole.is_privileged_role(TenantAccountRole(join.role)): raise ValueError("Only team owner or team admin can perform this action") @classmethod diff --git a/api/services/dataset_service.py b/api/services/dataset_service.py index e42b5ace75..9176ea71a2 100644 --- a/api/services/dataset_service.py +++ b/api/services/dataset_service.py @@ -214,7 +214,9 @@ class DatasetService: dataset.created_by = account.id dataset.updated_by = account.id dataset.tenant_id = tenant_id + # type: ignore dataset.embedding_model_provider = embedding_model.provider if embedding_model else None + # type: ignore dataset.embedding_model = embedding_model.model if embedding_model else None dataset.retrieval_model = retrieval_model.model_dump() if retrieval_model else None dataset.permission = permission or DatasetPermissionEnum.ONLY_ME @@ -1539,6 +1541,7 @@ class DocumentService: db.session.add(document) db.session.commit() # update document segment + # type: ignore update_params = {DocumentSegment.status: "re_segment"} db.session.query(DocumentSegment).filter_by(document_id=document.id).update(update_params) db.session.commit()