Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions carbonserver/carbonserver/api/schemas.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ def __repr__(self):
class EmissionBase(BaseModel):
timestamp: datetime
run_id: UUID
duration: int = Field(
duration: float = Field(
..., gt=0, description="The duration must be greater than zero"
)
emissions_sum: Optional[float] = Field(
Expand Down Expand Up @@ -283,7 +283,7 @@ class ExperimentReport(ExperimentBase):
gpu_energy: float
ram_energy: float
energy_consumed: float
duration: int
duration: float
emissions_rate: float
emissions_count: int
cpu_utilization_percent: Optional[float] = None
Expand Down Expand Up @@ -396,7 +396,7 @@ class ProjectReport(ProjectBase):
gpu_energy: float
ram_energy: float
energy_consumed: float
duration: int
duration: float
emissions_rate: float
emissions_count: int
cpu_utilization_percent: Optional[float] = None
Expand Down Expand Up @@ -443,7 +443,7 @@ class OrganizationReport(OrganizationBase):
gpu_energy: float
ram_energy: float
energy_consumed: float
duration: int
duration: float
emissions_rate: float
emissions_count: int
cpu_utilization_percent: Optional[float] = None
Expand Down
24 changes: 24 additions & 0 deletions carbonserver/tests/api/test_schema_compatibility.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,3 +118,27 @@ def test_client_create_payloads_validate_against_server_schemas(
client_payload, server_schema
):
server_schema.model_validate(dataclasses.asdict(client_payload))


def test_millisecond_duration_survives_client_to_server():
"""A single FastAPI request lasts milliseconds and must not be rounded away."""
payload = client_schemas.EmissionCreate(
timestamp="2021-04-04T08:43:00+02:00",
run_id="40088f1a-d28e-4980-8d80-bf5600056a14",
duration=0.0042,
emissions_sum=1544.54,
emissions_rate=1.548444,
cpu_power=0.3,
gpu_power=0.0,
ram_power=0.15,
cpu_energy=55.21874,
gpu_energy=0.0,
ram_energy=2.0,
energy_consumed=57.21874,
)

validated = server_schemas.EmissionCreate.model_validate(
dataclasses.asdict(payload)
)

assert validated.duration == 0.0042
7 changes: 1 addition & 6 deletions codecarbon/core/api_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -184,15 +184,10 @@ def add_emission(self, carbon_emission: dict):
"ApiClient.add_emission still no run_id, aborting for this time !"
)
return False
if carbon_emission["duration"] < 1:
logger.warning(
"ApiClient : emissions not sent because of a duration smaller than 1."
)
return False
emission = EmissionCreate(
timestamp=get_datetime_with_timezone(),
run_id=self.run_id,
duration=int(carbon_emission["duration"]),
duration=carbon_emission["duration"],
emissions_sum=carbon_emission["emissions"],
emissions_rate=carbon_emission["emissions_rate"],
cpu_power=carbon_emission["cpu_power"],
Expand Down
2 changes: 1 addition & 1 deletion codecarbon/core/schemas.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
class EmissionBase:
timestamp: str
run_id: str
duration: int
duration: float
emissions_sum: float
emissions_rate: float
cpu_power: float
Expand Down
50 changes: 27 additions & 23 deletions tests/test_api_call.py
Original file line number Diff line number Diff line change
Expand Up @@ -202,31 +202,35 @@ def test_add_emission_returns_false_when_run_creation_fails(self):
)
)

def test_add_emission_skips_short_duration(self):
api = ApiClient(
endpoint_url="http://test.com",
experiment_id="exp-1",
conf=conf,
create_run_automatically=False,
)
api.run_id = "run-1"
def test_add_emission_sends_millisecond_duration_unchanged(self):
"""A single FastAPI request lasts milliseconds: send it, do not round it."""
with requests_mock.Mocker() as m:
m.post("http://test.com/emissions", json={"id": "em-1"}, status_code=201)
api = ApiClient(
endpoint_url="http://test.com",
experiment_id="exp-1",
conf=conf,
create_run_automatically=False,
)
api.run_id = "run-1"

self.assertFalse(
api.add_emission(
{
"duration": 0.5,
"emissions": 1.0,
"emissions_rate": 1.0,
"cpu_power": 1.0,
"gpu_power": 0.0,
"ram_power": 0.5,
"cpu_energy": 0.1,
"gpu_energy": 0.0,
"ram_energy": 0.1,
"energy_consumed": 0.2,
}
self.assertTrue(
api.add_emission(
{
"duration": 0.0042,
"emissions": 1.0,
"emissions_rate": 1.0,
"cpu_power": 1.0,
"gpu_power": 0.0,
"ram_power": 0.5,
"cpu_energy": 0.1,
"gpu_energy": 0.0,
"ram_energy": 0.1,
"energy_consumed": 0.2,
}
)
)
)
self.assertEqual(m.last_request.json()["duration"], 0.0042)

def test_add_emission_raises_on_unsuccessful_post(self):
with requests_mock.Mocker() as m:
Expand Down
Loading