Skip to content

Commit e4390a3

Browse files
fix(ci): Resolve ruff linting and style errors
Addresses all linting errors reported by ruff, including undefined names for 'os' and 'timezone' by correcting import statements in 'dispatcher.py' and 'status_tracker.py'. Also resolves various code style violations (line breaks, comment punctuation) to align with ruff standards. This ensures the code adheres to project standards and passes the CI quality checks.
1 parent e9e71da commit e4390a3

File tree

6 files changed

+17
-16
lines changed

6 files changed

+17
-16
lines changed

examples/mem_scheduler/api_w_scheduler.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
)
77
from memos.api.routers.server_router import mem_scheduler, status_tracker
88
from memos.mem_scheduler.schemas.message_schemas import ScheduleMessageItem
9-
from memos.api.product_models import StatusRequest
109

1110

1211
# Debug: Print scheduler configuration

src/memos/api/routers/server_router.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
from memos.api.handlers.chat_handler import ChatHandler
2424
from memos.api.handlers.search_handler import SearchHandler
2525
from memos.api.product_models import (
26-
AddStatusRequest,
27-
AddStatusResponse,
2826
APIADDRequest,
2927
APIChatCompleteRequest,
3028
APISearchRequest,
@@ -36,10 +34,9 @@
3634
GetMemoryResponse,
3735
MemoryResponse,
3836
SearchResponse,
37+
StatusResponse,
3938
SuggestionRequest,
4039
SuggestionResponse,
41-
StatusRequest,
42-
StatusResponse,
4340
)
4441
from memos.log import get_logger
4542
from memos.mem_scheduler.base_scheduler import BaseScheduler

src/memos/mem_scheduler/base_scheduler.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import time
55

66
from collections.abc import Callable
7-
from datetime import datetime, timezone
7+
from datetime import datetime
88
from pathlib import Path
99
from typing import TYPE_CHECKING, Union
1010

@@ -44,10 +44,12 @@
4444
from memos.mem_scheduler.task_schedule_modules.local_queue import SchedulerLocalQueue
4545
from memos.mem_scheduler.task_schedule_modules.redis_queue import SchedulerRedisQueue
4646
from memos.mem_scheduler.task_schedule_modules.task_queue import ScheduleTaskQueue
47+
from memos.mem_scheduler.utils import metrics
4748
from memos.mem_scheduler.utils.db_utils import get_utc_now
4849
from memos.mem_scheduler.utils.filter_utils import (
4950
transform_name_to_key,
5051
)
52+
from memos.mem_scheduler.utils.status_tracker import TaskStatusTracker
5153
from memos.mem_scheduler.webservice_modules.rabbitmq_service import RabbitMQSchedulerModule
5254
from memos.mem_scheduler.webservice_modules.redis_service import RedisSchedulerModule
5355
from memos.memories.activation.kv import KVCacheMemory
@@ -59,14 +61,13 @@
5961
MemCubeID,
6062
UserID,
6163
)
62-
from memos.mem_scheduler.utils import metrics
63-
from memos.mem_scheduler.utils.status_tracker import TaskStatusTracker
6464

6565

6666
if TYPE_CHECKING:
67-
from memos.reranker.http_bge import HTTPBGEReranker
6867
import redis
6968

69+
from memos.reranker.http_bge import HTTPBGEReranker
70+
7071

7172
logger = get_logger(__name__)
7273

src/memos/mem_scheduler/task_schedule_modules/dispatcher.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import concurrent
2+
import os
23
import threading
34
import time
45

@@ -11,11 +12,12 @@
1112
from memos.log import get_logger
1213
from memos.mem_scheduler.general_modules.base import BaseSchedulerModule
1314
from memos.mem_scheduler.general_modules.task_threads import ThreadManager
14-
from memos.mem_scheduler.schemas.general_schemas import DEFAULT_STOP_WAIT
15-
from memos.mem_scheduler.schemas.message_schemas import ScheduleMessageItem, ScheduleLogForWebItem
15+
from memos.mem_scheduler.schemas.general_schemas import (
16+
DEFAULT_STOP_WAIT,
17+
)
18+
from memos.mem_scheduler.schemas.message_schemas import ScheduleLogForWebItem, ScheduleMessageItem
1619
from memos.mem_scheduler.schemas.task_schemas import RunningTaskItem
1720
from memos.mem_scheduler.utils.misc_utils import group_messages_by_user_and_mem_cube
18-
from memos.mem_scheduler.utils import metrics
1921
from memos.mem_scheduler.utils.status_tracker import TaskStatusTracker
2022

2123

@@ -102,7 +104,6 @@ def on_messages_enqueued(self, msgs: list[ScheduleMessageItem]) -> None:
102104
if not msgs:
103105
return
104106
# This is handled in BaseScheduler now
105-
pass
106107

107108
def _create_task_wrapper(self, handler: Callable, task_item: RunningTaskItem):
108109
"""
@@ -210,7 +211,7 @@ def wrapped_handler(messages: list[ScheduleMessageItem]):
210211
mem_cube_id=task_item.mem_cube_id,
211212
item_id=task_item.item_id,
212213
label=m.label,
213-
log_content=f"Task {task_item.item_id} failed for user {task_item.user_id} with error: {str(e)}.",
214+
log_content=f"Task {task_item.item_id} failed for user {task_item.user_id} with error: {e!s}.",
214215
status="failed",
215216
exception=str(e)
216217
)

src/memos/mem_scheduler/utils/metrics.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
# src/memos/mem_scheduler/utils/metrics.py
22
import time
3+
34
from contextlib import ContextDecorator
4-
from prometheus_client import Counter, Summary, Gauge, Histogram
5+
6+
from prometheus_client import Counter, Gauge, Histogram, Summary
7+
58

69
# --- Metric Definitions ---
710

src/memos/mem_scheduler/utils/status_tracker.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# src/memos/mem_scheduler/utils/status_tracker.py
22
import json
33

4-
from datetime import datetime, timedelta
4+
from datetime import datetime, timedelta, timezone
55
from typing import TYPE_CHECKING
66

77
from memos.dependency import require_python_package

0 commit comments

Comments
 (0)