openepd 6.31.0__tar.gz → 6.31.2__tar.gz

{openepd-6.31.0 → openepd-6.31.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: openepd
-Version: 6.31.0
+Version: 6.31.2
 Summary: Python library to work with OpenEPD format
 License: Apache-2.0
 Author: C-Change Labs

{openepd-6.31.0 → openepd-6.31.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "openepd"
-version = "6.31.0"
+version = "6.31.2"
 license = "Apache-2.0"
 description = "Python library to work with OpenEPD format"
 authors = ["C-Change Labs <support@c-change-labs.com>"]

{openepd-6.31.0 → openepd-6.31.2}/src/openepd/__version__.py

@@ -13,4 +13,4 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #
-VERSION = "6.31.0"
+VERSION = "6.31.2"

{openepd-6.31.0 → openepd-6.31.2}/src/openepd/model/base.py

@@ -70,7 +70,7 @@ class BaseOpenEpdSchema(pyd.BaseModel):
         allow_mutation = True
         validate_assignment = False
         allow_population_by_field_name = True
-        use_enum_values = True
+        use_enum_values = False
         schema_extra: Callable | dict = modify_pydantic_schema
 
     def to_serializable(self, *args, **kwargs) -> dict[str, Any]:

{openepd-6.31.0 → openepd-6.31.2}/src/openepd/model/common.py

@@ -22,7 +22,7 @@ from openepd.compat.pydantic import pyd
 from openepd.model.base import BaseOpenEpdSchema
 from openepd.model.validation.numbers import RatioFloat
 
-DATA_URL_REGEX = r"^data:([-\w]+\/[-+\w.]+)?(;?\w+=[-\w]+)*(;base64)?,.*$"
+DATA_URL_REGEX = r"^data:([-\w]+\/[-+\w.]+)?(;?\w+=[-\w]+)*(;base64)?,(.*)$"
 """
 Regular expression pattern for matching Data URLs.
 

{openepd-6.31.0 → openepd-6.31.2}/src/openepd/model/org.py

@@ -179,6 +179,10 @@ class Plant(PlantRef, WithAttachmentsMixin, WithAltIdsMixin):
             msg = "Incorrect pluscode for plant"
             raise ValueError(msg)
 
+        if not openlocationcode.isFull(pluscode):
+            msg = "Passed Open Location Code is not a valid full code"
+            raise ValueError(msg)
+
         if not web_domain:
             msg = "Incorrect web_domain for plant"
             raise ValueError(msg)

{openepd-6.31.0 → openepd-6.31.2}/src/openepd/model/specs/range/electrical.py

@@ -33,6 +33,7 @@ __all__ = (
     "LowVoltBusesRangeV1",
     "LowVoltageElectricalDistributionRangeV1",
     "MedVoltBusesRangeV1",
+    "OtherElectricalEquipmentRangeV1",
     "OtherElectricalPowerStorageRangeV1",
     "OtherGenerationRangeV1",
     "OutdoorLightingRangeV1",

openepd-6.31.2/src/openepd/model/specs/range/other_electrical_equipment.py

@@ -0,0 +1,18 @@
+#
+#  Copyright 2025 by C Change Labs Inc. www.c-change-labs.com
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#
+
+# Deprecated import: This import is kept for backward compatibility and should be removed in the future.
+from .electrical import OtherElectricalEquipmentRangeV1  # noqa: F401

{openepd-6.31.0 → openepd-6.31.2}/src/openepd/model/specs/singular/electrical.py

@@ -13,6 +13,39 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #
+__all__ = (
+    "BatteriesV1",
+    "CableTraysV1",
+    "ElectricPowerV1",
+    "ElectricalBusesV1",
+    "ElectricalConduitV1",
+    "ElectricalGenerationEquipmentV1",
+    "ElectricalPowerStorageV1",
+    "ElectricalV1",
+    "ElectricityFromPowerGridV1",
+    "ElectricityFromSpecificGeneratorV1",
+    "FloorEquipmentBoxesV1",
+    "FueledElectricalGeneratorsV1",
+    "LightbulbsV1",
+    "LightingControlsV1",
+    "LightingFixturesV1",
+    "LightingV1",
+    "LowVoltBusesV1",
+    "LowVoltageElectricalDistributionV1",
+    "MedVoltBusesV1",
+    "OtherElectricalEquipmentV1",
+    "OtherElectricalPowerStorageV1",
+    "OtherGenerationV1",
+    "OutdoorLightingV1",
+    "PhotovoltaicsV1",
+    "PowerDistributionUnitsV1",
+    "PowerPurchaseAgreementsV1",
+    "RacewaysV1",
+    "SpecialtyLightingV1",
+    "TaskLightingV1",
+    "WindTurbinesV1",
+)
+
 from openepd.compat.pydantic import pyd
 from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
 from openepd.model.specs.enums import CableTraysMaterial, EnergySource, RacewaysMaterial

{openepd-6.31.0 → openepd-6.31.2}/src/openepd/model/specs/singular/masonry.py

@@ -18,8 +18,6 @@ from openepd.model.specs.base import BaseOpenEpdHierarchicalSpec
 from openepd.model.validation.quantity import (
     PressureMPaStr,
     ThermalConductivityStr,
-    validate_quantity_ge_factory,
-    validate_quantity_unit_factory,
 )
 
 
@@ -41,14 +39,6 @@ class AutoclavedAeratedConcreteV1(BaseOpenEpdHierarchicalSpec):
     )
     white: bool | None = pyd.Field(default=None, description="", example=True)
 
-    _aac_thermal_conductivity_is_quantity_validator = pyd.validator("thermal_conductivity", allow_reuse=True)(
-        validate_quantity_unit_factory("W / (m * K)")
-    )
-
-    _aac_thermal_conductivity_min_validator = pyd.validator("thermal_conductivity", allow_reuse=True)(
-        validate_quantity_ge_factory("0 W / (m * K)")
-    )
-
 
 class BrickV1(BaseOpenEpdHierarchicalSpec):
     """Solid masonry units made from clay or shale."""

openepd-6.31.2/src/openepd/model/specs/singular/other_electrical_equipment.py

@@ -0,0 +1,18 @@
+#
+#  Copyright 2025 by C Change Labs Inc. www.c-change-labs.com
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#
+
+# Deprecated import: This import is kept for backward compatibility and should be removed in the future.
+from .electrical import OtherElectricalEquipmentV1  # noqa: F401

{openepd-6.31.0 → openepd-6.31.2}/src/openepd/model/validation/quantity.py

@@ -317,7 +317,7 @@ class AreaPerVolumeStr(QuantityStr):
 class ThermalConductivityStr(QuantityStr):
     """Thermal conductivity quantity type."""
 
-    unit = "1 W / K / m"
+    unit = "W / K / m"
 
 
 class ThermalExpansionStr(QuantityStr):