Merge remote-tracking branch 'origin/master' into add-ref-schema-rec-…

…imports
BrickSchema · Aug 1, 2023 · 8e71ca6 · 8e71ca6
2 parents ceabc1b + 129a19a
commit 8e71ca6
Show file tree

Hide file tree

Showing 46 changed files with 10,711 additions and 1,794 deletions.
diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
+        python-version: ['3.9', '3.10']
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}

diff --git a/.github/workflows/nightly-builds.yml b/.github/workflows/nightly-builds.yml
@@ -15,7 +15,7 @@ jobs:
 
       - uses: actions/setup-python@v3
         with:
-          python-version: '3.8'
+          python-version: '3.10'
           architecture: x64
       - name: Set up AllegroGraph (Docker)
         run: |

diff --git a/bricksrc/alarm.py b/bricksrc/alarm.py
@@ -40,27 +40,16 @@
                                     TAG.Low,
                                 ],
                                 "subclasses": {
-                                    "Low_Discharge_Air_Flow_Alarm": {
-                                        "tags": [
-                                            TAG.Point,
-                                            TAG.Air,
-                                            TAG.Alarm,
-                                            TAG.Flow,
-                                            TAG.Low,
-                                            TAG.Discharge,
-                                        ],
-                                    },
                                     "Low_Supply_Air_Flow_Alarm": {
-                                        OWL.equivalentClass: BRICK[
-                                            "Low_Discharge_Air_Flow_Alarm"
-                                        ],
+                                        "aliases": [BRICK["Low_Discharge_Air_Flow_Alarm"]],
                                         "tags": [
                                             TAG.Point,
                                             TAG.Air,
                                             TAG.Alarm,
                                             TAG.Flow,
                                             TAG.Low,
                                             TAG.Supply,
+                                            TAG.Discharge,
                                         ],
                                     },
                                 },
@@ -216,73 +205,37 @@
                         "tags": [TAG.Point, TAG.Air, TAG.Temperature, TAG.Alarm],
                         "parents": [BRICK.Air_Alarm],
                         "subclasses": {
-                            "Discharge_Air_Temperature_Alarm": {
-                                "tags": [
-                                    TAG.Point,
-                                    TAG.Discharge,
-                                    TAG.Air,
-                                    TAG.Temperature,
-                                    TAG.Alarm,
-                                ],
-                                "subclasses": {
-                                    "High_Discharge_Air_Temperature_Alarm": {
-                                        "tags": [
-                                            TAG.Point,
-                                            TAG.High,
-                                            TAG.Discharge,
-                                            TAG.Air,
-                                            TAG.Temperature,
-                                            TAG.Alarm,
-                                        ],
-                                        "parents": [BRICK.High_Temperature_Alarm],
-                                    },
-                                    "Low_Discharge_Air_Temperature_Alarm": {
-                                        "tags": [
-                                            TAG.Point,
-                                            TAG.Low,
-                                            TAG.Discharge,
-                                            TAG.Air,
-                                            TAG.Temperature,
-                                            TAG.Alarm,
-                                        ],
-                                        "parents": [BRICK.Low_Temperature_Alarm],
-                                    },
-                                },
-                            },
                             "Supply_Air_Temperature_Alarm": {
-                                OWL.equivalentClass: BRICK[
-                                    "Discharge_Air_Temperature_Alarm"
-                                ],
+                                "aliases": [BRICK["Discharge_Air_Temperature_Alarm"]],
                                 "tags": [
                                     TAG.Point,
                                     TAG.Supply,
+                                    TAG.Discharge,
                                     TAG.Air,
                                     TAG.Temperature,
                                     TAG.Alarm,
                                 ],
                                 "subclasses": {
                                     "High_Supply_Air_Temperature_Alarm": {
-                                        OWL.equivalentClass: BRICK[
-                                            "High_Discharge_Air_Temperature_Alarm"
-                                        ],
+                                        "aliases": [BRICK["High_Discharge_Air_Temperature_Alarm"]],
                                         "tags": [
                                             TAG.Point,
                                             TAG.High,
                                             TAG.Supply,
+                                            TAG.Discharge,
                                             TAG.Air,
                                             TAG.Temperature,
                                             TAG.Alarm,
                                         ],
                                         "parents": [BRICK.High_Temperature_Alarm],
                                     },
                                     "Low_Supply_Air_Temperature_Alarm": {
-                                        OWL.equivalentClass: BRICK[
-                                            "Low_Discharge_Air_Temperature_Alarm"
-                                        ],
+                                        "aliases": [BRICK["Low_Discharge_Air_Temperature_Alarm"]],
                                         "tags": [
                                             TAG.Point,
                                             TAG.Low,
                                             TAG.Supply,
+                                            TAG.Discharge,
                                             TAG.Air,
                                             TAG.Temperature,
                                             TAG.Alarm,
@@ -335,22 +288,10 @@
                         "tags": [TAG.Point, TAG.Smoke, TAG.Detection, TAG.Alarm],
                         "subclasses": {
                             "Supply_Air_Smoke_Detection_Alarm": {
-                                OWL.equivalentClass: BRICK[
-                                    "Discharge_Air_Smoke_Detection_Alarm"
-                                ],
+                                "aliases": [BRICK["Discharge_Air_Smoke_Detection_Alarm"]],
                                 "tags": [
                                     TAG.Point,
                                     TAG.Supply,
-                                    TAG.Air,
-                                    TAG.Smoke,
-                                    TAG.Detection,
-                                    TAG.Alarm,
-                                ],
-                                "parents": [BRICK.Air_Alarm],
-                            },
-                            "Discharge_Air_Smoke_Detection_Alarm": {
-                                "tags": [
-                                    TAG.Point,
                                     TAG.Discharge,
                                     TAG.Air,
                                     TAG.Smoke,

diff --git a/bricksrc/collections.py b/bricksrc/collections.py
@@ -1,6 +1,9 @@
 from .namespaces import TAG, OWL, BRICK
 
 system_subclasses = {
+    "Automatic_Tint_Window_Array": {
+        "tags": [TAG.System, TAG.Tint, TAG.Array, TAG.Shade]
+    },
     "Domestic_Hot_Water_System": {
         "tags": [TAG.Domestic, TAG.Water, TAG.Hot, TAG.System]
     },
@@ -36,10 +39,9 @@
         },
     },
     "Gas_System": {"tags": [TAG.Gas, TAG.System]},
-    "HVAC_System": {"tags": [TAG.HVAC, TAG.System]},
     "Heating_Ventilation_Air_Conditioning_System": {
-        OWL.equivalentClass: BRICK["HVAC_System"],
-        "tags": [TAG.Heat, TAG.Ventilation, TAG.Air, TAG.Conditioning, TAG.System],
+        "tags": [TAG.Heat, TAG.Ventilation, TAG.Air, TAG.Conditioning, TAG.HVAC, TAG.System],
+        "aliases": [BRICK["HVAC_System"]],
         "subclasses": {
             "Air_System": {
                 "tags": [TAG.Air, TAG.System],
@@ -167,13 +169,8 @@
         "constraints": {BRICK.hasPart: [BRICK.Equipment, BRICK.Point, BRICK.Location]},
     },
     "Photovoltaic_Array": {
-        "tags": [TAG.Collection, TAG.Photovoltaic, TAG.Array],
-        "constraints": {BRICK.hasPart: [BRICK.PV_Panel]},
-        OWL.equivalentClass: BRICK["PV_Array"],
-    },
-    "PV_Array": {
-        "tags": [TAG.Collection, TAG.PV, TAG.Array],
+        "tags": [TAG.Collection, TAG.Photovoltaic, TAG.PV, TAG.Array],
+        "aliases": [BRICK["PV_Array"]],
         "constraints": {BRICK.hasPart: [BRICK.PV_Panel]},
-        OWL.equivalentClass: BRICK["Photovoltaic_Array"],
     },
 }