galaxyproject / galaxy

Data intensive science for everyone.
https://galaxyproject.org
Other
1.39k stars 1k forks source link

carbon emission estimates are not getting disabled #17535

Closed microfuge closed 8 months ago

microfuge commented 8 months ago

Hi

I am using galaxy v23.2 and I have set the carbon_emission_estimates: false in galaxy.yml Yet the these are still shown in job info. Searching this flag in the code base I could not understand how this flag is applied.

Thanks

nsoranzo commented 8 months ago

Thanks for reporting! Can you test if the following patch fixes it?

diff --git a/client/src/components/DatasetInformation/DatasetDetails.vue b/client/src/components/DatasetInformation/DatasetDetails.vue
index 4049686acf..f9f2606669 100644
--- a/client/src/components/DatasetInformation/DatasetDetails.vue
+++ b/client/src/components/DatasetInformation/DatasetDetails.vue
@@ -25,7 +25,7 @@
                             :geographical-server-location-name="config.geographical_server_location_name"
                             :power-usage-effectiveness="config.power_usage_effectiveness"
                             :should-show-aws-estimate="config.aws_estimate"
-                            :should-show-carbon-emissions-estimates="config.carbon_emissions_estimates" />
+                            :should-show-carbon-emission-estimates="config.carbon_emission_estimates" />
                         <JobDestinationParams v-if="currentUser.is_admin" :job-id="dataset.creating_job" />
                         <JobDependencies :dependencies="job.dependencies"></JobDependencies>
                         <div v-if="dataset.peek">
diff --git a/client/src/components/JobMetrics/JobMetrics.vue b/client/src/components/JobMetrics/JobMetrics.vue
index de1cbe9a1d..c05befc7e5 100644
--- a/client/src/components/JobMetrics/JobMetrics.vue
+++ b/client/src/components/JobMetrics/JobMetrics.vue
@@ -45,7 +45,7 @@ const props = defineProps({
         type: Boolean,
         default: false,
     },
-    shouldShowCarbonEmissionsEstimates: {
+    shouldShowCarbonEmissionEstimates: {
         type: Boolean,
         default: true,
     },
@@ -210,7 +210,7 @@ const estimatedServerInstance = computed(() => {

         <CarbonEmissions
             v-if="
-                shouldShowCarbonEmissionsEstimates && estimatedServerInstance && jobRuntimeInSeconds && coresAllocated
+                shouldShowCarbonEmissionEstimates && estimatedServerInstance && jobRuntimeInSeconds && coresAllocated
             "
             :carbon-intensity="carbonIntensity"
             :geographical-server-location-name="geographicalServerLocationName"
diff --git a/client/src/components/Markdown/Elements/JobMetrics.vue b/client/src/components/Markdown/Elements/JobMetrics.vue
index 9557189686..c656b6d140 100644
--- a/client/src/components/Markdown/Elements/JobMetrics.vue
+++ b/client/src/components/Markdown/Elements/JobMetrics.vue
@@ -74,7 +74,7 @@ watch(
                 class="job-metrics"
                 :job-id="targetJobId"
                 :should-show-aws-estimate="false"
-                :should-show-carbon-emissions-estimates="false"
+                :should-show-carbon-emission-estimates="false"
                 :include-title="false" />
         </JobSelection>
         <b-card-footer v-if="footer">
microfuge commented 8 months ago

Hi Nicola,

Thanks! I confirm that this patch (applied to branch 23.2 ) fixes the issue.

Presuming these calculations still happen and are just not displayed, it would be good to have an option to disable completely. Could be part of job metrics. Not an expert, so please ignore this line if this does not make sense.

dannon commented 8 months ago

@nsoranzo Good eye, want to PR that?

nsoranzo commented 8 months ago

@dannon Sure, just need to clean up my git branch :D

nsoranzo commented 8 months ago

I've opened #17543 with the above fix.

microfuge commented 8 months ago

Thanks! Just a minor note that the carbon footprint is still shown in /admin/jobs interface when the admin looks at a particular job.