Spaces:
Sleeping
Sleeping
Commit ·
bfe0e24
1
Parent(s): 9852326
fix: replace deprecated datetime.utcnow with timezone-aware
Browse files
backend/app/agents/coordinator.py
CHANGED
|
@@ -1,7 +1,7 @@
|
|
| 1 |
"""Agent coordinator for orchestrating multiple agents with message passing."""
|
| 2 |
|
| 3 |
import asyncio
|
| 4 |
-
from datetime import datetime
|
| 5 |
from enum import Enum
|
| 6 |
from typing import Any
|
| 7 |
|
|
@@ -43,7 +43,7 @@ class Message:
|
|
| 43 |
self.message_type = message_type
|
| 44 |
self.content = content
|
| 45 |
self.priority = priority
|
| 46 |
-
self.timestamp = datetime.
|
| 47 |
|
| 48 |
def to_dict(self) -> dict[str, Any]:
|
| 49 |
"""Convert to dictionary."""
|
|
|
|
| 1 |
"""Agent coordinator for orchestrating multiple agents with message passing."""
|
| 2 |
|
| 3 |
import asyncio
|
| 4 |
+
from datetime import datetime, timezone
|
| 5 |
from enum import Enum
|
| 6 |
from typing import Any
|
| 7 |
|
|
|
|
| 43 |
self.message_type = message_type
|
| 44 |
self.content = content
|
| 45 |
self.priority = priority
|
| 46 |
+
self.timestamp = datetime.now(timezone.utc)
|
| 47 |
|
| 48 |
def to_dict(self) -> dict[str, Any]:
|
| 49 |
"""Convert to dictionary."""
|
backend/app/agents/memory_agent.py
CHANGED
|
@@ -1,6 +1,6 @@
|
|
| 1 |
"""Memory agent for memory operations and knowledge management."""
|
| 2 |
|
| 3 |
-
from datetime import datetime
|
| 4 |
from typing import Any
|
| 5 |
|
| 6 |
from app.core.action import Action, ActionType
|
|
@@ -26,20 +26,20 @@ class MemoryEntry:
|
|
| 26 |
self.memory_type = memory_type
|
| 27 |
self.ttl_seconds = ttl_seconds
|
| 28 |
self.metadata = metadata or {}
|
| 29 |
-
self.created_at = datetime.
|
| 30 |
-
self.accessed_at = datetime.
|
| 31 |
self.access_count = 0
|
| 32 |
|
| 33 |
def is_expired(self) -> bool:
|
| 34 |
"""Check if the memory entry has expired."""
|
| 35 |
if self.ttl_seconds is None:
|
| 36 |
return False
|
| 37 |
-
elapsed = (datetime.
|
| 38 |
return elapsed > self.ttl_seconds
|
| 39 |
|
| 40 |
def access(self) -> Any:
|
| 41 |
"""Access the memory and update metadata."""
|
| 42 |
-
self.accessed_at = datetime.
|
| 43 |
self.access_count += 1
|
| 44 |
return self.value
|
| 45 |
|
|
|
|
| 1 |
"""Memory agent for memory operations and knowledge management."""
|
| 2 |
|
| 3 |
+
from datetime import datetime, timezone
|
| 4 |
from typing import Any
|
| 5 |
|
| 6 |
from app.core.action import Action, ActionType
|
|
|
|
| 26 |
self.memory_type = memory_type
|
| 27 |
self.ttl_seconds = ttl_seconds
|
| 28 |
self.metadata = metadata or {}
|
| 29 |
+
self.created_at = datetime.now(timezone.utc)
|
| 30 |
+
self.accessed_at = datetime.now(timezone.utc)
|
| 31 |
self.access_count = 0
|
| 32 |
|
| 33 |
def is_expired(self) -> bool:
|
| 34 |
"""Check if the memory entry has expired."""
|
| 35 |
if self.ttl_seconds is None:
|
| 36 |
return False
|
| 37 |
+
elapsed = (datetime.now(timezone.utc) - self.created_at).total_seconds()
|
| 38 |
return elapsed > self.ttl_seconds
|
| 39 |
|
| 40 |
def access(self) -> Any:
|
| 41 |
"""Access the memory and update metadata."""
|
| 42 |
+
self.accessed_at = datetime.now(timezone.utc)
|
| 43 |
self.access_count += 1
|
| 44 |
return self.value
|
| 45 |
|
backend/app/memory/long_term.py
CHANGED
|
@@ -5,7 +5,7 @@ from __future__ import annotations
|
|
| 5 |
import asyncio
|
| 6 |
import hashlib
|
| 7 |
import logging
|
| 8 |
-
from datetime import datetime
|
| 9 |
from typing import Any
|
| 10 |
from uuid import uuid4
|
| 11 |
|
|
@@ -170,7 +170,7 @@ class LongTermMemory:
|
|
| 170 |
|
| 171 |
async with self._lock:
|
| 172 |
doc_id = document_id or self._generate_id(content)
|
| 173 |
-
now = datetime.
|
| 174 |
|
| 175 |
document = Document(
|
| 176 |
id=doc_id,
|
|
|
|
| 5 |
import asyncio
|
| 6 |
import hashlib
|
| 7 |
import logging
|
| 8 |
+
from datetime import datetime, timezone
|
| 9 |
from typing import Any
|
| 10 |
from uuid import uuid4
|
| 11 |
|
|
|
|
| 170 |
|
| 171 |
async with self._lock:
|
| 172 |
doc_id = document_id or self._generate_id(content)
|
| 173 |
+
now = datetime.now(timezone.utc)
|
| 174 |
|
| 175 |
document = Document(
|
| 176 |
id=doc_id,
|
backend/app/memory/short_term.py
CHANGED
|
@@ -4,7 +4,7 @@ from __future__ import annotations
|
|
| 4 |
|
| 5 |
import asyncio
|
| 6 |
from collections import OrderedDict
|
| 7 |
-
from datetime import datetime
|
| 8 |
from typing import Any, Generic, TypeVar
|
| 9 |
|
| 10 |
from pydantic import BaseModel, Field
|
|
@@ -12,12 +12,17 @@ from pydantic import BaseModel, Field
|
|
| 12 |
T = TypeVar("T")
|
| 13 |
|
| 14 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 15 |
class MemoryEntry(BaseModel, Generic[T]):
|
| 16 |
"""A single memory entry with metadata."""
|
| 17 |
|
| 18 |
key: str
|
| 19 |
value: Any
|
| 20 |
-
created_at: datetime = Field(default_factory=
|
| 21 |
updated_at: datetime = Field(default_factory=datetime.utcnow)
|
| 22 |
access_count: int = 0
|
| 23 |
tags: list[str] = Field(default_factory=list)
|
|
@@ -94,7 +99,7 @@ class ShortTermMemory:
|
|
| 94 |
ValueError: If max_size would be exceeded for a new key.
|
| 95 |
"""
|
| 96 |
async with self._lock:
|
| 97 |
-
now = datetime.
|
| 98 |
|
| 99 |
if key in self._store:
|
| 100 |
entry = self._store[key]
|
|
|
|
| 4 |
|
| 5 |
import asyncio
|
| 6 |
from collections import OrderedDict
|
| 7 |
+
from datetime import datetime, timezone
|
| 8 |
from typing import Any, Generic, TypeVar
|
| 9 |
|
| 10 |
from pydantic import BaseModel, Field
|
|
|
|
| 12 |
T = TypeVar("T")
|
| 13 |
|
| 14 |
|
| 15 |
+
def _utc_now() -> datetime:
|
| 16 |
+
"""Return current UTC datetime."""
|
| 17 |
+
return datetime.now(timezone.utc)
|
| 18 |
+
|
| 19 |
+
|
| 20 |
class MemoryEntry(BaseModel, Generic[T]):
|
| 21 |
"""A single memory entry with metadata."""
|
| 22 |
|
| 23 |
key: str
|
| 24 |
value: Any
|
| 25 |
+
created_at: datetime = Field(default_factory=_utc_now)
|
| 26 |
updated_at: datetime = Field(default_factory=datetime.utcnow)
|
| 27 |
access_count: int = 0
|
| 28 |
tags: list[str] = Field(default_factory=list)
|
|
|
|
| 99 |
ValueError: If max_size would be exceeded for a new key.
|
| 100 |
"""
|
| 101 |
async with self._lock:
|
| 102 |
+
now = datetime.now(timezone.utc)
|
| 103 |
|
| 104 |
if key in self._store:
|
| 105 |
entry = self._store[key]
|
backend/app/memory/working.py
CHANGED
|
@@ -4,20 +4,25 @@ from __future__ import annotations
|
|
| 4 |
|
| 5 |
import asyncio
|
| 6 |
from collections import OrderedDict
|
| 7 |
-
from datetime import datetime
|
| 8 |
from typing import Any
|
| 9 |
|
| 10 |
from pydantic import BaseModel, Field
|
| 11 |
|
| 12 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 13 |
class WorkingMemoryItem(BaseModel):
|
| 14 |
"""A single item in working memory."""
|
| 15 |
|
| 16 |
id: str
|
| 17 |
content: Any
|
| 18 |
priority: float = 0.0
|
| 19 |
-
created_at: datetime = Field(default_factory=
|
| 20 |
-
last_accessed: datetime = Field(default_factory=
|
| 21 |
access_count: int = 0
|
| 22 |
metadata: dict[str, Any] = Field(default_factory=dict)
|
| 23 |
|
|
@@ -86,7 +91,7 @@ class WorkingMemory:
|
|
| 86 |
self._counter += 1
|
| 87 |
item_id = f"wm_{self._counter}"
|
| 88 |
|
| 89 |
-
now = datetime.
|
| 90 |
|
| 91 |
# Check if item already exists (update it)
|
| 92 |
if item_id in self._items:
|
|
@@ -170,7 +175,7 @@ class WorkingMemory:
|
|
| 170 |
# Get last item
|
| 171 |
item_id = next(reversed(self._items))
|
| 172 |
item = self._items[item_id]
|
| 173 |
-
item.last_accessed = datetime.
|
| 174 |
item.access_count += 1
|
| 175 |
return item
|
| 176 |
|
|
@@ -187,7 +192,7 @@ class WorkingMemory:
|
|
| 187 |
async with self._lock:
|
| 188 |
item = self._items.get(item_id)
|
| 189 |
if item:
|
| 190 |
-
item.last_accessed = datetime.
|
| 191 |
item.access_count += 1
|
| 192 |
# Move to end (mark as recently accessed)
|
| 193 |
self._items.move_to_end(item_id)
|
|
|
|
| 4 |
|
| 5 |
import asyncio
|
| 6 |
from collections import OrderedDict
|
| 7 |
+
from datetime import datetime, timezone
|
| 8 |
from typing import Any
|
| 9 |
|
| 10 |
from pydantic import BaseModel, Field
|
| 11 |
|
| 12 |
|
| 13 |
+
def _utc_now() -> datetime:
|
| 14 |
+
"""Return current UTC datetime."""
|
| 15 |
+
return datetime.now(timezone.utc)
|
| 16 |
+
|
| 17 |
+
|
| 18 |
class WorkingMemoryItem(BaseModel):
|
| 19 |
"""A single item in working memory."""
|
| 20 |
|
| 21 |
id: str
|
| 22 |
content: Any
|
| 23 |
priority: float = 0.0
|
| 24 |
+
created_at: datetime = Field(default_factory=_utc_now)
|
| 25 |
+
last_accessed: datetime = Field(default_factory=_utc_now)
|
| 26 |
access_count: int = 0
|
| 27 |
metadata: dict[str, Any] = Field(default_factory=dict)
|
| 28 |
|
|
|
|
| 91 |
self._counter += 1
|
| 92 |
item_id = f"wm_{self._counter}"
|
| 93 |
|
| 94 |
+
now = datetime.now(timezone.utc)
|
| 95 |
|
| 96 |
# Check if item already exists (update it)
|
| 97 |
if item_id in self._items:
|
|
|
|
| 175 |
# Get last item
|
| 176 |
item_id = next(reversed(self._items))
|
| 177 |
item = self._items[item_id]
|
| 178 |
+
item.last_accessed = datetime.now(timezone.utc)
|
| 179 |
item.access_count += 1
|
| 180 |
return item
|
| 181 |
|
|
|
|
| 192 |
async with self._lock:
|
| 193 |
item = self._items.get(item_id)
|
| 194 |
if item:
|
| 195 |
+
item.last_accessed = datetime.now(timezone.utc)
|
| 196 |
item.access_count += 1
|
| 197 |
# Move to end (mark as recently accessed)
|
| 198 |
self._items.move_to_end(item_id)
|
backend/app/models/router.py
CHANGED
|
@@ -3,7 +3,7 @@
|
|
| 3 |
import asyncio
|
| 4 |
import logging
|
| 5 |
from dataclasses import dataclass, field
|
| 6 |
-
from datetime import datetime
|
| 7 |
from enum import Enum
|
| 8 |
from typing import Any
|
| 9 |
|
|
@@ -123,7 +123,7 @@ class CostTracker:
|
|
| 123 |
self.cost_by_model = {}
|
| 124 |
self.request_count = 0
|
| 125 |
self.total_tokens = TokenUsage()
|
| 126 |
-
self.start_time = datetime.
|
| 127 |
|
| 128 |
|
| 129 |
class SmartModelRouter:
|
|
|
|
| 3 |
import asyncio
|
| 4 |
import logging
|
| 5 |
from dataclasses import dataclass, field
|
| 6 |
+
from datetime import datetime, timezone
|
| 7 |
from enum import Enum
|
| 8 |
from typing import Any
|
| 9 |
|
|
|
|
| 123 |
self.cost_by_model = {}
|
| 124 |
self.request_count = 0
|
| 125 |
self.total_tokens = TokenUsage()
|
| 126 |
+
self.start_time = datetime.now(timezone.utc)
|
| 127 |
|
| 128 |
|
| 129 |
class SmartModelRouter:
|