dao-treasury 0.0.29__cp311-cp311-macosx_11_0_arm64.whl → 0.0.31__cp311-cp311-macosx_11_0_arm64.whl

dao_treasury/.grafana/provisioning/dashboards/dashboards.yaml

@@ -24,3 +24,11 @@ providers:
   editable: false
   options:
     path: /etc/grafana/provisioning/dashboards/transactions
+
+- name: 'LlamaPay Streams'
+  folder: 'streams'
+  type: file
+  disableDeletion: true
+  editable: false
+  options:
+    path: /etc/grafana/provisioning/dashboards/streams

dao_treasury/.grafana/provisioning/dashboards/streams/LlamaPay.json

@@ -0,0 +1,116 @@
+{
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": {
+          "type": "grafana",
+          "uid": "-- Grafana --"
+        },
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "type": "dashboard"
+      }
+    ]
+  },
+  "editable": true,
+  "fiscalYearStartMonth": 0,
+  "graphTooltip": 0,
+  "id": 7,
+  "links": [],
+  "liveNow": false,
+  "panels": [
+    {
+      "datasource": {
+        "type": "frser-sqlite-datasource",
+        "uid": "P2D2EEF3E092AF52B"
+      },
+      "description": "",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "custom": {
+            "align": "auto",
+            "cellOptions": {
+              "type": "auto"
+            },
+            "inspect": false
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 19,
+        "w": 24,
+        "x": 0,
+        "y": 0
+      },
+      "id": 1,
+      "options": {
+        "cellHeight": "sm",
+        "footer": {
+          "countRows": false,
+          "fields": "",
+          "reducer": [
+            "sum"
+          ],
+          "show": false
+        },
+        "showHeader": true
+      },
+      "pluginVersion": "10.2.0",
+      "targets": [
+        {
+          "datasource": {
+            "type": "frser-sqlite-datasource",
+            "uid": "P2D2EEF3E092AF52B"
+          },
+          "queryText": "select stream_id as \"Stream ID\", b.address as \"Factory\", start_block as \"Start Block\", end_block as \"End Block\", c.symbol as \"Token\", d.address as \"From\", e.address as \"To\", reason as \"Reason\", amount_per_second as \"Amount Per Second\", status as \"Status\", txgroup as \"TxGroup\"\nfrom streams a\nleft join addresses b on a.contract = b.address_id\nleft join tokens c on a.token = c.token_id\nleft join addresses d on a.from_address = d.address_id\nleft join addresses e on a.to_address = e.address_id",
+          "queryType": "table",
+          "rawQueryText": "select stream_id as \"Stream ID\", b.address as \"Factory\", start_block as \"Start Block\", end_block as \"End Block\", c.symbol as \"Token\", d.address as \"From\", e.address as \"To\", reason as \"Reason\", amount_per_second as \"Amount Per Second\", status as \"Status\", txgroup as \"TxGroup\"\nfrom streams a\nleft join addresses b on a.contract = b.address_id\nleft join tokens c on a.token = c.token_id\nleft join addresses d on a.from_address = d.address_id\nleft join addresses e on a.to_address = e.address_id",
+          "refId": "A",
+          "timeColumns": [
+            "time",
+            "ts"
+          ]
+        }
+      ],
+      "title": "LlamaPay Streams",
+      "type": "table"
+    }
+  ],
+  "refresh": "",
+  "schemaVersion": 38,
+  "tags": [],
+  "templating": {
+    "list": []
+  },
+  "time": {
+    "from": "now-6h",
+    "to": "now"
+  },
+  "timepicker": {},
+  "timezone": "",
+  "title": "LlamaPay",
+  "uid": "aa4d62a2-9e52-4acc-8f38-a96c77810aca",
+  "version": 1,
+  "weekStart": ""
+}

dao_treasury/.grafana/provisioning/dashboards/treasury/Cashflow.json

@@ -71,9 +71,9 @@
       "targets": [
         {
           "datasource": "SQLite",
-          "queryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n      ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    SUM(t.value_usd) AS total_revenue\nFROM treasury_txs t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Revenue'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
+          "queryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n      ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    SUM(t.value_usd) AS total_revenue\nFROM general_ledger t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Revenue'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
           "queryType": "table",
-          "rawQueryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n      ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    SUM(t.value_usd) AS total_revenue\nFROM treasury_txs t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Revenue'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
+          "rawQueryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n      ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    SUM(t.value_usd) AS total_revenue\nFROM general_ledger t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Revenue'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
           "refId": "A",
           "timeColumns": [
             "time",
@@ -133,9 +133,9 @@
       "targets": [
         {
           "datasource": "SQLite",
-          "queryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n      ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    SUM(t.value_usd) AS total_revenue\nFROM treasury_txs t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Expenses'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
+          "queryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n      ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    SUM(t.value_usd) AS total_revenue\nFROM general_ledger t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Expenses'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
           "queryType": "table",
-          "rawQueryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n      ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    SUM(t.value_usd) AS total_revenue\nFROM treasury_txs t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Expenses'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
+          "rawQueryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n      ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    SUM(t.value_usd) AS total_revenue\nFROM general_ledger t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Expenses'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
           "refId": "A",
           "timeColumns": [
             "time",
@@ -195,9 +195,9 @@
       "targets": [
         {
           "datasource": "SQLite",
-          "queryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n      ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    SUM(t.value_usd) AS total_revenue\nFROM treasury_txs t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Cost of Revenue'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
+          "queryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n      ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    SUM(t.value_usd) AS total_revenue\nFROM general_ledger t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Cost of Revenue'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
           "queryType": "table",
-          "rawQueryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n      ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    SUM(t.value_usd) AS total_revenue\nFROM treasury_txs t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Cost of Revenue'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
+          "rawQueryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n      ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    SUM(t.value_usd) AS total_revenue\nFROM general_ledger t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Cost of Revenue'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
           "refId": "A",
           "timeColumns": [
             "time",
@@ -257,9 +257,9 @@
       "targets": [
         {
           "datasource": "SQLite",
-          "queryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n      ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    SUM(t.value_usd) AS total_revenue\nFROM treasury_txs t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Other Income'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
+          "queryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n      ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    SUM(t.value_usd) AS total_revenue\nFROM general_ledger t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Other Income'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
           "queryType": "table",
-          "rawQueryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n      ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    SUM(t.value_usd) AS total_revenue\nFROM treasury_txs t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Other Income'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
+          "rawQueryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n      ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    SUM(t.value_usd) AS total_revenue\nFROM general_ledger t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Other Income'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
           "refId": "A",
           "timeColumns": [
             "time",
@@ -319,9 +319,9 @@
       "targets": [
         {
           "datasource": "SQLite",
-          "queryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n      ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    SUM(t.value_usd) AS total_revenue\nFROM treasury_txs t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Other Expenses'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
+          "queryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n      ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    SUM(t.value_usd) AS total_revenue\nFROM general_ledger t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Other Expenses'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
           "queryType": "table",
-          "rawQueryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n      ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    SUM(t.value_usd) AS total_revenue\nFROM treasury_txs t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Other Expenses'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
+          "rawQueryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n      ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    SUM(t.value_usd) AS total_revenue\nFROM general_ledger t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Other Expenses'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
           "refId": "A",
           "timeColumns": [
             "time",
@@ -382,9 +382,9 @@
       "targets": [
         {
           "datasource": "SQLite",
-          "queryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT\n        txgroup_id,\n        name AS top_category,\n        parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n      ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    (\n        -- Revenue\n        SUM(CASE WHEN gh.top_category = 'Revenue'         THEN t.value_usd ELSE 0 END)\n        -- Cost of Revenue\n      - SUM(CASE WHEN gh.top_category = 'Cost of Revenue' THEN t.value_usd ELSE 0 END)\n        -- Expenses\n      - SUM(CASE WHEN gh.top_category = 'Expenses'        THEN t.value_usd ELSE 0 END)\n        -- Other Income\n      + SUM(CASE WHEN gh.top_category = 'Other Income'    THEN t.value_usd ELSE 0 END)\n        -- Other Expenses\n      - SUM(CASE WHEN gh.top_category = 'Other Expenses'  THEN t.value_usd ELSE 0 END)\n    ) AS total_net\nFROM treasury_txs t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000",
+          "queryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT\n        txgroup_id,\n        name AS top_category,\n        parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n      ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    (\n        -- Revenue\n        SUM(CASE WHEN gh.top_category = 'Revenue'         THEN t.value_usd ELSE 0 END)\n        -- Cost of Revenue\n      - SUM(CASE WHEN gh.top_category = 'Cost of Revenue' THEN t.value_usd ELSE 0 END)\n        -- Expenses\n      - SUM(CASE WHEN gh.top_category = 'Expenses'        THEN t.value_usd ELSE 0 END)\n        -- Other Income\n      + SUM(CASE WHEN gh.top_category = 'Other Income'    THEN t.value_usd ELSE 0 END)\n        -- Other Expenses\n      - SUM(CASE WHEN gh.top_category = 'Other Expenses'  THEN t.value_usd ELSE 0 END)\n    ) AS total_net\nFROM general_ledger t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000",
           "queryType": "table",
-          "rawQueryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT\n        txgroup_id,\n        name AS top_category,\n        parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n      ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    (\n        -- Revenue\n        SUM(CASE WHEN gh.top_category = 'Revenue'         THEN t.value_usd ELSE 0 END)\n        -- Cost of Revenue\n      - SUM(CASE WHEN gh.top_category = 'Cost of Revenue' THEN t.value_usd ELSE 0 END)\n        -- Expenses\n      - SUM(CASE WHEN gh.top_category = 'Expenses'        THEN t.value_usd ELSE 0 END)\n        -- Other Income\n      + SUM(CASE WHEN gh.top_category = 'Other Income'    THEN t.value_usd ELSE 0 END)\n        -- Other Expenses\n      - SUM(CASE WHEN gh.top_category = 'Other Expenses'  THEN t.value_usd ELSE 0 END)\n    ) AS total_net\nFROM treasury_txs t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000",
+          "rawQueryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT\n        txgroup_id,\n        name AS top_category,\n        parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n      ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    (\n        -- Revenue\n        SUM(CASE WHEN gh.top_category = 'Revenue'         THEN t.value_usd ELSE 0 END)\n        -- Cost of Revenue\n      - SUM(CASE WHEN gh.top_category = 'Cost of Revenue' THEN t.value_usd ELSE 0 END)\n        -- Expenses\n      - SUM(CASE WHEN gh.top_category = 'Expenses'        THEN t.value_usd ELSE 0 END)\n        -- Other Income\n      + SUM(CASE WHEN gh.top_category = 'Other Income'    THEN t.value_usd ELSE 0 END)\n        -- Other Expenses\n      - SUM(CASE WHEN gh.top_category = 'Other Expenses'  THEN t.value_usd ELSE 0 END)\n    ) AS total_net\nFROM general_ledger t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000",
           "refId": "A",
           "timeColumns": [
             "time",
@@ -498,9 +498,9 @@
       "targets": [
         {
           "datasource": "SQLite",
-          "queryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT\n        txgroup_id,\n        name AS top_category,\n        parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n        ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    t.timestamp,\n    SUM(CASE WHEN gh.top_category in ('Revenue', 'Other Income')         THEN t.value_usd ELSE 0 END) AS \"Total Revenue\",\n    SUM(CASE WHEN gh.top_category in ('Cost of Revenue','Expenses','Other Expenses')  THEN t.value_usd ELSE 0 END) * -1 AS \"Total Expenses\",\n    SUM(CASE WHEN gh.top_category in ('Revenue', 'Other Income') THEN t.value_usd ELSE 0 END) - SUM(CASE WHEN gh.top_category in ('Cost of Revenue','Expenses','Other Expenses')  THEN t.value_usd ELSE 0 END) AS \"Net\"\nFROM treasury_txs AS t\nJOIN group_hierarchy gh\n    ON t.txgroup_id = gh.txgroup_id\nWHERE t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\nGROUP BY timestamp\nORDER BY timestamp;",
+          "queryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT\n        txgroup_id,\n        name AS top_category,\n        parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n        ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    t.timestamp,\n    SUM(CASE WHEN gh.top_category in ('Revenue', 'Other Income')         THEN t.value_usd ELSE 0 END) AS \"Total Revenue\",\n    SUM(CASE WHEN gh.top_category in ('Cost of Revenue','Expenses','Other Expenses')  THEN t.value_usd ELSE 0 END) * -1 AS \"Total Expenses\",\n    SUM(CASE WHEN gh.top_category in ('Revenue', 'Other Income') THEN t.value_usd ELSE 0 END) - SUM(CASE WHEN gh.top_category in ('Cost of Revenue','Expenses','Other Expenses')  THEN t.value_usd ELSE 0 END) AS \"Net\"\nFROM general_ledger AS t\nJOIN group_hierarchy gh\n    ON t.txgroup_id = gh.txgroup_id\nWHERE t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\nGROUP BY timestamp\nORDER BY timestamp;",
           "queryType": "table",
-          "rawQueryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT\n        txgroup_id,\n        name AS top_category,\n        parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n        ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    t.timestamp,\n    SUM(CASE WHEN gh.top_category in ('Revenue', 'Other Income')         THEN t.value_usd ELSE 0 END) AS \"Total Revenue\",\n    SUM(CASE WHEN gh.top_category in ('Cost of Revenue','Expenses','Other Expenses')  THEN t.value_usd ELSE 0 END) * -1 AS \"Total Expenses\",\n    SUM(CASE WHEN gh.top_category in ('Revenue', 'Other Income') THEN t.value_usd ELSE 0 END) - SUM(CASE WHEN gh.top_category in ('Cost of Revenue','Expenses','Other Expenses')  THEN t.value_usd ELSE 0 END) AS \"Net\"\nFROM treasury_txs AS t\nJOIN group_hierarchy gh\n    ON t.txgroup_id = gh.txgroup_id\nWHERE t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\nGROUP BY timestamp\nORDER BY timestamp;",
+          "rawQueryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT\n        txgroup_id,\n        name AS top_category,\n        parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n        ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    t.timestamp,\n    SUM(CASE WHEN gh.top_category in ('Revenue', 'Other Income')         THEN t.value_usd ELSE 0 END) AS \"Total Revenue\",\n    SUM(CASE WHEN gh.top_category in ('Cost of Revenue','Expenses','Other Expenses')  THEN t.value_usd ELSE 0 END) * -1 AS \"Total Expenses\",\n    SUM(CASE WHEN gh.top_category in ('Revenue', 'Other Income') THEN t.value_usd ELSE 0 END) - SUM(CASE WHEN gh.top_category in ('Cost of Revenue','Expenses','Other Expenses')  THEN t.value_usd ELSE 0 END) AS \"Net\"\nFROM general_ledger AS t\nJOIN group_hierarchy gh\n    ON t.txgroup_id = gh.txgroup_id\nWHERE t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\nGROUP BY timestamp\nORDER BY timestamp;",
           "refId": "A",
           "timeColumns": [
             "timestamp"
@@ -643,9 +643,9 @@
       "targets": [
         {
           "datasource": "SQLite",
-          "queryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n      ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    SUM(t.value_usd) AS total_revenue\nFROM treasury_txs t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Sort Me (Inbound)'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
+          "queryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n      ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    SUM(t.value_usd) AS total_revenue\nFROM general_ledger t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Sort Me (Inbound)'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
           "queryType": "table",
-          "rawQueryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n      ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    SUM(t.value_usd) AS total_revenue\nFROM treasury_txs t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Sort Me (Inbound)'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
+          "rawQueryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n      ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    SUM(t.value_usd) AS total_revenue\nFROM general_ledger t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Sort Me (Inbound)'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
           "refId": "A",
           "timeColumns": [
             "time",
@@ -706,9 +706,9 @@
       "targets": [
         {
           "datasource": "SQLite",
-          "queryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n      ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    SUM(t.value_usd) AS total_revenue\nFROM treasury_txs t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Sort Me (Outbound)'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
+          "queryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n      ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    SUM(t.value_usd) AS total_revenue\nFROM general_ledger t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Sort Me (Outbound)'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
           "queryType": "table",
-          "rawQueryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n      ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    SUM(t.value_usd) AS total_revenue\nFROM treasury_txs t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Sort Me (Outbound)'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
+          "rawQueryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n      ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    SUM(t.value_usd) AS total_revenue\nFROM general_ledger t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Sort Me (Outbound)'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
           "refId": "A",
           "timeColumns": [
             "time",
@@ -769,9 +769,9 @@
       "targets": [
         {
           "datasource": "SQLite",
-          "queryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT\n        txgroup_id,\n        name AS top_category,\n        parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n      ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    (\n        -- Revenue\n        SUM(CASE WHEN gh.top_category = 'Revenue'         THEN t.value_usd ELSE 0 END)\n        -- Cost of Revenue\n      - SUM(CASE WHEN gh.top_category = 'Cost of Revenue' THEN t.value_usd ELSE 0 END)\n        -- Expenses\n      - SUM(CASE WHEN gh.top_category = 'Expenses'        THEN t.value_usd ELSE 0 END)\n        -- Other Income\n      + SUM(CASE WHEN gh.top_category = 'Other Income'    THEN t.value_usd ELSE 0 END)\n        -- Other Expenses\n      - SUM(CASE WHEN gh.top_category = 'Other Expenses'  THEN t.value_usd ELSE 0 END)\n        -- Sort Me (Inbound)\n      + SUM(CASE WHEN gh.top_category = 'Sort Me (Inbound)'    THEN t.value_usd ELSE 0 END)\n        -- Sort Me (Outbound)\n      - SUM(CASE WHEN gh.top_category = 'Sort Me (Outbound)'    THEN t.value_usd ELSE 0 END)\n    ) AS total_net\nFROM treasury_txs t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000",
+          "queryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT\n        txgroup_id,\n        name AS top_category,\n        parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n      ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    (\n        -- Revenue\n        SUM(CASE WHEN gh.top_category = 'Revenue'         THEN t.value_usd ELSE 0 END)\n        -- Cost of Revenue\n      - SUM(CASE WHEN gh.top_category = 'Cost of Revenue' THEN t.value_usd ELSE 0 END)\n        -- Expenses\n      - SUM(CASE WHEN gh.top_category = 'Expenses'        THEN t.value_usd ELSE 0 END)\n        -- Other Income\n      + SUM(CASE WHEN gh.top_category = 'Other Income'    THEN t.value_usd ELSE 0 END)\n        -- Other Expenses\n      - SUM(CASE WHEN gh.top_category = 'Other Expenses'  THEN t.value_usd ELSE 0 END)\n        -- Sort Me (Inbound)\n      + SUM(CASE WHEN gh.top_category = 'Sort Me (Inbound)'    THEN t.value_usd ELSE 0 END)\n        -- Sort Me (Outbound)\n      - SUM(CASE WHEN gh.top_category = 'Sort Me (Outbound)'    THEN t.value_usd ELSE 0 END)\n    ) AS total_net\nFROM general_ledger t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000",
           "queryType": "table",
-          "rawQueryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT\n        txgroup_id,\n        name AS top_category,\n        parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n      ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    (\n        -- Revenue\n        SUM(CASE WHEN gh.top_category = 'Revenue'         THEN t.value_usd ELSE 0 END)\n        -- Cost of Revenue\n      - SUM(CASE WHEN gh.top_category = 'Cost of Revenue' THEN t.value_usd ELSE 0 END)\n        -- Expenses\n      - SUM(CASE WHEN gh.top_category = 'Expenses'        THEN t.value_usd ELSE 0 END)\n        -- Other Income\n      + SUM(CASE WHEN gh.top_category = 'Other Income'    THEN t.value_usd ELSE 0 END)\n        -- Other Expenses\n      - SUM(CASE WHEN gh.top_category = 'Other Expenses'  THEN t.value_usd ELSE 0 END)\n        -- Sort Me (Inbound)\n      + SUM(CASE WHEN gh.top_category = 'Sort Me (Inbound)'    THEN t.value_usd ELSE 0 END)\n        -- Sort Me (Outbound)\n      - SUM(CASE WHEN gh.top_category = 'Sort Me (Outbound)'    THEN t.value_usd ELSE 0 END)\n    ) AS total_net\nFROM treasury_txs t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000",
+          "rawQueryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT\n        txgroup_id,\n        name AS top_category,\n        parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n      ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    (\n        -- Revenue\n        SUM(CASE WHEN gh.top_category = 'Revenue'         THEN t.value_usd ELSE 0 END)\n        -- Cost of Revenue\n      - SUM(CASE WHEN gh.top_category = 'Cost of Revenue' THEN t.value_usd ELSE 0 END)\n        -- Expenses\n      - SUM(CASE WHEN gh.top_category = 'Expenses'        THEN t.value_usd ELSE 0 END)\n        -- Other Income\n      + SUM(CASE WHEN gh.top_category = 'Other Income'    THEN t.value_usd ELSE 0 END)\n        -- Other Expenses\n      - SUM(CASE WHEN gh.top_category = 'Other Expenses'  THEN t.value_usd ELSE 0 END)\n        -- Sort Me (Inbound)\n      + SUM(CASE WHEN gh.top_category = 'Sort Me (Inbound)'    THEN t.value_usd ELSE 0 END)\n        -- Sort Me (Outbound)\n      - SUM(CASE WHEN gh.top_category = 'Sort Me (Outbound)'    THEN t.value_usd ELSE 0 END)\n    ) AS total_net\nFROM general_ledger t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000",
           "refId": "A",
           "timeColumns": [
             "time",
@@ -885,9 +885,9 @@
       "targets": [
         {
           "datasource": "SQLite",
-          "queryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT\n        txgroup_id,\n        name AS top_category,\n        parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n        ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    t.timestamp,\n    SUM(CASE WHEN gh.top_category in ('Revenue', 'Other Income','Sort Me (Inbound)')         THEN t.value_usd ELSE 0 END) AS \"Total Revenue (incl. Unsorted)\",\n    SUM(CASE WHEN gh.top_category in ('Cost of Revenue','Expenses','Other Expenses','Sort Me (Outbound)')  THEN t.value_usd ELSE 0 END) * -1 AS \"Total Expenses (incl. Unsorted)\",\n    SUM(CASE WHEN gh.top_category in ('Revenue', 'Other Income','Sort Me (Inbound)') THEN t.value_usd ELSE 0 END) - SUM(CASE WHEN gh.top_category in ('Cost of Revenue','Expenses','Other Expenses','Sort Me (Outbound)')  THEN t.value_usd ELSE 0 END) AS \"Net (incl. Unsorted)\"\nFROM treasury_txs AS t\nJOIN group_hierarchy gh\n    ON t.txgroup_id = gh.txgroup_id\nWHERE t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\nGROUP BY timestamp\nORDER BY timestamp;",
+          "queryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT\n        txgroup_id,\n        name AS top_category,\n        parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n        ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    t.timestamp,\n    SUM(CASE WHEN gh.top_category in ('Revenue', 'Other Income','Sort Me (Inbound)')         THEN t.value_usd ELSE 0 END) AS \"Total Revenue (incl. Unsorted)\",\n    SUM(CASE WHEN gh.top_category in ('Cost of Revenue','Expenses','Other Expenses','Sort Me (Outbound)')  THEN t.value_usd ELSE 0 END) * -1 AS \"Total Expenses (incl. Unsorted)\",\n    SUM(CASE WHEN gh.top_category in ('Revenue', 'Other Income','Sort Me (Inbound)') THEN t.value_usd ELSE 0 END) - SUM(CASE WHEN gh.top_category in ('Cost of Revenue','Expenses','Other Expenses','Sort Me (Outbound)')  THEN t.value_usd ELSE 0 END) AS \"Net (incl. Unsorted)\"\nFROM general_ledger AS t\nJOIN group_hierarchy gh\n    ON t.txgroup_id = gh.txgroup_id\nWHERE t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\nGROUP BY timestamp\nORDER BY timestamp;",
           "queryType": "table",
-          "rawQueryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT\n        txgroup_id,\n        name AS top_category,\n        parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n        ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    t.timestamp,\n    SUM(CASE WHEN gh.top_category in ('Revenue', 'Other Income','Sort Me (Inbound)')         THEN t.value_usd ELSE 0 END) AS \"Total Revenue (incl. Unsorted)\",\n    SUM(CASE WHEN gh.top_category in ('Cost of Revenue','Expenses','Other Expenses','Sort Me (Outbound)')  THEN t.value_usd ELSE 0 END) * -1 AS \"Total Expenses (incl. Unsorted)\",\n    SUM(CASE WHEN gh.top_category in ('Revenue', 'Other Income','Sort Me (Inbound)') THEN t.value_usd ELSE 0 END) - SUM(CASE WHEN gh.top_category in ('Cost of Revenue','Expenses','Other Expenses','Sort Me (Outbound)')  THEN t.value_usd ELSE 0 END) AS \"Net (incl. Unsorted)\"\nFROM treasury_txs AS t\nJOIN group_hierarchy gh\n    ON t.txgroup_id = gh.txgroup_id\nWHERE t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\nGROUP BY timestamp\nORDER BY timestamp;",
+          "rawQueryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT\n        txgroup_id,\n        name AS top_category,\n        parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n        ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    t.timestamp,\n    SUM(CASE WHEN gh.top_category in ('Revenue', 'Other Income','Sort Me (Inbound)')         THEN t.value_usd ELSE 0 END) AS \"Total Revenue (incl. Unsorted)\",\n    SUM(CASE WHEN gh.top_category in ('Cost of Revenue','Expenses','Other Expenses','Sort Me (Outbound)')  THEN t.value_usd ELSE 0 END) * -1 AS \"Total Expenses (incl. Unsorted)\",\n    SUM(CASE WHEN gh.top_category in ('Revenue', 'Other Income','Sort Me (Inbound)') THEN t.value_usd ELSE 0 END) - SUM(CASE WHEN gh.top_category in ('Cost of Revenue','Expenses','Other Expenses','Sort Me (Outbound)')  THEN t.value_usd ELSE 0 END) AS \"Net (incl. Unsorted)\"\nFROM general_ledger AS t\nJOIN group_hierarchy gh\n    ON t.txgroup_id = gh.txgroup_id\nWHERE t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\nGROUP BY timestamp\nORDER BY timestamp;",
           "refId": "A",
           "timeColumns": [
             "timestamp"

dao_treasury/_docker.py

@@ -1,33 +1,38 @@
 """This module contains utilities for managing dao-treasury's docker containers"""
 
 import logging
-import os
+from importlib import resources
 import subprocess
 from functools import wraps
-from typing import Any, Callable, Coroutine, Final, Iterable, Tuple, TypeVar
+from typing import Any, Callable, Coroutine, Final, Iterable, Tuple, TypeVar, List
 
 import eth_portfolio_scripts.docker
 from typing_extensions import ParamSpec
 
 logger: Final = logging.getLogger(__name__)
 
-compose_file: Final = os.path.join(
-    os.path.dirname(os.path.abspath(__file__)), "docker-compose.yaml"
+compose_file: Final = str(
+    resources.files("dao_treasury").joinpath("docker-compose.yaml")
 )
 """The path of dao-treasury's docker-compose.yaml file on your machine"""
 
 
-def up() -> None:
-    """Build and start Grafana containers defined in the compose file.
+def up(*services: str) -> None:
+    """Build and start the specified containers defined in the compose file.
+
+    Args:
+        services: service names to bring up.
 
     This function first builds the Docker services by invoking
-    :func:`build` and then starts them in detached mode using
+    :func:`build` and then starts the specified services in detached mode using
     Docker Compose. If Docker Compose is not available, it falls back
     to the legacy ``docker-compose`` command.
 
     Examples:
+        >>> up('grafana')
+        starting the grafana container
         >>> up()
-        starting the grafana containers
+        starting all containers (grafana and renderer)
 
     See Also:
         :func:`build`
@@ -35,10 +40,10 @@ def up() -> None:
         :func:`_exec_command`
     """
     # eth-portfolio containers must be started first so dao-treasury can attach to the eth-portfolio docker network
-    eth_portfolio_scripts.docker.up()
-    build()
-    print("starting the grafana containers")
-    _exec_command(["up", "-d"])
+    eth_portfolio_scripts.docker.up("victoria-metrics")
+    build(*services)
+    print(f"starting the {', '.join(services) if services else 'grafana'} container(s)")
+    _exec_command(["up", "-d", *services])
 
 
 def down() -> None:
@@ -57,7 +62,7 @@ def down() -> None:
     _exec_command(["down"])
 
 
-def build() -> None:
+def build(*services: str) -> None:
     """Build Docker images for Grafana containers.
 
     This function builds all services defined in the Docker Compose
@@ -73,7 +78,7 @@ def build() -> None:
         :func:`_exec_command`
     """
     print("building the grafana containers")
-    _exec_command(["build"])
+    _exec_command(["build", *services])
 
 
 _P = ParamSpec("_P")
@@ -118,20 +123,20 @@ def ensure_containers(
         # signal.signal(signal.SIGINT, down)
 
         # start Grafana containers
-        up()
+        up("grafana")
 
         try:
             # attempt to run `fn`
-            await fn(*args, **kwargs)
+            return await fn(*args, **kwargs)
         finally:
             # stop and remove containers
             # down()
-            return
+            pass
 
     return compose_wrap
 
 
-def _exec_command(command: Iterable[str], *, compose_options: Tuple[str] = ()) -> None:
+def _exec_command(command: List[str], *, compose_options: Tuple[str, ...] = ()) -> None:
     """Execute a Docker Compose command with system checks and fallback.
 
     This internal function ensures that Docker and Docker Compose