dao-treasury 0.0.57__cp310-cp310-musllinux_1_2_x86_64.whl → 0.0.58__cp310-cp310-musllinux_1_2_x86_64.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.


This version of dao-treasury might be problematic. Click here for more details.

Files changed (24) hide show
  1. dao_treasury/.grafana/provisioning/dashboards/breakdowns/Expenses.json +31 -12
  2. dao_treasury/.grafana/provisioning/dashboards/breakdowns/Revenue.json +32 -13
  3. dao_treasury/_docker.cpython-310-x86_64-linux-gnu.so +0 -0
  4. dao_treasury/_nicknames.cpython-310-x86_64-linux-gnu.so +0 -0
  5. dao_treasury/_wallet.cpython-310-x86_64-linux-gnu.so +0 -0
  6. dao_treasury/constants.cpython-310-x86_64-linux-gnu.so +0 -0
  7. dao_treasury/main.py +2 -2
  8. dao_treasury/sorting/__init__.cpython-310-x86_64-linux-gnu.so +0 -0
  9. dao_treasury/sorting/_matchers.cpython-310-x86_64-linux-gnu.so +0 -0
  10. dao_treasury/sorting/_rules.cpython-310-x86_64-linux-gnu.so +0 -0
  11. dao_treasury/sorting/factory.cpython-310-x86_64-linux-gnu.so +0 -0
  12. dao_treasury/sorting/rule.cpython-310-x86_64-linux-gnu.so +0 -0
  13. dao_treasury/sorting/rules/__init__.cpython-310-x86_64-linux-gnu.so +0 -0
  14. dao_treasury/sorting/rules/ignore/__init__.cpython-310-x86_64-linux-gnu.so +0 -0
  15. dao_treasury/sorting/rules/ignore/llamapay.cpython-310-x86_64-linux-gnu.so +0 -0
  16. dao_treasury/streams/__init__.cpython-310-x86_64-linux-gnu.so +0 -0
  17. dao_treasury/streams/llamapay.cpython-310-x86_64-linux-gnu.so +0 -0
  18. dao_treasury/types.cpython-310-x86_64-linux-gnu.so +0 -0
  19. {dao_treasury-0.0.57.dist-info → dao_treasury-0.0.58.dist-info}/METADATA +2 -1
  20. {dao_treasury-0.0.57.dist-info → dao_treasury-0.0.58.dist-info}/RECORD +23 -23
  21. dao_treasury-0.0.58.dist-info/top_level.txt +2 -0
  22. bf2b4fe1f86ad2ea158b__mypyc.cpython-310-x86_64-linux-gnu.so → dao_treasury__mypyc.cpython-310-x86_64-linux-gnu.so +0 -0
  23. dao_treasury-0.0.57.dist-info/top_level.txt +0 -2
  24. {dao_treasury-0.0.57.dist-info → dao_treasury-0.0.58.dist-info}/WHEEL +0 -0
@@ -74,9 +74,9 @@
74
74
  "targets": [
75
75
  {
76
76
  "datasource": "SQLite",
77
- "queryText": "SELECT SUM(t.value_usd) AS total_revenue FROM general_ledger t JOIN txgroup_hierarchy gh USING (txgroup_id) WHERE gh.top_category in ('Cost of Revenue', 'Expenses', 'Other Expense') AND t.timestamp >= $__from/1000 AND t.timestamp <= $__to/1000",
77
+ "queryText": "SELECT SUM(t.value_usd) AS total_revenue FROM general_ledger t JOIN txgroup_hierarchy gh USING (txgroup_id) inner join txgroups g USING (txgroup_id) WHERE gh.top_category in ('Cost of Revenue', 'Expenses', 'Other Expense') AND t.timestamp >= $__from/1000 AND t.timestamp <= $__to/1000 AND ('$Txgroup' like '{%' or g.name = '$Txgroup')",
78
78
  "queryType": "table",
79
- "rawQueryText": "SELECT SUM(t.value_usd) AS total_revenue FROM general_ledger t JOIN txgroup_hierarchy gh USING (txgroup_id) WHERE gh.top_category in ('Cost of Revenue', 'Expenses', 'Other Expense') AND t.timestamp >= $__from/1000 AND t.timestamp <= $__to/1000",
79
+ "rawQueryText": "SELECT SUM(t.value_usd) AS total_revenue FROM general_ledger t JOIN txgroup_hierarchy gh USING (txgroup_id) inner join txgroups g USING (txgroup_id) WHERE gh.top_category in ('Cost of Revenue', 'Expenses', 'Other Expense') AND t.timestamp >= $__from/1000 AND t.timestamp <= $__to/1000 AND ('$Txgroup' like '{%' or g.name = '$Txgroup')",
80
80
  "refId": "A",
81
81
  "timeColumns": [
82
82
  "time",
@@ -139,9 +139,9 @@
139
139
  "targets": [
140
140
  {
141
141
  "datasource": "SQLite",
142
- "queryText": "SELECT SUM(t.value_usd) / (((1760217520685 - 1744406320685) / 1000.0 / 60 / 60 / 24 / 30.436875)) AS total_revenue FROM general_ledger t JOIN txgroup_hierarchy gh USING (txgroup_id) WHERE gh.top_category in ('Cost of Revenue', 'Expenses', 'Other Expense') AND t.timestamp >= 1744406320685/1000 AND t.timestamp <= 1760217520685/1000",
142
+ "queryText": "SELECT SUM(t.value_usd) / (((1760217520685 - 1744406320685) / 1000.0 / 60 / 60 / 24 / 30.436875)) AS total_revenue FROM general_ledger t JOIN txgroup_hierarchy gh USING (txgroup_id) inner join txgroups g USING (txgroup_id) WHERE gh.top_category in ('Cost of Revenue', 'Expenses', 'Other Expense') AND t.timestamp >= 1744406320685/1000 AND t.timestamp <= 1760217520685/1000 AND ('$Txgroup' like '{%' or g.name = '$Txgroup')",
143
143
  "queryType": "table",
144
- "rawQueryText": "SELECT SUM(t.value_usd) / ((($__to - $__from) / 1000.0 / 60 / 60 / 24 / 30.436875)) AS total_revenue FROM general_ledger t JOIN txgroup_hierarchy gh USING (txgroup_id) WHERE gh.top_category in ('Cost of Revenue', 'Expenses', 'Other Expense') AND t.timestamp >= $__from/1000 AND t.timestamp <= $__to/1000",
144
+ "rawQueryText": "SELECT SUM(t.value_usd) / ((($__to - $__from) / 1000.0 / 60 / 60 / 24 / 30.436875)) AS total_revenue FROM general_ledger t JOIN txgroup_hierarchy gh USING (txgroup_id) inner join txgroups g USING (txgroup_id) WHERE gh.top_category in ('Cost of Revenue', 'Expenses', 'Other Expense') AND t.timestamp >= $__from/1000 AND t.timestamp <= $__to/1000 AND ('$Txgroup' like '{%' or g.name = '$Txgroup')",
145
145
  "refId": "A",
146
146
  "timeColumns": [
147
147
  "time",
@@ -204,9 +204,9 @@
204
204
  "targets": [
205
205
  {
206
206
  "datasource": "SQLite",
207
- "queryText": "SELECT SUM(t.value_usd) / ((($__to - $__from) / 1000.0 / 60 / 60 / 24 / 7)) AS total_revenue FROM general_ledger t JOIN txgroup_hierarchy gh USING (txgroup_id) WHERE gh.top_category in ('Cost of Revenue', 'Expenses', 'Other Expense') AND t.timestamp >= $__from/1000 AND t.timestamp <= $__to/1000",
207
+ "queryText": "SELECT SUM(t.value_usd) / ((($__to - $__from) / 1000.0 / 60 / 60 / 24 / 7)) AS total_revenue FROM general_ledger t JOIN txgroup_hierarchy gh USING (txgroup_id) inner join txgroups g USING (txgroup_id) WHERE gh.top_category in ('Cost of Revenue', 'Expenses', 'Other Expense') AND t.timestamp >= $__from/1000 AND t.timestamp <= $__to/1000 AND ('$Txgroup' like '{%' or g.name = '$Txgroup')",
208
208
  "queryType": "table",
209
- "rawQueryText": "SELECT SUM(t.value_usd) / ((($__to - $__from) / 1000.0 / 60 / 60 / 24 / 7)) AS total_revenue FROM general_ledger t JOIN txgroup_hierarchy gh USING (txgroup_id) WHERE gh.top_category in ('Cost of Revenue', 'Expenses', 'Other Expense') AND t.timestamp >= $__from/1000 AND t.timestamp <= $__to/1000",
209
+ "rawQueryText": "SELECT SUM(t.value_usd) / ((($__to - $__from) / 1000.0 / 60 / 60 / 24 / 7)) AS total_revenue FROM general_ledger t JOIN txgroup_hierarchy gh USING (txgroup_id) inner join txgroups g USING (txgroup_id) WHERE gh.top_category in ('Cost of Revenue', 'Expenses', 'Other Expense') AND t.timestamp >= $__from/1000 AND t.timestamp <= $__to/1000 AND ('$Txgroup' like '{%' or g.name = '$Txgroup')",
210
210
  "refId": "A",
211
211
  "timeColumns": [
212
212
  "time",
@@ -269,9 +269,9 @@
269
269
  "targets": [
270
270
  {
271
271
  "datasource": "SQLite",
272
- "queryText": "SELECT SUM(t.value_usd) / ((($__to - $__from) / 1000.0 / 60 / 60 / 24)) AS total_revenue FROM general_ledger t JOIN txgroup_hierarchy gh USING (txgroup_id) WHERE gh.top_category in ('Cost of Revenue', 'Expenses', 'Other Expense') AND t.timestamp >= $__from/1000 AND t.timestamp <= $__to/1000",
272
+ "queryText": "SELECT SUM(t.value_usd) / ((($__to - $__from) / 1000.0 / 60 / 60 / 24)) AS total_revenue FROM general_ledger t JOIN txgroup_hierarchy gh USING (txgroup_id) inner join txgroups g USING (txgroup_id) WHERE gh.top_category in ('Cost of Revenue', 'Expenses', 'Other Expense') AND t.timestamp >= $__from/1000 AND t.timestamp <= $__to/1000 AND ('$Txgroup' like '{%' or g.name = '$Txgroup')",
273
273
  "queryType": "table",
274
- "rawQueryText": "SELECT SUM(t.value_usd) / ((($__to - $__from) / 1000.0 / 60 / 60 / 24)) AS total_revenue FROM general_ledger t JOIN txgroup_hierarchy gh USING (txgroup_id) WHERE gh.top_category in ('Cost of Revenue', 'Expenses', 'Other Expense') AND t.timestamp >= $__from/1000 AND t.timestamp <= $__to/1000",
274
+ "rawQueryText": "SELECT SUM(t.value_usd) / ((($__to - $__from) / 1000.0 / 60 / 60 / 24)) AS total_revenue FROM general_ledger t JOIN txgroup_hierarchy gh USING (txgroup_id) inner join txgroups g USING (txgroup_id) WHERE gh.top_category in ('Cost of Revenue', 'Expenses', 'Other Expense') AND t.timestamp >= $__from/1000 AND t.timestamp <= $__to/1000 AND ('$Txgroup' like '{%' or g.name = '$Txgroup')",
275
275
  "refId": "A",
276
276
  "timeColumns": [
277
277
  "time",
@@ -389,9 +389,9 @@
389
389
  "targets": [
390
390
  {
391
391
  "datasource": "SQLite",
392
- "queryText": "SELECT t.timestamp, SUM(CASE WHEN gh.top_category in ('Cost of Revenue', 'Expenses', 'Other Expense') THEN t.value_usd ELSE 0 END) AS \"Total Expenses\" FROM general_ledger AS t JOIN txgroup_hierarchy gh ON t.txgroup_id = gh.txgroup_id WHERE t.timestamp >= $__from/1000 AND t.timestamp <= $__to/1000 GROUP BY timestamp ORDER BY timestamp;",
392
+ "queryText": "SELECT t.timestamp, SUM(CASE WHEN gh.top_category in ('Cost of Revenue', 'Expenses', 'Other Expense') THEN t.value_usd ELSE 0 END) AS \"Total Expenses\" FROM general_ledger AS t JOIN txgroup_hierarchy gh ON t.txgroup_id = gh.txgroup_id INNER JOIN txgroups g USING (txgroup_id) WHERE t.timestamp >= $__from/1000 AND t.timestamp <= $__to/1000 AND ('$Txgroup' like '{%' or g.name = '$Txgroup') GROUP BY timestamp ORDER BY timestamp;",
393
393
  "queryType": "table",
394
- "rawQueryText": "SELECT t.timestamp, SUM(CASE WHEN gh.top_category in ('Cost of Revenue', 'Expenses', 'Other Expense') THEN t.value_usd ELSE 0 END) AS \"Total Expenses\" FROM general_ledger AS t JOIN txgroup_hierarchy gh ON t.txgroup_id = gh.txgroup_id WHERE t.timestamp >= $__from/1000 AND t.timestamp <= $__to/1000 GROUP BY timestamp ORDER BY timestamp;",
394
+ "rawQueryText": "SELECT t.timestamp, SUM(CASE WHEN gh.top_category in ('Cost of Revenue', 'Expenses', 'Other Expense') THEN t.value_usd ELSE 0 END) AS \"Total Expenses\" FROM general_ledger AS t JOIN txgroup_hierarchy gh ON t.txgroup_id = gh.txgroup_id INNER JOIN txgroups g USING (txgroup_id) WHERE t.timestamp >= $__from/1000 AND t.timestamp <= $__to/1000 AND ('$Txgroup' like '{%' or g.name = '$Txgroup') GROUP BY timestamp ORDER BY timestamp;",
395
395
  "refId": "A",
396
396
  "timeColumns": [
397
397
  "timestamp"
@@ -494,7 +494,25 @@
494
494
  "schemaVersion": 42,
495
495
  "tags": [],
496
496
  "templating": {
497
- "list": []
497
+ "list": [
498
+ {
499
+ "allowCustomValue": true,
500
+ "current": {
501
+ "text": "All",
502
+ "value": "$__all"
503
+ },
504
+ "definition": "SELECT DISTINCT t.name FROM treasury_txs a INNER JOIN txgroup_hierarchy gh ON a.txgroup_id = gh.txgroup_id LEFT JOIN txgroups t ON gh.txgroup_id = t.txgroup_id where gh.top_category = 'Revenue' or gh.top_category = 'Other Income';",
505
+ "description": "",
506
+ "includeAll": true,
507
+ "name": "Txgroup",
508
+ "options": [],
509
+ "query": "SELECT DISTINCT t.name FROM treasury_txs a INNER JOIN txgroup_hierarchy gh ON a.txgroup_id = gh.txgroup_id LEFT JOIN txgroups t ON gh.txgroup_id = t.txgroup_id where gh.top_category = 'Revenue' or gh.top_category = 'Other Income';",
510
+ "refresh": 2,
511
+ "regex": "",
512
+ "sort": 5,
513
+ "type": "query"
514
+ }
515
+ ]
498
516
  },
499
517
  "time": {
500
518
  "from": "now-6M",
@@ -503,5 +521,6 @@
503
521
  "timepicker": {},
504
522
  "timezone": "",
505
523
  "title": "Expenses Over Time",
506
- "version": 1
524
+ "uid": "62bccd38-918c-4395-9180-8f7f911e9ddf",
525
+ "version": 2
507
526
  }
@@ -19,7 +19,7 @@
19
19
  "editable": true,
20
20
  "fiscalYearStartMonth": 0,
21
21
  "graphTooltip": 1,
22
- "id": 5,
22
+ "id": 15,
23
23
  "links": [],
24
24
  "panels": [
25
25
  {
@@ -74,9 +74,9 @@
74
74
  "targets": [
75
75
  {
76
76
  "datasource": "SQLite",
77
- "queryText": "SELECT SUM(t.value_usd) AS total_revenue FROM general_ledger t JOIN txgroup_hierarchy gh USING (txgroup_id) WHERE gh.top_category = 'Revenue' AND t.timestamp >= $__from/1000 AND t.timestamp <= $__to/1000",
77
+ "queryText": "SELECT SUM(t.value_usd) AS total_revenue FROM general_ledger t JOIN txgroup_hierarchy gh USING (txgroup_id) inner join txgroups t USING (txgroup_id) WHERE gh.top_category = 'Revenue' AND t.timestamp >= $__from/1000 AND t.timestamp <= $__to/1000 AND ('$Txgroup' like '{%' or t.name = '$Txgroup')",
78
78
  "queryType": "table",
79
- "rawQueryText": "SELECT SUM(t.value_usd) AS total_revenue FROM general_ledger t JOIN txgroup_hierarchy gh USING (txgroup_id) WHERE gh.top_category = 'Revenue' AND t.timestamp >= $__from/1000 AND t.timestamp <= $__to/1000",
79
+ "rawQueryText": "SELECT SUM(t.value_usd) AS total_revenue FROM general_ledger t JOIN txgroup_hierarchy gh USING (txgroup_id) inner join txgroups t USING (txgroup_id) WHERE gh.top_category = 'Revenue' AND t.timestamp >= $__from/1000 AND t.timestamp <= $__to/1000 AND ('$Txgroup' like '{%' or t.name = '$Txgroup')",
80
80
  "refId": "A",
81
81
  "timeColumns": [
82
82
  "time",
@@ -139,9 +139,9 @@
139
139
  "targets": [
140
140
  {
141
141
  "datasource": "SQLite",
142
- "queryText": "SELECT SUM(t.value_usd) / (((1760217520685 - 1744406320685) / 1000.0 / 60 / 60 / 24 / 30.436875)) AS total_revenue FROM general_ledger t JOIN txgroup_hierarchy gh USING (txgroup_id) WHERE gh.top_category = 'Revenue' AND t.timestamp >= 1744406320685/1000 AND t.timestamp <= 1760217520685/1000",
142
+ "queryText": "SELECT SUM(t.value_usd) / ((($__to - $__from) / 1000.0 / 60 / 60 / 24 / 30.436875)) AS total_revenue FROM general_ledger t JOIN txgroup_hierarchy gh USING (txgroup_id) INNER JOIN txgroups t USING (txgroup_id) WHERE gh.top_category = 'Revenue' AND t.timestamp >= $__from/1000 AND t.timestamp <= $__to/1000 AND ('$Txgroup' like '{%' or t.name = '$Txgroup')",
143
143
  "queryType": "table",
144
- "rawQueryText": "SELECT SUM(t.value_usd) / ((($__to - $__from) / 1000.0 / 60 / 60 / 24 / 30.436875)) AS total_revenue FROM general_ledger t JOIN txgroup_hierarchy gh USING (txgroup_id) WHERE gh.top_category = 'Revenue' AND t.timestamp >= $__from/1000 AND t.timestamp <= $__to/1000",
144
+ "rawQueryText": "SELECT SUM(t.value_usd) / ((($__to - $__from) / 1000.0 / 60 / 60 / 24 / 30.436875)) AS total_revenue FROM general_ledger t JOIN txgroup_hierarchy gh USING (txgroup_id) INNER JOIN txgroups t USING (txgroup_id) WHERE gh.top_category = 'Revenue' AND t.timestamp >= $__from/1000 AND t.timestamp <= $__to/1000 AND ('$Txgroup' like '{%' or t.name = '$Txgroup')",
145
145
  "refId": "A",
146
146
  "timeColumns": [
147
147
  "time",
@@ -204,9 +204,9 @@
204
204
  "targets": [
205
205
  {
206
206
  "datasource": "SQLite",
207
- "queryText": "SELECT SUM(t.value_usd) / ((($__to - $__from) / 1000.0 / 60 / 60 / 24 / 7)) AS total_revenue FROM general_ledger t JOIN txgroup_hierarchy gh USING (txgroup_id) WHERE gh.top_category = 'Revenue' AND t.timestamp >= $__from/1000 AND t.timestamp <= $__to/1000",
207
+ "queryText": "SELECT SUM(t.value_usd) / ((($__to - $__from) / 1000.0 / 60 / 60 / 24 / 7)) AS total_revenue FROM general_ledger t JOIN txgroup_hierarchy gh USING (txgroup_id) INNER JOIN txgroups t USING (txgroup_id) WHERE gh.top_category = 'Revenue' AND t.timestamp >= $__from/1000 AND t.timestamp <= $__to/1000 AND ('$Txgroup' like '{%' or t.name = '$Txgroup')",
208
208
  "queryType": "table",
209
- "rawQueryText": "SELECT SUM(t.value_usd) / ((($__to - $__from) / 1000.0 / 60 / 60 / 24 / 7)) AS total_revenue FROM general_ledger t JOIN txgroup_hierarchy gh USING (txgroup_id) WHERE gh.top_category = 'Revenue' AND t.timestamp >= $__from/1000 AND t.timestamp <= $__to/1000",
209
+ "rawQueryText": "SELECT SUM(t.value_usd) / ((($__to - $__from) / 1000.0 / 60 / 60 / 24 / 7)) AS total_revenue FROM general_ledger t JOIN txgroup_hierarchy gh USING (txgroup_id) INNER JOIN txgroups t USING (txgroup_id) WHERE gh.top_category = 'Revenue' AND t.timestamp >= $__from/1000 AND t.timestamp <= $__to/1000 AND ('$Txgroup' like '{%' or t.name = '$Txgroup')",
210
210
  "refId": "A",
211
211
  "timeColumns": [
212
212
  "time",
@@ -269,9 +269,9 @@
269
269
  "targets": [
270
270
  {
271
271
  "datasource": "SQLite",
272
- "queryText": "SELECT SUM(t.value_usd) / ((($__to - $__from) / 1000.0 / 60 / 60 / 24)) AS total_revenue FROM general_ledger t JOIN txgroup_hierarchy gh USING (txgroup_id) WHERE gh.top_category = 'Revenue' AND t.timestamp >= $__from/1000 AND t.timestamp <= $__to/1000",
272
+ "queryText": "SELECT SUM(t.value_usd) / ((($__to - $__from) / 1000.0 / 60 / 60 / 24)) AS total_revenue FROM general_ledger t JOIN txgroup_hierarchy gh USING (txgroup_id) INNER JOIN txgroups t USING (txgroup_id) WHERE gh.top_category = 'Revenue' AND t.timestamp >= $__from/1000 AND t.timestamp <= $__to/1000 AND ('$Txgroup' like '{%' or t.name = '$Txgroup')",
273
273
  "queryType": "table",
274
- "rawQueryText": "SELECT SUM(t.value_usd) / ((($__to - $__from) / 1000.0 / 60 / 60 / 24)) AS total_revenue FROM general_ledger t JOIN txgroup_hierarchy gh USING (txgroup_id) WHERE gh.top_category = 'Revenue' AND t.timestamp >= $__from/1000 AND t.timestamp <= $__to/1000",
274
+ "rawQueryText": "SELECT SUM(t.value_usd) / ((($__to - $__from) / 1000.0 / 60 / 60 / 24)) AS total_revenue FROM general_ledger t JOIN txgroup_hierarchy gh USING (txgroup_id) INNER JOIN txgroups t USING (txgroup_id) WHERE gh.top_category = 'Revenue' AND t.timestamp >= $__from/1000 AND t.timestamp <= $__to/1000 AND ('$Txgroup' like '{%' or t.name = '$Txgroup')",
275
275
  "refId": "A",
276
276
  "timeColumns": [
277
277
  "time",
@@ -389,9 +389,9 @@
389
389
  "targets": [
390
390
  {
391
391
  "datasource": "SQLite",
392
- "queryText": "SELECT t.timestamp, SUM(CASE WHEN gh.top_category in ('Revenue', 'Other Income') THEN t.value_usd ELSE 0 END) AS \"Total Revenue\" FROM general_ledger AS t JOIN txgroup_hierarchy gh ON t.txgroup_id = gh.txgroup_id WHERE t.timestamp >= $__from/1000 AND t.timestamp <= $__to/1000 GROUP BY timestamp ORDER BY timestamp;",
392
+ "queryText": "SELECT t.timestamp, SUM(CASE WHEN gh.top_category in ('Revenue', 'Other Income') THEN t.value_usd ELSE 0 END) AS \"Total Revenue\" FROM general_ledger AS t JOIN txgroup_hierarchy gh ON t.txgroup_id = gh.txgroup_id INNER JOIN txgroups g USING (txgroup_id) WHERE t.timestamp >= $__from/1000 AND t.timestamp <= $__to/1000 AND ('$Txgroup' like '{%' or g.name = '$Txgroup') GROUP BY timestamp ORDER BY timestamp;",
393
393
  "queryType": "table",
394
- "rawQueryText": "SELECT t.timestamp, SUM(CASE WHEN gh.top_category in ('Revenue', 'Other Income') THEN t.value_usd ELSE 0 END) AS \"Total Revenue\" FROM general_ledger AS t JOIN txgroup_hierarchy gh ON t.txgroup_id = gh.txgroup_id WHERE t.timestamp >= $__from/1000 AND t.timestamp <= $__to/1000 GROUP BY timestamp ORDER BY timestamp;",
394
+ "rawQueryText": "SELECT t.timestamp, SUM(CASE WHEN gh.top_category in ('Revenue', 'Other Income') THEN t.value_usd ELSE 0 END) AS \"Total Revenue\" FROM general_ledger AS t JOIN txgroup_hierarchy gh ON t.txgroup_id = gh.txgroup_id INNER JOIN txgroups g USING (txgroup_id) WHERE t.timestamp >= $__from/1000 AND t.timestamp <= $__to/1000 AND ('$Txgroup' like '{%' or g.name = '$Txgroup') GROUP BY timestamp ORDER BY timestamp;",
395
395
  "refId": "A",
396
396
  "timeColumns": [
397
397
  "timestamp"
@@ -494,7 +494,25 @@
494
494
  "schemaVersion": 42,
495
495
  "tags": [],
496
496
  "templating": {
497
- "list": []
497
+ "list": [
498
+ {
499
+ "allowCustomValue": true,
500
+ "current": {
501
+ "text": "All",
502
+ "value": "$__all"
503
+ },
504
+ "definition": "SELECT DISTINCT t.name FROM treasury_txs a INNER JOIN txgroup_hierarchy gh ON a.txgroup_id = gh.txgroup_id LEFT JOIN txgroups t ON gh.txgroup_id = t.txgroup_id where gh.top_category = 'Revenue' or gh.top_category = 'Other Income';",
505
+ "description": "",
506
+ "includeAll": true,
507
+ "name": "Txgroup",
508
+ "options": [],
509
+ "query": "SELECT DISTINCT t.name FROM treasury_txs a INNER JOIN txgroup_hierarchy gh ON a.txgroup_id = gh.txgroup_id LEFT JOIN txgroups t ON gh.txgroup_id = t.txgroup_id where gh.top_category = 'Revenue' or gh.top_category = 'Other Income';",
510
+ "refresh": 2,
511
+ "regex": "",
512
+ "sort": 5,
513
+ "type": "query"
514
+ }
515
+ ]
498
516
  },
499
517
  "time": {
500
518
  "from": "now-6M",
@@ -503,5 +521,6 @@
503
521
  "timepicker": {},
504
522
  "timezone": "",
505
523
  "title": "Revenue Over Time",
506
- "version": 4
524
+ "uid": "5284bb56-b9fb-4f36-b971-eb125bfdac7d",
525
+ "version": 2
507
526
  }
dao_treasury/main.py CHANGED
@@ -100,8 +100,8 @@ parser.add_argument(
100
100
  parser.add_argument(
101
101
  "--concurrency",
102
102
  type=int,
103
- help="The max number of historical blocks to export concurrently. default: 50",
104
- default=50,
103
+ help="The max number of historical blocks to export concurrently. default: 30",
104
+ default=30,
105
105
  )
106
106
  parser.add_argument(
107
107
  "--daemon",
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: dao_treasury
3
- Version: 0.0.57
3
+ Version: 0.0.58
4
4
  Summary: Produce comprehensive financial reports for your on-chain org
5
5
  Classifier: Development Status :: 3 - Alpha
6
6
  Classifier: Intended Audience :: Developers
@@ -66,6 +66,7 @@ poetry run dao-treasury run --wallet 0x123 --network mainnet --interval 12h
66
66
  **CLI Options:**
67
67
  - `--network`: The id of the brownie network the exporter will connect to (default: mainnet)
68
68
  - `--interval`: The time interval between each data snapshot (default: 12h)
69
+ - `--concurrency`: The max number of historical blocks to export concurrently. (default: 30)
69
70
  - `--daemon`: Run the export process in the background (default: False) (NOTE: currently unsupported)
70
71
  - `--grafana-port`: Set the port for the Grafana dashboard where you can view data (default: 3004)
71
72
  - `--renderer-port`: Set the port for the report rendering service (default: 8091)
@@ -1,24 +1,24 @@
1
- bf2b4fe1f86ad2ea158b__mypyc.cpython-310-x86_64-linux-gnu.so,sha256=RB_DVK9yDJ0qIENuzA0gJ01iM4fxWrgSeCoQK4711Ck,1411688
1
+ dao_treasury__mypyc.cpython-310-x86_64-linux-gnu.so,sha256=_nJr7ZwvKQ4W7bGc_8mTg8pss-t3E1Kd7n0uRGwxq9g,1411632
2
2
  dao_treasury/ENVIRONMENT_VARIABLES.py,sha256=LEczR1MSWTY00sLHnFs3j_Jm8WZNJCxjwEzrvjbwl2E,636
3
3
  dao_treasury/__init__.py,sha256=W4syl9-cNhHOdD25ye9U7aBJTLE_R-uP49FXC_6CUOE,1477
4
- dao_treasury/_docker.cpython-310-x86_64-linux-gnu.so,sha256=UxaaleBikfH5KjSiCRl52EXIRphNsBtBr-Tf-SsHXPs,17624
4
+ dao_treasury/_docker.cpython-310-x86_64-linux-gnu.so,sha256=HSgmUZfX3mvMUrXUhgENjeOwtsFG7ycMqVDhozAjpQs,17624
5
5
  dao_treasury/_docker.py,sha256=b3exLlhtaC9S3osrLQsL8SIOLKUtSoop2uue0cSP9WM,5908
6
- dao_treasury/_nicknames.cpython-310-x86_64-linux-gnu.so,sha256=FKcjM-1hGte4BscAuiRYGJl7w7LY44u6S3BbzP-_SXc,17632
6
+ dao_treasury/_nicknames.cpython-310-x86_64-linux-gnu.so,sha256=Ton1hDlidap0X2PkMbf7-lTLVVrTiYTYwxAILndr9Go,17632
7
7
  dao_treasury/_nicknames.py,sha256=bvz0b8C31tFQ0pGtpSJW86OwjUF_qMBal4VXVT5UyLo,1017
8
- dao_treasury/_wallet.cpython-310-x86_64-linux-gnu.so,sha256=Y_Q83pAUNG1ggTfZs848kU6grcHkMGDrQbTxZ5c0LeA,17624
8
+ dao_treasury/_wallet.cpython-310-x86_64-linux-gnu.so,sha256=08S964XZYADoQmnvTAXE8-oegw0WiTufVXHhYwMAyrk,17624
9
9
  dao_treasury/_wallet.py,sha256=epV8LVuwHlOzc9UkA66js7HfEiZBOSAGJMtWbDTzmjU,10462
10
- dao_treasury/constants.cpython-310-x86_64-linux-gnu.so,sha256=PI6ukeIvCoX5BNzLGOeAO6laHmJN8lqtBH2KJWQZN1w,17624
10
+ dao_treasury/constants.cpython-310-x86_64-linux-gnu.so,sha256=Oe4H4qezS8ihvl6OHGHu_5KtbpZQA8bOrMma4islj_E,17624
11
11
  dao_treasury/constants.py,sha256=BGWVeN4KqpxWDGLG-DjPmdXmyVEb2C9KpMig9RaGJws,1444
12
12
  dao_treasury/db.py,sha256=wJi8-Zh2EO0F4A2ZabSt1ftcUTY6eCfF3FaChpjsTmg,48824
13
13
  dao_treasury/docker-compose.yaml,sha256=0epL6OjrW8cIwtqWerzB5c1Y_txLwvGMuHWUTIGtlsA,1309
14
- dao_treasury/main.py,sha256=j1O2dUk6PTBCI3H50YBV6sQesKdhttLFi9-DzENBKkY,8205
14
+ dao_treasury/main.py,sha256=uMY5XP_GpxO6Qd9VA1YMLzMOd-O4VnxbGJ2Pdqh0Zo0,8205
15
15
  dao_treasury/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
16
16
  dao_treasury/treasury.py,sha256=taTvwTH_Zdu2M61TrUCENcIUjxdQO3vryrZ2iVb6suM,7223
17
- dao_treasury/types.cpython-310-x86_64-linux-gnu.so,sha256=lpKYmzsG-SbQRO5GumD9y6o5KjVs-zQ-ogbyozBdyD4,17608
17
+ dao_treasury/types.cpython-310-x86_64-linux-gnu.so,sha256=wOv4bD362Vtn5qTFRyuzRcCnH7r6-KQZCZHTEJ2wpQ0,17608
18
18
  dao_treasury/types.py,sha256=dJDx0hYfDDL3slcUzRnCgrzFFsgCzoqg8uaTtLaT4kk,3685
19
19
  dao_treasury/.grafana/provisioning/dashboards/dashboards.yaml,sha256=mop3_BaSxm68HvYRNrAUXJa_LevFD8j4uZBhyc6v44g,1830
20
- dao_treasury/.grafana/provisioning/dashboards/breakdowns/Expenses.json,sha256=aKDEnqq_lX1vQ-cgl7tLIjqfcDHD-B-O5R9bZHzPGIQ,14556
21
- dao_treasury/.grafana/provisioning/dashboards/breakdowns/Revenue.json,sha256=UdJPmqz6AP0KmePWVHuHB6ibjaW3pRzw539Qr5iwnaA,14187
20
+ dao_treasury/.grafana/provisioning/dashboards/breakdowns/Expenses.json,sha256=xOC1QTr-yCvWNXrDJmK95n1yO7pimazN8OOWex0trr0,16353
21
+ dao_treasury/.grafana/provisioning/dashboards/breakdowns/Revenue.json,sha256=8Lly44gGloXR1_x49KnSk0CZFK6w0SnOlPfSJ4GvW3s,15957
22
22
  dao_treasury/.grafana/provisioning/dashboards/streams/LlamaPay.json,sha256=R1mUD-am1JzTkkZdQqc84q76uIB8FNSiEBOG1wBPVBU,7195
23
23
  dao_treasury/.grafana/provisioning/dashboards/summary/Monthly.json,sha256=3ILVMAN0M2QKDKIypdFk895tSIdFomvgtawYAJPO4Bk,6752
24
24
  dao_treasury/.grafana/provisioning/dashboards/transactions/Treasury Transactions.json,sha256=wTVhrkKfBqegq0pOHcqlLAvwoIv9rsr5nnxulLawXzA,12774
@@ -28,27 +28,27 @@ dao_treasury/.grafana/provisioning/dashboards/treasury/Current Treasury Assets.j
28
28
  dao_treasury/.grafana/provisioning/dashboards/treasury/Historical Treasury Balances.json,sha256=biPG7z1tsRLZiZGhTqVMwnqGmRruO38gkFwj751O-ak,130964
29
29
  dao_treasury/.grafana/provisioning/dashboards/treasury/Operating Cashflow.json,sha256=ZiGchTyhoWAYrpgGCOUD6alOWk9t4nTnejMehqS1IsM,15315
30
30
  dao_treasury/.grafana/provisioning/datasources/datasources.yaml,sha256=mjQs8or651NgD_bZnKBm8vSghzjw_g3enL01YPt0dik,327
31
- dao_treasury/sorting/__init__.cpython-310-x86_64-linux-gnu.so,sha256=JDd0sNee1Qx_FKEQ5RQxQWPz-YGOwYFpeu2kwCciuDk,17624
31
+ dao_treasury/sorting/__init__.cpython-310-x86_64-linux-gnu.so,sha256=dWBBXe4zBsQWkj95RcCU9AUqFU6mzGUm-R5zDbBDaM4,17624
32
32
  dao_treasury/sorting/__init__.py,sha256=vKj3NPB7EWbX7_fSUWKXk-NsyPasOkFhJvJVGclBOAE,10371
33
- dao_treasury/sorting/_matchers.cpython-310-x86_64-linux-gnu.so,sha256=0smDmHFXpsKkW4eABZEUCtfyFkY6qq7iFEmLRR_10dA,17640
33
+ dao_treasury/sorting/_matchers.cpython-310-x86_64-linux-gnu.so,sha256=_HLENEF_uRTaki-cU7jgCg7uAb0UVSrw1PwTDNh_E7A,17640
34
34
  dao_treasury/sorting/_matchers.py,sha256=u0GfPYiODr_NtzbfyLxEKDuXmWRiaeuZulDj9FPDOH8,14005
35
- dao_treasury/sorting/_rules.cpython-310-x86_64-linux-gnu.so,sha256=nXR1i_9tDRymftsWB7_CLEoSLvJOc00VQ-iohPvSD6w,17632
35
+ dao_treasury/sorting/_rules.cpython-310-x86_64-linux-gnu.so,sha256=vSc7vnh4h0_KsgWjOk2q0kDni-0fAfty_tkszjqfDOM,17632
36
36
  dao_treasury/sorting/_rules.py,sha256=vWkqJVA8yCHKRv9sw872Jq6G0zpM-v_J1jCz-Mgleec,8994
37
- dao_treasury/sorting/factory.cpython-310-x86_64-linux-gnu.so,sha256=dHnTX14KhMgkS_4_UF-atlKRSJozHchHrS3hTodop5o,17640
37
+ dao_treasury/sorting/factory.cpython-310-x86_64-linux-gnu.so,sha256=3qEUw5qpw2RL7FXY3HgDLDGwZVN4H2aCn0DIvFdrHh8,17640
38
38
  dao_treasury/sorting/factory.py,sha256=pFD6luc0bKxOTT1hlAp3ZwJw6R0wN8pjIZrqMZwhsko,10185
39
- dao_treasury/sorting/rule.cpython-310-x86_64-linux-gnu.so,sha256=tiswQx_dOoXhYlYA4CNcoLw5hW5RsfxelB7WPGp-0kE,17624
39
+ dao_treasury/sorting/rule.cpython-310-x86_64-linux-gnu.so,sha256=JGdacvJClcbpsykwJg2klzQCmH_azZDuST81EnZTQUA,17624
40
40
  dao_treasury/sorting/rule.py,sha256=WtGGN5mOd6S2Bhk7v5lsBWSSzVGKON7V10ImrUN79Y4,11628
41
- dao_treasury/sorting/rules/__init__.cpython-310-x86_64-linux-gnu.so,sha256=AD9UV7dAK_ujhZUy1UwOLhG0lBe0Rkk3g3XCO2ix1eM,17624
41
+ dao_treasury/sorting/rules/__init__.cpython-310-x86_64-linux-gnu.so,sha256=UyH5tnZJpY-6OtYT57SZrY012AyYY8gkZ4b5oLw7qLg,17624
42
42
  dao_treasury/sorting/rules/__init__.py,sha256=ofzIsW0P74kuKr6DlScZIF8p7hBh6guRpe1uOq6oLLA,48
43
- dao_treasury/sorting/rules/ignore/__init__.cpython-310-x86_64-linux-gnu.so,sha256=spsieV2jVMFO-XsK1Y92rEpha0hXk_Cju1SeQr_a1w0,17648
43
+ dao_treasury/sorting/rules/ignore/__init__.cpython-310-x86_64-linux-gnu.so,sha256=8w6efLveK3dcfuj7E5kN-ukRZTi2u4BNqX67ocjRbxU,17648
44
44
  dao_treasury/sorting/rules/ignore/__init__.py,sha256=dJ4oKSLe7fal1Ct7XtMCfVJAtvZXcyIomf8HF3gWUhQ,57
45
- dao_treasury/sorting/rules/ignore/llamapay.cpython-310-x86_64-linux-gnu.so,sha256=YdulbPnjXqh8UkJI-0aWoRlyeNO0cmdTffT_ffkrKIs,17664
45
+ dao_treasury/sorting/rules/ignore/llamapay.cpython-310-x86_64-linux-gnu.so,sha256=fMzr2NhaRYp_YyXF1RCxcj_8YUOzEx61OmY0FOs_-iQ,17664
46
46
  dao_treasury/sorting/rules/ignore/llamapay.py,sha256=NgiVt9MRtI-f4mw9U5_gqttdPqDa3vt_z5XWJP_UYWs,763
47
- dao_treasury/streams/__init__.cpython-310-x86_64-linux-gnu.so,sha256=spCFByAopkwhqQsXpRNbgLhBQAzVvr-2VboRIEEGT80,17624
47
+ dao_treasury/streams/__init__.cpython-310-x86_64-linux-gnu.so,sha256=InyFqHpfSgvVIualodxz0mjfkU6lz2MJSuSOr1q3QVM,17624
48
48
  dao_treasury/streams/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
49
- dao_treasury/streams/llamapay.cpython-310-x86_64-linux-gnu.so,sha256=0gXyA-ojZirURgTGce9vquRZYAYXOV_QgrX7O9BRgBg,17640
49
+ dao_treasury/streams/llamapay.cpython-310-x86_64-linux-gnu.so,sha256=cqwMAgz0qHO-4ZaOcqNWZPEgTQFWVsrFjAMNgnplby0,17640
50
50
  dao_treasury/streams/llamapay.py,sha256=yn37gwVfqGFF9fOhHuj9_t7KlHGyrdekF2TUmVDyg64,13147
51
- dao_treasury-0.0.57.dist-info/METADATA,sha256=SXN7tNRZs47YRwroBMwZjGyO8EYVyGq2vs-dZWXz35c,7029
52
- dao_treasury-0.0.57.dist-info/WHEEL,sha256=YJPq7zroHSsdctrb_KymZ4ss41PkmaA9SD9TZzqKSX8,112
53
- dao_treasury-0.0.57.dist-info/top_level.txt,sha256=Gw-ri_26lZA_3hwhnOX48mffUbmBGr8NhtoQ0XoMeF8,41
54
- dao_treasury-0.0.57.dist-info/RECORD,,
51
+ dao_treasury-0.0.58.dist-info/METADATA,sha256=sYOgR_OxSxzMzFuYPIZh44qrgGM5V615pQzIxIEbdqs,7122
52
+ dao_treasury-0.0.58.dist-info/WHEEL,sha256=YJPq7zroHSsdctrb_KymZ4ss41PkmaA9SD9TZzqKSX8,112
53
+ dao_treasury-0.0.58.dist-info/top_level.txt,sha256=CV8aYytuSYplDhLVY4n0GphckdysXCd1lHmbqfsPxNk,33
54
+ dao_treasury-0.0.58.dist-info/RECORD,,
@@ -0,0 +1,2 @@
1
+ dao_treasury
2
+ dao_treasury__mypyc
@@ -1,2 +0,0 @@
1
- bf2b4fe1f86ad2ea158b__mypyc
2
- dao_treasury