diff --git a/api/controllers/service_api/dataset/metadata.py b/api/controllers/service_api/dataset/metadata.py index 9defe6af0..444a791c0 100644 --- a/api/controllers/service_api/dataset/metadata.py +++ b/api/controllers/service_api/dataset/metadata.py @@ -1,6 +1,6 @@ from typing import Literal -from flask_login import current_user # type: ignore +from flask_login import current_user from flask_restx import marshal, reqparse from werkzeug.exceptions import NotFound diff --git a/api/controllers/service_api/wraps.py b/api/controllers/service_api/wraps.py index 8aac3de4c..d2473c15a 100644 --- a/api/controllers/service_api/wraps.py +++ b/api/controllers/service_api/wraps.py @@ -6,7 +6,7 @@ from functools import wraps from typing import Optional from flask import current_app, request -from flask_login import user_logged_in # type: ignore +from flask_login import user_logged_in from flask_restx import Resource from pydantic import BaseModel from sqlalchemy import select, update diff --git a/api/controllers/web/login.py b/api/controllers/web/login.py index d2b7c72ba..a489101cc 100644 --- a/api/controllers/web/login.py +++ b/api/controllers/web/login.py @@ -1,5 +1,5 @@ from flask_restx import Resource, reqparse -from jwt import InvalidTokenError # type: ignore +from jwt import InvalidTokenError import services from controllers.console.auth.error import ( diff --git a/api/core/model_runtime/model_providers/__base/tokenizers/gpt2_tokenizer.py b/api/core/model_runtime/model_providers/__base/tokenizers/gpt2_tokenizer.py index 68d30112d..cb740c1fd 100644 --- a/api/core/model_runtime/model_providers/__base/tokenizers/gpt2_tokenizer.py +++ b/api/core/model_runtime/model_providers/__base/tokenizers/gpt2_tokenizer.py @@ -43,7 +43,7 @@ class GPT2Tokenizer: except Exception: from os.path import abspath, dirname, join - from transformers import GPT2Tokenizer as TransformerGPT2Tokenizer # type: ignore + from transformers import GPT2Tokenizer as TransformerGPT2Tokenizer base_path = abspath(__file__) gpt2_tokenizer_path = join(dirname(base_path), "gpt2") diff --git a/api/core/plugin/backwards_invocation/model.py b/api/core/plugin/backwards_invocation/model.py index d07ab3d0c..6cdc047a6 100644 --- a/api/core/plugin/backwards_invocation/model.py +++ b/api/core/plugin/backwards_invocation/model.py @@ -375,16 +375,16 @@ Here is the extra instruction you need to follow: # merge lines into messages with max tokens messages: list[str] = [] - for i in new_lines: # type: ignore + for line in new_lines: if len(messages) == 0: - messages.append(i) # type: ignore + messages.append(line) else: - if len(messages[-1]) + len(i) < max_tokens * 0.5: # type: ignore - messages[-1] += i # type: ignore - if get_prompt_tokens(messages[-1] + i) > max_tokens * 0.7: # type: ignore - messages.append(i) # type: ignore + if len(messages[-1]) + len(line) < max_tokens * 0.5: + messages[-1] += line + if get_prompt_tokens(messages[-1] + line) > max_tokens * 0.7: + messages.append(line) else: - messages[-1] += i # type: ignore + messages[-1] += line summaries = [] for i in range(len(messages)): diff --git a/api/core/rag/datasource/vdb/analyticdb/analyticdb_vector_sql.py b/api/core/rag/datasource/vdb/analyticdb/analyticdb_vector_sql.py index bb61b71bb..df2173d1c 100644 --- a/api/core/rag/datasource/vdb/analyticdb/analyticdb_vector_sql.py +++ b/api/core/rag/datasource/vdb/analyticdb/analyticdb_vector_sql.py @@ -3,8 +3,8 @@ import uuid from contextlib import contextmanager from typing import Any -import psycopg2.extras # type: ignore -import psycopg2.pool # type: ignore +import psycopg2.extras +import psycopg2.pool from pydantic import BaseModel, model_validator from core.rag.models.document import Document diff --git a/api/core/rag/datasource/vdb/opengauss/opengauss.py b/api/core/rag/datasource/vdb/opengauss/opengauss.py index 2548881b9..3ba9569d3 100644 --- a/api/core/rag/datasource/vdb/opengauss/opengauss.py +++ b/api/core/rag/datasource/vdb/opengauss/opengauss.py @@ -3,8 +3,8 @@ import uuid from contextlib import contextmanager from typing import Any -import psycopg2.extras # type: ignore -import psycopg2.pool # type: ignore +import psycopg2.extras +import psycopg2.pool from pydantic import BaseModel, model_validator from configs import dify_config diff --git a/api/core/rag/datasource/vdb/opensearch/opensearch_vector.py b/api/core/rag/datasource/vdb/opensearch/opensearch_vector.py index ed2dcb40a..3c9302f4d 100644 --- a/api/core/rag/datasource/vdb/opensearch/opensearch_vector.py +++ b/api/core/rag/datasource/vdb/opensearch/opensearch_vector.py @@ -48,7 +48,7 @@ class OpenSearchConfig(BaseModel): return values def create_aws_managed_iam_auth(self) -> Urllib3AWSV4SignerAuth: - import boto3 # type: ignore + import boto3 return Urllib3AWSV4SignerAuth( credentials=boto3.Session().get_credentials(), diff --git a/api/core/rag/datasource/vdb/pgvector/pgvector.py b/api/core/rag/datasource/vdb/pgvector/pgvector.py index a2985b9d0..108167d74 100644 --- a/api/core/rag/datasource/vdb/pgvector/pgvector.py +++ b/api/core/rag/datasource/vdb/pgvector/pgvector.py @@ -6,8 +6,8 @@ from contextlib import contextmanager from typing import Any import psycopg2.errors -import psycopg2.extras # type: ignore -import psycopg2.pool # type: ignore +import psycopg2.extras +import psycopg2.pool from pydantic import BaseModel, model_validator from configs import dify_config diff --git a/api/core/rag/datasource/vdb/pyvastbase/vastbase_vector.py b/api/core/rag/datasource/vdb/pyvastbase/vastbase_vector.py index 156730ff3..580da7d62 100644 --- a/api/core/rag/datasource/vdb/pyvastbase/vastbase_vector.py +++ b/api/core/rag/datasource/vdb/pyvastbase/vastbase_vector.py @@ -3,8 +3,8 @@ import uuid from contextlib import contextmanager from typing import Any -import psycopg2.extras # type: ignore -import psycopg2.pool # type: ignore +import psycopg2.extras +import psycopg2.pool from pydantic import BaseModel, model_validator from configs import dify_config diff --git a/api/core/rag/extractor/excel_extractor.py b/api/core/rag/extractor/excel_extractor.py index 7cc554c74..baa3fdf2e 100644 --- a/api/core/rag/extractor/excel_extractor.py +++ b/api/core/rag/extractor/excel_extractor.py @@ -4,7 +4,7 @@ import os from typing import Optional, cast import pandas as pd -from openpyxl import load_workbook # type: ignore +from openpyxl import load_workbook from core.rag.extractor.extractor_base import BaseExtractor from core.rag.models.document import Document diff --git a/api/core/rag/extractor/html_extractor.py b/api/core/rag/extractor/html_extractor.py index 350b52234..9ff1dfa1b 100644 --- a/api/core/rag/extractor/html_extractor.py +++ b/api/core/rag/extractor/html_extractor.py @@ -1,6 +1,6 @@ """Abstract interface for document loader implementations.""" -from bs4 import BeautifulSoup # type: ignore +from bs4 import BeautifulSoup from core.rag.extractor.extractor_base import BaseExtractor from core.rag.models.document import Document diff --git a/api/core/rag/extractor/unstructured/unstructured_eml_extractor.py b/api/core/rag/extractor/unstructured/unstructured_eml_extractor.py index 856a9bce1..2427de829 100644 --- a/api/core/rag/extractor/unstructured/unstructured_eml_extractor.py +++ b/api/core/rag/extractor/unstructured/unstructured_eml_extractor.py @@ -3,7 +3,7 @@ import contextlib import logging from typing import Optional -from bs4 import BeautifulSoup # type: ignore +from bs4 import BeautifulSoup from core.rag.extractor.extractor_base import BaseExtractor from core.rag.models.document import Document diff --git a/api/core/rag/splitter/text_splitter.py b/api/core/rag/splitter/text_splitter.py index 489aa0543..1b60fb778 100644 --- a/api/core/rag/splitter/text_splitter.py +++ b/api/core/rag/splitter/text_splitter.py @@ -144,7 +144,7 @@ class TextSplitter(BaseDocumentTransformer, ABC): def from_huggingface_tokenizer(cls, tokenizer: Any, **kwargs: Any) -> TextSplitter: """Text splitter that uses HuggingFace tokenizer to count length.""" try: - from transformers import PreTrainedTokenizerBase # type: ignore + from transformers import PreTrainedTokenizerBase if not isinstance(tokenizer, PreTrainedTokenizerBase): raise ValueError("Tokenizer received was not an instance of PreTrainedTokenizerBase") diff --git a/api/core/tools/utils/parser.py b/api/core/tools/utils/parser.py index 3857a2a16..78f1f339f 100644 --- a/api/core/tools/utils/parser.py +++ b/api/core/tools/utils/parser.py @@ -6,7 +6,7 @@ from typing import Optional from flask import request from requests import get -from yaml import YAMLError, safe_load # type: ignore +from yaml import YAMLError, safe_load from core.tools.entities.common_entities import I18nObject from core.tools.entities.tool_bundle import ApiToolBundle diff --git a/api/extensions/ext_blueprints.py b/api/extensions/ext_blueprints.py index 1024fd9ce..9c08a08c4 100644 --- a/api/extensions/ext_blueprints.py +++ b/api/extensions/ext_blueprints.py @@ -5,7 +5,7 @@ from dify_app import DifyApp def init_app(app: DifyApp): # register blueprint routers - from flask_cors import CORS # type: ignore + from flask_cors import CORS from controllers.console import bp as console_app_bp from controllers.files import bp as files_bp diff --git a/api/extensions/ext_otel.py b/api/extensions/ext_otel.py index 7313d8e3c..12bb18553 100644 --- a/api/extensions/ext_otel.py +++ b/api/extensions/ext_otel.py @@ -9,7 +9,7 @@ from typing import Union import flask from celery.signals import worker_init -from flask_login import user_loaded_from_request, user_logged_in # type: ignore +from flask_login import user_loaded_from_request, user_logged_in from configs import dify_config from dify_app import DifyApp diff --git a/api/extensions/storage/aws_s3_storage.py b/api/extensions/storage/aws_s3_storage.py index 7b6b2eedd..e755ab089 100644 --- a/api/extensions/storage/aws_s3_storage.py +++ b/api/extensions/storage/aws_s3_storage.py @@ -1,9 +1,9 @@ import logging from collections.abc import Generator -import boto3 # type: ignore -from botocore.client import Config # type: ignore -from botocore.exceptions import ClientError # type: ignore +import boto3 +from botocore.client import Config +from botocore.exceptions import ClientError from configs import dify_config from extensions.storage.base_storage import BaseStorage diff --git a/api/models/account.py b/api/models/account.py index 7b7d39341..0c5bb6ff0 100644 --- a/api/models/account.py +++ b/api/models/account.py @@ -4,7 +4,7 @@ from datetime import datetime from typing import Optional, cast import sqlalchemy as sa -from flask_login import UserMixin # type: ignore +from flask_login import UserMixin from sqlalchemy import DateTime, String, func, select from sqlalchemy.orm import Mapped, mapped_column, reconstructor diff --git a/api/tasks/delete_conversation_task.py b/api/tasks/delete_conversation_task.py index 2ba9104a0..dc2751a65 100644 --- a/api/tasks/delete_conversation_task.py +++ b/api/tasks/delete_conversation_task.py @@ -2,7 +2,7 @@ import logging import time import click -from celery import shared_task # type: ignore +from celery import shared_task from extensions.ext_database import db from models import ConversationVariable diff --git a/api/tests/integration_tests/vdb/opengauss/test_opengauss.py b/api/tests/integration_tests/vdb/opengauss/test_opengauss.py index 2a1129493..338077bbf 100644 --- a/api/tests/integration_tests/vdb/opengauss/test_opengauss.py +++ b/api/tests/integration_tests/vdb/opengauss/test_opengauss.py @@ -1,6 +1,6 @@ import time -import psycopg2 # type: ignore +import psycopg2 from core.rag.datasource.vdb.opengauss.opengauss import OpenGauss, OpenGaussConfig from tests.integration_tests.vdb.test_vector_store import ( diff --git a/api/tests/unit_tests/oss/__mock/aliyun_oss.py b/api/tests/unit_tests/oss/__mock/aliyun_oss.py index 4f6d8a2f5..27e1c0ad8 100644 --- a/api/tests/unit_tests/oss/__mock/aliyun_oss.py +++ b/api/tests/unit_tests/oss/__mock/aliyun_oss.py @@ -4,8 +4,8 @@ from unittest.mock import MagicMock import pytest from _pytest.monkeypatch import MonkeyPatch -from oss2 import Bucket # type: ignore -from oss2.models import GetObjectResult, PutObjectResult # type: ignore +from oss2 import Bucket +from oss2.models import GetObjectResult, PutObjectResult from tests.unit_tests.oss.__mock.base import ( get_example_bucket, diff --git a/api/tests/unit_tests/oss/aliyun_oss/aliyun_oss/test_aliyun_oss.py b/api/tests/unit_tests/oss/aliyun_oss/aliyun_oss/test_aliyun_oss.py index f87a38569..10388a888 100644 --- a/api/tests/unit_tests/oss/aliyun_oss/aliyun_oss/test_aliyun_oss.py +++ b/api/tests/unit_tests/oss/aliyun_oss/aliyun_oss/test_aliyun_oss.py @@ -1,7 +1,7 @@ from unittest.mock import patch import pytest -from oss2 import Auth # type: ignore +from oss2 import Auth from extensions.storage.aliyun_oss_storage import AliyunOssStorage from tests.unit_tests.oss.__mock.aliyun_oss import setup_aliyun_oss_mock diff --git a/api/tests/unit_tests/utils/yaml/test_yaml_utils.py b/api/tests/unit_tests/utils/yaml/test_yaml_utils.py index 8d6454872..95b93651d 100644 --- a/api/tests/unit_tests/utils/yaml/test_yaml_utils.py +++ b/api/tests/unit_tests/utils/yaml/test_yaml_utils.py @@ -1,7 +1,7 @@ from textwrap import dedent import pytest -from yaml import YAMLError # type: ignore +from yaml import YAMLError from core.tools.utils.yaml_utils import load_yaml_file