openepd 6.4.1__py3-none-any.whl → 6.4.2__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.4.1"
+VERSION = "6.4.2"

openepd/model/lcia.py

@@ -206,9 +206,17 @@ class ScopeSet(BaseOpenEpdSchema):
             if isinstance(v, Measurement):
                 all_units.add(v.unit)
 
-        # units should be the same across all measurements (textually)
-        if len(all_units) > 1:
-            raise ValueError("All scopes and measurements should be expressed in the same unit.")
+        if not cls.allowed_units:
+            # For unknown units - only units should be the same across all measurements (textually)
+            if len(all_units) > 1:
+                raise ValueError("All scopes and measurements should be expressed in the same unit.")
+        else:
+            # might be multiple variations of the same unit (kgCFC-11e, kgCFC11e)
+            if len(all_units) > 1 and ExternalValidationConfig.QUANTITY_VALIDATOR:
+                all_units_list = list(all_units)
+                first = all_units_list[0]
+                for unit in all_units_list[1:]:
+                    ExternalValidationConfig.QUANTITY_VALIDATOR.validate_same_dimensionality(first, unit)
 
         # can correctly validate unit
         if cls.allowed_units is not None and len(all_units) == 1 and ExternalValidationConfig.QUANTITY_VALIDATOR:

openepd/model/validation/quantity.py

@@ -33,7 +33,7 @@ class QuantityValidator(ABC):
     """
 
     @abstractmethod
-    def validate_same_dimensionality(self, unit: str | None, dimensionality_unit: str) -> None:
+    def validate_same_dimensionality(self, unit: str | None, dimensionality_unit: str | None) -> None:
         """
         Validate that a given unit ('kg') has the same dimesnionality as provided dimensionality_unit ('g').
 

{openepd-6.4.1.dist-info → openepd-6.4.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openepd
-Version: 6.4.1
+Version: 6.4.2
 Summary: Python library to work with OpenEPD format
 Home-page: https://github.com/cchangelabs/openepd
 License: Apache-2.0

{openepd-6.4.1.dist-info → openepd-6.4.2.dist-info}/RECORD

@@ -1,5 +1,5 @@
 openepd/__init__.py,sha256=Shkfh0Kun0YRhmRDw7LkUj2eQL3X-HnP55u2THOEALw,794
-openepd/__version__.py,sha256=ynbiHC7WrNYOSyzyrd2Hj7jVjQQIObp13PMqmGs_IDQ,638
+openepd/__version__.py,sha256=LyifoozbkojKiw7ry9hn1dHTlFfXjPvebpjBZDdw6uU,638
 openepd/api/__init__.py,sha256=UGmZGEyMnASrYwEBPHuXmVzHiuCUskUsJEPoHTIo-lg,620
 openepd/api/average_dataset/__init__.py,sha256=UGmZGEyMnASrYwEBPHuXmVzHiuCUskUsJEPoHTIo-lg,620
 openepd/api/average_dataset/generic_estimate_sync_api.py,sha256=mxWwDokEGMe87Px8C_aHvIdVKZVHrEAuVtaSA1zJchU,7953
@@ -42,7 +42,7 @@ openepd/model/factory.py,sha256=XP7eeQNW5tqwX_4hfuEb3lK6BFQDb4KB0fSN0r8-lCU,2656
 openepd/model/generic_estimate.py,sha256=bbU0cR4izSqjZcfxUHNbdO4pllqqd8OaUFikrEgCFoA,3992
 openepd/model/geography.py,sha256=G3Oz3QBw5n-RiSCAv-vAGxrOZBhwIT5rASnPlo9dkcs,42095
 openepd/model/industry_epd.py,sha256=rgXhCUDAgzZ9eGio7ExqE3ymP3zTXnrrwcIDvg5YP1A,3285
-openepd/model/lcia.py,sha256=NTUoPv8Yy-f_MCiezEKvB4gx18r0In5vl2e2SuLqQjY,25012
+openepd/model/lcia.py,sha256=a0OZQzZBtXNx_6O1jMnC1WQrlU3rdFrDN-Y3UchfgGM,25507
 openepd/model/org.py,sha256=PtG4-EgjKvNSt7446lV60HhDC3YyRx2E-yJ8MMs5raE,5049
 openepd/model/pcr.py,sha256=QknLtTn6Y14JORWKQ1qBqGgKnZpbKgqNiYF3Axl4U4c,5494
 openepd/model/specs/README.md,sha256=UGhSiFJ9hOxT1mZl-5ZrhkOrPKf1W_gcu5CI9hzV7LU,2430
@@ -129,11 +129,11 @@ openepd/model/validation/__init__.py,sha256=UGmZGEyMnASrYwEBPHuXmVzHiuCUskUsJEPo
 openepd/model/validation/common.py,sha256=FLYqK8gYFagx08LCkS0jy3qo4-Zq9VAv5i8ZwF2svkc,2435
 openepd/model/validation/enum.py,sha256=06Fi2_sdjVhOElavtgvNXvkKU0NQ-bcAFx5_5MiDzdU,1793
 openepd/model/validation/numbers.py,sha256=J2rVMwJTPr8uC1DrU80xpq2SZGMXvVKx7v74SgOVi0U,851
-openepd/model/validation/quantity.py,sha256=UP6x2nUj1nP7G8e2rpi-HigHx9rwKeCuIDh_XWFRU6U,20187
+openepd/model/validation/quantity.py,sha256=1z-G46dlryJEm4W-O0QiEJuFYICz7CPTM6gLhQKstgM,20194
 openepd/model/versioning.py,sha256=R_zm6rCrgF3vlJQYbpyWhirdS_Oek16cv_mvZmpuE8I,4473
 openepd/patch_pydantic.py,sha256=xrkzblatmU9HBzukWkp1cPq9ZSuohoz1p0pQqVKSlKs,4122
 openepd/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-openepd-6.4.1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-openepd-6.4.1.dist-info/METADATA,sha256=YqnvdbcllbapVDL63YMJA-0UJozK9OH5TGhnicVv95I,9038
-openepd-6.4.1.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-openepd-6.4.1.dist-info/RECORD,,
+openepd-6.4.2.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+openepd-6.4.2.dist-info/METADATA,sha256=5kTEsZy4PiO9EBGPxbl5Lu7pqAwDaJOjqkpRkVKUbas,9038
+openepd-6.4.2.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+openepd-6.4.2.dist-info/RECORD,,