Browse Source

chore: cleanup unnecessary mypy suppressions on imports (#24712)

tags/1.8.1
Bowen Liang 2 months ago
parent
commit
39064197da
No account linked to committer's email address

+ 1
- 1
api/controllers/service_api/dataset/metadata.py View File

@@ -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


+ 1
- 1
api/controllers/service_api/wraps.py View File

@@ -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

+ 1
- 1
api/controllers/web/login.py View File

@@ -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 (

+ 1
- 1
api/core/model_runtime/model_providers/__base/tokenizers/gpt2_tokenizer.py View File

@@ -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")

+ 7
- 7
api/core/plugin/backwards_invocation/model.py View File

@@ -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)):

+ 2
- 2
api/core/rag/datasource/vdb/analyticdb/analyticdb_vector_sql.py View File

@@ -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

+ 2
- 2
api/core/rag/datasource/vdb/opengauss/opengauss.py View File

@@ -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

+ 1
- 1
api/core/rag/datasource/vdb/opensearch/opensearch_vector.py View File

@@ -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(),

+ 2
- 2
api/core/rag/datasource/vdb/pgvector/pgvector.py View File

@@ -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

+ 2
- 2
api/core/rag/datasource/vdb/pyvastbase/vastbase_vector.py View File

@@ -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

+ 1
- 1
api/core/rag/extractor/excel_extractor.py View File

@@ -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

+ 1
- 1
api/core/rag/extractor/html_extractor.py View File

@@ -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

+ 1
- 1
api/core/rag/extractor/unstructured/unstructured_eml_extractor.py View File

@@ -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

+ 1
- 1
api/core/rag/splitter/text_splitter.py View File

@@ -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")

+ 1
- 1
api/core/tools/utils/parser.py View File

@@ -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

+ 1
- 1
api/extensions/ext_blueprints.py View File

@@ -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

+ 1
- 1
api/extensions/ext_otel.py View File

@@ -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

+ 3
- 3
api/extensions/storage/aws_s3_storage.py View File

@@ -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

+ 1
- 1
api/models/account.py View File

@@ -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


+ 1
- 1
api/tasks/delete_conversation_task.py View File

@@ -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

+ 1
- 1
api/tests/integration_tests/vdb/opengauss/test_opengauss.py View File

@@ -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 (

+ 2
- 2
api/tests/unit_tests/oss/__mock/aliyun_oss.py View File

@@ -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,

+ 1
- 1
api/tests/unit_tests/oss/aliyun_oss/aliyun_oss/test_aliyun_oss.py View File

@@ -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

+ 1
- 1
api/tests/unit_tests/utils/yaml/test_yaml_utils.py View File

@@ -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


Loading…
Cancel
Save