Skip to content

Fix thread-unsafe MessageBus in s10, s11, and s_full (#1) #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
leesf wants to merge 1 commit into
base: main
Choose a base branch
from
+56 −20
Open

Fix thread-unsafe MessageBus in s10, s11, and s_full (#1) #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions agents/s09_agent_teams.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ class MessageBus:
def __init__(self, inbox_dir: Path):
self.dir = inbox_dir
self.dir.mkdir(parents=True, exist_ok=True)
self._lock = threading.Lock()

def send(self, sender: str, to: str, content: str,
msg_type: str = "message", extra: dict = None) -> str:
Expand All @@ -92,19 +93,26 @@ def send(self, sender: str, to: str, content: str,
if extra:
msg.update(extra)
inbox_path = self.dir / f"{to}.jsonl"
with open(inbox_path, "a") as f:
f.write(json.dumps(msg) + "\n")
with self._lock:
with open(inbox_path, "a") as f:
f.write(json.dumps(msg) + "\n")
return f"Sent {msg_type} to {to}"

def read_inbox(self, name: str) -> list:
inbox_path = self.dir / f"{name}.jsonl"
if not inbox_path.exists():
return []
with self._lock:
content = inbox_path.read_text()
inbox_path.write_text("")
messages = []
for line in inbox_path.read_text().strip().splitlines():
for line in content.splitlines():
line = line.strip()
if line:
messages.append(json.loads(line))
inbox_path.write_text("")
try:
messages.append(json.loads(line))
except json.JSONDecodeError:
pass
return messages

def broadcast(self, sender: str, content: str, teammates: list) -> str:
Expand Down
18 changes: 13 additions & 5 deletions agents/s10_team_protocols.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ class MessageBus:
def __init__(self, inbox_dir: Path):
self.dir = inbox_dir
self.dir.mkdir(parents=True, exist_ok=True)
self._lock = threading.Lock()

def send(self, sender: str, to: str, content: str,
msg_type: str = "message", extra: dict = None) -> str:
Expand All @@ -102,19 +103,26 @@ def send(self, sender: str, to: str, content: str,
if extra:
msg.update(extra)
inbox_path = self.dir / f"{to}.jsonl"
with open(inbox_path, "a") as f:
f.write(json.dumps(msg) + "\n")
with self._lock:
with open(inbox_path, "a") as f:
f.write(json.dumps(msg) + "\n")
return f"Sent {msg_type} to {to}"

def read_inbox(self, name: str) -> list:
inbox_path = self.dir / f"{name}.jsonl"
if not inbox_path.exists():
return []
with self._lock:
content = inbox_path.read_text()
inbox_path.write_text("")
messages = []
for line in inbox_path.read_text().strip().splitlines():
for line in content.splitlines():
line = line.strip()
if line:
messages.append(json.loads(line))
inbox_path.write_text("")
try:
messages.append(json.loads(line))
except json.JSONDecodeError:
pass
return messages

def broadcast(self, sender: str, content: str, teammates: list) -> str:
Expand Down
18 changes: 13 additions & 5 deletions agents/s11_autonomous_agents.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ class MessageBus:
def __init__(self, inbox_dir: Path):
self.dir = inbox_dir
self.dir.mkdir(parents=True, exist_ok=True)
self._lock = threading.Lock()

def send(self, sender: str, to: str, content: str,
msg_type: str = "message", extra: dict = None) -> str:
Expand All @@ -95,19 +96,26 @@ def send(self, sender: str, to: str, content: str,
if extra:
msg.update(extra)
inbox_path = self.dir / f"{to}.jsonl"
with open(inbox_path, "a") as f:
f.write(json.dumps(msg) + "\n")
with self._lock:
with open(inbox_path, "a") as f:
f.write(json.dumps(msg) + "\n")
return f"Sent {msg_type} to {to}"

def read_inbox(self, name: str) -> list:
inbox_path = self.dir / f"{name}.jsonl"
if not inbox_path.exists():
return []
with self._lock:
content = inbox_path.read_text()
inbox_path.write_text("")
messages = []
for line in inbox_path.read_text().strip().splitlines():
for line in content.splitlines():
line = line.strip()
if line:
messages.append(json.loads(line))
inbox_path.write_text("")
try:
messages.append(json.loads(line))
except json.JSONDecodeError:
pass
return messages

def broadcast(self, sender: str, content: str, teammates: list) -> str:
Expand Down
22 changes: 17 additions & 5 deletions agents/s_full.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,21 +364,33 @@ def drain(self) -> list:
class MessageBus:
def __init__(self):
INBOX_DIR.mkdir(parents=True, exist_ok=True)
self._lock = threading.Lock()

def send(self, sender: str, to: str, content: str,
msg_type: str = "message", extra: dict = None) -> str:
msg = {"type": msg_type, "from": sender, "content": content,
"timestamp": time.time()}
if extra: msg.update(extra)
with open(INBOX_DIR / f"{to}.jsonl", "a") as f:
f.write(json.dumps(msg) + "\n")
with self._lock:
with open(INBOX_DIR / f"{to}.jsonl", "a") as f:
f.write(json.dumps(msg) + "\n")
return f"Sent {msg_type} to {to}"

def read_inbox(self, name: str) -> list:
path = INBOX_DIR / f"{name}.jsonl"
if not path.exists(): return []
msgs = [json.loads(l) for l in path.read_text().strip().splitlines() if l]
path.write_text("")
if not path.exists():
return []
with self._lock:
content = path.read_text()
path.write_text("")
msgs = []
for l in content.splitlines():
l = l.strip()
if l:
try:
msgs.append(json.loads(l))
except json.JSONDecodeError:
pass
return msgs

def broadcast(self, sender: str, content: str, names: list) -> str:
Expand Down