dao-treasury 0.0.71__cp311-cp311-win_amd64.whl → 0.1.1__cp311-cp311-win_amd64.whl

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

@@ -22,9 +22,8 @@
   "links": [],
   "panels": [
     {
-      "datasource": "SQLite",
+      "datasource": "PostgreSQL",
       "fieldConfig": {
-        "unit": "currencyUSD",
         "defaults": {
           "color": {
             "mode": "thresholds"
@@ -42,7 +41,8 @@
                 "value": 80
               }
             ]
-          }
+          },
+          "unit": "currencyUSD"
         },
         "overrides": []
       },
@@ -71,10 +71,9 @@
       "pluginVersion": "12.1.1",
       "targets": [
         {
-          "datasource": "SQLite",
-          "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",
-          "queryType": "table",
-          "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",
+          "datasource": "PostgreSQL",
+          "format": "table",
+          "rawSql": "SELECT SUM(p.value_usd) AS total_revenue FROM usdvalue_presum p JOIN txgroup_hierarchy gh USING (txgroup_id) WHERE gh.top_category = 'Revenue' AND p.timestamp >= $__from/1000 AND p.timestamp <= $__to/1000",
           "refId": "A",
           "timeColumns": ["time", "ts"]
         }
@@ -84,9 +83,8 @@
       "description": "Displays the total value of all transactions sorted as Revenue for the selected period."
     },
     {
-      "datasource": "SQLite",
+      "datasource": "PostgreSQL",
       "fieldConfig": {
-        "unit": "currencyUSD",
         "defaults": {
           "color": {
             "mode": "thresholds"
@@ -104,7 +102,8 @@
                 "value": 80
               }
             ]
-          }
+          },
+          "unit": "currencyUSD"
         },
         "overrides": []
       },
@@ -133,10 +132,9 @@
       "pluginVersion": "12.1.1",
       "targets": [
         {
-          "datasource": "SQLite",
-          "queryText": "SELECT SUM(t.value_usd) AS total_revenue FROM general_ledger t JOIN txgroup_hierarchy gh USING (txgroup_id) WHERE gh.top_category = 'Cost of Revenue' AND t.timestamp >= $__from/1000 AND t.timestamp <= $__to/1000",
-          "queryType": "table",
-          "rawQueryText": "SELECT SUM(t.value_usd) AS total_revenue FROM general_ledger t JOIN txgroup_hierarchy gh USING (txgroup_id) WHERE gh.top_category = 'Cost of Revenue' AND t.timestamp >= $__from/1000 AND t.timestamp <= $__to/1000",
+          "datasource": "PostgreSQL",
+          "format": "table",
+          "rawSql": "SELECT SUM(p.value_usd) AS total_revenue FROM usdvalue_presum p JOIN txgroup_hierarchy gh USING (txgroup_id) WHERE gh.top_category = 'Cost of Revenue' AND p.timestamp >= $__from/1000 AND p.timestamp <= $__to/1000",
           "refId": "A",
           "timeColumns": ["time", "ts"]
         }
@@ -146,9 +144,8 @@
       "description": "Displays the total value of all transactions sorted as Cost of Revenue for the selected period."
     },
     {
-      "datasource": "SQLite",
+      "datasource": "PostgreSQL",
       "fieldConfig": {
-        "unit": "currencyUSD",
         "defaults": {
           "color": {
             "mode": "thresholds"
@@ -166,7 +163,8 @@
                 "value": 80
               }
             ]
-          }
+          },
+          "unit": "currencyUSD"
         },
         "overrides": []
       },
@@ -195,10 +193,9 @@
       "pluginVersion": "12.1.1",
       "targets": [
         {
-          "datasource": "SQLite",
-          "queryText": "SELECT SUM(t.value_usd) AS total_revenue FROM general_ledger t JOIN txgroup_hierarchy gh USING (txgroup_id) WHERE gh.top_category = 'Expenses' AND t.timestamp >= $__from/1000 AND t.timestamp <= $__to/1000",
-          "queryType": "table",
-          "rawQueryText": "SELECT SUM(t.value_usd) AS total_revenue FROM general_ledger t JOIN txgroup_hierarchy gh USING (txgroup_id) WHERE gh.top_category = 'Expenses' AND t.timestamp >= $__from/1000 AND t.timestamp <= $__to/1000",
+          "datasource": "PostgreSQL",
+          "format": "table",
+          "rawSql": "SELECT SUM(p.value_usd) AS total_revenue FROM usdvalue_presum p JOIN txgroup_hierarchy gh USING (txgroup_id) WHERE gh.top_category = 'Expenses' AND p.timestamp >= $__from/1000 AND p.timestamp <= $__to/1000",
           "refId": "A",
           "timeColumns": ["time", "ts"]
         }
@@ -208,10 +205,9 @@
       "description": "Displays the total value of all transactions sorted as Expenses for the selected period."
     },
     {
-      "datasource": "SQLite",
+      "datasource": "PostgreSQL",
       "description": "Shows the net operating cashflow (Revenue minus Cost of Revenue and Expenses) for the selected period.",
       "fieldConfig": {
-        "unit": "currencyUSD",
         "defaults": {
           "color": {
             "mode": "thresholds"
@@ -229,7 +225,8 @@
                 "value": 80
               }
             ]
-          }
+          },
+          "unit": "currencyUSD"
         },
         "overrides": []
       },
@@ -258,10 +255,9 @@
       "pluginVersion": "12.1.1",
       "targets": [
         {
-          "datasource": "SQLite",
-          "queryText": "SELECT (\n  SUM(CASE WHEN gh.top_category = 'Revenue' THEN t.value_usd ELSE 0 END)\n  - SUM(CASE WHEN gh.top_category = 'Cost of Revenue' THEN t.value_usd ELSE 0 END)\n  - SUM(CASE WHEN gh.top_category = 'Expenses' THEN t.value_usd ELSE 0 END)\n) AS total_net\nFROM general_ledger t\nJOIN txgroup_hierarchy gh USING (txgroup_id)\nWHERE t.timestamp >= $__from/1000 AND t.timestamp <= $__to/1000",
-          "queryType": "table",
-          "rawQueryText": "SELECT (\n  SUM(CASE WHEN gh.top_category = 'Revenue' THEN t.value_usd ELSE 0 END)\n  - SUM(CASE WHEN gh.top_category = 'Cost of Revenue' THEN t.value_usd ELSE 0 END)\n  - SUM(CASE WHEN gh.top_category = 'Expenses' THEN t.value_usd ELSE 0 END)\n) AS total_net\nFROM general_ledger t\nJOIN txgroup_hierarchy gh USING (txgroup_id)\nWHERE t.timestamp >= $__from/1000 AND t.timestamp <= $__to/1000",
+          "datasource": "PostgreSQL",
+          "format": "table",
+          "rawSql": "SELECT (\n  SUM(CASE WHEN gh.top_category = 'Revenue' THEN p.value_usd ELSE 0 END)\n  - SUM(CASE WHEN gh.top_category = 'Cost of Revenue' THEN p.value_usd ELSE 0 END)\n  - SUM(CASE WHEN gh.top_category = 'Expenses' THEN p.value_usd ELSE 0 END)\n) AS total_net\nFROM usdvalue_presum p\nJOIN txgroup_hierarchy gh USING (txgroup_id)\nWHERE p.timestamp >= $__from/1000 AND p.timestamp <= $__to/1000",
           "refId": "A",
           "timeColumns": ["time", "ts"]
         }
@@ -270,10 +266,9 @@
       "type": "stat"
     },
     {
-      "datasource": "SQLite",
+      "datasource": "PostgreSQL",
       "description": "Time series chart of all sorted operational cashflows, grouped by category, for the selected period. Shows Total Revenue, Total Expenses, and Net for each week, helping to analyze trends in the DAO's operational financial flows over time.",
       "fieldConfig": {
-        "unit": "currencyUSD",
         "defaults": {
           "color": {
             "mode": "palette-classic"
@@ -324,7 +319,8 @@
                 "value": 80
               }
             ]
-          }
+          },
+          "unit": "currencyUSD"
         },
         "overrides": [
           {
@@ -375,10 +371,9 @@
       "pluginVersion": "12.1.1",
       "targets": [
         {
-          "datasource": "SQLite",
-          "queryText": "SELECT t.timestamp,\r\n       SUM(CASE WHEN gh.top_category = 'Revenue' THEN t.value_usd ELSE 0 END) AS \"Total Revenue\",\r\n       SUM(CASE WHEN gh.top_category in ('Cost of Revenue','Expenses') THEN t.value_usd ELSE 0 END) * -1 AS \"Total Expenses\",\r\n       SUM(CASE WHEN gh.top_category = 'Revenue' THEN t.value_usd ELSE 0 END) - SUM(CASE WHEN gh.top_category in ('Cost of Revenue','Expenses') THEN t.value_usd ELSE 0 END) AS \"Net\"\r\nFROM general_ledger AS t\r\nJOIN txgroup_hierarchy gh ON t.txgroup_id = gh.txgroup_id\r\nWHERE t.timestamp >= $__from/1000 AND t.timestamp <= $__to/1000\r\nGROUP BY timestamp\r\nORDER BY timestamp;",
-          "queryType": "table",
-          "rawQueryText": "SELECT t.timestamp,\r\n       SUM(CASE WHEN gh.top_category = 'Revenue' THEN t.value_usd ELSE 0 END) AS \"Total Revenue\",\r\n       SUM(CASE WHEN gh.top_category in ('Cost of Revenue','Expenses') THEN t.value_usd ELSE 0 END) * -1 AS \"Total Expenses\",\r\n       SUM(CASE WHEN gh.top_category = 'Revenue' THEN t.value_usd ELSE 0 END) - SUM(CASE WHEN gh.top_category in ('Cost of Revenue','Expenses') THEN t.value_usd ELSE 0 END) AS \"Net\"\r\nFROM general_ledger AS t\r\nJOIN txgroup_hierarchy gh ON t.txgroup_id = gh.txgroup_id\r\nWHERE t.timestamp >= $__from/1000 AND t.timestamp <= $__to/1000\r\nGROUP BY timestamp\r\nORDER BY timestamp;",
+          "datasource": "PostgreSQL",
+          "format": "table",
+          "rawSql": "SELECT to_timestamp(p.timestamp) AS \"timestamp\", SUM(CASE WHEN gh.top_category = 'Revenue' THEN p.value_usd ELSE 0 END) AS \"Total Revenue\", SUM(CASE WHEN gh.top_category in ('Cost of Revenue','Expenses') THEN p.value_usd ELSE 0 END) * -1 AS \"Total Expenses\", SUM(CASE WHEN gh.top_category = 'Revenue' THEN p.value_usd ELSE 0 END) - SUM(CASE WHEN gh.top_category in ('Cost of Revenue','Expenses') THEN p.value_usd ELSE 0 END) AS \"Net\" FROM usdvalue_presum AS p JOIN txgroup_hierarchy gh ON p.txgroup_id = gh.txgroup_id WHERE p.timestamp >= $__from/1000 AND p.timestamp <= $__to/1000 GROUP BY timestamp ORDER BY timestamp;",
           "refId": "A",
           "timeColumns": ["timestamp"]
         }
@@ -474,5 +469,5 @@
   "title": "Operating Cashflow Summary",
   "description": "Provides a focused view of core operational cashflows, including only sorted transactions in Revenue, Cost of Revenue, and Expenses categories. Excludes unsorted transactions and non-operational activity, helping monitor specifically the DAO's operational financial flows.",
   "uid": "fdf9969c-357a-4203-ae7b-12816e87bc7e",
-  "version": 100
+  "version": 105
 }

dao_treasury/.grafana/provisioning/datasources/datasources.yaml

@@ -1,13 +1,18 @@
 apiVersion: 1
 
 datasources:
-- name: SQLite
-  type: frser-sqlite-datasource
+- name: PostgreSQL
+  type: postgres
   isDefault: true
   editable: false
+  url: postgres:5432
+  user: dao_treasury
   jsonData:
-    path: /app/dao-treasury-data/dao-treasury.sqlite
-  secureJsonData: {}
+    database: dao_treasury
+    sslmode: "disable"
+    postgresVersion: 1801
+  secureJsonData:
+    password: dao_treasury
 
 - name: 'PROMETHEUS'
   type: 'prometheus'

dao_treasury/__init__.py

@@ -13,7 +13,6 @@ This is the main import point for users and integrations.
 """
 
 from dao_treasury import ENVIRONMENT_VARIABLES as ENVS
-from dao_treasury._nicknames import setup_address_nicknames_in_db
 from dao_treasury._wallet import TreasuryWallet
 from dao_treasury.db import TreasuryTx
 from dao_treasury.sorting import (
@@ -34,9 +33,6 @@ from dao_treasury.sorting import (
 from dao_treasury.treasury import Treasury
 
 
-setup_address_nicknames_in_db()
-
-
 if ENVS.SQL_DEBUG:
     import pony.orm
 

dao_treasury/_docker.py

@@ -52,8 +52,12 @@ def up(*services: str) -> None:
         :func:`down`
         :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("victoria-metrics")
+    # the proper envs for victoria-metrics arent set yet when we need to start up the postgres container,
+    # but they're ready by the time we start the other containers
+    if services != ("postgres",):
+        # eth-portfolio containers must be started first so dao-treasury can attach to the eth-portfolio docker network
+        eth_portfolio_scripts.docker.up("victoria-metrics")
+
     build(*services)
     _print_notice("starting", services)
     _exec_command(["up", "-d", *services])

dao_treasury/_nicknames.py

@@ -18,15 +18,16 @@ from typing import Final
 from pony.orm import db_session
 
 from dao_treasury import constants
-from dao_treasury.db import Address, _set_address_nicknames_for_tokens
+from dao_treasury.db import Address, init_db, set_address_nicknames_for_tokens
 
 
 set_nickname: Final = Address.set_nickname
 
 
 def setup_address_nicknames_in_db() -> None:
+    init_db()
     with db_session:
         set_nickname(constants.ZERO_ADDRESS, "Zero Address")
         for address in constants.DISPERSE_APP:
             set_nickname(address, "Disperse.app")
-        _set_address_nicknames_for_tokens()
+        set_address_nicknames_for_tokens()