openepd 6.13.1__py3-none-any.whl → 6.14.0__py3-none-any.whl

openepd/__version__.py

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

openepd/m49/__init__.py

@@ -13,3 +13,5 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #
+
+from . import utils as geo_converter  # for backwards compatibility

openepd/m49/const.py

@@ -13,8 +13,8 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #
-
 from typing import NamedTuple
+import warnings
 
 M49_CODE_WORLD = "001"
 M49_CODE_AFRICA = "002"
@@ -1169,4 +1169,7 @@ def is_m49_code(to_check: str) -> bool:
     :param to_check: any string
     :return: `True` if passed string is M49 code, `False` otherwise
     """
-    return to_check in M49_AREAS or to_check in M49_TO_ISO3166_ALPHA2
+    warnings.warn("Use m49.utils.is_m49_code instead.", DeprecationWarning)
+    from . import utils
+
+    return utils.is_m49_code(to_check)

openepd/m49/{geo_converter.py → utils.py}

@@ -13,11 +13,21 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #
+__all__ = [
+    "iso_to_m49",
+    "m49_to_iso",
+    "region_and_country_names_to_m49",
+    "m49_to_region_and_country_names",
+    "openepd_to_m49",
+    "m49_to_openepd",
+    "is_m49_code",
+]
 from typing import Collection
 
 from openepd.m49.const import (
     COUNTRY_VERBOSE_NAME_TO_M49,
     ISO3166_ALPHA2_TO_M49,
+    M49_AREAS,
     M49_TO_COUNTRY_VERBOSE_NAME,
     M49_TO_ISO3166_ALPHA2,
     M49_TO_REGION_VERBOSE_NAME,
@@ -122,10 +132,10 @@ def openepd_to_m49(regions: Collection[str]) -> set[str]:
     Convert OpenEPD geography definitions to pure M49 region codes.
 
     :param regions: list of OpenEPD geography definitions including letter codes and aliases
-        like "EU27" or "NAFTA" (e.g., ["EU27", "NAFTA"], ["US", "CA, MX"])
+        like "EU27" or "NAFTA" (e.g., ["EU27", "NAFTA"], ["US", "CA, MX"], ["NAFTA", "051"])
     :return: Set of M49 region codes (e.g., {"040", "056", "100", "191", "196", "203", "208", "233", "246", "250",
         "276", "300", "348", "372", "380", "428", "440", "442", "470", "528", "616", "620", "642", "703", "705", "724",
-        "752", "840", "124", "484"}, {"840", "124", "484"})
+        "752", "840", "124", "484"}, {"840", "124", "484"}, {"840", "124", "484", "051"})
     :raises ValueError: If a region or country name is not found in ISO3166 or OpenEPD special regions.
     """
 
@@ -140,6 +150,8 @@ def openepd_to_m49(regions: Collection[str]) -> set[str]:
             m49_code = ISO3166_ALPHA2_TO_M49.get(region.upper())
             if m49_code:
                 result.add(m49_code)
+            elif is_m49_code(region):
+                result.add(region)
             else:
                 raise ValueError(f"Region '{region}' not found in ISO3166 or OpenEPD special regions.")
     return result
@@ -176,3 +188,13 @@ def m49_to_openepd(regions: list[str]) -> set[str]:
             raise ValueError(f"Region code '{code}' not found in ISO3166 or OpenEPD special regions.")
 
     return result
+
+
+def is_m49_code(to_check: str) -> bool:
+    """
+    Check if passed string is M49 code.
+
+    :param to_check: any string
+    :return: `True` if passed string is M49 code, `False` otherwise
+    """
+    return to_check in M49_AREAS or to_check in M49_TO_ISO3166_ALPHA2

openepd/model/lcia.py

@@ -359,6 +359,18 @@ class ScopeSetCTUe(ScopeSet):
     allowed_units = "CTUe"
 
 
+class ScopeSetKgSbe(ScopeSet):
+    """ScopeSet measured in kgSbe."""
+
+    allowed_units = "kgSbe"
+
+
+class ScopeSetMJ(ScopeSet):
+    """ScopeSet measured in MJ."""
+
+    allowed_units = "MJ"
+
+
 class ScopeSetDiseaseIncidence(ScopeSet):
     """ScopeSet measuring disease incidence measured in AnnualPerCapita (cases)."""
 
@@ -474,6 +486,17 @@ class ImpactSet(ScopesetByNameBase):
         default=None,
         description="Land use related impacts / Soil quality, in potential soil quality parameters.",
     )
+    ADP_mineral: ScopeSetKgSbe | None = pyd.Field(
+        alias="ADP-mineral",
+        default=None,
+        description='Abiotic depletion potential for non-fossil resources. EN15804 calls this "ADP - minerals and metals".',
+    )
+
+    ADP_fossil: ScopeSetMJ | None = pyd.Field(
+        alias="ADP-fossil",
+        default=None,
+        description="Abiotic depletion potential for fossil resources",
+    )
 
 
 class LCIAMethod(StrEnum):

openepd/model/specs/range/furnishings.py

@@ -19,11 +19,11 @@ __all__ = (
     "CountertopsRangeV1",
     "DemountablePartitionsRangeV1",
     "OtherFurnishingsRangeV1",
-    "OpenStorageRangeV1",
-    "ClosedStorageRangeV1",
-    "RetractableStorageRangeV1",
-    "MobileStorageRangeV1",
-    "WallMountedShelvingRangeV1",
+    "OpenStorageFurnitureRangeV1",
+    "ClosedStorageFurnitureRangeV1",
+    "RetractableStorageFurnitureRangeV1",
+    "MobileStorageFurnitureRangeV1",
+    "WallMountedStorageShelvingRangeV1",
     "OtherStorageFurnitureRangeV1",
     "StorageFurnitureRangeV1",
     "TablesRangeV1",
@@ -97,7 +97,7 @@ class OtherFurnishingsRangeV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
 
-class OpenStorageRangeV1(BaseOpenEpdHierarchicalSpec):
+class OpenStorageFurnitureRangeV1(BaseOpenEpdHierarchicalSpec):
     """
     Open Storage.
 
@@ -109,7 +109,7 @@ class OpenStorageRangeV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
 
-class ClosedStorageRangeV1(BaseOpenEpdHierarchicalSpec):
+class ClosedStorageFurnitureRangeV1(BaseOpenEpdHierarchicalSpec):
     """
     Closed Storage.
 
@@ -121,7 +121,7 @@ class ClosedStorageRangeV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
 
-class RetractableStorageRangeV1(BaseOpenEpdHierarchicalSpec):
+class RetractableStorageFurnitureRangeV1(BaseOpenEpdHierarchicalSpec):
     """
     Retractable Storage.
 
@@ -133,7 +133,7 @@ class RetractableStorageRangeV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
 
-class MobileStorageRangeV1(BaseOpenEpdHierarchicalSpec):
+class MobileStorageFurnitureRangeV1(BaseOpenEpdHierarchicalSpec):
     """
     Mobile Storage.
 
@@ -145,7 +145,7 @@ class MobileStorageRangeV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
 
-class WallMountedShelvingRangeV1(BaseOpenEpdHierarchicalSpec):
+class WallMountedStorageShelvingRangeV1(BaseOpenEpdHierarchicalSpec):
     """
     Wall Mounted Shelving.
 
@@ -176,11 +176,11 @@ class StorageFurnitureRangeV1(BaseOpenEpdHierarchicalSpec):
 
     _EXT_VERSION = "1.1"
 
-    OpenStorage: OpenStorageRangeV1 | None = None
-    ClosedStorage: ClosedStorageRangeV1 | None = None
-    RetractableStorage: RetractableStorageRangeV1 | None = None
-    MobileStorage: MobileStorageRangeV1 | None = None
-    WallMountedShelving: WallMountedShelvingRangeV1 | None = None
+    OpenStorageFurniture: OpenStorageFurnitureRangeV1 | None = None
+    ClosedStorageFurniture: ClosedStorageFurnitureRangeV1 | None = None
+    RetractableStorageFurniture: RetractableStorageFurnitureRangeV1 | None = None
+    MobileStorageFurniture: MobileStorageFurnitureRangeV1 | None = None
+    WallMountedStorageShelving: WallMountedStorageShelvingRangeV1 | None = None
     OtherStorageFurniture: OtherStorageFurnitureRangeV1 | None = None
 
 

openepd/model/specs/singular/furnishings.py

@@ -57,7 +57,7 @@ class OtherFurnishingsV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
 
-class OpenStorageV1(BaseOpenEpdHierarchicalSpec):
+class OpenStorageFurnitureV1(BaseOpenEpdHierarchicalSpec):
     """
     Open Storage.
 
@@ -67,7 +67,7 @@ class OpenStorageV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
 
-class ClosedStorageV1(BaseOpenEpdHierarchicalSpec):
+class ClosedStorageFurnitureV1(BaseOpenEpdHierarchicalSpec):
     """
     Closed Storage.
 
@@ -77,7 +77,7 @@ class ClosedStorageV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
 
-class RetractableStorageV1(BaseOpenEpdHierarchicalSpec):
+class RetractableStorageFurnitureV1(BaseOpenEpdHierarchicalSpec):
     """
     Retractable Storage.
 
@@ -87,7 +87,7 @@ class RetractableStorageV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
 
-class MobileStorageV1(BaseOpenEpdHierarchicalSpec):
+class MobileStorageFurnitureV1(BaseOpenEpdHierarchicalSpec):
     """
     Mobile Storage.
 
@@ -97,7 +97,7 @@ class MobileStorageV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.0"
 
 
-class WallMountedShelvingV1(BaseOpenEpdHierarchicalSpec):
+class WallMountedStorageShelvingV1(BaseOpenEpdHierarchicalSpec):
     """
     Wall Mounted Shelving.
 
@@ -119,11 +119,11 @@ class StorageFurnitureV1(BaseOpenEpdHierarchicalSpec):
     _EXT_VERSION = "1.1"
 
     # Nested specs:
-    OpenStorage: OpenStorageV1 | None = None
-    ClosedStorage: ClosedStorageV1 | None = None
-    RetractableStorage: RetractableStorageV1 | None = None
-    MobileStorage: MobileStorageV1 | None = None
-    WallMountedShelving: WallMountedShelvingV1 | None = None
+    OpenStorageFurniture: OpenStorageFurnitureV1 | None = None
+    ClosedStorageFurniture: ClosedStorageFurnitureV1 | None = None
+    RetractableStorageFurniture: RetractableStorageFurnitureV1 | None = None
+    MobileStorageFurniture: MobileStorageFurnitureV1 | None = None
+    WallMountedStorageShelving: WallMountedStorageShelvingV1 | None = None
     OtherStorageFurniture: OtherStorageFurnitureV1 | None = None
 
 

{openepd-6.13.1.dist-info → openepd-6.14.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openepd
-Version: 6.13.1
+Version: 6.14.0
 Summary: Python library to work with OpenEPD format
 Home-page: https://github.com/cchangelabs/openepd
 License: Apache-2.0
@@ -15,6 +15,8 @@ Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Provides-Extra: api-client
 Requires-Dist: email-validator (>=1.3.1)

{openepd-6.13.1.dist-info → openepd-6.14.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
 openepd/__init__.py,sha256=fhxfEyEurLvSfvQci-vb3njzl_lvhcLXiZrecCOaMU8,794
-openepd/__version__.py,sha256=sgmt6cETSc5fqwbwM-ICVdVetdp89fDLgd8mFB7w4go,639
+openepd/__version__.py,sha256=j453SSnXhKMHPbf1O03SN8RtQbB3r2ZWnWQ2okYB0mw,639
 openepd/api/__init__.py,sha256=9THJcV3LT7JDBOMz1px-QFf_sdJ0LOqJ5dmA9Dvvtd4,620
 openepd/api/average_dataset/__init__.py,sha256=9THJcV3LT7JDBOMz1px-QFf_sdJ0LOqJ5dmA9Dvvtd4,620
 openepd/api/average_dataset/generic_estimate_sync_api.py,sha256=KHCmSKMOJTQct6vhdhAatAENoouStc_yVRza5AFNoIo,7953
@@ -32,9 +32,9 @@ openepd/bundle/writer.py,sha256=gHK1D-F-td2C18QFWerg666JUTLaGUkTUSQURJi9o74,8136
 openepd/compat/__init__.py,sha256=9THJcV3LT7JDBOMz1px-QFf_sdJ0LOqJ5dmA9Dvvtd4,620
 openepd/compat/compat_functional_validators.py,sha256=aWg3a80fqT8zjN0S260N-Ad2WFKAaB8ByN7ArBW3NMA,834
 openepd/compat/pydantic.py,sha256=dNwPXK1X5xq9sdkd0kcbKQAUIter1GAfcxXOl6hmITQ,1146
-openepd/m49/__init__.py,sha256=9THJcV3LT7JDBOMz1px-QFf_sdJ0LOqJ5dmA9Dvvtd4,620
-openepd/m49/const.py,sha256=O31VJ5_sR4GAOvJnFsi3An2YMaMa96H7XBqaQ0kNwnw,31734
-openepd/m49/geo_converter.py,sha256=mRamQTVwd35kwn5-23N3E8cxqpYG7l9eW787SJYM7nw,6515
+openepd/m49/__init__.py,sha256=vkXC6i8OeCl5K88JUIRN_NKfsAIpNIaN-fyPmmd-Lfk,689
+openepd/m49/const.py,sha256=buspTHOOWhkBXWUIS0oqvQ0y1L7y70Y_PXilkiBIKD4,31819
+openepd/m49/utils.py,sha256=Qm8HvxAZlQncsyUYDO0lG0feMFFnT4HQPNSMp78W4zU,7111
 openepd/model/__init__.py,sha256=9THJcV3LT7JDBOMz1px-QFf_sdJ0LOqJ5dmA9Dvvtd4,620
 openepd/model/base.py,sha256=1GeaEDn-ppy94GaOaZI1y6Yew_0eBBho1COaxfzzLCw,9834
 openepd/model/category.py,sha256=reeOVRDuZPYU77EMwG0K5VjnK2H9yOGxT0PJXXqrjEk,1639
@@ -45,7 +45,7 @@ openepd/model/factory.py,sha256=doexyqZXJVGd45T1JsbjuyGUjEykW-MerKUq4SQHhRY,2656
 openepd/model/generic_estimate.py,sha256=zLGTyf4Uzmp2C0m-J1ePWItSz2RGdZ0OiGPWC5nhKHk,3992
 openepd/model/geography.py,sha256=Jx7NIDdk_sIvwyh-7YxnIjAwIHW2HCQK7UtFGM2xKtw,42095
 openepd/model/industry_epd.py,sha256=QZr7OhgGkzqZ8H5p6dCIVk9zSHEYtK3y9Nk-DvkFMyk,4011
-openepd/model/lcia.py,sha256=gS4WFcw7v8PKKDCBUQXQP5I8Jh_TdyZyIklAjUc5HL4,25507
+openepd/model/lcia.py,sha256=sUuVOJivfyx1m2l83YdPyTgkJBOn7mJGVFxvbCo_bCk,26107
 openepd/model/org.py,sha256=MtaUrD8IdSbcMJEwL2lnXOIXNfE8wpzrepFSe2qh2uc,5342
 openepd/model/pcr.py,sha256=b8WmeII8MZ3rJFWxugqv_Z0ETan8NMWj9L6mSrhneJk,5494
 openepd/model/specs/README.md,sha256=UGhSiFJ9hOxT1mZl-5ZrhkOrPKf1W_gcu5CI9hzV7LU,2430
@@ -70,7 +70,7 @@ openepd/model/specs/range/electrical_transmission_and_distribution_equipment.py,
 openepd/model/specs/range/electricity.py,sha256=yn_S25C_tZqseb8hiJ1yiHszu2mQ49FOFWWCqNpOBY0,997
 openepd/model/specs/range/finishes.py,sha256=oCaPVYJja1KYxwEzTHCl7HtxQ2mokzeyahjyP33zHSg,21291
 openepd/model/specs/range/fire_and_smoke_protection.py,sha256=u5veICQznf-woYlh49S_IbvPA23CLWEy7Ngvic2FIpw,3337
-openepd/model/specs/range/furnishings.py,sha256=7r9albaHmuf0ttqkSQ6elJcSzgFgOHSrwAfhEpJMm5k,6531
+openepd/model/specs/range/furnishings.py,sha256=FOGfaaA2mGtlWuBuzJLxkHU3JSKzhtCDZVgpfEtR85Y,6703
 openepd/model/specs/range/grouting.py,sha256=BQPxH6BvlXpdhLEZBui9zTuY93K_9syjoa6rdnF8GGY,1095
 openepd/model/specs/range/manufacturing_inputs.py,sha256=xzgkNz7yG8cp715hxS0LtJX9nfJ5RQR8GxlD2bAduwE,5574
 openepd/model/specs/range/masonry.py,sha256=IyjQMb8Mx3tpJlHIIam0OrMkFsJXKvc0WXRLRBupozY,2867
@@ -109,7 +109,7 @@ openepd/model/specs/singular/electrical_transmission_and_distribution_equipment.
 openepd/model/specs/singular/electricity.py,sha256=f1cJ9eklNUf97khCIZiT5-z8V_TbOcvH2me_1UTQVrE,823
 openepd/model/specs/singular/finishes.py,sha256=bAlNZiUP-HwePaJyC1D4j2fpv0xnMp3V5mhtAs9iaxQ,22571
 openepd/model/specs/singular/fire_and_smoke_protection.py,sha256=1uyEGdMAsboYORHvSFN1wftRVAps_UJ1Ep3Dk9arT3s,3058
-openepd/model/specs/singular/furnishings.py,sha256=6V6Dc4xph8PcIQhuuLFyFGL4w2Yh_ByEKCNvQfUkxZQ,5603
+openepd/model/specs/singular/furnishings.py,sha256=4bReWm8FSWHRyq6vmjPm7ZixFIau7J8JF1gtZq6_jVA,5732
 openepd/model/specs/singular/grouting.py,sha256=pg2tX3W7a2TQ3z_eyFYGlBJY3WEwn6JlZyqM3PQIJcU,934
 openepd/model/specs/singular/manufacturing_inputs.py,sha256=9WSDOVN0mUqvFXqWf82lkpHi-XRQSMcEpe9bweegwhU,5093
 openepd/model/specs/singular/masonry.py,sha256=f6nph-gscAmVeJ60bG-ebto5kz0fgh0LY27n0VutGFA,3165
@@ -139,7 +139,7 @@ openepd/model/validation/quantity.py,sha256=vfSe-3DGQf84bCp_sMIU0ZPAA1wIilodpTjL
 openepd/model/versioning.py,sha256=cm3LaAUODnbbu3W3pC6baJzxKusTQ1kZH-PwwScCj3c,4473
 openepd/patch_pydantic.py,sha256=LVqDMKn723VYYf_V-RgTLxIb1xiUtYOfPYCQP6-7RoM,4122
 openepd/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-openepd-6.13.1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-openepd-6.13.1.dist-info/METADATA,sha256=T7QapSryr1s5pRrcSY-TBnm6HauXRFkEOD-_If1ZfpI,9039
-openepd-6.13.1.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-openepd-6.13.1.dist-info/RECORD,,
+openepd-6.14.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+openepd-6.14.0.dist-info/METADATA,sha256=h-mIxr7O0iGai5O1phDjpdwakuWYzUtnrTzEW9BzX3U,9141
+openepd-6.14.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+openepd-6.14.0.dist-info/RECORD,,

{openepd-6.13.1.dist-info → openepd-6.14.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.6.1
+Generator: poetry-core 1.9.1
 Root-Is-Purelib: true
 Tag: py3-none-any