chore: added missing dependencies and linting

brickllm/__init__.py

@@ -3,9 +3,9 @@
 from .schemas import (
     ElemListSchema,
     RelationshipsSchema,
+    SensorSchema,
     TTLSchema,
     TTLToBuildingPromptSchema,
-    SensorSchema
 )
 from .states import State, StateLocal
 
@@ -18,5 +18,5 @@
     "StateLocal",
     "GraphConfig",
     "custom_logger",
-    "SensorSchema"
+    "SensorSchema",
 ]

brickllm/edges/__init__.py

@@ -1,5 +1,5 @@
+from .check_sensor_presence import check_sensor_presence
 from .validate_condition import validate_condition
 from .validate_condition_local import validate_condition_local
-from .check_sensor_presence import check_sensor_presence
 
 __all__ = ["validate_condition", "validate_condition_local", "check_sensor_presence"]

brickllm/edges/check_sensor_presence.py

@@ -1,10 +1,12 @@
 from typing import Any, Dict, Literal
 
-from ..utils import get_hierarchical_info
 from ..logger import custom_logger
+from ..utils import get_hierarchical_info
 
 
-def check_sensor_presence(state: Dict[str, Any]) -> Literal["get_sensors", "schema_to_ttl"]:
+def check_sensor_presence(
+    state: Dict[str, Any]
+) -> Literal["get_sensors", "schema_to_ttl"]:
     """
     Check if the sensors are present in the building structure.
 

brickllm/graphs/brickschema_graph.py

@@ -4,14 +4,14 @@
 from langgraph.graph import END, START, StateGraph
 
 from .. import GraphConfig, State
-from ..edges import validate_condition, check_sensor_presence
+from ..edges import check_sensor_presence, validate_condition
 from ..nodes import (
     get_elem_children,
     get_elements,
     get_relationships,
     get_sensors,
     schema_to_ttl,
-    validate_schema
+    validate_schema,
 )
 from .abstract_graph import AbstractBrickSchemaGraph
 
@@ -38,11 +38,11 @@ def build_graph(self):
         self.workflow.add_edge(START, "get_elements")
         self.workflow.add_edge("get_elements", "get_elem_children")
         self.workflow.add_edge("get_elem_children", "get_relationships")
-        self.workflow.add_conditional_edges("get_relationships", check_sensor_presence,
-                                            {
-                                                "get_sensors": "get_sensors",
-                                                "schema_to_ttl": "schema_to_ttl"
-                                            })
+        self.workflow.add_conditional_edges(
+            "get_relationships",
+            check_sensor_presence,
+            {"get_sensors": "get_sensors", "schema_to_ttl": "schema_to_ttl"},
+        )
         self.workflow.add_edge("get_sensors", "schema_to_ttl")
         self.workflow.add_edge("schema_to_ttl", "validate_schema")
         self.workflow.add_conditional_edges("validate_schema", validate_condition)

brickllm/helpers/__init__.py

@@ -3,11 +3,11 @@
     get_elem_children_instructions,
     get_elem_instructions,
     get_relationships_instructions,
+    get_sensors_instructions,
     prompt_template_local,
     schema_to_ttl_instructions,
     ttl_example,
     ttl_to_user_prompt,
-    get_sensors_instructions
 )
 
 __all__ = [
@@ -19,5 +19,5 @@
     "ttl_example",
     "prompt_template_local",
     "ttl_to_user_prompt",
-    "get_sensors_instructions"
+    "get_sensors_instructions",
 ]

brickllm/helpers/llm_models.py

@@ -2,9 +2,9 @@
 
 from langchain.chat_models.base import BaseChatModel
 from langchain_anthropic import ChatAnthropic
-from langchain_ollama import ChatOllama
 from langchain_community.llms import Ollama
 from langchain_fireworks import ChatFireworks
+from langchain_ollama import ChatOllama
 from langchain_openai import ChatOpenAI
 
 
@@ -38,4 +38,6 @@ def _get_model(model: Union[str, BaseChatModel]) -> BaseChatModel:
         return Ollama(model="hf.co/Giudice7/llama32-3B-brick-demo:latest")
 
     else:
-        raise ValueError(f"Unsupported model type: {model}. Load your own BaseChatModel if this one is not supported.")
+        raise ValueError(
+            f"Unsupported model type: {model}. Load your own BaseChatModel if this one is not supported."
+        )

brickllm/nodes/__init__.py

@@ -13,5 +13,5 @@
     "get_sensors",
     "schema_to_ttl",
     "validate_schema",
-    "generation_local"
+    "generation_local",
 ]

brickllm/nodes/get_relationships.py

@@ -1,5 +1,4 @@
 import json
-from collections import defaultdict
 from typing import Any, Dict
 
 from langchain_core.messages import HumanMessage, SystemMessage
@@ -48,7 +47,7 @@ def get_relationships(state: State, config: Dict[str, Any]) -> Dict[str, Any]:
     try:
         tree_dict = build_hierarchy(answer.relationships)
     except Exception:
-        custom_logger.warning(f"Error building the hierarchy. Trying again.")
+        custom_logger.warning("Error building the hierarchy. Trying again.")
 
     # Group sensors by their paths
     sensor_paths = []
@@ -58,10 +57,10 @@ def get_relationships(state: State, config: Dict[str, Any]) -> Dict[str, Any]:
     grouped_sensors = {}
 
     for sensor in sensor_paths:
-        grouped_sensors[sensor["name"]] = {"name": sensor["name"],
-                                           "uuid": None,
-                                           "unit": None}
+        grouped_sensors[sensor["name"]] = {
+            "name": sensor["name"],
+            "uuid": None,
+            "unit": None,
+        }
 
-    return {
-        "rel_tree": tree_dict,
-        "sensors_dict": grouped_sensors}
+    return {"rel_tree": tree_dict, "sensors_dict": grouped_sensors}

brickllm/nodes/get_sensors.py

@@ -1,11 +1,11 @@
-from typing import Any, Dict
 import json
+from typing import Any, Dict
 
 from langchain_core.messages import HumanMessage, SystemMessage
 
-from .. import State, SensorSchema
-from ..logger import custom_logger
+from .. import SensorSchema, State
 from ..helpers import get_sensors_instructions
+from ..logger import custom_logger
 
 
 def get_sensors(state: State, config: Dict[str, Any]) -> Dict[str, Any]:

brickllm/schemas.py

@@ -1,6 +1,6 @@
-from typing import List, Tuple, Dict, Optional, Any
+from typing import List, Optional, Tuple
 
-from pydantic.v1 import BaseModel, Field
+from pydantic import BaseModel, Field
 
 
 # pydantic schemas

brickllm/states.py

@@ -1,8 +1,9 @@
 from typing import Any, Dict, List
-from .schemas import Sensor
 
 from typing_extensions import TypedDict
 
+from .schemas import Sensor
+
 
 # state for BrickSchemaGraph class
 class State(TypedDict):

examples/example_openai.py

@@ -19,7 +19,7 @@
 brick_graph = BrickSchemaGraph(model="openai")
 
 # Display the graph structure
-brick_graph.display(file_name="graph_openai.png")
+brick_graph.display(filename="graph_openai.png")
 
 # Prepare input data
 input_data = {"user_prompt": building_description}

examples/my_building.ttl

@@ -1,8 +1,11 @@
 @prefix bldg: <urn:Building#> .
 @prefix brick: <https://brickschema.org/schema/Brick#> .
+@prefix unit: <https://qudt.org/vocab/unit/> .
+@prefix ref: <https://brickschema.org/schema/Brick/ref#> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
 bldg:Bolzano_Building a brick:Building ;
-    brick:hasLocation [ brick:value "Bolzano" ] .
+    brick:hasLocation [ brick:value "Bolzano"^^xsd:string ] .
 
 bldg:Floor_1 a brick:Floor ;
     brick:isPartOf bldg:Bolzano_Building .
@@ -13,83 +16,83 @@ bldg:Floor_2 a brick:Floor ;
 bldg:Floor_3 a brick:Floor ;
     brick:isPartOf bldg:Bolzano_Building .
 
-bldg:Office_1 a brick:Office ;
+bldg:Office_1_Floor_1 a brick:Room ;
     brick:isPartOf bldg:Floor_1 .
 
-bldg:Office_2 a brick:Office ;
+bldg:Office_1_Floor_2 a brick:Room ;
     brick:isPartOf bldg:Floor_2 .
 
-bldg:Office_3 a brick:Office ;
+bldg:Office_1_Floor_3 a brick:Room ;
     brick:isPartOf bldg:Floor_3 .
 
-bldg:Room_1 a brick:Room ;
-    brick:isPartOf bldg:Office_1 .
+bldg:Room_1_Office_1_Floor_1 a brick:Room ;
+    brick:isPartOf bldg:Office_1_Floor_1 .
 
-bldg:Room_2 a brick:Room ;
-    brick:isPartOf bldg:Office_1 .
+bldg:Room_2_Office_1_Floor_1 a brick:Room ;
+    brick:isPartOf bldg:Office_1_Floor_1 .
 
-bldg:Room_3 a brick:Room ;
-    brick:isPartOf bldg:Office_2 .
+bldg:Room_1_Office_1_Floor_2 a brick:Room ;
+    brick:isPartOf bldg:Office_1_Floor_2 .
 
-bldg:Room_4 a brick:Room ;
-    brick:isPartOf bldg:Office_2 .
+bldg:Room_2_Office_1_Floor_2 a brick:Room ;
+    brick:isPartOf bldg:Office_1_Floor_2 .
 
-bldg:Room_5 a brick:Room ;
-    brick:isPartOf bldg:Office_3 .
+bldg:Room_1_Office_1_Floor_3 a brick:Room ;
+    brick:isPartOf bldg:Office_1_Floor_3 .
 
-bldg:Room_6 a brick:Room ;
-    brick:isPartOf bldg:Office_3 .
+bldg:Room_2_Office_1_Floor_3 a brick:Room ;
+    brick:isPartOf bldg:Office_1_Floor_3 .
 
-bldg:Temperature_Sensor_1 a brick:Temperature_Sensor ;
-    brick:isPointOf bldg:Room_1 .
+bldg:Temperature_Sensor_Room_1_Office_1_Floor_1 a brick:Temperature_Sensor ;
+    brick:isPointOf bldg:Room_1_Office_1_Floor_1 .
 
-bldg:Humidity_Sensor_1 a brick:Humidity_Sensor ;
-    brick:isPointOf bldg:Room_1 .
+bldg:Humidity_Sensor_Room_1_Office_1_Floor_1 a brick:Humidity_Sensor ;
+    brick:isPointOf bldg:Room_1_Office_1_Floor_1 .
 
-bldg:CO_Sensor_1 a brick:CO_Sensor ;
-    brick:isPointOf bldg:Room_1 .
+bldg:CO2_Sensor_Room_1_Office_1_Floor_1 a brick:CO2_Sensor ;
+    brick:isPointOf bldg:Room_1_Office_1_Floor_1 .
 
-bldg:Temperature_Sensor_2 a brick:Temperature_Sensor ;
-    brick:isPointOf bldg:Room_2 .
+bldg:Temperature_Sensor_Room_2_Office_1_Floor_1 a brick:Temperature_Sensor ;
+    brick:isPointOf bldg:Room_2_Office_1_Floor_1 .
 
-bldg:Humidity_Sensor_2 a brick:Humidity_Sensor ;
-    brick:isPointOf bldg:Room_2 .
+bldg:Humidity_Sensor_Room_2_Office_1_Floor_1 a brick:Humidity_Sensor ;
+    brick:isPointOf bldg:Room_2_Office_1_Floor_1 .
 
-bldg:CO_Sensor_2 a brick:CO_Sensor ;
-    brick:isPointOf bldg:Room_2 .
+bldg:CO2_Sensor_Room_2_Office_1_Floor_1 a brick:CO2_Sensor ;
+    brick:isPointOf bldg:Room_2_Office_1_Floor_1 .
 
-bldg:Temperature_Sensor_3 a brick:Temperature_Sensor ;
-    brick:isPointOf bldg:Room_3 .
+bldg:Temperature_Sensor_Room_1_Office_1_Floor_2 a brick:Temperature_Sensor ;
+    brick:isPointOf bldg:Room_1_Office_1_Floor_2 .
 
-bldg:Humidity_Sensor_3 a brick:Humidity_Sensor ;
-    brick:isPointOf bldg:Room_3 .
+bldg:Humidity_Sensor_Room_1_Office_1_Floor_2 a brick:Humidity_Sensor ;
+    brick:isPointOf bldg:Room_1_Office_1_Floor_2 .
 
-bldg:CO_Sensor_3 a brick:CO_Sensor ;
-    brick:isPointOf bldg:Room_3 .
+bldg:CO2_Sensor_Room_1_Office_1_Floor_2 a brick:CO2_Sensor ;
+    brick:isPointOf bldg:Room_1_Office_1_Floor_2 .
 
-bldg:Temperature_Sensor_4 a brick:Temperature_Sensor ;
-    brick:isPointOf bldg:Room_4 .
+bldg:Temperature_Sensor_Room_2_Office_1_Floor_2 a brick:Temperature_Sensor ;
+    brick:isPointOf bldg:Room_2_Office_1_Floor_2 .
 
-bldg:Humidity_Sensor_4 a brick:Humidity_Sensor ;
-    brick:isPointOf bldg:Room_4 .
+bldg:Humidity_Sensor_Room_2_Office_1_Floor_2 a brick:Humidity_Sensor ;
+    brick:isPointOf bldg:Room_2_Office_1_Floor_2 .
 
-bldg:CO_Sensor_4 a brick:CO_Sensor ;
-    brick:isPointOf bldg:Room_4 .
+bldg:CO2_Sensor_Room_2_Office_1_Floor_2 a brick:CO2_Sensor ;
+    brick:isPointOf bldg:Room_2_Office_1_Floor_2 .
 
-bldg:Temperature_Sensor_5 a brick:Temperature_Sensor ;
-    brick:isPointOf bldg:Room_5 .
+bldg:Temperature_Sensor_Room_1_Office_1_Floor_3 a brick:Temperature_Sensor ;
+    brick:isPointOf bldg:Room_1_Office_1_Floor_3 .
 
-bldg:Humidity_Sensor_5 a brick:Humidity_Sensor ;
-    brick:isPointOf bldg:Room_5 .
+bldg:Humidity_Sensor_Room_1_Office_1_Floor_3 a brick:Humidity_Sensor ;
+    brick:isPointOf bldg:Room_1_Office_1_Floor_3 .
 
-bldg:CO_Sensor_5 a brick:CO_Sensor ;
-    brick:isPointOf bldg:Room_5 .
+bldg:CO2_Sensor_Room_1_Office_1_Floor_3 a brick:CO2_Sensor ;
+    brick:isPointOf bldg:Room_1_Office_1_Floor_3 .
 
-bldg:Temperature_Sensor_6 a brick:Temperature_Sensor ;
-    brick:isPointOf bldg:Room_6 .
+bldg:Temperature_Sensor_Room_2_Office_1_Floor_3 a brick:Temperature_Sensor ;
+    brick:isPointOf bldg:Room_2_Office_1_Floor_3 .
 
-bldg:Humidity_Sensor_6 a brick:Humidity_Sensor ;
-    brick:isPointOf bldg:Room_6 .
+bldg:Humidity_Sensor_Room_2_Office_1_Floor_3 a brick:Humidity_Sensor ;
+    brick:isPointOf bldg:Room_2_Office_1_Floor_3 .
 
-bldg:CO_Sensor_6 a brick:CO_Sensor ;
-    brick:isPointOf bldg:Room_6 .
+bldg:CO2_Sensor_Room_2_Office_1_Floor_3 a brick:CO2_Sensor ;
+    brick:isPointOf bldg:Room_2_Office_1_Floor_3 .

pyproject.toml

@@ -43,10 +43,12 @@ langgraph = "0.2.23"
 langchain_openai = "0.2.0"
 langchain-fireworks = "0.2.0"
 langchain-anthropic = "0.2.1"
+langchain-ollama = "^0.2.2"
 langchain_community = "0.3.0"
-langchain_core = "0.3.5"
+langchain_core = "^0.3.5"
 rdflib = ">=6.2.0,<7"
 pyshacl = "0.21"
+python-dotenv = "^1.0.1"
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^7.4"