Merge pull request #82 from cloudnativedaysjp/fix/get_votes_csv_from_weaver

Fix: get votes csv from weaver

Author: ystkfujii

tools/cfp-vote-counter/README.md

@@ -25,13 +25,10 @@ aws sso login
 
 # Generate CSV
 ./main.py generate_csv cndt2022 [stg]
-
-# Show time-series graph
-./main.py time_series cndt2022 [stg]
 ```
 
 Help
 
 ```
-./main.py generate -h
+./main.py generate_csv -h
 ```

tools/cfp-vote-counter/main.py

@@ -1,66 +1,51 @@
 #!/usr/bin/env python3
-from typing import Literal, Optional
+from typing import Final, Literal, Optional
 
 import fire
 import pandas as pd
 import matplotlib.pyplot as plt
 
-from src.query import QueryConfig, fetch_votes, Boto3Config
-from src.transform import unique_over_time, count_votes, time_series_total_count
+from gql import gql, Client
+from gql.transport.aiohttp import AIOHTTPTransport
+
+
+DKW_ENDPOINT: Final[dict[str, str]] = {
+    "stg": "https://dkw.dev.cloudnativedays.jp/query",
+    "prd": "https://dkw.cloudnativedays.jp/query",
+}
 
 
 class Command:
     """CFP Vote Counter CLI"""
 
-    def generate_csv(self, event: str, env: Literal["stg", "prd"] = "prd", span: int = 3600,
-                     region: Optional[str] = None):
+    def generate_csv(self, event: str, env: Literal["stg", "prd"] = "prd"):
         """
         Generate transformed CFP vote csv
 
         :param event: Event Abbreviation (e.g. cndt2022)
         :param env: Environment (stg|prd)
-        :param span: Seconds of span where multiple votes from the same GIP would be considered as the same one
-        :param region: Region of Dynamo vote table
         """
-        conf = QueryConfig(event, env)
-        boto3_conf = Boto3Config(region)
-        res = fetch_votes(conf, boto3_conf)
-        if res["Count"] == 0:
-            print("No votes found.")
-            return
 
-        df = pd.DataFrame(res["Items"])
-        df = unique_over_time(df, span)
-        sr = count_votes(df)
-        print(sr.to_csv())
-
-    def time_series(self, event: str, env: Literal["stg", "prd"] = "prd", span: int = 3600,
-                    region: Optional[str] = None, file: str = None):
-        """
-        Generate transformed CFP vote csv
+        transport = AIOHTTPTransport(url=DKW_ENDPOINT[env])
+        client = Client(transport=transport, fetch_schema_from_transport=True)
 
-        :param event: Event Abbreviation (e.g. cndt2022)
-        :param env: Environment (stg|prd)
-        :param span: Seconds of span where multiple votes from the same GIP would be considered as the same one
-        :param region: Region of Dynamo vote table
-        :param file: File name of time-series graph figure
+        query = gql(
         """
-        conf = QueryConfig(event, env)
-        boto3_conf = Boto3Config(region)
-        res = fetch_votes(conf, boto3_conf)
-        if res["Count"] == 0:
-            print("No votes found.")
-            return
-
-        df = pd.DataFrame(res["Items"])
-        df = unique_over_time(df, span)
-        df = time_series_total_count(df, span)
-        print(df)
-        df.plot()
-        if file:
-            plt.savefig(file)
-        else:
-            plt.show()
+        query getVoteCounts($confName: ConfName!){
+          voteCounts(confName: $confName) {
+            talkId
+            count
+          }
+        }
+        """)
+
+        data = client.execute(query, {"confName": event})
+        df = (
+            pd.DataFrame(data["voteCounts"])
+            .sort_values(["count", "talkId"], ascending=[False, True])
+            .reset_index(drop=True)
+        )
+        print(df.to_csv())
 
 
 if __name__ == "__main__":

tools/cfp-vote-counter/requirements.txt

@@ -1,5 +1,6 @@
-boto3
 pandas
 pytest
 fire
-matplotlib
+matplotlib
+gql
+aiohttp