xref events removal

The-Academic-Observatory · Oct 3, 2024 · 9d7513d · 9d7513d
1 parent ea4d118
commit 9d7513d
Show file tree

Hide file tree

Showing 26 changed files with 51 additions and 1,625 deletions.
diff --git a/dags/oaebu_workflows/airflow_pools.py b/dags/oaebu_workflows/airflow_pools.py
@@ -41,14 +41,3 @@ def create_or_get_pool(self):
             return self.get_pool()
         except PoolNotFound:
             return self.create_pool()
-
-
-class CrossrefEventsPool(AirflowPool):
-    def __init__(self, pool_slots: int = 15):
-        """Constructor CrossrefEventsPool instance
-
-        :param pool_slots: The number of slots assigned to this pool
-        """
-        super().__init__(
-            pool_name="crossref_events_pool", pool_slots=pool_slots, pool_description="Crossref Events API Pool"
-        )
diff --git a/dags/oaebu_workflows/onix_workflow/onix_workflow.py b/dags/oaebu_workflows/onix_workflow/onix_workflow.py
diff --git a/dags/oaebu_workflows/onix_workflow/schema/book.json b/dags/oaebu_workflows/onix_workflow/schema/book.json
@@ -80,85 +80,5 @@
     "name": "chapters",
     "type": "RECORD",
     "description": "Crossref Objects (that are of type chapter) associated with the primary ISBN"
-  },
-  {
-    "fields": [
-      {
-        "fields": [
-          {
-            "mode": "NULLABLE",
-            "name": "source",
-            "type": "STRING",
-            "description": "Event Source"
-          },
-          {
-            "mode": "NULLABLE",
-            "name": "count",
-            "type": "INTEGER",
-            "description": "Count of Events"
-          }
-        ],
-        "mode": "REPEATED",
-        "name": "overall",
-        "type": "RECORD",
-        "description": "Overall Event Count"
-      },
-      {
-        "fields": [
-          {
-            "mode": "NULLABLE",
-            "name": "month",
-            "type": "STRING",
-            "description": "Month of the count"
-          },
-          {
-            "mode": "NULLABLE",
-            "name": "source",
-            "type": "STRING",
-            "description": "Event Source"
-          },
-          {
-            "mode": "NULLABLE",
-            "name": "count",
-            "type": "INTEGER",
-            "description": "Event Count in time period"
-          }
-        ],
-        "mode": "REPEATED",
-        "name": "months",
-        "type": "RECORD",
-        "description": "Event counts broken down by month"
-      },
-      {
-        "fields": [
-          {
-            "mode": "NULLABLE",
-            "name": "year",
-            "type": "INTEGER",
-            "description": "Year of count"
-          },
-          {
-            "mode": "NULLABLE",
-            "name": "source",
-            "type": "STRING",
-            "description": "Event Source"
-          },
-          {
-            "mode": "NULLABLE",
-            "name": "count",
-            "type": "INTEGER",
-            "description": "Event count in time period"
-          }
-        ],
-        "mode": "REPEATED",
-        "name": "years",
-        "type": "RECORD",
-        "description": "Event counts broken down by month"
-      }
-    ],
-    "mode": "NULLABLE",
-    "name": "events",
-    "type": "RECORD",
-    "description": "Crossref events assoicated with ISBN"
   }
 ]
diff --git a/dags/oaebu_workflows/onix_workflow/schema/book_metrics.json b/dags/oaebu_workflows/onix_workflow/schema/book_metrics.json
@@ -146,19 +146,5 @@
     "name": "month",
     "type": "DATE",
     "description": "The month in which the metrics took place"
-  },
-  {
-    "fields": [
-      {
-        "mode": "NULLABLE",
-        "name": "count",
-        "type": "INTEGER",
-        "description": "Count of events"
-      }
-    ],
-    "mode": "NULLABLE",
-    "name": "crossref_events",
-    "type": "RECORD",
-    "description": "Metrics from Crossref Events"
   }
 ]
diff --git a/dags/oaebu_workflows/onix_workflow/schema/book_metrics_author.json b/dags/oaebu_workflows/onix_workflow/schema/book_metrics_author.json
@@ -28,19 +28,6 @@
     "name": "month",
     "type": "DATE",
     "description": "Month in which metrics took place"
-  },
-  {
-    "fields": [
-      {
-        "mode": "NULLABLE",
-        "name": "count",
-        "type": "INTEGER",
-        "description": "Count of events"
-      }
-    ],
-    "mode": "NULLABLE",
-    "name": "crossref_events",
-    "type": "RECORD",
-    "description": "Metrics from Crossref events"
   }
-]
+]
+
diff --git a/dags/oaebu_workflows/onix_workflow/schema/book_metrics_events.json b/dags/oaebu_workflows/onix_workflow/schema/book_metrics_events.json
diff --git a/dags/oaebu_workflows/onix_workflow/schema/book_metrics_subject_bic.json b/dags/oaebu_workflows/onix_workflow/schema/book_metrics_subject_bic.json
@@ -22,19 +22,6 @@
     "name": "month",
     "type": "DATE",
     "description": "The month in which the metrics occurred"
-  },
-  {
-    "fields": [
-      {
-        "mode": "NULLABLE",
-        "name": "count",
-        "type": "INTEGER",
-        "description": "Count of events"
-      }
-    ],
-    "mode": "NULLABLE",
-    "name": "crossref_events",
-    "type": "RECORD",
-    "description": "Metrics from Crossref events"
   }
-]
+]
+
diff --git a/dags/oaebu_workflows/onix_workflow/schema/book_metrics_subject_bisac.json b/dags/oaebu_workflows/onix_workflow/schema/book_metrics_subject_bisac.json
@@ -22,19 +22,6 @@
     "name": "month",
     "type": "DATE",
     "description": "The month in which the metrics occurred"
-  },
-  {
-    "fields": [
-      {
-        "mode": "NULLABLE",
-        "name": "count",
-        "type": "INTEGER",
-        "description": "Count of events"
-      }
-    ],
-    "mode": "NULLABLE",
-    "name": "crossref_events",
-    "type": "RECORD",
-    "description": "Metrics from Crossref events"
   }
-]
+]
+
diff --git a/dags/oaebu_workflows/onix_workflow/schema/book_metrics_subject_thema.json b/dags/oaebu_workflows/onix_workflow/schema/book_metrics_subject_thema.json
@@ -22,19 +22,6 @@
     "name": "month",
     "type": "DATE",
     "description": "The month in which the metrics occurred"
-  },
-  {
-    "fields": [
-      {
-        "mode": "NULLABLE",
-        "name": "count",
-        "type": "INTEGER",
-        "description": "Count of events"
-      }
-    ],
-    "mode": "NULLABLE",
-    "name": "crossref_events",
-    "type": "RECORD",
-    "description": "Metrics from Crossref events"
   }
-]
+]
+