Skip to content

Commit e5e2801

Browse files
authored
♻️ Refactor Sort backend imports (utils) #1037
2 parents 19bb5e6 + 00306d8 commit e5e2801

File tree

14 files changed

+52
-38
lines changed

14 files changed

+52
-38
lines changed

backend/services/file_management_service.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,24 @@
1-
# Concurrency control
21
import asyncio
32
import json
43
import logging
54
import os
6-
import uuid
75
from io import BytesIO
86
from pathlib import Path
97
from typing import List, Optional, AsyncGenerator
108

119
import httpx
12-
import requests
1310
from fastapi import UploadFile
1411

1512
from agents.preprocess_manager import preprocess_manager
1613
from consts.const import UPLOAD_FOLDER, MAX_CONCURRENT_UPLOADS, DATA_PROCESS_SERVICE
17-
from database.attachment_db import upload_fileobj, get_file_url, get_content_type, get_file_stream, delete_file, \
14+
from database.attachment_db import (
15+
upload_fileobj,
16+
get_file_url,
17+
get_content_type,
18+
get_file_stream,
19+
delete_file,
1820
list_files
21+
)
1922
from utils.attachment_utils import convert_image_to_text, convert_long_text_to_text
2023
from utils.prompt_template_utils import get_file_processing_messages_template
2124
from utils.file_management_utils import save_upload_file

backend/services/image_service.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
logger = logging.getLogger("image_service")
99

10+
1011
async def proxy_image_impl(decoded_url: str):
1112
# Create session to call the data processing service
1213
async with aiohttp.ClientSession() as session:

backend/services/memory_config_service.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
from typing import Dict, List, Union
33

44
from consts.const import (
5-
MEMORY_SWITCH_KEY,
6-
MEMORY_AGENT_SHARE_KEY,
7-
DISABLE_AGENT_ID_KEY,
8-
DISABLE_USERAGENT_ID_KEY,
9-
DEFAULT_MEMORY_SWITCH_KEY,
10-
DEFAULT_MEMORY_AGENT_SHARE_KEY,
5+
MEMORY_SWITCH_KEY,
6+
MEMORY_AGENT_SHARE_KEY,
7+
DISABLE_AGENT_ID_KEY,
8+
DISABLE_USERAGENT_ID_KEY,
9+
DEFAULT_MEMORY_SWITCH_KEY,
10+
DEFAULT_MEMORY_AGENT_SHARE_KEY,
1111
)
1212
from consts.model import MemoryAgentShareMode
1313
from database.memory_config_db import (
@@ -204,4 +204,4 @@ def build_memory_context(user_id: str, tenant_id: str, agent_id: str | int) -> M
204204
tenant_id=tenant_id,
205205
user_id=user_id,
206206
agent_id=str(agent_id),
207-
)
207+
)

backend/services/northbound_service.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
update_conversation_title as update_conversation_title_service,
3131
)
3232

33-
3433
logger = logging.getLogger("northbound_service")
3534

3635

backend/services/tenant_config_service.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
from database.knowledge_db import get_knowledge_info_by_knowledge_ids, get_knowledge_ids_by_index_names
55
from database.tenant_config_db import get_tenant_config_info, insert_config, delete_config_by_tenant_config_id
66

7-
87
logger = logging.getLogger("tenant_config_service")
98

109

backend/utils/attachment_utils.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
from typing import Union, BinaryIO
22

3-
from utils.config_utils import tenant_config_manager, get_model_name_from_config
4-
from utils.prompt_template_utils import get_analyze_file_prompt_template
53
from jinja2 import Template, StrictUndefined
6-
7-
from nexent.core.models.openai_vlm import OpenAIVLModel
8-
from nexent.core.models.openai_long_context_model import OpenAILongContextModel
94
from nexent.core import MessageObserver
5+
from nexent.core.models.openai_long_context_model import OpenAILongContextModel
6+
from nexent.core.models.openai_vlm import OpenAIVLModel
107

8+
from utils.config_utils import get_model_name_from_config, tenant_config_manager
9+
from utils.prompt_template_utils import get_analyze_file_prompt_template
1110

1211

1312
def convert_image_to_text(query: str, image_input: Union[str, BinaryIO], tenant_id: str, language: str = 'zh'):

backend/utils/auth_utils.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
1-
import logging
2-
import os
31
import hashlib
42
import hmac
3+
import logging
4+
import os
55
import time
66
from datetime import datetime, timedelta
77
from typing import Optional, Tuple
88

9-
from fastapi import Request
10-
from consts.const import DEFAULT_USER_ID, DEFAULT_TENANT_ID, IS_SPEED_MODE
11-
from consts.exceptions import LimitExceededError, SignatureValidationError, UnauthorizedError
129
import jwt
10+
from fastapi import Request
1311
from supabase import create_client
12+
13+
from consts.const import DEFAULT_TENANT_ID, DEFAULT_USER_ID, IS_SPEED_MODE
14+
from consts.exceptions import LimitExceededError, SignatureValidationError, UnauthorizedError
1415
from database.user_tenant_db import get_user_tenant_by_user_id
1516

1617
# Get Supabase configuration

backend/utils/config_utils.py

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,18 @@
11
import json
2-
import time
32
import logging
4-
3+
import time
54
from typing import Dict, Any
5+
66
from sqlalchemy.sql import func
7-
from database.tenant_config_db import get_all_configs_by_tenant_id, insert_config, delete_config_by_tenant_config_id, update_config_by_tenant_config_id_and_data, get_single_config_info
7+
88
from database.model_management_db import get_model_by_model_id
9+
from database.tenant_config_db import (
10+
delete_config_by_tenant_config_id,
11+
get_all_configs_by_tenant_id,
12+
get_single_config_info,
13+
insert_config,
14+
update_config_by_tenant_config_id_and_data,
15+
)
916

1017
logger = logging.getLogger("config_utils")
1118

backend/utils/file_management_utils.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import logging
22
import os
3+
import traceback
34
from pathlib import Path
45
from typing import List
5-
import traceback
66

77
import aiofiles
88
import httpx
9-
from fastapi import UploadFile
109
import requests
10+
from fastapi import UploadFile
1111

1212
from consts.const import DATA_PROCESS_SERVICE
1313
from consts.model import ProcessParams

backend/utils/langchain_utils.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import os
2-
import logging
31
import importlib.util
4-
from typing import Callable, List, Any, Tuple, Optional
2+
import logging
3+
import os
4+
from typing import Any, Callable, List, Optional, Tuple
55

66
logger = logging.getLogger(__name__)
77

0 commit comments

Comments
 (0)