Merge branch 'cicd-cleanup' into cleanup-cicd

.github/workflows/image_build_push.yml

@@ -25,7 +25,7 @@ jobs:
         set -a; source .env; set +a
         echo "SERVER_IMAGE_TAG=${SERVER_IMAGE_TAG}" >> "$GITHUB_OUTPUT"
         echo "Current server image tag (push): ${SERVER_IMAGE_TAG}"
-
+  
     - name: docker login
       run: | # log into docker hub account
         docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
@@ -64,18 +64,6 @@ jobs:
           git push origin 
         fi
 
-    - name: Create artifact text file
-      run: |
-        echo ${{ steps.date.outputs.date }} > tag_file.txt
-        echo "Created tag text file"
-
-    - name: Upload Artifact
-      uses: actions/upload-artifact@v4
-      with:
-        name: docker-image-tag
-        path: tag_file.txt
-        overwrite: true
-
   dispatch:
     needs: build
     runs-on: ubuntu-latest

Dockerfile

@@ -3,8 +3,6 @@ FROM ubuntu:jammy-20240227
 
 MAINTAINER K. Shankari ([email protected])
 
-ADD https://truststore.pki.rds.amazonaws.com/global/global-bundle.pem /etc/ssl/certs/
-
 WORKDIR /usr/src/app
 
 RUN apt-get -y -qq update

emission/net/api/metrics.py

@@ -7,6 +7,7 @@
 from builtins import zip
 from builtins import *
 import logging
+import asyncio
 
 import emission.analysis.result.metrics.time_grouping as earmt
 import emission.analysis.result.metrics.simple_metrics as earms
@@ -28,7 +29,7 @@ def summarize_by_local_date(user_id, start_ld, end_ld, freq_name, metric_list, i
 def summarize_by_yyyy_mm_dd(user_id, start_ymd, end_ymd, freq, metric_list, include_agg, app_config): 
     time_query = estf.FmtTimeQuery("data.start_fmt_time", start_ymd, end_ymd)
     trips = esda.get_entries(esda.COMPOSITE_TRIP_KEY, None, time_query)
-    return emcms.generate_summaries(metric_list, trips, app_config)
+    return asyncio.run(emcms.generate_summaries(metric_list, trips, app_config))
 
 def _call_group_fn(group_fn, user_id, start_time, end_time, freq, metric_list, include_aggregate):
     summary_fn_list = [earms.get_summary_fn(metric_name)