Merge remote-tracking branch 'origin/dev' into feat/cb2ui-robot-connections

src/control_backend/agents/bdi/bdi_core.py

@@ -5,13 +5,15 @@ from spade_bdi.bdi import BDIAgent
 
 from control_backend.agents.bdi.behaviours.belief_setter import BeliefSetter
 
+
 class BDICoreAgent(BDIAgent):
     """
-    This is the Brain agent that does the belief inference with AgentSpeak. 
+    This is the Brain agent that does the belief inference with AgentSpeak.
     This is a continous process that happens automatically in the background.
     This class contains all the actions that can be called from AgentSpeak plans.
     It has the BeliefSetter behaviour.
     """
+
     logger = logging.getLogger("BDI Core")
 
     async def setup(self):
@@ -31,5 +33,3 @@ class BDICoreAgent(BDIAgent):
     def _send_to_llm(self, message) -> str:
         """TODO: implement"""
         return f"This is a reply to {message}"
-
-

src/control_backend/agents/bdi/behaviours/belief_setter.py

@@ -8,15 +8,17 @@ from spade_bdi.bdi import BDIAgent
 
 from control_backend.core.config import settings
 
+
 class BeliefSetter(CyclicBehaviour):
     """
-    This is the behaviour that the BDI agent runs.
-    This behaviour waits for incoming message and processes it based on sender.
-    Currently, t only waits for messages containing beliefs from Belief Collector and adds these to its KB.
+    This is the behaviour that the BDI agent runs. This behaviour waits for incoming
+    message and processes it based on sender. Currently, it only waits for messages
+    containing beliefs from BeliefCollector and adds these to its KB.
     """
+
     agent: BDIAgent
     logger = logging.getLogger("BDI/Belief Setter")
-    
+
     async def run(self):
         msg = await self.receive(timeout=0.1)
         if msg:
@@ -36,7 +38,8 @@ class BeliefSetter(CyclicBehaviour):
                 pass
 
     def _process_belief_message(self, message: Message):
-        if not message.body: return
+        if not message.body:
+            return
 
         match message.thread:
             case "beliefs":
@@ -48,7 +51,6 @@ class BeliefSetter(CyclicBehaviour):
             case _:
                 pass
 
-
     def _set_beliefs(self, beliefs: dict[str, list[list[str]]]):
         if self.agent.bdi is None:
             self.logger.warning("Cannot set beliefs, since agent's BDI is not yet initialized.")

src/control_backend/api/v1/endpoints/message.py

@@ -1,6 +1,6 @@
-from fastapi import APIRouter, Request
 import logging
 
+from fastapi import APIRouter, Request
 from zmq import Socket
 
 from control_backend.schemas.message import Message
@@ -9,6 +9,7 @@ logger = logging.getLogger(__name__)
 
 router = APIRouter()
 
+
 @router.post("/message", status_code=202)
 async def receive_message(message: Message, request: Request):
     logger.info("Received message: %s", message.message)

src/control_backend/api/v1/endpoints/sse.py

@@ -2,7 +2,8 @@ from fastapi import APIRouter, Request
 
 router = APIRouter()
 
+
 # TODO: implement
 @router.get("/sse")
 async def sse(request: Request):
-    pass
+    pass

src/control_backend/api/v1/router.py

@@ -4,10 +4,7 @@ from control_backend.api.v1.endpoints import message, sse, command
 
 api_router = APIRouter()
 
-api_router.include_router(
-    message.router,
-    tags=["Messages"]
-)
+api_router.include_router(message.router, tags=["Messages"])
 
 api_router.include_router(
     sse.router,
@@ -17,4 +14,4 @@ api_router.include_router(
 api_router.include_router(
     command.router,
     tags=["Commands"]
-)
+)

src/control_backend/core/config.py

@@ -1,10 +1,11 @@
-from re import L
 from pydantic import BaseModel
 from pydantic_settings import BaseSettings, SettingsConfigDict
 
+
 class ZMQSettings(BaseModel):
     internal_comm_address: str = "tcp://localhost:5560"
 
+
 class AgentSettings(BaseModel):
     host: str = "localhost"
     bdi_core_agent_name: str = "bdi_core"
@@ -22,7 +23,8 @@ class Settings(BaseSettings):
     zmq_settings: ZMQSettings = ZMQSettings()
 
     agent_settings: AgentSettings = AgentSettings()
-    
+
     model_config = SettingsConfigDict(env_file=".env")
-    
+
+
 settings = Settings()

src/control_backend/main.py

@@ -1,26 +1,24 @@
 # Standard library imports
-import asyncio
-import json
 
 # External imports
 import contextlib
+import logging
+
+import zmq
 from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware
-import logging
-from spade.agent import Agent, Message
-from spade.behaviour import OneShotBehaviour
-import zmq
 
 # Internal imports
 from control_backend.agents.ri_communication_agent import RICommunicationAgent
 from control_backend.agents.bdi.bdi_core import BDICoreAgent
 from control_backend.api.v1.router import api_router
-from control_backend.core.config import AgentSettings, settings
+from control_backend.core.config import settings
 from control_backend.core.zmq_context import context
 
 logger = logging.getLogger(__name__)
 logging.basicConfig(level=logging.DEBUG)
 
+
 @contextlib.asynccontextmanager
 async def lifespan(app: FastAPI):
     logger.info("%s starting up.", app.title)
@@ -44,22 +42,24 @@ async def lifespan(app: FastAPI):
                             settings.agent_settings.bdi_core_agent_name, 
                             "src/control_backend/agents/bdi/rules.asl")
     await bdi_core.start()
-    
+
     yield
-    
+
     logger.info("%s shutting down.", app.title)
 
+
 # if __name__ == "__main__":
 app = FastAPI(title=settings.app_title, lifespan=lifespan)
 
 # This middleware allows other origins to communicate with us
 app.add_middleware(
-    CORSMiddleware, # https://developer.mozilla.org/en-US/docs/Web/HTTP/Guides/CORS
-    allow_origins=[settings.ui_url], # address of our UI application
-    allow_methods=["*"], # GET, POST, etc.
+    CORSMiddleware,  # https://developer.mozilla.org/en-US/docs/Web/HTTP/Guides/CORS
+    allow_origins=[settings.ui_url],  # address of our UI application
+    allow_methods=["*"],  # GET, POST, etc.
 )
 
-app.include_router(api_router, prefix="") # TODO: make prefix /api/v1
+app.include_router(api_router, prefix="")  # TODO: make prefix /api/v1
+
 
 @app.get("/")
 async def root():

src/control_backend/schemas/message.py

@@ -1,4 +1,5 @@
 from pydantic import BaseModel
 
+
 class Message(BaseModel):
-    message: str
+    message: str