add: point in time and interval models

warehouse/metrics_mesh/models/metrics_factories.py

@@ -45,6 +45,22 @@
             ref="gas_fees.sql",
             time_aggregations=["daily", "weekly", "monthly"],
         ),
+        "repositories": MetricQueryDef(
+            ref="repositories.sql",
+            time_aggregations=["daily", "weekly", "monthly"],
+        ),
+        "first_commit": MetricQueryDef(
+            ref="first_commit_date.sql",
+            time_aggregations=["daily", "weekly", "monthly"],
+        ),
+        "last_commit": MetricQueryDef(
+            ref="last_commit_date.sql",
+            time_aggregations=["daily", "weekly", "monthly"],
+        ),
+        "contributors": MetricQueryDef(
+            ref="contributors.sql",
+            time_aggregations=["daily", "weekly", "monthly"],
+        ),
         # This defines something with a rolling option that allows you to look back
         # to some arbitrary window. So you specify the window and specify the unit.
         # The unit and the window are used to pass in variables to the query. So it's
@@ -106,18 +122,68 @@
                 cron="@daily",
             ),
         ),
-        "developer_states": MetricQueryDef(
-            ref="developer_states.sql",
-            vars={
-                "full_time_ratio": 10 / 30,
-            },
+        "contributors_6_months": MetricQueryDef(
+            ref="contributors.sql",
             rolling=RollingConfig(
-                windows=[30, 60, 90],
+                windows=[180],
+                unit="day",
+                cron="@daily",
+            ),
+            entity_types=["artifact", "project", "collection"],
+        ),
+        "active_developers_6_months": MetricQueryDef(
+            ref="active_developers.sql",
+            rolling=RollingConfig(
+                windows=[180],
+                unit="day",
+                cron="@daily",
+            ),
+            entity_types=["artifact", "project", "collection"],
+        ),
+        "commits_6_months": MetricQueryDef(
+            ref="commits.sql",
+            rolling=RollingConfig(
+                windows=[180],
+                unit="day",
+                cron="@daily",
+            ),
+            entity_types=["artifact", "project", "collection"],
+        ),
+        "opened_pull_requests_6_months": MetricQueryDef(
+            ref="prs_opened.sql",
+            rolling=RollingConfig(
+                windows=[180],
+                unit="day",
+                cron="@daily",
+            ),
+            entity_types=["artifact", "project", "collection"],
+        ),
+        "merged_pull_requests_6_months": MetricQueryDef(
+            ref="prs_merged.sql",
+            rolling=RollingConfig(
+                windows=[180],
+                unit="day",
+                cron="@daily",
+            ),
+            entity_types=["artifact", "project", "collection"],
+        ),
+        "opened_issues_6_months": MetricQueryDef(
+            ref="issues_opened.sql",
+            rolling=RollingConfig(
+                windows=[180],
+                unit="day",
+                cron="@daily",
+            ),
+            entity_types=["artifact", "project", "collection"],
+        ),
+        "closed_issues_6_months": MetricQueryDef(
+            ref="issues_closed.sql",
+            rolling=RollingConfig(
+                windows=[180],
                 unit="day",
                 cron="@daily",
             ),
             entity_types=["artifact", "project", "collection"],
-            is_intermediate=False,
         ),
     },
     default_dialect="clickhouse",

warehouse/metrics_mesh/oso_metrics/active_developers.sql

@@ -1,14 +1,14 @@
 select @metrics_sample_date(events.bucket_day) as metrics_sample_date,
   events.event_source,
-  events.to_artifact_id as project_id,
+  events.to_artifact_id as to_artifact_id,
   '' as from_artifact_id,
   @metric_name() as metric,
   COUNT(distinct events.from_artifact_id) as amount
 from metrics.events_daily_to_artifact as events
 where events.event_type = 'COMMIT_CODE'
-  and events.bucket_day BETWEEN @metrics_start(DATE) AND @metrics_end(DATE)
+  and events.bucket_day BETWEEN @metrics_start('DATE') AND @metrics_end('DATE')
 group by 1,
   metric,
   from_artifact_id,
-  project_id,
+  to_artifact_id,
   event_source

warehouse/metrics_mesh/oso_metrics/contributors.sql

@@ -1,19 +1,19 @@
 select @metrics_sample_date(events.bucket_day) as metrics_sample_date,
   events.event_source,
-  events.to_artifact_id as project_id,
+  events.to_artifact_id as to_artifact_id,
   '' as from_artifact_id,
   @metric_name() as metric,
-  COUNT(distinct events.from_artifact_id) as contributor_count
+  COUNT(distinct events.from_artifact_id) as amount
 from metrics.events_daily_to_artifact as events
 where events.event_type in (
   'COMMIT_CODE',
   'ISSUE_OPENED',
   'PULL_REQUEST_OPENED',
   'PULL_REQUEST_MERGED'
   )
-  and events.bucket_day BETWEEN @metrics_start(DATE) AND @metrics_end(DATE)
+  and events.bucket_day BETWEEN @metrics_start('DATE') AND @metrics_end('DATE')
 group by 1,
   metric,
   from_artifact_id,
-  project_id,
+  to_artifact_id,
   event_source

warehouse/metrics_mesh/oso_metrics/first_commit_date.sql

@@ -1,14 +1,15 @@
 select @metrics_sample_date(events.bucket_day) as metrics_sample_date,
   events.event_source,
-  events.to_artifact_id as project_id,
+  events.to_artifact_id as to_artifact_id,
   '' as from_artifact_id,
   @metric_name() as metric,
+  1 as amount,
   MIN(events.bucket_day) as first_commit_date
 from metrics.events_daily_to_artifact as events
 where events.event_type = 'COMMIT_CODE'
-  and events.bucket_day BETWEEN @metrics_start(DATE) AND @metrics_end(DATE)
+  and events.bucket_day BETWEEN @metrics_start('DATE') AND @metrics_end('DATE')
 group by 1,
   metric,
   from_artifact_id,
-  project_id,
+  to_artifact_id,
   event_source

warehouse/metrics_mesh/oso_metrics/last_commit_date.sql

@@ -1,14 +1,15 @@
 select @metrics_sample_date(events.bucket_day) as metrics_sample_date,
   events.event_source,
-  events.to_artifact_id as project_id,
+  events.to_artifact_id as to_artifact_id,
   '' as from_artifact_id,
   @metric_name() as metric,
+  1 as amount,
   MAX(events.bucket_day) as last_commit_date
 from metrics.events_daily_to_artifact as events
 where events.event_type = 'COMMIT_CODE'
-  and events.bucket_day BETWEEN @metrics_start(DATE) AND @metrics_end(DATE)
+  and events.bucket_day BETWEEN @metrics_start('DATE') AND @metrics_end('DATE')
 group by 1,
   metric,
   from_artifact_id,
-  project_id,
+  to_artifact_id,
   event_source

warehouse/metrics_mesh/oso_metrics/repositories.sql

@@ -1,6 +1,6 @@
 select @metrics_sample_date(events.bucket_day) as metrics_sample_date,
   events.event_source,
-  events.to_artifact_id as project_id,
+  events.to_artifact_id as to_artifact_id,
   '' as from_artifact_id,
   @metric_name() as metric,
   COUNT(distinct events.to_artifact_id) as amount
@@ -17,9 +17,9 @@ where events.event_type in (
     'PULL_REQUEST_MERGED',
     'ISSUE_CLOSED',
     )
-  and events.bucket_day BETWEEN @metrics_start(DATE) AND @metrics_end(DATE)
+  and events.bucket_day BETWEEN @metrics_start('DATE') AND @metrics_end('DATE')
 group by 1,
   metric,
   from_artifact_id,
-  project_id,
+  to_artifact_id,
   event_source