Fix range formatting

ecologits/_ecologits.py

@@ -5,8 +5,8 @@
 
 from packaging.version import Version
 
-from ecologits.exceptions import EcoLogitsError
-from ecologits.log import logger
+from ecologits.utils.exceptions import EcoLogitsError
+from ecologits.utils.log import logger
 
 
 def init_openai_instrumentor() -> None:

ecologits/impacts/llm.py

@@ -4,7 +4,7 @@
 
 from ecologits.impacts.dag import DAG
 from ecologits.impacts.modeling import GWP, PE, ADPe, Embodied, Energy, Impacts, Usage
-from ecologits.range_value import RangeValue, ValueOrRange
+from ecologits.utils.range_value import RangeValue, ValueOrRange
 
 MODEL_QUANTIZATION_BITS = 4
 

ecologits/impacts/modeling.py

@@ -2,8 +2,8 @@
 
 from pydantic import BaseModel
 
-from ecologits.exceptions import ModelingError
-from ecologits.range_value import ValueOrRange
+from ecologits.utils.exceptions import ModelingError
+from ecologits.utils.range_value import ValueOrRange
 
 
 @total_ordering

ecologits/model_repository.py

@@ -5,7 +5,7 @@
 
 from pydantic import BaseModel
 
-from ecologits.range_value import ValueOrRange
+from ecologits.utils.range_value import ValueOrRange
 
 
 class Providers(Enum):

ecologits/tracers/utils.py

@@ -3,8 +3,8 @@
 from ecologits.electricity_mix_repository import electricity_mixes
 from ecologits.impacts.llm import compute_llm_impacts
 from ecologits.impacts.modeling import Impacts
-from ecologits.log import logger
 from ecologits.model_repository import ArchitectureTypes, models
+from ecologits.utils.log import logger
 
 
 def _avg(value_range: tuple) -> float:

ecologits/range_value.py → ecologits/utils/range_value.py

@@ -63,5 +63,10 @@ def __gt__(self, other: Any) -> bool:
         else:
             return self.min > other
 
+    def __format__(self,format_spec:str)-> str:
+        return f"{format(self.min,format_spec)} to {format(self.max,format_spec)}"
+
+
+
 
 ValueOrRange = Union[int, float, RangeValue]

tests/test_modeling_impacts.py

@@ -3,8 +3,8 @@
 import pytest
 
 from ecologits.impacts.modeling import Impact, Energy, GWP, ADPe, PE
-from ecologits.exceptions import ModelingError
-from ecologits.range_value import RangeValue
+from ecologits.utils.exceptions import ModelingError
+from ecologits.utils.range_value import RangeValue
 
 
 impact_config = dict(

tests/utils/range_value.py

@@ -0,0 +1,10 @@
+from ecologits.utils.range_value import RangeValue
+
+
+def test_range_formats_ok():
+
+    range = RangeValue(min =0.00000006, max=0.00008)
+
+    expected = f"{range.min:.2f} to {range.max:.2f}"
+
+    assert f"{range:.2f}" == expected