106 lines
8.5 KiB
Plaintext
106 lines
8.5 KiB
Plaintext
|
+
|
|||
|
|
Åç
|
|||
|
|
j× ã ó@ a € 0 t $ R t^ RIHt ^ RIt^ RIt^ RIt^ RIt^ RIH t ^ RI
|
|||
|
|
t
|
|||
|
|
]P ! R4 t
|
|||
|
|
RsR]R& ]P ! 4 t]P ! 4 tRsR R ltR
|
|||
|
|
R ltR R
|
|||
|
|
ltR R ltR R ltR R ltR R ltR# ] d Rt
|
|||
|
|
Lti ; i)aØ Postgres-backed key/value persistence for mail-api admin state.
|
|||
|
|
|
|||
|
|
The mail-api historically stored client_profiles / allowed_emails / drafts
|
|||
|
|
as JSON files on a Docker volume. This module lets the same data live in
|
|||
|
|
the shared Goodwalk postgres database so the admin dashboard at
|
|||
|
|
admin.goodwalk.co.nz reads from a real database instead of a per-container
|
|||
|
|
JSON file. JSON files remain as a development/local fallback and as the
|
|||
|
|
seed source for the initial postgres migration.
|
|||
|
|
)Ú annotationsN)ÚAnyz mail-api.dbr Ú_poolFc ó € V ^8„ d QhRR/# )é ÚreturnÚstr© )Úformats "Ú1C:\Users\mattc\gw-svelte\gw-svelte\mail-api\db.pyÚ __annotate__r ! s € ÷ >ñ >�cñ >ó c ór € \ P P R R4 ;' g RP 4 # )Ú DATABASE_URLÚ )ÚosÚenvironÚgetÚstripr r
|
|||
|
|
r Ú database_urlr ! s( € Ü �J‰J�N‰N˜>¨2Ó .× 4Ð 4°"× ;Ñ ;Ó =Ð=r
|
|||
|
|
c ó € V ^8„ d QhRR/# ©r r Úboolr )r
|
|||
|
|
s "r r r % s € ÷ 8ñ 8�Dñ 8r
|
|||
|
|
c óH € \ \ 4 4 ;' d \ R J# )N)r r Úasyncpgr r
|
|||
|
|
r Ú
|
|||
|
|
is_enabledr % s € Ü ” “Ó × 7Ð 7¤G°4Ð$7Ð7r
|
|||
|
|
c ó € V ^8„ d QhRR/# )r r r r )r
|
|||
|
|
s "r r r ) s € ÷ ñ ˜ñ r
|
|||
|
|
c ƒ ó " € \ 4 ' g R# \ e \ # \ ;_uu_4 GRj x€L
|
|||
|
|
\ fA \ P ! \ 4 ^^^
|
|||
|
|
R7 G Rj x€L
|
|||
|
|
s\ P R4 RRR4 GRj x€L
|
|||
|
|
\ # Lb L1 \ d3 p \ P RT 4 Rp ? RRR4 GRj x€L
|
|||
|
|
R# Rp ? ii ; i LN + GRj x€L
|
|||
|
|
' g i \ # ; i5i)zFReturn a lazily-initialised asyncpg pool, or None when DB is disabled.N)ÚdsnÚmin_sizeÚmax_sizeÚcommand_timeoutz,Postgres pool ready for admin_kv persistencez9Postgres pool init failed (%s); falling back to JSON only)
|
|||
|
|
r r Ú
|
|||
|
|
_pool_lockr Ú create_poolr ÚloggerÚinfoÚ ExceptionÚwarning)Úexcs r Úget_poolr) ) s· é € ô �<Š<ÙÜ Ò܈ ß�zŽzÜ Š=ð
|
|||
|
|
|
|||
|
|
Ü %× 1Ò 1Ü$›Ø Ø Ø$&ô ÷ �ô — ‘ Ð JÔK÷ �zô €Lñ ñøô ô
|
|||
|
|
Ü—‘Ð ZÐ\_Ô`Û÷ �zŠzûð
|
|||
|
|
ú÷ �z�z‰zô €Lüs’ ‚3C?µB¶C?¹ C Á%B Á(BÁ)B Â C?Â
|
|||
|
|
C Â C?ÂB Â CÂ'CÂ=C Ã C?Ã CÃ
|
|||
|
|
C?ÃCÃC Ã C?Ã C< Ã$C'Ã%
|
|||
|
|
C< Ã0C< Ã2
|
|||
|
|
C?c ó € V ^8„ d QhRR/# )r r ÚNoner )r
|
|||
|
|
s "r r r @ s € ÷ ñ ˜dñ r
|
|||
|
|
c
|
|||
|
|
ƒ ó " € \ ' d R # \ 4 G R j x€L
|
|||
|
|
p V f R # \ ;_uu_4 GR j x€L
|
|||
|
|
\ ' d R R R 4 GR j x€L
|
|||
|
|
R # V P 4 ;_uu_4 GR j x€L
|
|||
|
|
pVP R4 G R j x€L
|
|||
|
|
R R R 4 GR j x€L
|
|||
|
|
Rs R R R 4 GR j x€L
|
|||
|
|
R # Lž Lƒ Lh LG L0 L" + GR j x€L
|
|||
|
|
' g i L9; i L. + GR j x€L
|
|||
|
|
' g i R # ; i5i)Nzê
|
|||
|
|
create table if not exists admin_kv (
|
|||
|
|
key text primary key,
|
|||
|
|
value jsonb not null,
|
|||
|
|
updated_at timestamptz not null default now()
|
|||
|
|
);
|
|||
|
|
T)Ú_schema_ensuredr) Ú _schema_lockÚacquireÚexecute)ÚpoolÚconns r Ú_ensure_schemar3 @ s¥ é € çƒÙÜ“× €DØ ‚|Ùß�|Ž|ß ‹?Ø ÷ �|‰|ð —<‘<—>—>”> TØ—,‘,ðó÷
|
|||
|
|
ð
|
|||
|
|
÷ "—>ð ˆ÷ �|‰|ñ ó ñ "ñ
|
|||
|
|
÷ "—>—>’>ú÷ �|�|‹|üsØ ‚ DžB=Ÿ D»B?¼D¿C'Á
|
|||
|
|
DÁCÁDÁ C'Á;C Á<C'Á?C ÂC ÂC Â C'Â$CÂ%C'Â+ DÂ6C%Â7DÂ?DÃDÃC'ÃC ÃC'Ã C"
|
|||
|
|
ÃCÃ
|
|||
|
|
C"
|
|||
|
|
ÃC"
|
|||
|
|
à C'Ã%DÃ'D Ã-C0Ã.
|
|||
|
|
D Ã9D Ã; Dc ó € V ^8„ d QhRRRR/# )r Úkeyr r z
|
|||
|
|
Any | Noner )r
|
|||
|
|
s "r r r W s € ÷ ñ �cð ˜jñ r
|
|||
|
|
c ƒ óÆ " € \ 4 G R j x€L
|
|||
|
|
pVf R # \ 4 G R j x€L
|
|||
|
|
VP 4 ;_uu_4 GR j x€L
|
|||
|
|
pVP RV 4 G R j x€L
|
|||
|
|
pV' g R R R 4 GR j x€L
|
|||
|
|
R # VR, p\ V\
|
|||
|
|
\ 34 ' d TuuR R R 4 GR j x€L
|
|||
|
|
# \ V\ \ 34 ' d VP R4 p \ P ! V4 uuR R R 4 GR j x€L
|
|||
|
|
# EL Lì LÍ Lµ Lž Lf L \ d R R R 4 GR j x€L
|
|||
|
|
R # i ; i + GR j x€L
|
|||
|
|
' g i R # ; i5i)Nz)select value from admin_kv where key = $1Úvaluezutf-8)
|
|||
|
|
r) r3 r/ ÚfetchrowÚ
|
|||
|
|
isinstanceÚdictÚlistÚbytesÚ bytearrayÚdecodeÚjsonÚloadsr& )r5 r1 r2 ÚrowÚraws & r Úget_kvrC W sõ é € Ü“× €DØ ‚|ÙÜ
|
|||
|
|
Ó
|
|||
|
|
×ÐØ�|‰|�~�~Œ~ Ø—M‘MÐ"MÈsÓS×SˆßØ÷ �~‰~ð �'�lˆä �cœD¤$˜<× (Ò (Ø÷ �~Š~ô �cœE¤9Ð-× .Ò .Ø—*‘*˜WÓ%ˆCð Ü—:’:˜c“?÷ �~Š~ò ñ Ù ÙSõ øô ô Ø÷ �~Š~ð ú÷ �~�~‰~üsñ ‚E!�D‘E!¨D© E!Á DÁ
|
|||
|
|
E!Á
|
|||
|
|
EÁ#DÁ$ EÁ0EÁ1 E!Á<DÁ=E!Â&EÂ)
|
|||
|
|
E!Â6D Â7E!Â<-EÃ*D!Ã?
|
|||
|
|
E!Ä D Ä
|
|||
|
|
E!ÄE!ÄE!ÄEÄE!Ä E!Ä E!Ä! EÄ,EÄ- E!Ä8D;Ä9E!Å EÅEÅE Å
|
|||
|
|
E
|
|||
|
|
Å
|
|||
|
|
E ÅE Å E!c ó$ € V ^8„ d QhRRRRRR/# )r r5 r r7 r r r r )r
|
|||
|
|
s "r r r l s! € ÷ ñ �cð #ð ¨$ñ r
|
|||
|
|
c ƒ ót " € \ 4 G R j x€L
|
|||
|
|
pVf R# \ 4 G R j x€L
|
|||
|
|
\ P ! V4 pVP 4 ;_uu_4 GR j x€L
|
|||
|
|
pVP RV V4 G R j x€L
|
|||
|
|
R R R 4 GR j x€L
|
|||
|
|
R# L€ Lj L5 L L + GR j x€L
|
|||
|
|
' g i R# ; i5i)NFzö
|
|||
|
|
insert into admin_kv (key, value, updated_at)
|
|||
|
|
values ($1, $2::jsonb, now())
|
|||
|
|
on conflict (key) do update
|
|||
|
|
set value = excluded.value,
|