Compare commits

...
Author SHA1 Message Date
Brandon Thomas ff22319c77 purge session cache with billing endpoints 2023-03-12 05:17:37 -04:00
Brandon Thomas 16f2d5557b clear session cache when user is edited 2023-03-12 04:49:59 -04:00
Brandon Thomas e5cdb84c52 correct cache key 2023-03-12 04:34:50 -04:00
Brandon Thomas 8079be9f7e progress with generics 2023-03-12 04:25:44 -04:00
Brandon Thomas 2821240cc0 generic over executor types 2023-03-12 04:12:22 -04:00
Brandon Thomas ae0522419a this *should* work - need to work on non-pooled version 2023-03-12 03:11:33 -04:00
Brandon Thomas 46bb4274ca work in progress session caching (redis) 2023-03-12 03:00:47 -04:00
Brandon Thomas f2b6dc4349 Merge pull request #39 from storytold/bt-redis-cache-endpoint
Bt redis cache endpoint
2023-03-12 01:25:31 -05:00
Brandon Thomas a395c04265 Delete cache when tts model is edited 2023-03-12 01:24:23 -05:00
Brandon Thomas d3a4613cc9 cleanup closures, fail open to db 2023-03-12 00:04:25 -05:00
Brandon Thomas bdca25cf4f cache works! 2023-03-11 23:58:14 -05:00
Brandon Thomas 06a053b6d9 this compiles too 2023-03-11 23:43:39 -05:00
Brandon Thomas 4104ef0129 this compiles too 2023-03-11 23:33:29 -05:00
Brandon Thomas 0f076cbacd work in progress redis caching (this compiles) 2023-03-11 23:21:39 -05:00
Brandon Thomas 817b2c01df new redis ttl cache crate (untested) 2023-03-11 22:53:01 -05:00
Brandon Thomas c06c47f02e Merge pull request #38 from storytold/bt-fix
Bt fix
2023-03-11 21:57:42 -05:00
Brandon Thomas 23b0dafd6b fix compile errors 2023-03-11 21:57:13 -05:00
Brandon Thomas 91e83c8b90 notes 2023-03-11 21:57:13 -05:00
Brandon Thomas 4a32ced9cd Merge pull request #37 from storytold/cache-profiles-redis
cache user profiles with redis
2023-03-11 06:42:15 -05:00
Brandon Thomas 75014a673a cache user profiles with redis 2023-03-11 06:41:51 -05:00
Brandon Thomas 52afa5462d Merge pull request #36 from storytold/block-ips
block more IPs
2023-03-11 05:15:40 -05:00
Brandon Thomas a826d54311 block more IPs 2023-03-11 05:15:09 -05:00
Brandon Thomas 4f38e4b20a codegen 2023-03-11 03:44:54 -05:00
Brandon Thomas 6880efd2f0 Merge pull request #35 from storytold/bt-edit-mfactor
edit tts model m-factor (mods only)
2023-03-11 03:42:27 -05:00
Brandon Thomas e372a4b5ec edit tts model m-factor (mods only) 2023-03-11 03:41:59 -05:00
Brandon Thomas f978f1b055 Merge pull request #34 from storytold/bt-inference-test-jobs
test requests bypass the model cache
2023-03-11 02:36:11 -05:00
Brandon Thomas ee69e72661 test requests bypass the model cache 2023-03-11 02:35:50 -05:00
Brandon Thomas 6295fd9569 update queries codegen 2023-03-11 02:09:03 -05:00
Brandon Thomas 53d9d55036 re-build all the things 2023-03-11 01:13:39 -05:00
Brandon Thomas 7e236f1e81 tts job now conveys mel multiplier 2023-03-11 01:12:35 -05:00
Brandon Thomas 6b7370ee64 migrations for mel multiply factor 2023-03-10 23:49:52 -05:00
Brandon Thomas 406d2eb7af rename paths 2023-03-10 05:54:56 -05:00
Brandon Thomas 1cfb3663e9 endpoint disablement filter allows adjustment of online endpoints 2023-03-10 05:50:00 -05:00
Brandon Thomas aa24f781fb remove old ip banlist filter 2023-03-10 04:33:22 -05:00
Brandon Thomas 3a2dad2027 more cleanup, organization, refactor 2023-03-10 03:08:29 -05:00
Brandon Thomas 814c04cdac more cleanup 2023-03-10 02:59:54 -05:00
Brandon Thomas c45a6da8a5 rid database_queries of container_common::anyhow_result 2023-03-10 02:55:57 -05:00
Brandon Thomas a5b2028588 begin removing container_common stuff 2023-03-10 02:53:48 -05:00
Brandon Thomas 4a743bace1 New static IP filter + docker config includes 2023-03-10 02:45:36 -05:00
Brandon Thomas 5ef5d6832b IP lists of attackers to ban 2023-03-10 02:28:35 -05:00
Brandon Thomas 0ebb1e398b Directory to contain IP bans 2023-03-10 02:21:48 -05:00
Brandon Thomas 4be572c36b refactor / organize top level directories 2023-03-10 02:13:16 -05:00
Brandon Thomas 97bea31b1d load an entire directory of bans 2023-03-10 01:49:11 -05:00
Brandon Thomas f3dd785331 load ip sets from file 2023-03-10 01:34:57 -05:00
Brandon Thomas 0d99c2fc08 new ip address filter middleware (wip) 2023-03-10 01:12:37 -05:00
Brandon Thomas edba26a2db cache leaderboard 2023-03-09 18:29:15 -05:00
Brandon Thomas 89a9448c9a new caching logic for get pending tts counts 2023-03-09 18:16:02 -05:00
Brandon Thomas d557c78123 new LRU cache to bypass expiry 2023-03-09 18:06:21 -05:00
Brandon Thomas 9ac7f33008 feature flag to control frontend tts queue refresh rate 2023-03-09 10:47:59 -05:00
Brandon Thomas 716e7923ff Add IP addresses that attacked us 2023-03-09 02:19:51 -05:00
Brandon Thomas ad389491a2 mark dummy service logs 2023-03-09 00:31:00 -05:00
Brandon Thomas 85b5e427b9 Wrap forwarded ip 2023-03-09 00:30:20 -05:00
Brandon Thomas 74d7b543f2 dummy service too 2023-03-08 21:10:09 -05:00
Brandon Thomas 2078bac70f forwarded IP in logs 2023-03-08 21:09:47 -05:00
Brandon Thomas 2e0110b0d9 omfg I'm dumb 2023-03-08 20:49:59 -05:00
Brandon Thomas 80a32eedf3 default route 2023-03-08 20:37:54 -05:00
Brandon Thomas 539c5ae796 with and without compression (messy af hack) 2023-03-08 20:32:54 -05:00
Brandon Thomas 6440d519f9 build dummy service in docker image 2023-03-08 20:17:30 -05:00
Brandon Thomas 690f4f1064 dummy service for debugging 2023-03-08 20:16:35 -05:00
Brandon Thomas a1e4ca35cd configurable health check duration 2023-03-08 18:49:56 -05:00
Brandon Thomas d93c0a5a8d log dropped requests 2023-03-08 17:10:36 -05:00
Brandon Thomas 9cc5ce9a04 faster builds for outage 2023-03-08 16:53:15 -05:00
Brandon Thomas 202b6c4a97 always opt in health checkers 2023-03-08 16:32:09 -05:00
Brandon Thomas 71abf1caa2 fix the pushback filter for the global GKE load balancer 2023-03-08 15:31:52 -05:00
Brandon Thomas de01d0fde7 protect another endpoint (tts model list) with flag 2023-03-08 15:10:57 -05:00
Brandon Thomas bb5ef2a3fe 404 "None" job statuses from broken Python clients 2023-03-08 14:53:14 -05:00
Brandon Thomas a8ab9c1265 Middleware to disable site with 429 global pushback 2023-03-08 14:44:08 -05:00
Brandon Thomas 2412e15868 add a followup github action step 2023-03-08 12:48:12 -05:00
Brandon Thomas 4b45924455 one more disk space report 2023-03-08 12:30:06 -05:00
Brandon Thomas 72ce767337 bump github actions caching plugin 2023-03-08 12:28:06 -05:00
Brandon Thomas 76c562bf2e trying one more thing 2023-03-08 12:24:37 -05:00
Brandon Thomas 6ac8759aba remove check of filesystem at root due to permissions on /proc 2023-03-08 12:23:45 -05:00
Brandon Thomas 3503a4527c disable docker container build tests (for now - emergency) 2023-03-08 12:23:04 -05:00
Brandon Thomas 03160b73d4 Merge pull request #33 from storytold/bt-space-check
report disk usage
2023-03-08 12:15:42 -05:00
Brandon Thomas 601b786b06 report disk usage 2023-03-08 12:15:25 -05:00
Brandon Thomas 05503512d8 Merge pull request #32 from storytold/bt-space
attempt to fix github builds failing for space issues
2023-03-08 11:48:02 -05:00
Brandon Thomas 7db6f074b6 attempt to fix github builds failing for space issues 2023-03-08 11:47:31 -05:00
Brandon Thomas e7ad3a34de Merge pull request #31 from storytold/bt-ff
feature flag to disable tts queue length
2023-03-08 11:28:13 -05:00
Brandon Thomas 5ccd512a2a feature flag to disable tts queue length 2023-03-08 11:27:42 -05:00
Brandon Thomas c40333e2a2 Fixup sqlx offline query caching, fix failing tests, fix docker 2023-03-08 05:56:59 -05:00
Brandon Thomas edcfc9ff9b port final storyteller-web query out: enqueue infer w2l 2023-03-08 05:31:56 -05:00
Brandon Thomas 862be58f1a port "assign/unassign tts category" out of storyteller-web 2023-03-08 05:14:34 -05:00
Brandon Thomas 8b08f2ba1d port "edit w2l template" queries out of storyteller-web 2023-03-08 05:01:49 -05:00
Brandon Thomas fe3f8dec6c port "edit w2l result" queries 2023-03-08 03:30:09 -05:00
Brandon Thomas 8ae5d34074 port the two "edit tts result" queries 2023-03-08 03:14:54 -05:00
Brandon Thomas 89f8837706 port tts upload job status query 2023-03-08 01:05:35 -05:00
Brandon Thomas 03ed0b4c7b analytics queries 2023-03-07 23:57:43 -05:00
Brandon Thomas f1d8161481 port get pending w2l detailed stats out of storyteller-web 2023-03-06 20:03:43 -05:00
Brandon Thomas 2d20430f55 port tts inference stats from storyteller web 2023-03-06 19:56:26 -05:00
Brandon Thomas e2b98491cb port storyteller-web query: insert w2l template upload job 2023-03-06 19:21:14 -05:00
Brandon Thomas 910caa1000 port storyteller-web get w2l inference job status 2023-03-06 18:58:15 -05:00
Brandon Thomas 0e39999097 port query get upload w2l template status 2023-03-06 06:03:59 -05:00
Brandon Thomas 77779bc231 port insert tts upload job query 2023-03-06 05:47:51 -05:00
Brandon Thomas 898c22b9cc port "edit category" out of storyteller-web 2023-03-06 05:28:17 -05:00
Brandon Thomas 96b80b35a5 port query: set w2l template mod approval 2023-03-06 05:16:22 -05:00
Brandon Thomas d182f800f7 port query: inference job status 2023-03-06 05:07:43 -05:00
Brandon Thomas 60af92ea39 port storyteller-web query: pending w2l template list 2023-03-06 04:57:45 -05:00
Brandon Thomas da8c164b40 port storyteller-web query: create category 2023-03-06 04:49:36 -05:00
Brandon Thomas d304f40984 port useless query - should have just deleted this one 2023-03-06 04:41:05 -05:00
Brandon Thomas 8f0d347c38 move storyteller-web query: set user role 2023-03-06 04:27:34 -05:00
Brandon Thomas 73db1b1a49 move another storyteller web query: category soft delete 2023-03-06 04:18:58 -05:00
Brandon Thomas 97b7120ff8 move another storyteller-web query: ban user 2023-03-06 04:07:46 -05:00
Brandon Thomas 961c5cf43d remove another storyteller-web query: upsert ip ban 2023-03-06 03:58:47 -05:00
Brandon Thomas 4c2c54bd74 Merge pull request #30 from storytold/bt-extract-queries
Bt extract queries
2023-03-06 02:05:03 -05:00
Brandon Thomas c158097b42 move queries for public event feed out of storyteller-web 2023-03-06 02:01:46 -05:00
Brandon Thomas 1c9366da4b remove another storyteller-web query : staff 2023-03-06 02:01:46 -05:00
Brandon Thomas f648f7b714 port db query for toggle IP ban out of storyteller-web 2023-03-06 02:01:46 -05:00
Brandon Thomas c3db6ce24a remove another ip ban query from storyteller-web 2023-03-06 02:01:46 -05:00
Brandon Thomas 1910b6497c get rid of storyteller-web list ip bans query 2023-03-06 02:01:46 -05:00
Brandon Thomas ac90b89230 SQL codegen for MySQL + Sqlite 2023-03-02 05:46:53 -05:00
Brandon Thomas 70e6ba5aec codegen db 2023-02-26 00:12:58 -05:00
Brandon Thomas 5af6a68de7 Random init news story progress - better for initial mix of stories 2023-02-24 04:21:26 -05:00
Brandon Thomas 19532388a3 work on selecting random stories to scrape 2023-02-24 04:05:03 -05:00
Brandon Thomas 27adc9f73e gizmodo + kotaku in app scraping 2023-02-24 03:41:12 -05:00
Brandon Thomas 6d082f2b9e Kotaku + Gizmodo RSS indexers 2023-02-24 03:18:00 -05:00
Brandon Thomas 2c86a4189c kotaku scraper 2023-02-24 02:49:02 -05:00
Brandon Thomas bf5b2b385e CNN timestamps 2023-02-24 02:33:37 -05:00
Brandon Thomas b7c73930b4 CNN timestamps 2023-02-24 02:20:36 -05:00
Brandon Thomas f9d61a1482 Gizmodo scraper 2023-02-24 01:50:08 -05:00
Brandon Thomas 4799d3ceac CBS News scraper 2023-02-24 01:21:29 -05:00
Brandon Thomas 696fd2bd8d Add timestamp to theguardian scraper 2023-02-24 00:45:10 -05:00
Brandon Thomas 1cfb3bb715 TheGuardian scraper 2023-02-23 19:21:19 -05:00
Brandon Thomas ccb36f7f6e CLI utility to test parsing 2023-02-23 18:57:23 -05:00
Brandon Thomas 83a16f83e3 fix builds? 2023-02-23 17:19:16 -05:00
Brandon Thomas 8f9554be9f try to fix builds again 2023-02-23 05:10:10 -05:00
Brandon Thomas d987397586 fix builds? 2023-02-23 02:54:29 -05:00
Brandon Thomas 41e03feb85 more analytics queries 2023-02-23 02:15:04 -05:00
Brandon Thomas 5c8cab0d90 extra analysis query 2023-02-23 01:35:03 -05:00
Brandon Thomas 8f40db9a3e return short news title in HTTP endpoint 2023-02-22 08:36:18 -05:00
Brandon Thomas b0a7c953be Try to remove stories that have TTS strokes 2023-02-22 08:29:06 -05:00
Brandon Thomas a08bc3fa64 include outputs in table, cleanup bugs 2023-02-22 07:51:53 -05:00
Brandon Thomas 5d111f0a68 fix job queue state flow 2023-02-22 07:35:45 -05:00
Brandon Thomas 51a5571d84 new jobs: LLM title summary, LLM categorization 2023-02-22 07:28:04 -05:00
Brandon Thomas 95f2ec3e40 Add new status columns to list queries 2023-02-22 06:02:10 -05:00
Brandon Thomas b511420c03 Refactor to group news story tasks by phase 2023-02-22 05:14:07 -05:00
Brandon Thomas aeab9da077 Summary news title and categories DB migrations 2023-02-22 04:57:05 -05:00
Brandon Thomas 46452415fd hanashi v3 2023-02-21 23:06:42 -05:00
Brandon Thomas cecbc8e730 report headline image url 2023-02-20 05:41:59 -05:00
Brandon Thomas 1ba73c817c Avoid empty scraped articles 2023-02-20 05:37:59 -05:00
Brandon Thomas 8395739500 save debugging info 2023-02-20 05:23:07 -05:00
Brandon Thomas c537f09c8f Image generation works! 2023-02-20 05:09:35 -05:00
Brandon Thomas 1e7de6bf36 hanashi v2, include cnn entertainment feed 2023-02-19 06:35:22 -05:00
Brandon Thomas ab6e3ceb5a get rid of ads 2023-02-19 06:21:11 -05:00
Brandon Thomas 896938b762 begin work on per-website greenlighting 2023-02-19 06:05:48 -05:00
Brandon Thomas 486960905d Add web_content_type to news_stories and news_story_productions 2023-02-19 05:57:36 -05:00
Brandon Thomas 2a54d3aac9 switch voices at runtime 2023-02-18 06:58:13 -05:00
Brandon Thomas 10ac9fee82 GUI dropdown (non-functional), window size 2023-02-18 06:38:59 -05:00
Brandon Thomas cab4840a61 Sigil value in API for UNREAL's sake. Ugh. 2023-02-18 03:04:07 -05:00
Brandon Thomas 68a3c123eb Include all news stories if "recent" is an empty list 2023-02-18 01:19:41 -05:00
Brandon Thomas 582ce9aa93 more debugging 2023-02-18 01:13:27 -05:00
Brandon Thomas eaeb864c1c debugging for endpoints 2023-02-16 05:56:05 -05:00
Brandon Thomas 77d4bc3b75 working retry 2023-02-16 04:50:51 -05:00
Brandon Thomas b6be95144c FakeYou with backoff 2023-02-16 04:40:24 -05:00
Brandon Thomas 5ca4dd3600 use session cookie credentials instead, because API sessions broken 2023-02-16 03:53:00 -05:00
Brandon Thomas 294c3107b5 API token for channels 2023-02-16 02:41:45 -05:00
Brandon Thomas 2de7ce146f increase sqlite "connections"(??) to improve performance 2023-02-16 02:28:53 -05:00
Brandon Thomas f7ddd24325 Get next audio file in sequence 2023-02-16 02:26:48 -05:00
Brandon Thomas 1b1ed15f21 endpoint for random news story 2023-02-15 04:55:46 -05:00
Brandon Thomas dc93602306 track audio durations in db 2023-02-15 04:04:21 -05:00
Brandon Thomas 2898f40ad1 Fix errors 2023-02-15 03:34:27 -05:00
Brandon Thomas ced51c7f58 track extra metadata throughout production 2023-02-15 03:20:38 -05:00
Brandon Thomas b208847ec8 insert news story, tighten up timings 2023-02-15 02:48:15 -05:00
Brandon Thomas 744656cfd9 remove imgui (we're not using it) 2023-02-15 01:33:22 -05:00
Brandon Thomas a735d3e972 sequence length 2023-02-15 01:24:16 -05:00
Brandon Thomas 90aa091398 refactor tts_render_targets -> tts_render_tasks 2023-02-15 01:12:58 -05:00
Brandon Thomas f8e7ae3ced preproduction story finalization 2023-02-14 13:09:22 -05:00
Brandon Thomas a1b8a22225 Download files 2023-02-14 12:47:23 -05:00
Brandon Thomas 0a0105410d Get updated audio status 2023-02-14 05:13:57 -05:00
Brandon Thomas 69a79b76ea seems to work better? 2023-02-14 04:26:53 -05:00
Brandon Thomas 809387958c cleanup 2023-02-14 03:29:46 -05:00
Brandon Thomas 44f7824910 cleanup 2023-02-14 02:59:29 -05:00
Brandon Thomas 1e05dcb7e2 Add sequence order 2023-02-14 02:47:07 -05:00
Brandon Thomas 72bdea7d10 Record inference details 2023-02-14 02:22:00 -05:00
Brandon Thomas c3981e8554 idempotency crate, FakeYou requests to infer work 2023-02-14 02:03:31 -05:00
Brandon Thomas 6b937b7cd0 FakeYou rendering *almost* works 2023-02-14 01:37:26 -05:00
Brandon Thomas 5be10ae87a refactor/organize worker modules 2023-02-13 21:32:46 -05:00
Brandon Thomas 12f7e30047 fakeyou client 2023-02-13 21:25:43 -05:00
Brandon Thomas a5e0c2ab01 reorganize analytics queries 2023-02-13 17:39:58 -05:00
Brandon Thomas 0764711439 pause controls for scraping 2023-02-13 17:12:12 -05:00
Brandon Thomas 969be4726c easier concurrency atomic bools, add controls for pieces 2023-02-13 17:05:22 -05:00
Brandon Thomas 8244bac6e1 tweak timings 2023-02-13 04:52:41 -05:00
Brandon Thomas 1d173a74d5 split into paragraph heuristic 2023-02-13 04:34:24 -05:00
Brandon Thomas 3786a64eb1 text splitting 2023-02-13 03:49:01 -05:00
Brandon Thomas cc6cf0d6c0 "add dragon", as old colleagues would say
Maybe one day we can afford to buy Nintendo. (That's crazy.)
2023-02-12 22:53:56 -05:00
Brandon Thomas 144df6ffc0 refactor to make llm rendition a part of production flow 2023-02-12 17:52:18 -05:00
Brandon Thomas 85e0ce4b4a Greenlighting stories + production workflow (abstract, but will use) 2023-02-12 15:54:26 -05:00
Brandon Thomas 107d11f0f9 Analysis of paying subscribers 2023-02-12 02:40:11 -05:00
Brandon Thomas 7efb65ae08 new tables 2023-02-10 21:26:14 -05:00
Brandon Thomas ba3ff9768a WIP - tables for stories 2023-02-10 06:28:55 -05:00
Brandon Thomas b8e37d2e77 mark jobs done 2023-02-10 03:49:45 -05:00
Brandon Thomas 5a1e61b692 add some filters 2023-02-10 01:16:51 -05:00
Brandon Thomas 19b57b9c1d unused module 2023-02-10 00:41:57 -05:00
Brandon Thomas 6c33c31289 skip CNN video content 2023-02-08 05:13:45 -05:00
Brandon Thomas b1bbfe21ec OpenAI API calls 2023-02-08 03:36:41 -05:00
Brandon Thomas 5878224f7e rendition schema 2023-02-07 22:40:35 -05:00
Brandon Thomas 5497b7c0aa small refactor 2023-02-07 18:54:23 -05:00
Brandon Thomas bc58b50408 shared title/image extractors 2023-02-07 17:50:58 -05:00
Brandon Thomas ce17a3e1bf CNN articles, shared extractors 2023-02-07 17:13:07 -05:00
Brandon Thomas b8fe3a0e7d fix pagination bugs 2023-02-07 03:04:04 -05:00
Brandon Thomas d41cec6c90 cleanup log spam 2023-02-07 02:24:44 -05:00
Brandon Thomas 6a86f43a92 scraping appears to work 2023-02-07 02:18:00 -05:00
Brandon Thomas 65a7a46914 finish refactoring macros 2023-02-06 23:53:19 -05:00
Brandon Thomas 31eafed60d refactor database enum macros 2023-02-06 23:51:30 -05:00
Brandon Thomas 6abbbaae01 list query, enum macros for web_scraping_targets (sqlite) 2023-02-06 23:46:22 -05:00
Brandon Thomas 82efbf4d1f update docs 2023-02-06 22:10:12 -05:00
Brandon Thomas b1cefa66d5 docs about windows setup 2023-02-06 22:09:03 -05:00
Brandon Thomas 7f5f578abd ignore this mess 2023-02-06 21:58:47 -05:00
Brandon Thomas 0c574c31d6 update path 2023-02-06 18:42:31 -05:00
Brandon Thomas 393bc084d4 scope aichatbot to sqlite 2023-02-06 18:38:33 -05:00
Brandon Thomas 035faa0561 update launch script 2023-02-06 17:56:32 -05:00
Brandon Thomas 84e2bcd2c3 sqlite library for windows 2023-02-06 16:37:12 -05:00
Brandon Thomas bc69ecbda5 start script for windows 2023-02-06 16:17:16 -05:00
Brandon Thomas 5f35323a5f fixes for windows 2023-02-06 16:14:24 -05:00
Brandon Thomas 30c9f779bd outline remaining work 2023-02-06 05:00:32 -05:00
Brandon Thomas 4f7d03a505 index cnn + techcrunch 2023-02-06 04:56:49 -05:00
Brandon Thomas 5a031b1b80 indexer flow 2023-02-06 04:49:28 -05:00
Brandon Thomas d1b6facd95 worker threads 2023-02-06 04:46:10 -05:00
Brandon Thomas 79984058c0 Save webpage and scraping summary 2023-02-06 03:56:51 -05:00
Brandon Thomas adc52cd01e directory to persist html 2023-02-06 03:32:07 -05:00
Brandon Thomas aad257a1b2 fully refactor "hashing" out of container_common 2023-02-06 03:18:53 -05:00
Brandon Thomas b8d5a1fad1 hashing refactor 2023-02-06 03:06:01 -05:00
Brandon Thomas f757b94eaf refactor "hashing" 2023-02-06 03:02:23 -05:00
Brandon Thomas 8ff2408cbf begin to work on persisting scraping 2023-02-06 02:47:21 -05:00
Brandon Thomas 01fa2f8d67 serde 2023-02-05 17:35:44 -05:00
Brandon Thomas 25b7024655 title, more fields 2023-02-05 17:32:29 -05:00
Brandon Thomas f7b8423623 techcrunch parsing sort of works 2023-02-05 16:29:17 -05:00
Brandon Thomas 0f99360c20 the guardian 2023-02-05 05:54:25 -05:00
Brandon Thomas fe606c1610 three techcrunch feeds 2023-02-05 05:28:39 -05:00
Brandon Thomas 201481f969 handle TechCrunch venture feed 2023-02-05 05:24:54 -05:00
Brandon Thomas 665cd83739 techcrunch scraping of RSS feed 2023-02-05 05:12:42 -05:00
Brandon Thomas eefe48f8ca CNN candidate articles via RSS + Sqlite inserts 2023-02-05 05:02:13 -05:00
Brandon Thomas a1c5ef6eb2 add sqlite columns, move database 2023-02-05 03:44:02 -05:00
Brandon Thomas 2f4fe2dabc Web scraping WIP 2023-02-05 03:36:17 -05:00
Brandon Thomas d63a505b8b comments in .gitignore, aichatbot diesel configs 2023-02-05 01:41:08 -05:00
Brandon Thomas fb1bf9940e move migrations dir 2023-02-05 01:32:34 -05:00
Brandon Thomas d4de388bb6 new reserved usernames for channels 2023-02-05 01:21:57 -05:00
Brandon Thomas a0a5c68086 Project outline 2023-02-04 18:24:45 -05:00
Brandon Thomas ddb106a9af reqwest, ingestion modules (wip) 2023-02-03 23:57:12 -05:00
Brandon Thomas 7c229ba59b fix 2023-02-03 06:00:21 -05:00
Brandon Thomas d1978298f0 unixy paths 2023-02-03 05:57:41 -05:00
Brandon Thomas 1dcf06b571 fix? 2023-02-03 05:50:37 -05:00
Brandon Thomas 8af2368f32 fix? 2023-02-03 05:46:29 -05:00
Brandon Thomas 79fba33aae more debugging 2023-02-03 05:44:38 -05:00
Brandon Thomas bff0f9181d debugging 2023-02-03 05:42:27 -05:00
Brandon Thomas bd8f2570e2 report audio filename 2023-02-03 05:37:29 -05:00
Brandon Thomas 74c289b338 refactor sidecar, save dir 2023-02-03 05:17:09 -05:00
Brandon Thomas 63bb0e7253 cursor 2023-02-03 03:45:17 -05:00
Brandon Thomas 4140d07924 OpenAI API calls 2023-02-03 02:09:55 -05:00
Brandon Thomas aa03abd3b5 Merge pull request #28 from storytold/saj-unsubscribe-reason
endpoint for indicating why a user is unsubscribing
2023-02-03 01:33:54 -05:00
Paul Sajna fb8142fb49 endpoint for indicating why a user is unsubscribing 2023-02-02 22:25:00 -08:00
Brandon Thomas 362f41cbf3 Webserver + Egui synced 2023-02-02 17:55:04 -05:00
Brandon Thomas a79d3bcf9a fix windows builds? 2023-02-02 16:17:01 -05:00
Brandon Thomas 41e7780fa0 fix builds ? 2023-02-02 15:57:22 -05:00
Brandon Thomas 329e7defc5 update paths 2023-02-02 15:54:41 -05:00
Brandon Thomas 6ce0437aa2 ignore some code from Github language statistics 2023-02-02 15:52:33 -05:00
Brandon Thomas 34bb2c5266 ACTUALLY YOU CAN LAUNCH ACTIX FROM ANOTHER THREAD 2023-02-02 15:41:56 -05:00
Brandon Thomas 2b50d2bce5 new lib: actix_helpers (RouteBuilder), --gui, etc. 2023-02-02 15:33:01 -05:00
Brandon Thomas c9f55fbb7c Still issues with launching a gui on non-main thread; add fonts 2023-02-02 12:22:53 -05:00
Brandon Thomas 2da4971ec7 analytics query adjustments 2023-02-02 11:56:53 -05:00
Brandon Thomas 2cd6a98259 egui wants to run on main thread; so does actix. ugh 2023-02-02 04:38:43 -05:00
Brandon Thomas 7ba765b89c Setting up aichatbot-sidecar desktop program 2023-02-02 01:40:44 -05:00
Brandon Thomas 02d7495e54 kick this can down the road _again_ 2023-02-02 00:43:59 -05:00
Brandon Thomas 088535cb5a refactor/move "plugins" crate to pertain only to services 2023-02-02 00:40:01 -05:00
Brandon Thomas 4ef9ad35a7 fix migration dir config 2023-02-02 00:30:30 -05:00
Brandon Thomas f80f2c8962 Move all SQL stuff into single directory 2023-02-01 23:53:49 -05:00
Brandon Thomas 98fb5758e5 I'll see myself out 2023-02-01 19:32:03 -05:00
Brandon Thomas 06f219a8af more reserved names 2023-02-01 19:30:30 -05:00
Brandon Thomas 439527a504 more reserved words 2023-02-01 19:26:00 -05:00
Brandon Thomas 61e1cc62b6 analytics query 2023-01-30 01:20:06 -05:00
Brandon Thomas 633dfb5682 more queries 2023-01-29 20:58:03 -05:00
Brandon Thomas 8df0273ca8 more analysis 2023-01-29 20:17:50 -05:00
Brandon Thomas 41630e1fc5 paying user analytics 2023-01-29 20:09:28 -05:00
Brandon Thomas 40bc0cf883 never need 500 voices in analytics 2023-01-27 02:33:00 -05:00
Brandon Thomas 7fdb5cfe9c codegen db 2023-01-26 01:17:27 -05:00
Brandon Thomas a0da010dab Add model ratings to TTS list and get endpoints 2023-01-26 01:12:20 -05:00
Brandon Thomas 74ff632f4d update TTS statistics on model rate 2023-01-26 01:12:20 -05:00
Brandon Thomas e6d1f0db11 Alter tts_models to add ratings counts 2023-01-26 01:12:20 -05:00
Brandon Thomas d190173f4d new queries 2023-01-25 16:29:25 -05:00
Brandon Thomas 22e8a14170 Fix build errors and mistakes with user ratings 2023-01-25 16:24:44 -05:00
Brandon Thomas b6fce130b5 GET and POST endpoints for user ratings 2023-01-25 16:08:22 -05:00
Brandon Thomas 1bb0dda330 Rating type instead of bool, upsert query, enums 2023-01-25 02:33:56 -05:00
Brandon Thomas bcbb36a9ed User ratings table 2023-01-25 00:47:35 -05:00
Brandon Thomas dbfd80531d analytics query 2023-01-23 23:21:44 -05:00
Brandon Thomas 4152b346c1 Server info endpoint to report backend SHA 2023-01-21 03:17:49 -05:00
Brandon Thomas 3b37cf9e89 analytics query 2023-01-20 06:22:40 -05:00
Brandon Thomas c49bbd299a analytics queries for category assignments 2023-01-20 05:42:54 -05:00
Brandon Thomas 993fe647b4 remove whitespace from TTS model titles 2023-01-20 03:27:39 -05:00
Brandon Thomas d46778569c Add Arabic and Turkish language support (serverside) 2023-01-20 03:25:17 -05:00
Brandon Thomas 2ea0e1450c Sort tts models returned by category membership endpoint 2023-01-18 01:01:29 -05:00
Brandon Thomas b31bafd639 split up heavy category endpoint into modules 2023-01-17 23:58:53 -05:00
Brandon Thomas 9246ab83cf sort models in category flag 2023-01-17 21:39:23 -05:00
Brandon Thomas 93b06bd8b5 rename synthetic categories 2023-01-17 21:32:22 -05:00
Brandon Thomas 271bce9815 fix trending voices with hack 2023-01-17 07:28:10 -05:00
Brandon Thomas f0bebc6135 ugh, docker typo 2023-01-17 06:39:00 -05:00
Brandon Thomas 98ce37d9a4 re-codegen db 2023-01-17 05:55:29 -05:00
Brandon Thomas b0bc019db2 Merge pull request #27 from storytold/bt-trending-voices
Bt trending voices
2023-01-17 05:50:22 -05:00
Brandon Thomas f3c34d9a7b Trending voices / job 2023-01-17 05:49:23 -05:00
Brandon Thomas 98c8bbda57 Trending voices / analytics table 2023-01-16 16:28:17 -05:00
Brandon Thomas 18b20d6c4d cleanup analytics queries 2023-01-16 16:15:42 -05:00
Brandon Thomas 11fd4881ea re-codegen 2023-01-16 04:57:25 -05:00
Brandon Thomas 7ab39d0b5c Merge pull request #26 from storytold/bt-categories
Work on synthetic categories; "latest models" category
2023-01-16 04:22:39 -05:00
Brandon Thomas 77e16d4bd8 synthetic categories 2023-01-16 04:21:19 -05:00
Brandon Thomas 58c7695a2a Refactor enums 2023-01-16 01:56:38 -05:00
Brandon Thomas 140c93fc76 Work on categories 2023-01-16 01:37:24 -05:00
Brandon Thomas 2b58e3c32d Emit server build SHA from /_status endpoint 2023-01-15 01:40:58 -05:00
Brandon Thomas 142adf10ee ugh, that was stupid af 2023-01-15 01:24:39 -05:00
Brandon Thomas d1698ead1d fix build arg? 2023-01-15 01:24:03 -05:00
Brandon Thomas 2909e2dbb4 reintroduce GIT_SHA to container 2023-01-14 22:42:09 -05:00
Brandon Thomas 9015efdf9e real world language header test 2023-01-14 20:20:41 -05:00
Brandon Thomas 2a5634503f Reorganize tts category handlers 2023-01-14 19:07:57 -05:00
Brandon Thomas 623b82dd0e fix accept-language for q-factor 2023-01-14 06:54:34 -05:00
Brandon Thomas 9fbafd7fcd sqlx 0.4.x -> 0.6.x 2023-01-14 06:39:28 -05:00
Brandon Thomas cc573fe242 return even less nonessential data 2023-01-14 04:32:07 -05:00
Brandon Thomas c4225ce571 Cache computed TTS category assignments 2023-01-14 04:29:48 -05:00
Brandon Thomas 2f6747b98a Merge pull request #25 from storytold/bt-serverside-category-memberships
Compute and cache TTS model category assignments serverside
2023-01-14 00:17:03 -05:00
Brandon Thomas bc5090af54 Compute and cache TTS model category assignments serverside 2023-01-14 00:13:27 -05:00
Brandon Thomas 8062833e8d gzip response payloads 2023-01-12 05:36:14 -05:00
Paul Sajna e5a852acd6 remove rustup override from ci 2023-01-11 18:35:35 -08:00
Brandon Thomas 84ccda1960 default rustup to 1.66 2023-01-11 06:51:06 -05:00
Brandon Thomas 893a861d22 Bump to trigger rebuild (to test build caching) 2023-01-11 06:19:43 -05:00
Brandon Thomas 13b014e7fc bump rust version? 2023-01-11 05:17:41 -05:00
Brandon Thomas c8598bc9e3 Merge pull request #24 from storytold/saj-ci
CI MVP
2023-01-11 04:40:22 -05:00
Brandon Thomas ecf84c4b15 Fix codegen (for reals), notes for mac, perform codegen 2023-01-11 04:31:25 -05:00
Paul Sajna c4ea221c50 test 2023-01-11 00:37:09 -08:00
Brandon Thomas 8de1722466 fix migration script 2023-01-11 03:22:58 -05:00
Paul Sajna a716b8963f ;) 2023-01-11 00:09:39 -08:00
Paul Sajna 7f70de0148 ??? 2023-01-11 00:06:50 -08:00
Brandon Thomas bc033c2202 Merge pull request #23 from storytold/brandon-web-vc
Web-based Voice Conversion Part 1
2023-01-11 03:06:15 -05:00
Paul Sajna 756c357462 attempt to hide brandon's crimes 2023-01-10 23:57:53 -08:00
Paul Sajna 4b8c454c84 getting there? 2023-01-10 23:42:23 -08:00
Paul Sajna d2b3386fea urggggghhhhhhhh 2023-01-10 23:39:47 -08:00
Paul Sajna f458f29109 urgggggh 2023-01-10 23:38:15 -08:00
Paul Sajna aa3faca551 another test 2023-01-10 23:36:50 -08:00
Paul Sajna 2512810e81 another test 2023-01-10 23:35:25 -08:00
Paul Sajna db629a6a0d WIP for testing if github actions has mysql 2023-01-10 23:33:48 -08:00
Brandon Thomas 30202e6e5a Fix build errors. This is largely because inference_job is not done 2023-01-11 01:39:48 -05:00
Brandon Thomas 9a263a01a1 more reserved words 2023-01-11 00:33:40 -05:00
Brandon Thomas 85ae704ab5 more analytics queries 2023-01-11 00:33:40 -05:00
Brandon Thomas b128cdb3f5 inference job handlers 2023-01-11 00:33:40 -05:00
Brandon Thomas 8755e7a533 generic inference job queries 2023-01-11 00:33:40 -05:00
Brandon Thomas 9f873c33e7 Begin refactor of generic inference-job 2023-01-11 00:33:40 -05:00
Brandon Thomas 81302d0e1d Payload for voice conversion inference records 2023-01-11 00:33:40 -05:00
Brandon Thomas 9e589c2b72 Refactor - db enum types into enums crate 2023-01-11 00:33:40 -05:00
Brandon Thomas 7a33c0721a enqueue webvc inference work 2023-01-11 00:33:40 -05:00
Brandon Thomas e1793d71b5 enqueue voice conversion request handler, media synthetic ids, ... 2023-01-11 00:33:40 -05:00
Brandon Thomas 5b20710f96 Upload file to GCS bucket 2023-01-11 00:33:40 -05:00
Brandon Thomas 77e1319b81 'crockford' crate, use crockford entropy for bucket 2023-01-11 00:33:40 -05:00
Brandon Thomas 8061880a83 consolidate upload handling, use new bucket paths 2023-01-11 00:33:40 -05:00
Brandon Thomas 651ed42b64 New 'buckets' crate for cloud storage uploads 2023-01-11 00:33:40 -05:00
Brandon Thomas e870d6f4de rename storage_buckets_common crate -> cloud_storage 2023-01-11 00:33:40 -05:00
Brandon Thomas 16a2e765ca Handle video formats, too 2023-01-11 00:33:40 -05:00
Brandon Thomas ee7626602a Calculate duration for audio files without metadata 2023-01-11 00:33:40 -05:00
Brandon Thomas 533cd5e051 Tests + test data for media uploads 2023-01-11 00:33:40 -05:00
Brandon Thomas 7f51ccd01b file size bytes 2023-01-11 00:33:40 -05:00
Brandon Thomas f2bfcfeb75 audio codec/encoding 2023-01-11 00:33:40 -05:00
Brandon Thomas 603a678378 new errors crate, cleanup media duration calculation 2023-01-11 00:33:40 -05:00
Brandon Thomas 1ba3215881 organize media/files crates 2023-01-11 00:33:40 -05:00
Brandon Thomas c4c5b89118 Calculate audio duration millis 2023-01-11 00:33:40 -05:00
Brandon Thomas 9aaee506ed hash uploaded file 2023-01-11 00:33:40 -05:00
Brandon Thomas ff12990b01 sort _types crates at the top 2023-01-11 00:33:40 -05:00
Brandon Thomas 45b7af9bd2 detect upload mimetype 2023-01-11 00:33:39 -05:00
Brandon Thomas a34aedc375 move sqlx impls to reusable macro 2023-01-11 00:33:39 -05:00
Brandon Thomas cb1e092ccd tests on derived Display/Debug 2023-01-11 00:33:39 -05:00
Brandon Thomas 07d13a4ab5 proper case for enum mysql insert 2023-01-11 00:33:39 -05:00
Brandon Thomas 43c890b27c Hack for sqlx to insert enums into varchar, but case still wrong 2023-01-11 00:33:39 -05:00
Brandon Thomas a1510d45b2 Media uploads "working" from frontend. Need to handle file + upload 2023-01-11 00:33:39 -05:00
Brandon Thomas 32c7354798 Get rid of super legacy CreatorSetVisibility 2023-01-11 00:33:39 -05:00
Brandon Thomas 31bb03d9d3 Sayonara, RecordVisibility 2023-01-11 00:33:39 -05:00
Brandon Thomas 66bb76e60f Goodbye, 'EntityVisibility' 2023-01-11 00:33:39 -05:00
Brandon Thomas 68f2e46540 more tests on enum types 2023-01-11 00:33:39 -05:00
Brandon Thomas d08d3cd543 New 'enums' crate for db "enum-like" fields, composite keys, etc.
This should be useful for:

- Actual enum fields
- Enum-like char/varchar fields
- Composite keys, polymorphic record behavior, etc.

This should also define how these values are returned over the HTTP API
2023-01-11 00:33:39 -05:00
Brandon Thomas e7fc93de86 Mild refactor: tokens, reusable_types under types/ directory 2023-01-11 00:33:39 -05:00
Brandon Thomas deb3671be6 Endpoint for audio uploading 2023-01-11 00:33:39 -05:00
Brandon Thomas 8591f74ff2 Look at "started" w2l jobs too 2023-01-11 00:33:39 -05:00
Brandon Thomas 26587e51e3 More "analytics" (more operational) queries for w2l jobs 2023-01-11 00:33:39 -05:00
Brandon Thomas 2fad965446 "analytics" query to soft delete tts results for a given model 2023-01-11 00:33:39 -05:00
Brandon Thomas c2f4c2c057 Fix hifigan (softvc) model check 2023-01-11 00:33:39 -05:00
Brandon Thomas 51350e6e5c default parameters for local download job 2023-01-11 00:33:39 -05:00
Brandon Thomas 5f598dc516 Fix download-job queries and compile errors 2023-01-11 00:33:39 -05:00
Brandon Thomas 7bcde1e490 queries to handle softvc download (insert) 2023-01-11 00:33:39 -05:00
Brandon Thomas 13d00f6edf partially handle softvc model downloads 2023-01-11 00:33:39 -05:00
Brandon Thomas 91695cde00 downloader job: handle softvc hifigan 2023-01-11 00:33:39 -05:00
Brandon Thomas 91ac868369 new download types 2023-01-11 00:33:39 -05:00
Brandon Thomas 60af0ea36d enum refactor, whew 2023-01-11 00:33:39 -05:00
Brandon Thomas 46280c7877 3x voice conversion tables (models, results, synthetic_ids) 2023-01-11 00:33:39 -05:00
Brandon Thomas 08c2736ea4 More new tables: media_uploads, audit_logs 2023-01-11 00:33:39 -05:00
Brandon Thomas 02bf8808d0 Web + Job queries for generic_inference_jobs 2023-01-11 00:33:39 -05:00
Brandon Thomas 1de10d1b9f Move all service/web/job projects into grouped subdirectories by type 2023-01-11 00:33:39 -05:00
Brandon Thomas b649bb17c5 Web Voice Conversion 2023-01-11 00:33:39 -05:00
Brandon Thomas 587ea70d33 Merge pull request #22 from storytold/sajattack-kubernetes-localdev
Kubernetes localdev
2023-01-10 22:17:23 -05:00
Paul Sajna ffd7793a8d Update local_development_k8s.md 2023-01-10 19:12:27 -08:00
Paul Sajna 6e13777e84 docs? 2023-01-10 18:59:01 -08:00
Paul Sajna b7fd9aa8d1 x86_64-unknown-linux-musl compatibility and volume mount 2023-01-10 18:59:01 -08:00
Paul Sajna 26e91bd990 database migration bugfix 2023-01-10 18:59:01 -08:00
Paul Sajna 61d0cbd385 clean up something I was trying that I no longer need 2023-01-10 18:59:01 -08:00
Paul Sajna 28d7a26d97 storyteller-web api runs successfully 2023-01-10 18:59:01 -08:00
Brandon Thomas 4196a6499b fix download url check 2022-12-19 19:14:19 -05:00
Brandon Thomas 2cf07c1346 Block uploads of invalid video urls for w2l 2022-12-19 18:02:30 -05:00
Brandon Thomas f56ea64dce automate ubuntu setup 2022-12-15 03:59:28 -05:00
Brandon Thomas 5cfb3f50d7 codegen db 2022-12-13 20:52:41 -05:00
Brandon Thomas 5e0851eb09 fix session / loyalty plan test; mark legacy tokens deprecated 2022-12-13 18:42:18 -05:00
Brandon Thomas 0d3ffd3f3b use DownloadJobToken throughout codebase 2022-12-13 18:26:45 -05:00
Brandon Thomas 1b60427ab0 Add UserToken-specific tests so we have a backup in case the macro fails 2022-12-13 18:05:35 -05:00
Brandon Thomas 75ede876d5 More tests 2022-12-13 17:46:46 -05:00
Brandon Thomas 086980318c use enum variants for prefixes 2022-12-13 17:08:12 -05:00
Brandon Thomas c4ca48f399 prefix registry 2022-12-13 16:50:23 -05:00
Brandon Thomas ad88800b4e enum variants to control character set 2022-12-13 15:43:19 -05:00
Brandon Thomas 64e3864140 Macro-defined tests "kind of" work. 2022-12-13 15:32:23 -05:00
Brandon Thomas 81757870ab Crockford constructor 2022-12-13 02:22:23 -05:00
Brandon Thomas 2769a0b3f9 macro to implement common string token methods 2022-12-13 01:27:29 -05:00
Brandon Thomas 89e721e3bc derive serde traits 2022-12-13 00:20:49 -05:00
Brandon Thomas 353aa4211b more tests 2022-12-13 00:16:44 -05:00
Brandon Thomas 422e36b405 add tests 2022-12-12 23:54:09 -05:00
Brandon Thomas 110c7f828f simplify UserToken type as a wrapper type 2022-12-12 23:16:44 -05:00
Brandon Thomas b9e2c87025 use UserToken in an existing flow 2022-12-12 22:44:04 -05:00
Brandon Thomas b1d5244620 WIP tokens crate 2022-12-12 22:34:08 -05:00
Brandon Thomas 7bcb576436 also track subscription status 2022-12-07 18:09:13 -05:00
Brandon Thomas 2e561acbb4 Analytics over top contributors, change loyalty plan slug 2022-12-07 18:05:40 -05:00
Brandon Thomas c1860a0584 add powerstream to reserved usernames 2022-12-07 16:39:40 -05:00
Brandon Thomas 70140c0e7d new slurs I just found 2022-12-07 16:38:27 -05:00
Brandon Thomas cc56deb27c UserBadge moved to reusable_types 2022-12-06 06:39:10 -05:00
Brandon Thomas a15324adee CORS separation by environments + tests 2022-12-04 02:40:28 -05:00
Brandon Thomas fa108a5303 Add more german languages, fix failing test time bomb 2022-12-03 23:25:08 -05:00
Brandon Thomas 7193ddf18b Fix codegen, codegen db, and update docs for dev db setup 2022-12-03 22:30:57 -05:00
Brandon Thomas 21e74c5367 Fix build error with tts-download-job 2022-12-03 17:46:50 -05:00
Brandon Thomas 11304d77cb Italian TTS 2022-12-03 17:42:46 -05:00
Brandon Thomas ba52695f35 root directory option for downloader 2022-12-01 21:52:52 -05:00
Brandon Thomas d28fb07d6d Clean up new consolidated downloader so it can be deployed 2022-12-01 21:44:32 -05:00
Brandon Thomas 740b419989 codegen script for download job and inference job 2022-11-27 16:56:45 -05:00
Brandon Thomas 8f2640c5eb relabel docker image 2022-11-27 16:21:22 -05:00
Brandon Thomas 6e7c708374 Duplicate tts-inference-job into inference-job 2022-11-27 16:07:29 -05:00
Brandon Thomas 7b0066bea5 Bugfix; download-job handles TTS model download (locally tested) 2022-11-27 05:17:02 -05:00
Brandon Thomas 3d3dec1e23 download job can now handle tacotron (untested) 2022-11-27 04:37:49 -05:00
Brandon Thomas 1ac61b7748 GPU support for docker commands 2022-11-27 03:28:30 -05:00
Brandon Thomas 24c9cc2d08 subprocess stuff in its own lib 2022-11-27 03:10:01 -05:00
Brandon Thomas 2392062276 Download script works with docker image 2022-11-27 02:45:17 -05:00
Brandon Thomas 94c74eb9e0 Refactor download job to be easier to generalize 2022-11-26 21:44:41 -05:00
Brandon Thomas 7f5ccac55c rename generic-download-job -> download-job 2022-11-26 20:41:13 -05:00
Brandon Thomas 62c4f2cbe0 Merge branch 'master' of github.com:storytold/storyteller-rust 2022-11-19 02:56:38 -05:00
Brandon Thomas 507f97bef5 note on subscription statuses 2022-11-18 05:27:53 -05:00
Brandon Thomas a628e986e5 analytics query 2022-11-18 05:14:48 -05:00
Brandon Thomas 2fdd3b38ea codegen 2022-11-17 21:45:02 -05:00
Brandon Thomas a3234b3cb4 Add max_decoder_steps / max_duration_seconds to tts job 2022-11-17 21:41:16 -05:00
Brandon Thomas dbf3d541e2 Production plans 2022-11-16 06:05:59 -05:00
Brandon Thomas f690c73ebf Force environmental plans 2022-11-16 05:42:18 -05:00
Brandon Thomas 567f3143d4 fix test failure 2022-11-16 04:16:42 -05:00
Brandon Thomas 2416056f6f list subscriptions endpoint 2022-11-16 03:10:07 -05:00
Brandon Thomas e390a7d1ac fix endpoint to accept json 2022-11-16 01:28:23 -05:00
Brandon Thomas 00ab91b05c new development stripe plan, minor method name refactor 2022-11-15 23:31:30 -05:00
Brandon Thomas b403ed7c9e Customer portal JSON handler 2022-11-15 19:07:42 -05:00
Brandon Thomas 049b0cf375 rename directory 2022-11-14 21:36:07 -05:00
Brandon Thomas 0e6657e9b7 fix short sha tagging? 2022-11-14 11:13:10 -05:00
Brandon Thomas acdea58a81 tag with short SHA 2022-11-14 11:12:19 -05:00
Brandon Thomas 9711a60494 test build caching of leaf dependency 2022-11-14 05:51:02 -05:00
Brandon Thomas 8edbb3efda revert dockerfile 2022-11-14 04:51:25 -05:00
Brandon Thomas 87b319b99a tagging image again (this might work) 2022-11-14 04:46:49 -05:00
Brandon Thomas ed6f19c2ab test image tagging 2022-11-14 04:39:01 -05:00
Brandon Thomas 31fc96c356 attempt to tag image 2022-11-14 04:35:26 -05:00
Brandon Thomas 4b6eab5a1d fix image name? 2022-11-14 04:33:31 -05:00
Brandon Thomas 6af1234095 attempt to fix github action build (temporarily broke dockerfile) 2022-11-14 04:31:18 -05:00
Brandon Thomas 8132a0bcb0 Attempt to use build caching 2022-11-14 03:55:57 -05:00
Brandon Thomas c679aa3430 Clean up dockerfile, add notes 2022-11-14 03:07:19 -05:00
Brandon Thomas 33485670dd Remove Python models (see storyteller-ml repo), rework Dockerfile
- TTS and W2L were moved to storyteller-ml. TTS has been hosted there
  for a while, but W2L will need to be reworked.

- Restructure Dockerfile to remove old Python deps.

- Also begin using "cargo-chef". Unsure if this will work to speed things up.
2022-11-14 00:39:41 -05:00
Brandon Thomas 9008e7c044 codegen 2022-11-13 23:09:31 -05:00
Brandon Thomas 2d2a0b68ff fix errors from last yolo-commit 2022-11-13 17:37:12 -05:00
Brandon Thomas a211d45f26 on-prem worker stats 2022-11-13 16:42:18 -05:00
Brandon Thomas d20d8a4c1c Not a slur 2022-11-13 16:14:30 -05:00
Brandon Thomas 9aec48d237 placeholder 2022-11-07 12:47:38 -05:00
Brandon Thomas e4835258cb deletion queries 2022-11-02 23:24:35 -04:00
Brandon Thomas f34fd6fc4c re-codegen tts job queries 2022-11-02 23:02:20 -04:00
Brandon Thomas 413d1b7c1c Merge pull request #21 from storytold/tts-job-debugging
Log failure metadata for TTS inference jobs
2022-11-02 22:54:25 -04:00
Brandon Thomas fb99af8a23 Log failure metadata for TTS inference jobs 2022-11-02 22:51:47 -04:00
Brandon Thomas 23b0dab44f re-codegen sqlx 2022-11-02 16:41:03 -04:00
Brandon Thomas 8ee5eca076 Add debugging info to tts_inference_jobs table; move app routes 2022-11-02 16:28:45 -04:00
Brandon Thomas 9a1df0cd8c Merge pull request #20 from storytold/premium-tts
Premium tts
2022-11-02 05:28:54 -04:00
Brandon Thomas 5377cca3b1 TTS now has premium features 2022-11-02 04:36:19 -04:00
Brandon Thomas badcb4b058 Migrations to add duration controls to inference jobs 2022-11-02 00:36:36 -04:00
Brandon Thomas 28a4f5ca8d Merge pull request #19 from storytold/subscription-schema-migrations-2
Migrations to change/rename some columns
2022-11-01 23:39:23 -04:00
Brandon Thomas 3efe1afa48 Migrations to change/rename some columns 2022-11-01 23:33:59 -04:00
Brandon Thomas d4a7c06f72 Merge pull request #18 from storytold/premium-plans-sessions
Premium plans sessions
2022-11-01 06:56:19 -04:00
Brandon Thomas 6b4d0b3ad1 Adding premium info to sessions 2022-11-01 06:39:59 -04:00
Brandon Thomas 23f6e74fd8 ugh, a gross refactor commit 2022-11-01 03:19:08 -04:00
Brandon Thomas 778d7eba7e Premium plans + session changes 2022-11-01 01:54:07 -04:00
Brandon Thomas e5db702289 SSL local dev instructions 2022-10-31 01:46:31 -04:00
Brandon Thomas 4eb400867a Merge pull request #17 from storytold/url-configs
Url configs
2022-10-31 01:32:38 -04:00
Brandon Thomas 4584e9dbcf Cors and local nginx configs for dev.fakeyou.com etc. 2022-10-31 01:31:46 -04:00
Brandon Thomas 2ca477fd8c Better environment-based URL configuration 2022-10-31 00:07:34 -04:00
Brandon Thomas 13487a9046 Fix bug with upsert not changing the product key 2022-10-30 05:25:22 -04:00
Brandon Thomas aff94446ac Merge pull request #16 from storytold/stripe-customer-portal
Stripe customer portal (subscription cancellation / modification)
2022-10-30 05:04:36 -04:00
Brandon Thomas 15c9c1256b Stripe customer portal (subscription cancellation / modification) 2022-10-30 04:57:10 -04:00
Brandon Thomas 009d0eab87 CLI crates
(was building a stripe tool, but need to remember to make DB tools)
2022-10-29 22:20:26 -04:00
Brandon Thomas 0d9a882f3f Refactor stripe component modules 2022-10-27 04:36:43 -04:00
Brandon Thomas 4c878e332e upgrade breaking transitive dependency? 2022-10-25 05:13:24 -04:00
Brandon Thomas d22242ab69 Merge pull request #15 from storytold/product-integration-2
Continued work on product integration
2022-10-25 05:03:19 -04:00
Brandon Thomas 5ee51ed8e2 Continued work on product integration 2022-10-25 05:02:52 -04:00
Brandon Thomas 560448f1ad Merge pull request #14 from storytold/product-integration
Integrate stripe / product crate
2022-10-24 23:03:27 -04:00
Brandon Thomas 1b40495ef3 Integrate stripe / product crate
Associates internal metadata with stripe subscription and better
composes both systems
2022-10-24 23:02:16 -04:00
Brandon Thomas e8d376a3eb Merge pull request #13 from storytold/premium-plans
Premium plan definitions
2022-10-23 00:44:34 -04:00
Brandon Thomas 8e6c02d1b1 Premium plan definitions 2022-10-23 00:43:53 -04:00
Brandon Thomas 4e4dbf0688 Premium plans config (just getting started on this) 2022-10-21 19:18:37 -04:00
Brandon Thomas 1ca54927d7 fix compile errors 2022-10-21 03:19:28 -04:00
Brandon Thomas ddd29ada80 This appears to fix openssl!? Transitive dep update. 2022-10-21 03:17:00 -04:00
Brandon Thomas 5ef27bb86f Merge pull request #12 from storytold/tts-failure-slowdown
Slow down jobs on repeated failures
2022-10-21 00:46:34 -04:00
Brandon Thomas c03bdba0a6 Slow down jobs on repeated failures 2022-10-21 00:46:00 -04:00
Brandon Thomas 14432e9808 Fix build errors (couldn't run build on Linux due to SSL breaks) 2022-10-09 06:06:56 -04:00
Brandon Thomas 1204ac5399 Merge pull request #11 from storytold/desktop-app-api-stubs
Stub API for the desktop app
2022-10-09 05:47:39 -04:00
Brandon Thomas 468d2d1d75 stupid time bomb 2022-10-09 05:46:49 -04:00
Brandon Thomas aac2af635b Stub API for the desktop app 2022-10-09 05:45:11 -04:00
Brandon Thomas 90c96b5f50 codegen from mac (broken on Ubuntu?) 2022-10-09 04:47:32 -04:00
Brandon Thomas 207e63a5aa Merge pull request #10 from storytold/echelon-stripe
merge incomplete arc of work
2022-10-09 03:50:06 -04:00
Brandon Thomas 399ed6cb2e fscking sqlx and ubuntu 22.04 ssl - wtf
I can't link against Ubuntu 22.04 native tls

I can't get rustls to work

wtf
2022-10-09 03:48:23 -04:00
Brandon Thomas d51d6720e6 Setup on a more modern Ubuntu 2022-10-09 02:58:16 -04:00
Brandon Thomas 8f807a7719 wip 2022-09-22 05:36:16 -04:00
Brandon Thomas c8ba2d1863 include price, make adjustments to subscription product/price 2022-09-19 06:30:49 -04:00
Brandon Thomas 2f3cbd4523 handle terminated subscriptions 2022-09-19 05:16:56 -04:00
Brandon Thomas cf7cd9945d Handle grace period days 2022-09-19 04:39:51 -04:00
Brandon Thomas 6a2a99741e cancel_at_period_end and new test 2022-09-19 04:35:59 -04:00
Brandon Thomas dc115a7aa1 begin handling deleted subscriptions 2022-09-19 04:18:08 -04:00
Brandon Thomas 6ea1bf3226 handle events with idempotency by ignoring replays 2022-09-19 04:11:35 -04:00
Brandon Thomas 334fc3022e record whether webhook events had actions taken, idempotency flag 2022-09-19 03:54:32 -04:00
Brandon Thomas 3fb26771de subscription interval tracked 2022-09-19 03:35:30 -04:00
Brandon Thomas ba448ccc50 record subscription billing periods, start date 2022-09-19 02:09:35 -04:00
Brandon Thomas fd3081e440 Track status as an enum, don't update at terminal state 2022-09-19 01:36:01 -04:00
Brandon Thomas 66981c4d2c Track subscription status 2022-09-19 00:26:16 -04:00
Brandon Thomas c6a1fc18d6 coalesce nulls 2022-09-19 00:12:21 -04:00
Brandon Thomas afb77393c0 Don't update on create if already existing, make user token optional 2022-09-19 00:02:52 -04:00
Brandon Thomas a2e71d8944 Handle subscription update and create 2022-09-18 23:26:39 -04:00
Brandon Thomas ca63e00905 user subscriptions 2022-09-18 19:52:11 -04:00
Brandon Thomas faf689dc09 log more info from webhooks 2022-09-17 13:33:22 -04:00
Brandon Thomas aec31779b8 store webhook logs 2022-09-17 13:02:10 -04:00
Brandon Thomas 452a3473b3 WIP schema 2022-09-17 12:06:21 -04:00
Brandon Thomas 00322c6ed4 tests 2022-09-12 06:53:16 -04:00
Brandon Thomas 6dd02d48c4 extractor 2022-09-12 06:33:20 -04:00
Brandon Thomas 2eaf7c499e subscription extractor 2022-09-11 22:18:43 -04:00
Brandon Thomas 3b82e7a389 tests 2022-09-11 21:37:40 -04:00
Brandon Thomas c825f17672 wip 2022-09-11 03:40:18 -04:00
Brandon Thomas 6bbf4453da notes 2022-09-10 20:11:49 -04:00
Brandon Thomas dda247b5ea Handle payment intent success 2022-09-10 18:57:13 -04:00
Brandon Thomas f0435804ec one-time payment 2022-09-10 18:24:45 -04:00
Brandon Thomas 176feda73b wip 2022-09-10 17:41:45 -04:00
Brandon Thomas f81d40b5bb Make logging less verbose 2022-09-10 05:42:50 -04:00
Brandon Thomas c07f100986 wip 2022-09-10 04:26:24 -04:00
Brandon Thomas 9feded54bd most of the events we want 2022-09-10 04:26:24 -04:00
Brandon Thomas 4acec068aa asdhfahsdf 2022-09-10 04:26:24 -04:00
Brandon Thomas e1d4c0f5f3 ugh, I hate this part of the project 2022-09-10 04:26:24 -04:00
Brandon Thomas f066658c3c Move in-progress Stripe / billing work to shared component crate 2022-09-10 04:26:24 -04:00
Brandon Thomas 17021f04b9 fml payments 2022-09-10 04:26:24 -04:00
Brandon Thomas 0e5b4599bb stripe wip 2022-09-10 04:26:24 -04:00
Brandon Thomas 02e7d1f4fa Stripe WIP 2022-09-10 04:26:24 -04:00
Brandon Thomas 360a389e3d Add stripe payments support 2022-09-10 04:26:22 -04:00
Brandon Thomas 999d73db81 analytics queries 2022-09-10 00:53:25 -04:00
Brandon Thomas ec1f5edd5c on-prem analytics queries 2022-09-09 14:40:41 -04:00
Brandon Thomas 2bc00dd6ca comment describing why to include this in the dockerfile 2022-09-09 14:11:08 -04:00
Brandon Thomas 6e6253bf86 dockerfile fixes? 2022-09-09 04:41:48 -04:00
Brandon Thomas 97e6fdc51b Downgrade docker rust build Ubuntu 22.04 -> 20.04 for openssl bug 2022-09-09 04:01:43 -04:00
Brandon Thomas 3cb9afa074 Update Dockerfile to point to new base Rust image 2022-09-09 02:26:38 -04:00
Brandon Thomas 34d08bce61 Not sure what recently broke with the dockerfile. Print Rust versions 2022-09-09 01:25:49 -04:00
Brandon Thomas 3b3603d7cf How did I forget to include the lock file? ugh. 2022-09-09 01:09:44 -04:00
Brandon Thomas ab0180a591 Update s3 bucket client to respect timeout arg 2022-09-09 00:45:44 -04:00
Brandon Thomas 40e92a1b24 Use no-op Redis status logger optionally 2022-09-08 15:22:52 -04:00
Brandon Thomas bf9bc013df New dynamic job progress reporter with no-op version 2022-09-08 14:56:35 -04:00
Brandon Thomas 4a58f49d3d kill pending jobs 2022-09-04 21:34:50 -04:00
Brandon Thomas da7270e058 Queries to investigate service load, etc. 2022-09-04 19:22:02 -04:00
Brandon Thomas 420a2c8b40 fix gravatar test 2022-09-01 23:49:17 -04:00
Brandon Thomas d1e261e633 no longer fail tests (timebomb bump) 2022-09-01 23:43:31 -04:00
Brandon Thomas bfe4b8d090 Merge pull request #9 from storytold/echelon-billing-and-images
Pull user system into a reusable component library
2022-09-01 23:40:32 -04:00
Brandon Thomas 269145a395 codegen db 2022-09-01 23:38:51 -04:00
Brandon Thomas 22122046ce We're not ready to perform this migrations
I'm being lazy and not pulling the relevant commits out of history
2022-09-01 23:35:43 -04:00
Brandon Thomas 4284aeced6 Substantial refactor: pull user system (except mod controls) into crate
This has been tested in storyteller-web to ensure it still works
2022-09-01 23:33:21 -04:00
Brandon Thomas d047fa50a9 Successfully move one "user" endpoint into new package 2022-09-01 17:25:13 -04:00
Brandon Thomas 273b5f3c4e Move SessionCookieManager to users component 2022-08-29 05:39:00 -04:00
Brandon Thomas 3477cc395b refactor 2022-08-29 04:49:51 -04:00
Brandon Thomas 59f2c4a55d service stub for image-generation-service 2022-08-29 00:56:38 -04:00
Brandon Thomas 84c616b6f6 New lib and service crates 2022-08-29 00:28:26 -04:00
Brandon Thomas 57e3dd05c7 generated image data 2022-08-28 19:52:01 -04:00
Brandon Thomas 2b52488bfa generated images tables 2022-08-25 04:01:50 -04:00
Brandon Thomas 3d2f28431f add credits tables 2022-08-23 13:09:20 -04:00
Brandon Thomas f1c8364b72 First attempt at generic_workloads table 2022-08-23 10:32:09 -04:00
Brandon Thomas bb8ba60829 Initial schema migrations for generated images + billing 2022-08-23 10:07:15 -04:00
Brandon Thomas 50d6537a73 report worker node name, if available 2022-08-18 03:01:06 -04:00
Brandon Thomas e68b6dc72d Merge pull request #8 from storytold/echelon-list-tts-single-connector
Use single connector with list TTS endpoint
2022-08-17 19:42:33 -04:00
Brandon Thomas 1da020abd4 Use single connector with list TTS endpoint 2022-08-17 19:41:30 -04:00
2478 changed files with 368682 additions and 254933 deletions
+2
View File
@@ -1,9 +1,11 @@
*secret*sh
*~
.dockerignore
.env
.env-secrets
.git
.idea/
Dockerfile
__pycache__/
_ignored_schema.rs
models/Wav2Lip/python/
+18
View File
@@ -1,7 +1,14 @@
SERVER_ENVIRONMENT=development
DATABASE_URL=mysql://storyteller:password@localhost/storyteller
#DATABASE_URL=mysql://root:root@localhost/storyteller
#DATABASE_URL=mysql://root@localhost/storyteller
# Diesel-cli reads this for the migration directory to use.
# We've renamed it so the migrations are sorted near the top of the project directory tree
# (since they kind of serve as documentation)
MIGRATION_DIRECTORY=_sql/migrations/
# SQLX normally requires a live database to reflect upon at build time.
# This setting turns that on and requires a `sql-data.json` cache file instead.
# See https://github.com/launchbadge/sqlx/tree/master/sqlx-cli#readme
@@ -64,3 +71,14 @@ TTS_HIFIGAN_SUPERRES_VOCODER_MODEL_FILENAME=hifigan_superres_twilight_33000.pt
# Development key. Permissible to check in.
NEWRELIC_API_KEY=c402be1c4c4216ec83d0cfc0851520cfFFFFNRAL
# Stripe configs
# All secrets are development and okay to check in
STRIPE_CHECKOUT_SUCCESS_URL_PATH=/checkout_success
STRIPE_CHECKOUT_CANCEL_URL_PATH=/checkout_cancel
STRIPE_PORTAL_RETURN_URL_PATH=/portal_success
STRIPE_PORTAL_DEFAULT_CONFIG_ID=bpc_1LyPPREU5se17MekYiViZF12
# STRIPE_PORTAL_DEFAULT_CONFIG_ID=bpc_1M4jc3EU5se17MekmgdS4dDJ # Production (not a secret)
STRIPE_PUBLISHABLE_KEY=pk_test_51KZvWXEU5se17Mekx6e0gw32ovDF78k2eeaGctLIs8oQVxN6DerEp1BDqh6gLMYKli4VsTZoVGHoxq5RmwKMlxtP00r59UEEad
STRIPE_SECRET_KEY=sk_test_51KZvWXEU5se17Mek11ZdnWr4frnyw7tWOPuvl3pRzL290zvkT6KqcbGUl3fcvc3hA8oH6lWXz2kGWXXUlNcCuDxB003uVT9JX0
STRIPE_SECRET_WEBHOOK_SIGNING_KEY=whsec_40b60bd75768052532b63dbeefa7a1b163e182c3e657fb27fa906ef49a2cd59f
+25
View File
@@ -0,0 +1,25 @@
# Environmental configurations specific to `download-job`.
# These are defaulted for dev and are easy to overwrite in production with K8s environment variables.
# !! DOES *NOT* CONTAIN SECRETS !!
WEB_DOWNLOADER_COMMAND=./download_internet_file.py
WEB_DOWNLOADER_MAYBE_VENV_SCRIPT=./python/bin/activate
WEB_DOWNLOADER_MAYBE_DOCKER_IMAGE=d73f28ce3ff6
SOFTVC_MODEL_CHECK_ROOT_DIRECTORY=/
SOFTVC_MODEL_CHECK_MAYBE_VENV_COMMAND="source python/bin/activate"
SOFTVC_MODEL_CHECK_MAYBE_DOCKER_IMAGE=a79106991ce3
TACOTRON_MODEL_CHECK_ROOT_DIRECTORY=/models/tts
TACOTRON_MODEL_CHECK_MAYBE_VENV_COMMAND="source python/bin/activate"
TACOTRON_MODEL_CHECK_COMMAND=./vocodes_model_check_tacotron.py
TACOTRON_MODEL_CHECK_MAYBE_DOCKER_IMAGE=5642d0fd7fc1
HIFIGAN_SOFTVC_MODEL_CHECK_ROOT_DIRECTORY=/
HIFIGAN_SOFTVC_MODEL_CHECK_MAYBE_VENV_COMMAND="source python/bin/activate"
HIFIGAN_SOFTVC_MODEL_CHECK_MAYBE_DOCKER_IMAGE=a79106991ce3
HIFIGAN_MODEL_CHECK_ROOT_DIRECTORY=/models/tts
HIFIGAN_MODEL_CHECK_MAYBE_VENV_COMMAND="source python/bin/activate"
HIFIGAN_MODEL_CHECK_COMMAND=./vocodes_model_check_hifigan.py
HIFIGAN_MODEL_CHECK_MAYBE_DOCKER_IMAGE=5642d0fd7fc1
+5
View File
@@ -0,0 +1,5 @@
# Ignore certain code for Github language statistics
# https://github.com/github/linguist/blob/master/docs/overrides.md
old_code/trumpet-trumped.com/dictionary/cmudict-0.7b linguist-vendored
old_code/voder-vocodes-1.0/frontends/admin/node_modules linguist-vendored
windows/sqlite linguist-vendored
+52
View File
@@ -0,0 +1,52 @@
name: CI
on: [push, pull_request]
env:
MYSQL_URL: mysql://root:root@localhost/storyteller
DATABASE_URL: mysql://root:root@localhost/storyteller
REDIS_0_URL: redis://redisd@localhost/0
REDIS_1_URL: redis://redisd@localhost/1
DEBIAN_FRONTEND: noninteractive
jobs:
setup_build_test:
runs-on: ubuntu-20.04
steps:
- name: Checkout sources
uses: actions/checkout@v3
- name: Cache cargo registry
uses: actions/cache@v3
with:
path: |
~/.cargo/registry
~/.cargo/git
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.toml') }}
- name: Setup mysql
run: |
sudo systemctl start mysql
sudo apt-get update
sudo apt-get -y install mysql-client libmysqlclient-dev
mysql -e "create user 'storyteller'@'localhost' IDENTIFIED BY 'password';" -uroot -proot
mysql -e "create database storyteller; grant all on storyteller.* to 'storyteller'@'localhost';" -uroot -proot
- name: Setup Redis
run: |
sudo apt-get -y install redis-server
sudo service redis-server start
- name: Setup Rust
run: |
rustup set profile minimal
rustup show
rustup install 1.66
rustup default 1.66
rustup show
cargo install sqlx-cli --features openssl-vendored
cargo install diesel_cli
- name: Run database migrations
run: |
# nothing to see here ;)
set +e +o pipefail
diesel migration run
set -e -o pipefail
- name: Build
run: cargo build --release
- name: Test
run: cargo test --release
+73 -28
View File
@@ -15,53 +15,98 @@ env:
jobs:
# Push image to GitHub Packages.
# See also https://docs.docker.com/docker-hub/builds/
push:
runs-on: ubuntu-latest
# See also https://depot.dev/blog/docker-layer-caching-in-github-actions
# See also https://evilmartians.com/chronicles/build-images-on-github-actions-with-docker-layer-caching
build-docker-image:
name: "Build Docker Image"
runs-on: ubuntu-22.04 # runs-on: ubuntu-latest
if: github.event_name == 'push'
permissions:
packages: write
contents: read
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Login to GitHub Container Registry
uses: docker/login-action@v1
# - uses: docker/setup-buildx-action@v1
# name: Set up Docker Buildx
- uses: docker/login-action@v1
name: Login to GitHub Container Registry
with:
registry: ghcr.io
#username: ${{ github.repository_owner }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
username: ${{ github.actor }} # username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Build image
- name: Calculate short SHA
id: vars
# echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
run: |
SHORT_SHA=$(echo ${GITHUB_SHA} | cut -c1-12)
docker build . --file Dockerfile --tag $IMAGE_NAME --label "runnumber=${GITHUB_RUN_ID}" --build-arg GIT_SHA=${SHORT_SHA}
echo "sha_short=$(echo ${{ github.sha }} | cut -c1-12)" >> $GITHUB_OUTPUT
- name: Push image to GitHub Container Registry
- name: Emit short SHA
run: |
IMAGE_ID=ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME
echo "Full SHA: ${{ github.sha }}"
echo "Short SHA: ${{ steps.vars.outputs.sha_short }}"
# Change all uppercase to lowercase
IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
#- uses: actions/cache@v2
# name: Cache Docker layers
# with:
# path: /tmp/.buildx-cache
# key: ${{ runner.os }}-buildx-${{ github.sha }}
# restore-keys: |
# ${{ runner.os }}-buildx-
# Strip git ref prefix from version
VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
# Docs for this action are at https://github.com/marketplace/actions/build-docker-images-using-cache
- uses: whoan/docker-build-with-cache-action@v6
with:
registry: ghcr.io
username: ${{ github.actor }} # username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
image_name: storytold/storyteller-rust
# NB: The `git_push_tag: true` option does not work as expected, so we put the sha in `image_tag`:
# https://github.com/whoan/docker-build-with-cache-action/issues/72
image_tag: latest,${{ github.sha }},${{ steps.vars.outputs.sha_short }}
# NB: Inject the Git SHA into the container so the servers can emit their own version:
build_extra_args: "--build-arg=GIT_SHA=${{ github.sha }}"
# Strip "v" prefix from tag name
[[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
# - name: Build image
# run: |
# SHORT_SHA=$(echo ${GITHUB_SHA} | cut -c1-12)
# docker build . --file Dockerfile --tag $IMAGE_NAME --label "runnumber=${GITHUB_RUN_ID}" --build-arg GIT_SHA=${SHORT_SHA}
# Use Docker `latest` tag convention
[ "$VERSION" == "$default-branch" ] && VERSION=latest
# - name: Push image to GitHub Container Registry
# run: |
# IMAGE_ID=ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME
echo IMAGE_ID=$IMAGE_ID
echo VERSION=$VERSION
# # Change all uppercase to lowercase
# IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
docker tag $IMAGE_NAME $IMAGE_ID:$VERSION
docker push $IMAGE_ID:$VERSION
# # Strip git ref prefix from version
# VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
SHORT_SHA=$(echo ${GITHUB_SHA} | cut -c1-12)
# # Strip "v" prefix from tag name
# [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
docker tag $IMAGE_NAME $IMAGE_ID:$SHORT_SHA
docker push $IMAGE_ID:$SHORT_SHA
# # Use Docker `latest` tag convention
# [ "$VERSION" == "$default-branch" ] && VERSION=latest
# echo IMAGE_ID=$IMAGE_ID
# echo VERSION=$VERSION
# docker tag $IMAGE_NAME $IMAGE_ID:$VERSION
# docker push $IMAGE_ID:$VERSION
# SHORT_SHA=$(echo ${GITHUB_SHA} | cut -c1-12)
# docker tag $IMAGE_NAME $IMAGE_ID:$SHORT_SHA
# docker push $IMAGE_ID:$SHORT_SHA
- name: Cleanup / Debug
# This job will run even on failures to help with debugging.
if: always()
run: |
echo "Report at final github action step:"
echo "Disk usage:"
pwd
du -hsc * | sort -hr
+40 -11
View File
@@ -1,22 +1,51 @@
*.swo
*.swp
# Secrets are BAD!
*secret*sh
*~
.env
.env-aichatbot-secrets
.env-secrets
.idea/
__pycache__/
_ignored_schema.rs
db.secrets
db_secrets.toml
models/Wav2Lip/python/
models/tacotron2/python/
production_database_secret_connect.sh
production_database_secret_query.sh
production_database_voice_clone_report_download.sh
secrets.toml
secrets.yaml
target/
tools/.secrets
tools/db_secrets.toml
_develop/tools/.secrets
_develop/tools/db_secrets.toml
twitch_secrets.toml
# Rust build directory
target/
crates/lib/database_queries/target/
crates/lib/sqlite_queries/target/
# Vim noise
*.swo
*.swp
*~
# IntelliJ/CLion noise
.idea/
# Python noise
__pycache__/
# We use diesel for DB migrations only. We don't care about its codgen.
_ignored_schema.rs
# AI Chat Sidecar has its own schema managed by diesel, but we don't care for diesel codegen.
crates/programs/aichatbot-sidecar/_ignored_schema.rs
# AI Chat sidecar's SQlite database shouldn't be checked in
crates/programs/aichatbot-sidecar/database.db
# Runtime data for the AI chatbot
runtime_data/
# Old Python virtual environments
models/Wav2Lip/python/
models/tacotron2/python/
# Stuff I want to keep around, but not commit
scraps/
+21 -4
View File
@@ -1,18 +1,35 @@
<component name="ProjectDictionaryState">
<!--
Despite spellcheck dictionaries being created per-user, IntelliJ loads all of them, per:
https://stackoverflow.com/a/28151692
-->
<dictionary name="bt">
<words>
<w>arpabet</w>
<w>backfill</w>
<w>cashapp</w>
<w>cheermote</w>
<w>crockford</w>
<w>culted</w>
<w>dalle</w>
<w>downvote</w>
<w>fakeyou</w>
<w>ffprobe</w>
<w>greenlight</w>
<w>greenlighting</w>
<w>greenlit</w>
<w>hanashi</w>
<w>hifigan</w>
<w>replayable</w>
<w>retryably</w>
<w>scrollback</w>
<w>softvc</w>
<w>symphonia</w>
<w>tacotron</w>
<w>techcrunch</w>
<w>transcoded</w>
<w>transcodings</w>
<w>upserting</w>
<w>vocoded</w>
<w>vocoder</w>
<w>vocoders</w>
<w>vocodes</w>
</words>
</dictionary>
</component>
Generated
+4014 -666
View File
File diff suppressed because it is too large Load Diff
+56 -18
View File
@@ -1,29 +1,67 @@
[workspace]
members = [
# Types: common strongly-typed tokens, ids, payloads, etc.
# Also common cloud buckets and other "strongly typed" configs.
"crates/_types/buckets",
"crates/_types/enums",
"crates/_types/reusable_types", # TODO(bt, 2022-12-21): Deprecate
"crates/_types/tokens",
# CLI tools for operations, etc.
"crates/cli/database_backup",
"crates/cli/database_cleanup",
"crates/cli/scrape_test",
# Shared libraries
"crates/lib/config",
"crates/lib/container_common",
"crates/lib/database_queries",
"crates/lib/google_drive_common",
"crates/lib/actix_helpers",
"crates/lib/caching/memory_caching",
"crates/lib/caching/redis_caching",
"crates/lib/clients/cloud_storage",
"crates/lib/clients/fakeyou_client",
"crates/lib/clients/google_drive_common",
"crates/lib/clients/twitch_common",
"crates/lib/concurrency",
"crates/lib/config", # TODO(bt, 2023-02-13): Deprecate or repurpose
"crates/lib/container_common", # TODO(bt, 2023-02-13): Pull apart and rehome pieces
"crates/lib/crockford",
"crates/lib/database_queries", # TODO(bt2, 2023-02-13): Rename "mysql_queries", though this will not live beyond a single DB
"crates/lib/datetimes",
"crates/lib/errors",
"crates/lib/files",
"crates/lib/hashing",
"crates/lib/http_server_common",
"crates/lib/idempotency",
"crates/lib/jobs_common",
"crates/lib/memory_caching",
"crates/lib/media",
"crates/lib/redis_common",
"crates/lib/reusable_types",
"crates/lib/storage_buckets_common",
"crates/lib/sqlite_queries",
"crates/lib/sqlx_mysql_helpers",
"crates/lib/subprocess_common",
"crates/lib/tts_common",
"crates/lib/twitch_common",
"crates/lib/url_config",
"crates/lib/user_input_common",
"crates/lib/web_scrapers",
# Application
"crates/service/generic_download_job",
"crates/service/storyteller_web",
"crates/service/tts_download_job",
"crates/service/tts_inference_job",
"crates/service/twitch_pubsub_subscriber",
"crates/service/w2l_download_job",
"crates/service/w2l_inference_job",
"crates/service/websocket_gateway",
# Programs: Desktop apps
"crates/programs/aichatbot-sidecar",
# Services: API servers, jobs, workers, etc.
"crates/service/job/analytics_job",
"crates/service/job/download_job",
"crates/service/job/inference_job",
"crates/service/job/tts_download_job",
"crates/service/job/tts_inference_job",
"crates/service/job/w2l_download_job",
"crates/service/job/w2l_inference_job",
"crates/service/other/twitch_pubsub_subscriber",
"crates/service/web/dummy_service",
"crates/service/web/image_generation_service",
"crates/service/web/storyteller_web",
"crates/service/web/websocket_gateway",
# Service Plugins: complete subsystems that can be plugged into services (users, billing, etc.)
"crates/service/plugins/billing",
"crates/service/plugins/inference_workloads",
"crates/service/plugins/users",
]
+152 -111
View File
@@ -1,70 +1,104 @@
# ==================== Python Build Base ====================
FROM ghcr.io/storytold/docker-base-images-nvidia-cuda-experimental:080f96bc7087 as pybuild-base
# The downloader needs youtube-dl as a python library
# NB: No longer maintained: https://news.ycombinator.com/item?id=28319624
#RUN pip3 install --upgrade youtube-dl
# Used by the downloader script.
# And it looks like youtube-dl is dead...
# Per the README, it looks like pip will always pull the latest version.
# https://github.com/yt-dlp/yt-dlp#update
RUN python3 -m pip install --upgrade yt-dlp
# ==================== Python Build Step 2: Wav2Lip Requirements ====================
FROM pybuild-base as pybuild-requirements
WORKDIR /
COPY models/Wav2Lip ./models/Wav2Lip
WORKDIR models/Wav2Lip
# NB: We need Python3.6
RUN python3.6 -m venv python
#RUN virtualenv -p /usr/bin/python3.6 ... wait
RUN . python/bin/activate \
&& pip install --upgrade pip \
&& pip install -r requirements.txt \
&& deactivate
WORKDIR /
COPY models/tts ./models/tts
WORKDIR models/tts
# NB: Not sure if we need Python3.6 for Tacotron2, but Python3.8 gave me trouble.
# NB: Setuptools fix: https://github.com/tensorflow/tensorflow/issues/34302#issuecomment-554450289
RUN python3.6 -m venv python
RUN . python/bin/activate \
&& pip install --upgrade pip setuptools \
&& pip install -r requirements-tacotron-python36.txt \
&& deactivate
# ==================== Rust Build Base ====================
# ================================================================
# =============== (1) set up core rust build image ===============
# ================================================================
# Custom base image
# Make sure to add this repository so it has read acces to the base image:
# https://github.com/orgs/storytold/packages/container/docker-base-images-rust-ssl/settings/actions_access
FROM ghcr.io/storytold/docker-base-images-rust-ssl:latest as rust-build
# FROM ghcr.io/storytold/docker-base-images-rust-ssl:d94ce4350c3b as rust-build
FROM ubuntu:jammy as rust-base
# NB: This can be "stable" or another version.
ARG RUST_TOOLCHAIN="1.66.0"
WORKDIR /tmp
COPY Cargo.lock .
# NB: cmake is required for freetype-sys-0.13.1, which in turn has only been added for egui.
# NB: fontconfig is required by servo-fontconfig-sys, which is in the dependency chain for egui.
# NB: libfontconfig-dev is required by servo-fontconfig-sys, which is in the dependency chain for egui.
# NB: pkg-config and libssl are for container TLS; we may switch to rustls in the future.
RUN apt-get update \
&& DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get install -y \
build-essential \
cmake \
curl \
fontconfig \
libfontconfig1-dev \
libssl-dev \
pkg-config
# NB: Fix for fontconfig (servo-fontconfig-sys): https://github.com/alacritty/alacritty/issues/4423#issuecomment-727277235
# TODO(bt, 2023-02-23): This has not been verified to work yet.
RUN export PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig
# Install Rust
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs \
| sh -s -- --default-toolchain $RUST_TOOLCHAIN -y
# Install correct Rust version
#RUN $HOME/.cargo/bin/rustup install $RUST_VERSION
#RUN $HOME/.cargo/bin/rustup default $RUST_VERSION
# Report Rust version for build debugging
RUN $HOME/.cargo/bin/rustup show
RUN $HOME/.cargo/bin/rustc --version
RUN $HOME/.cargo/bin/cargo --version
# Cargo Chef does Rust build caching: https://github.com/LukeMathWalker/cargo-chef
# TODO(bt,2023-03-08): builds are failing with "no space left on device"; disabling build caching
#RUN $HOME/.cargo/bin/cargo install cargo-chef --locked
# ======================================================================
# =============== (2) use cargo-chef to "plan" the build ===============
# ======================================================================
FROM rust-base AS planner
# NB: Copying in everything does not appear to impact cached builds if irrelevant files are changed (at least at this step)
# TODO(bt,2023-03-08): builds are failing with "no space left on device"; disabling build caching
#COPY . .
# TODO(bt,2023-03-08): builds are failing with "no space left on device"; disabling build caching
#RUN $HOME/.cargo/bin/cargo chef prepare --recipe-path recipe.json
# ======================================================================================================
# =============== (3) "cook" the libraries (cacheable), then run the app build and tests ===============
# ======================================================================================================
FROM rust-base AS builder
# TODO(bt,2023-03-08): builds are failing with "no space left on device"; disabling build caching
#COPY --from=planner /tmp/recipe.json recipe.json
# NB: This step builds and caches the dependencies as its own layer.
# TODO(bt,2023-03-08): builds are failing with "no space left on device"; disabling build caching
#RUN $HOME/.cargo/bin/cargo chef cook --release --recipe-path recipe.json
# NB: Now we build and test our code.
COPY Cargo.lock .
COPY Cargo.toml .
COPY sqlx-data.json .
COPY crates/ ./crates
COPY db/ ./db
COPY test_data/ ./test_data
COPY container_includes/ ./container_includes
RUN $HOME/.cargo/bin/cargo fetch
ARG GIT_SHA
RUN echo -n ${GIT_SHA} > GIT_SHA
# Print a report on disk space
#RUN echo "Disk usage at root (before tests):"
#RUN du -hsc / | sort -hr
RUN echo "Disk usage at current directory (before tests):"
RUN pwd
RUN du -hsc * | sort -hr
# Run all of the tests
RUN SQLX_OFFLINE=true \
LD_LIBRARY_PATH=/usr/lib:${LD_LIBRARY_PATH} \
$HOME/.cargo/bin/cargo test
#RUN SQLX_OFFLINE=true \
# LD_LIBRARY_PATH=/usr/lib:${LD_LIBRARY_PATH} \
# $HOME/.cargo/bin/cargo test
# Print a report on disk space
#RUN echo "Disk usage at root (after tests):"
#RUN du -hsc / | sort -hr
RUN echo "Disk usage at current directory (after tests):"
RUN pwd
RUN du -hsc * | sort -hr
# Build all the binaries.
RUN SQLX_OFFLINE=true \
@@ -73,6 +107,30 @@ RUN SQLX_OFFLINE=true \
--release \
--bin storyteller-web
RUN SQLX_OFFLINE=true \
LD_LIBRARY_PATH=/usr/lib:${LD_LIBRARY_PATH} \
$HOME/.cargo/bin/cargo build \
--release \
--bin dummy-service
RUN SQLX_OFFLINE=true \
LD_LIBRARY_PATH=/usr/lib:${LD_LIBRARY_PATH} \
$HOME/.cargo/bin/cargo build \
--release \
--bin analytics-job
RUN SQLX_OFFLINE=true \
LD_LIBRARY_PATH=/usr/lib:${LD_LIBRARY_PATH} \
$HOME/.cargo/bin/cargo build \
--release \
--bin download-job
RUN SQLX_OFFLINE=true \
LD_LIBRARY_PATH=/usr/lib:${LD_LIBRARY_PATH} \
$HOME/.cargo/bin/cargo build \
--release \
--bin inference-job
RUN SQLX_OFFLINE=true \
LD_LIBRARY_PATH=/usr/lib:${LD_LIBRARY_PATH} \
$HOME/.cargo/bin/cargo build \
@@ -85,12 +143,6 @@ RUN SQLX_OFFLINE=true \
--release \
--bin w2l-download-job
RUN SQLX_OFFLINE=true \
LD_LIBRARY_PATH=/usr/lib:${LD_LIBRARY_PATH} \
$HOME/.cargo/bin/cargo build \
--release \
--bin generic-download-job
RUN SQLX_OFFLINE=true \
LD_LIBRARY_PATH=/usr/lib:${LD_LIBRARY_PATH} \
$HOME/.cargo/bin/cargo build \
@@ -115,72 +167,61 @@ RUN SQLX_OFFLINE=true \
--release \
--bin twitch-pubsub-subscriber
# Print a report on disk space
RUN echo "Disk usage at current directory (after all builds):"
RUN pwd
RUN du -hsc * | sort -hr
# =============================================================
# =============== (4) construct the final image ===============
# =============================================================
# Final image
# FROM ubuntu:xenial
FROM pybuild-requirements as final
FROM ubuntu:jammy as final
# See: https://github.com/opencontainers/image-spec/blob/master/annotations.md
LABEL org.opencontainers.image.title='Storyteller Rust'
LABEL org.opencontainers.image.authors='bt@brand.io, echelon@gmail.com'
LABEL org.opencontainers.image.description='All of the binaries from the Rust monorepo'
LABEL org.opencontainers.image.documentation='https://github.com/storytold/storyteller-web'
LABEL org.opencontainers.image.source='https://github.com/storytold/storyteller-web'
LABEL org.opencontainers.image.url='https://github.com/storytold/storyteller-web'
WORKDIR /
COPY scripts/ ./scripts
# See: https://github.com/opencontainers/image-spec/blob/master/annotations.md
LABEL org.opencontainers.image.authors='bt@brand.io, echelon@gmail.com'
LABEL org.opencontainers.image.url='https://github.com/storytold/storyteller-web'
LABEL org.opencontainers.image.documentation='https://github.com/storytold/storyteller-web'
LABEL org.opencontainers.image.source='https://github.com/storytold/storyteller-web'
# NB(echelon,2022-05-31): NVIDIA revoked some of their keys.
# A better long term fix is to remove these dependencies outright and not have ML deps in this repo.
# https://developer.nvidia.com/blog/updating-the-cuda-linux-gpg-repository-key/
# https://forums.developer.nvidia.com/t/invalid-public-key-for-cuda-apt-repository/212901/11
RUN apt-key del 7fa2af80
# NB: Fix for 'E: Conflicting values set for option Signed-By regarding source'
# NB: We need to remove all sources
RUN rm $(find /etc/apt | grep cuda)
#RUN wget https://developer.download.nvidia.com/compute/cuda/repos/$distro/$arch/cuda-keyring_1.0-1_all.deb
RUN wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/cuda-keyring_1.0-1_all.deb
RUN dpkg -i cuda-keyring_1.0-1_all.deb
# NB: Comment this out for non-debug images
# TODO: Figure out how this is done elsewhere with just the static binaries
# Others: `mysql-client`
RUN apt-get update \
&& apt-get install -y \
curl \
python3-pip \
python3 \
wget
RUN python3 --version
# TODO: Use venv to do this instead.
RUN pip3 install gdown
# Give the container its version so it can report over HTTP.
ARG GIT_SHA
RUN echo -n ${GIT_SHA} > GIT_SHA
# Copy all the binaries.
COPY --from=rust-build /tmp/target/release/storyteller-web /
COPY --from=rust-build /tmp/target/release/tts-download-job /
COPY --from=rust-build /tmp/target/release/tts-inference-job /
COPY --from=rust-build /tmp/target/release/w2l-download-job /
COPY --from=rust-build /tmp/target/release/w2l-inference-job /
COPY --from=rust-build /tmp/target/release/websocket-gateway /
COPY --from=rust-build /tmp/target/release/twitch-pubsub-subscriber /
COPY --from=rust-build /tmp/target/release/generic-download-job /
COPY --from=rust-build /tmp/GIT_SHA /
COPY --from=builder /tmp/target/release/storyteller-web /
COPY --from=builder /tmp/target/release/dummy-service /
COPY --from=builder /tmp/target/release/analytics-job /
COPY --from=builder /tmp/target/release/download-job /
COPY --from=builder /tmp/target/release/inference-job /
COPY --from=builder /tmp/target/release/tts-download-job /
COPY --from=builder /tmp/target/release/tts-inference-job /
COPY --from=builder /tmp/target/release/w2l-download-job /
COPY --from=builder /tmp/target/release/w2l-inference-job /
COPY --from=builder /tmp/target/release/websocket-gateway /
COPY --from=builder /tmp/target/release/twitch-pubsub-subscriber /
# SSL certs are required for crypto
COPY --from=rust-build /etc/ssl /etc/ssl
COPY --from=builder /etc/ssl /etc/ssl
# Required dynamically linked libraries
COPY --from=rust-build /lib/x86_64-linux-gnu/libssl.* /lib/x86_64-linux-gnu/
COPY --from=rust-build /lib/x86_64-linux-gnu/libcrypto.* /lib/x86_64-linux-gnu/
COPY --from=builder /usr/lib/x86_64-linux-gnu/libssl.* /lib/x86_64-linux-gnu/
COPY --from=builder /usr/lib/x86_64-linux-gnu/libcrypto.* /lib/x86_64-linux-gnu/
# Container includes
COPY container_includes/ /container_includes
# Make sure all the links resolve
RUN ldd storyteller-web
# Without a .env file, Rust crashes "mysteriously" (ugh)
RUN touch .env
RUN touch .env-download-job
RUN touch .env-secrets
EXPOSE 8080
+41 -72
View File
@@ -1,77 +1,46 @@
storyteller-rust
================
Our Rust monorepo, which services our
API surface area.
Application overview
--------------------
* [FakeYou.com](https://fakeyou.com) is powered by:
* HTTP APIs:
* `storyteller-web` - HTTP + database monolith for FakeYou
* Asynchronous Jobs:
* `tts-download-job` - Async download of models
* `tts-inference-job` - Async TTS inference
* `w2l-download-job` - Async download of videos and images
* `w2l-inference-job` - Async W2L inference
* [StorytellerStream](https://storyteller.stream) is powered by:
* HTTP APIs:
* `storyteller-web` - HTTP + database monolith for FakeYou
* Websocket events:
* `websocket-gateway` - Websocket to pull down Twitch events.
* Twitch API integration:
* `twitch-pubsub-subscriber` - Dynamically subscribes to Twitch PubSub for "active" users
Schema and API notes
--------------------
* [Redis Schema Notes README](_docs/redis_schema.md)
Local development
-----------------
[Local development setup README](_docs/local_development_setup.md)
Production and Deployment
-------------------------
[Production builds and deployment README](_docs/production_builds_and_deployment.md)
Development notes
-----------------
[Development notes README](_docs/development_notes.md)
Dump a MySQL report
-------------------
Our Rust monorepo, which serves both our API surface area and our downloadable client applications.
```
mysql -u storyteller \
-pPasswordHere \
-h IP_HERE \
-P 3306 \
-D storyteller \
-B \
-e "select * from voice_clone_requests;" | sed "s/'/\'/;s/\t/\",\"/g;s/^/\"/;s/$/\"/;s/\n//g" > voice_clone_report.csv
```
TODO
----
* Revise this README to be more useful.
Notes / TODOs:
* Examples for good Actix+Sqlx Tests:
https://stackoverflow.com/questions/65370752/how-do-i-create-an-actix-web-server-that-accepts-both-sqlx-database-pools-and-tr
* Actix/sqlx runtime compat:
https://github.com/launchbadge/sqlx/issues/1117#issuecomment-801237734
* Redis caching of more endpoints
* Jobs for analytics queries (#uses per model, etc)
* Jobs for ingesting Discord, Twitter, Reddit RPAN chat, Twitch chat (not PubSub), etc.
."-,.__
`. `. ,
.--' .._,'"-' `.
. .' `'
`. / ,'
` '--. ,-"'
`"` | \
-. \, |
`--Y.' ___.
\ L._, \
_., `. < <\ _
,' ' `, `. | \ ( `
../, `. ` | .\`. \ \_
,' ,.. . _.,' ||\l ) '".
, ,' \ ,'.-.`-._,' | . _._`.
,' / \ \ `' ' `--/ | \ / / ..\
.' / \ . |\__ - _ ,'` ` / / `.`.
| ' .. `-...-" | `-' / / . `.
| / |L__ | | / / `. `.
, / . . | | / / ` `
/ / ,. ,`._ `-_ | | _ ,-' / ` \
/ . \"`_/. `-_ \_,. ,' +-' `-' _, ..,-. \`.
. ' .-f ,' ` '. \__.---' _ .' ' \ \
' / `.' l .' / \.. ,_|/ `. ,'` L`
|' _.-""` `. \ _,' ` \ `.___`.'"`-. , | | | \
|| ,' `. `. ' _,...._ ` | `/ ' | ' .|
|| ,' `. ;.,.---' ,' `. `.. `-' .-' /_ .' ;_ ||
|| ' V / / ` | ` ,' ,' '. ! `. ||
||/ _,-------7 ' . | `-' l / `||
. | ,' .- ,' || | .-. `. .' ||
`' ,' `".' | | `. '. -.' `'
/ ,' | |,' \-.._,.'/'
. / . . \ .''
.`. | `. / :_,'.'
\ `...\ _ ,'-. .' /_.-' S T O R Y T E L L E R
`-.__ `, `' . _.>----''. _ __ / Turning memes into dreams
.' /"' | "' '_ One Rust Monorepo at a time
/_|.-'\ ,". '.'`__'-( \
/ ,"'"\,' `/ `-.|"
```
+38
View File
@@ -0,0 +1,38 @@
AI Chatbot Sidecar
==================
This is the first app that doesn't run as a part of our SoA API architecture. (Though it is written such that we
could port it.) This app is responsible for generating all the content that goes into our streaming AI-powered TV
programs.
### Windows Installation
The application uses sqlite, which is tricky to install on Windows.
1. Put together an sqlite build directory containing the sources and dll file. One is checked in under this monorepo
in `./windows/sqlite` at the time of this writing, though that may change in the future.
2. Add environment variables for the sqlite build directory (see https://github.com/diesel-rs/diesel/issues/487)
* PATH (append the sqlite build directory to the end)
* SQLITE3_LIB_DIR (a new environment variable; set it to the sqllite build path)
3. Build the `sqlite3.lib` file with the following:
```
lib /def:sqlite3.def /out:sqlite3.lib /MACHINE:amd64
```
This must be done in "Developer Command Prompt for VS 2022" (or similar), not `cmd` or `PowerShell`.
4. Run the diesel_cli tool build
```
cargo install diesel_cli --no-default-features --features sqlite
```
If it still complains about the `sqlite3.lib` file not being found, be sure to double check that `echo %PATH%` shows
the updated PATH from the steps above.
+20
View File
@@ -0,0 +1,20 @@
# Local Kubernetes environment for standing up the APIs and their dependencies
- Install minikube, kubectl, docker, and musl from your OS package manager
- `rustup target add x86_64-unknown-linux-musl`
- `cargo build --release --bin storyteller-web --target=x86_64-unknown-linux-musl`
- `minikube start --extra-config=apiserver.service-node-port-range=1-65535`
- `eval $(minikube docker-env)`
- `minikube mount /path/to/storyteller-rust/:/storyteller-rust &> /dev/null &`
- `docker build -t storyteller-web -f localdev/Dockerfile .`
- `kubectl apply -f localdev/kubernetes.yml`
- Get the ip address of minikube with `minikube ip`, this is where all the services will be running on their
regular ports (12345 for the api, 6379 for redis, 3306 for mysql)
- That's it, we just spun up mysql, applied database migrations, spun up redis, and spun up our api
# Development tips
- Rebuild and "deploy" (locally) with `cargo build --release --bin storyteller-web --target=x86_64-unknown-linux-musl && kubectl rollout restart storyteller-web`
- View logs from the api with `kubectl logs storyteller-web<TAB>`
- Delete everything minikube (if you start running out of disk space or what-have-you) with `minikube delete`
- See pod status with `kubectl get pods`
- If there are errors you can get more info with `kubectl describe pods`
@@ -1,9 +1,9 @@
dev setup
=========
[Back to main README](../README.md)
[Back to main README](../../README.md)
### Debugging and Fixing CUDA/PyTorch
## Debugging and Fixing CUDA/PyTorch
See this spreadsheet for previous battles with version incompatibility:
https://docs.google.com/spreadsheets/d/1BEdLmwOzo3r83-iJn9sj6co1VT92t3lIeJ-lNH25bdQ/edit#gid=0
@@ -11,27 +11,53 @@ https://docs.google.com/spreadsheets/d/1BEdLmwOzo3r83-iJn9sj6co1VT92t3lIeJ-lNH25
Ubuntu might upgrade the driver by accident, and it might need reinstallation. Who knows.
This stuff is a nightmare.
### Database Setup
## Database Setup
### Mac Install
```
brew install mysql
# If mysql -uroot fails, reboot the machine:
sudo reboot now
```
### Linux Install
Install the following libraries, and see the notes further below about MySQL on Ubuntu 20.04.
```
jq # for combining mysql codegen outputs
libmysqlclient-dev
mysql-server
imagemagick
libsqlite3-dev
pkgconf # if using openssl instead of rustls
```
### Migrations
To manage the database and perform migrations, install the Rust tools diesel and sqlx.
We'll be using diesel to manage the migrations, but sqlx within the app to actually perform queries.
Diesel is an ORM, which is dumb, so we use sqlx as at-compile-time typesafe SQL.
The CLI is necessary to perform codegen:
```
sudo apt-get install libmysqlclient-dev
cargo install sqlx-cli --no-default-features --features mysql [2022-01-16: is this needed?]
cargo install sqlx-cli --no-default-features --features rustls,mysql,sqlite
```
To install a more modern version of Diesel (unreleased) that
supports the "migrations_dir" toml config option:
Diesel now supports configuring the migration directory via an environment variable,
so we can install the currently published version:
```
cargo install diesel_cli \
--no-default-features \
--features mysql,sqlite
```
If the modern version fails, try installing a cherry-picked version with a
TOML-based migration directory configuration:
```
cargo install diesel_cli \
@@ -60,6 +86,21 @@ If MySql in local dev can't be connected to, reset the accounts:
https://linuxconfig.org/how-to-reset-root-mysql-mariadb-password-on-ubuntu-20-04-focal-fossa-linux
#### MySql on Ubuntu 22.04
Should work largely out of the box. We'll need a dev account:
```
# Connect to mysql:
# sudo mysql -u root -p (password is "root")
use mysql;
CREATE USER 'storyteller'@'localhost' IDENTIFIED BY 'password';
GRANT ALL PRIVILEGES ON storyteller.* TO 'storyteller'@'localhost';
```
Then verify with `./dev_mysql_connect.sh`
#### Fixing dev MySql on Ubuntu 20.04
For some reason, the MySql default install on 20.04 gave me a bunch of trouble.
+77
View File
@@ -0,0 +1,77 @@
old readme
==========
Contents of the main README.md, which will always be woefully out of date. Docs will migrate into this folder on a
per-subject basis. App-specific docs will live under each app.
Application overview
--------------------
* [FakeYou.com](https://fakeyou.com) is powered by:
* HTTP APIs:
* `storyteller-web` - HTTP + database monolith for FakeYou
* Asynchronous Jobs:
* `tts-download-job` - Async download of models
* `tts-inference-job` - Async TTS inference
* `w2l-download-job` - Async download of videos and images
* `w2l-inference-job` - Async W2L inference
* [StorytellerStream](https://storyteller.stream) is powered by:
* HTTP APIs:
* `storyteller-web` - HTTP + database monolith for FakeYou
* Websocket events:
* `websocket-gateway` - Websocket to pull down Twitch events.
* Twitch API integration:
* `twitch-pubsub-subscriber` - Dynamically subscribes to Twitch PubSub for "active" users
Schema and API notes
--------------------
* [Redis Schema Notes README](_docs/redis_schema.md)
Local development
-----------------
[Local development setup README](_docs/local_development_setup.md)
Production and Deployment
-------------------------
[Production builds and deployment README](_docs/production_builds_and_deployment.md)
Development notes
-----------------
[Development notes README](_docs/development_notes.md)
Dump a MySQL report
-------------------
```
mysql -u storyteller \
-pPasswordHere \
-h IP_HERE \
-P 3306 \
-D storyteller \
-B \
-e "select * from voice_clone_requests;" | sed "s/'/\'/;s/\t/\",\"/g;s/^/\"/;s/$/\"/;s/\n//g" > voice_clone_report.csv
```
TODO
----
* Revise this README to be more useful.
Notes / TODOs:
* Examples for good Actix+Sqlx Tests:
https://stackoverflow.com/questions/65370752/how-do-i-create-an-actix-web-server-that-accepts-both-sqlx-database-pools-and-tr
* Actix/sqlx runtime compat:
https://github.com/launchbadge/sqlx/issues/1117#issuecomment-801237734
* Redis caching of more endpoints
* Jobs for analytics queries (#uses per model, etc)
* Jobs for ingesting Discord, Twitter, Reddit RPAN chat, Twitch chat (not PubSub), etc.
+23
View File
@@ -0,0 +1,23 @@
FROM rust:latest
ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update && \
apt-get install -y \
mariadb-client \
imagemagick \
libmariadb-dev \
&& rm -rf /var/lib/apt/lists/*
RUN cargo install diesel_cli --features mysql && \
cargo install sqlx-cli --features mysql
WORKDIR /storyteller-rust
ARG GIT_SHA
RUN echo -n ${GIT_SHA} > /GIT_SHA
CMD ["/storyteller-rust/localdev/startup.sh"]
+153
View File
@@ -0,0 +1,153 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: mysql
spec:
replicas: 1
selector:
matchLabels:
app: mysql
template:
metadata:
labels:
app: mysql
spec:
containers:
- name: mysql
image: mysql:8.0.30
env:
- name: MYSQL_USER
value: storyteller
- name: MYSQL_PASSWORD
value: password
- name: MYSQL_DATABASE
value: storyteller
- name: MYSQL_ROOT_PASSWORD
value: password
ports:
- containerPort: 3306
---
apiVersion: apps/v1
kind: Deployment
metadata:
name: redis
spec:
replicas: 1
selector:
matchLabels:
app: redis
template:
metadata:
labels:
app: redis
spec:
containers:
- name: redis
image: redis:7.0.4
ports:
- containerPort: 6379
---
apiVersion: apps/v1
kind: Deployment
metadata:
name: storyteller-web
spec:
replicas: 1
selector:
matchLabels:
app: storyteller-web
template:
metadata:
labels:
app: storyteller-web
spec:
containers:
- name: storyteller-web
image: storyteller-web:latest
imagePullPolicy: Never
env:
- name: MYSQL_URL
value: mysql://storyteller:password@mysql.default/storyteller
- name: REDIS_0_URL
value: redis://redisd@redis.default/0
- name: REDIS_1_URL
value: redis://redisd@redis.default/1
- name: ACCESS_KEY
value: garbage
- name: SECRET_KEY
value: garbage
- name: REGION_NAME
value: garbage
- name: W2L_PRIVATE_DOWNLOAD_BUCKET_NAME
value: garbage
- name: W2L_PUBLIC_DOWNLOAD_BUCKET_NAME
value: garbage
- name: AUDIO_UPLOADS_BUCKET_ROOT
value: garbage
- name: TWITCH_USERNAME
value: garbage
- name: TWITCH_STREAM_KEY
value: garbage
- name: TWITCH_APP_CLIENT_ID
value: garbage
- name: TWITCH_APP_CLIENT_SECRET
value: garbage
ports:
- containerPort: 12345
volumeMounts:
- mountPath: /storyteller-rust
name: storyteller-rust-folder
volumes:
- name: storyteller-rust-folder
hostPath:
path: /storyteller-rust
---
apiVersion: v1
kind: Service
metadata:
name: mysql
spec:
type: NodePort
ports:
- name: mysql
port: 3306
nodePort: 3306
selector:
app: mysql
---
apiVersion: v1
kind: Service
metadata:
name: redis
spec:
type: NodePort
ports:
- name: redis
port: 6379
nodePort: 6379
selector:
app: redis
---
apiVersion: v1
kind: Service
metadata:
name: storyteller-web
spec:
type: NodePort
ports:
- name: storyteller-web
port: 12345
nodePort: 12345
selector:
app: storyteller-web
@@ -0,0 +1,258 @@
# Nginx configs for "jungle.horse" and "api.jungle.horse" (http)
#
# On Ubuntu Linux, this config is located at the following location:
#
# - /etc/nginx/sites-enabled/{name-of-site}
#
# Move this file there, and then restart with,
#
# sudo service nginx restart
#
# On Mac, this is located at the following locations:
#
# - /opt/homebrew/etc/nginx/servers/{name-of-site} (for nginx installed with homebrew)
# - /usr/local/etc/nginx/sites-enabled/{name-of-site} (for default nginx install)
#
#
# On Mac, verify configs and restart with,
#
# sudo nginx -t
# sudo nginx -s reload
#
# ================
# SSL Instructions
# ================
#
# You can launch Chrome in a way it disregards self-signed certs and CORS:
#
# chromium --disable-web-security --ignore-certificate-errors --user-data-dir=~/chromeTemp
#
# To create self-signed certs on Ubuntu Linux,
#
# sudo apt-get install openssl
#
# sudo openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/ssl/private/localhost.key -out /etc/ssl/certs/localhost.crt
#
# ^ most fields can be blank, but the "Common Name" should be `*.jungle.horse`
#
# sudo openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/ssl/private/devfakeyou.key -out /etc/ssl/certs/devfakeyou.crt
# sudo openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/ssl/private/devstoryteller.key -out /etc/ssl/certs/devstoryteller.crt
#
# ^ most fields can be blank, but the "Common Name" should be `*.dev.fakeyou.com` and `*.dev.storyteller.io` respectively.
#
# For more: https://www.cloudsavvyit.com/1306/how-to-create-and-use-self-signed-ssl-on-nginx/
#
# To create self-signed certs on Mac,
#
# openssl req -x509 -sha256 -nodes -newkey rsa:2048 -days 365 -keyout localhost.key -out localhost.crt
#
# ^ most fields can be blank, but the "Common Name" should be `*.jungle.horse`
#
# On Mac, load the self signed cert into the keychain with the following command:
#
# sudo security add-trusted-cert \
# -d -r trustRoot \
# -k /Library/Keychains/System.keychain /etc/ssl/certs/localhost.crt
#
# Self signed certs might be considered insecure by the browser. In Firefox,
# set about:config `security.tls.insecure_fallback_hosts` to include a list of
# permitted domains. You may also need to configure other settings.
#
#
# ========================================================
# FAKEYOU
# ========================================================
# FakeYou javascript frontend over plain HTTP (launched by Yarn)
server {
listen 80;
server_name dev.fakeyou.com;
location / {
proxy_set_header Host $host;
proxy_pass http://127.0.0.1:7000;
proxy_redirect off;
}
}
# FakeYou API backend over plain HTTP (Rust app)
server {
listen 80;
server_name api.dev.fakeyou.com;
location / {
proxy_set_header Host $host;
proxy_pass http://127.0.0.1:12345;
proxy_redirect off;
}
}
# FakeYou javascript frontend over SSL (launched by Yarn)
server {
listen 443 ssl;
listen [::]:443 ssl;
ssl_certificate /etc/ssl/certs/devfakeyou.crt;
ssl_certificate_key /etc/ssl/private/devfakeyou.key;
ssl_protocols TLSv1.2 TLSv1.1 TLSv1;
server_name dev.fakeyou.com;
location / {
proxy_set_header Host $host;
proxy_pass http://127.0.0.1:7000;
proxy_redirect off;
}
}
# FakeYou API backend over SSL (Rust app)
server {
listen 443 ssl;
listen [::]:443 ssl;
ssl_certificate /etc/ssl/certs/devfakeyou.crt;
ssl_certificate_key /etc/ssl/private/devfakeyou.key;
ssl_protocols TLSv1.2 TLSv1.1 TLSv1;
server_name api.dev.fakeyou.com;
location / {
proxy_set_header Host $host;
proxy_pass http://127.0.0.1:12345;
proxy_redirect off;
}
}
# ========================================================
# STORYTELLER
# ========================================================
# Storyteller javascript frontend over plain HTTP (launched by Yarn)
server {
listen 80;
server_name dev.storyteller.io;
location / {
proxy_set_header Host $host;
proxy_pass http://127.0.0.1:7000;
proxy_redirect off;
}
}
# Storyteller API backend over plain HTTP
server {
listen 80;
server_name api.dev.storyteller.io;
location / {
proxy_set_header Host $host;
proxy_pass http://127.0.0.1:12345;
proxy_redirect off;
}
}
# Storyteller javascript frontend over SSL (launched by Yarn)
server {
listen 443 ssl;
listen [::]:443 ssl;
ssl_certificate /etc/ssl/certs/devstoryteller.crt;
ssl_certificate_key /etc/ssl/private/devstoryteller.key;
ssl_protocols TLSv1.2 TLSv1.1 TLSv1;
server_name dev.storyteller.io;
location / {
proxy_set_header Host $host;
proxy_pass http://127.0.0.1:7000;
proxy_redirect off;
}
}
# Storyteller API backend over SSL
server {
listen 443 ssl;
listen [::]:443 ssl;
ssl_certificate /etc/ssl/certs/devstoryteller.crt;
ssl_certificate_key /etc/ssl/private/devstoryteller.key;
ssl_protocols TLSv1.2 TLSv1.1 TLSv1;
server_name api.dev.storyteller.io;
location / {
proxy_set_header Host $host;
proxy_pass http://127.0.0.1:12345;
proxy_redirect off;
}
}
# ========================================================
# OLD PRODUCTS THAT NEED UPDATING
# ========================================================
# ## TODO(2022-02-13): This is new and untested
# # WebSocket API backend over plain HTTP
# server {
# listen 80;
# server_name ws.jungle.horse;
# location / {
# proxy_set_header Host $host;
# proxy_pass http://127.0.0.1:54321;
# proxy_redirect off;
# }
# }
#
# # Websocket API backend over SSL
# server {
# listen 443 ssl;
# listen [::]:443 ssl;
# ssl_certificate /etc/ssl/certs/localhost.crt;
# ssl_certificate_key /etc/ssl/private/localhost.key;
# ssl_protocols TLSv1.2 TLSv1.1 TLSv1;
# server_name ws.jungle.horse;
# location / {
# proxy_set_header Host $host;
# proxy_pass http://127.0.0.1:54321;
# proxy_redirect off;
# }
# }
#
# # Javascript frontend over plain HTTP
# server {
# listen 80;
# server_name jungle.horse;
# location / {
# proxy_set_header Host $host;
# proxy_pass http://127.0.0.1:7000;
# proxy_redirect off;
# }
# }
#
# # TODO(2022-02-13): This is new and untested
# # Javascript frontend (OBS Layer) over plain HTTP
# server {
# listen 80;
# server_name obs.jungle.horse;
# location / {
# proxy_set_header Host $host;
# proxy_pass http://127.0.0.1:7007;
# proxy_redirect off;
# }
# }
#
# # Javascript frontend over SSL
# server {
# listen 443 ssl;
# listen [::]:443 ssl;
# ssl_certificate /etc/ssl/certs/localhost.crt;
# ssl_certificate_key /etc/ssl/private/localhost.key;
# ssl_protocols TLSv1.2 TLSv1.1 TLSv1;
# server_name jungle.horse;
# location / {
# proxy_set_header Host $host;
# proxy_pass http://127.0.0.1:7000;
# proxy_redirect off;
# }
# }
#
# # Javascript frontend over SSL (OBS Layer)
# server {
# listen 443 ssl;
# listen [::]:443 ssl;
# ssl_certificate /etc/ssl/certs/localhost.crt;
# ssl_certificate_key /etc/ssl/private/localhost.key;
# ssl_protocols TLSv1.2 TLSv1.1 TLSv1;
# server_name obs.jungle.horse;
# location / {
# proxy_set_header Host $host;
# proxy_pass http://127.0.0.1:7007;
# proxy_redirect off;
# }
# }
#
+6
View File
@@ -0,0 +1,6 @@
#!/bin/bash
set +e +o pipefail
diesel migration run --database-url="${MYSQL_URL}"
set -e -o pipefail
./target/x86_64-unknown-linux-musl/release/storyteller-web
+36
View File
@@ -0,0 +1,36 @@
#!/bin/bash
echo 'Installing APT packages...'
# OpenSSL requirements: libssl-dev, pkg-config
# Database requirements: mysql-server, libmysqlclient-dev
# Other tools: jq (db codegen)
sudo apt-get install -y \
jq \
libmysqlclient-dev \
libssl-dev \
mysql-server \
pkg-config \
--no-install-recommends
echo 'Installing Cargo packages...'
# Install Diesel CLI for migrations
cargo install diesel_cli \
--no-default-features \
--features mysql
# Install SQLx for codegen
cargo install sqlx-cli \
--no-default-features \
--features rustls,mysql
echo 'Installing Database user...'
# Create DB account (using default system mysql password)
sudo mysql \
-u "root" \
-p"password" \
-e "use mysql; CREATE DATABASE IF NOT EXISTS storyteller; CREATE USER IF NOT EXISTS 'storyteller'@'localhost' IDENTIFIED BY 'password'; GRANT ALL PRIVILEGES ON storyteller.* TO 'storyteller'@'localhost';"
-235
View File
@@ -1,235 +0,0 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
CREATE TABLE users (
-- Not used for anything except replication.
id BIGINT(20) NOT NULL AUTO_INCREMENT,
-- Visible "primary key"
token VARCHAR(32) NOT NULL,
-- Username is a lookup key; display_name allows the user to add custom case.
username VARCHAR(20) NOT NULL,
display_name VARCHAR(20) NOT NULL,
email_address VARCHAR(255) NOT NULL,
email_confirmed BOOLEAN NOT NULL DEFAULT false,
-- The role assigned to the user confers permissions.
user_role_slug VARCHAR(16) NOT NULL,
-- ========== CREDENTIALS ==========
-- Bcrypt password hash. Granted, there are newer methods:
-- https://cheatsheetseries.owasp.org/cheatsheets/Password_Storage_Cheat_Sheet.html
-- Passwords may be a max of 64 characters per BCrypt.
password_hash BINARY(60) NOT NULL,
-- Incremented with every update to the password.
password_version INT NOT NULL DEFAULT 0,
-- ========== ABUSE TRACKING ==========
-- For abuse tracking.
-- Wide enough for IPv4/6
ip_address_creation VARCHAR(40) NOT NULL,
ip_address_last_login VARCHAR(40) NOT NULL,
ip_address_last_update VARCHAR(40) NOT NULL,
-- ========== DISPLAY / PROFILE ==========
-- Gravatar image hashes are precomputed.
email_gravatar_hash CHAR(32) NOT NULL,
-- The profile of the user in markdown (user editable).
profile_markdown TEXT NOT NULL,
-- Generated HTML (not user-editable).
profile_rendered_html TEXT NOT NULL,
-- An uploaded avatar. Public hash in our bucket.
-- avatar_public_bucket_hash CHAR(32) DEFAULT NULL,
-- ========== SOCIAL MEDIA ==========
-- Social media usernames
-- These are not confirmed. We'll need to build an OAuth system to handle that.
discord_username VARCHAR(36) DEFAULT NULL,
twitter_username VARCHAR(36) DEFAULT NULL,
twitch_username VARCHAR(36) DEFAULT NULL,
patreon_username VARCHAR(36) DEFAULT NULL,
github_username VARCHAR(36) DEFAULT NULL,
cashapp_username VARCHAR(36) DEFAULT NULL,
website_url VARCHAR(255) DEFAULT NULL,
-- ========== USER PREFERENCES ==========
-- If the user doesn't want to use gravatar and doesn't have an uploaded avatar.
disable_gravatar BOOLEAN NOT NULL DEFAULT false,
-- (THIS MIGHT NOT BE USED)
-- NB: DO NOT SORT!
-- THIS MUST MATCH THE RESPECTIVE JOBS TABLE.
-- Visibility preference used at TTS inference time (which can be changed on the result itself).
-- Moderators will still see them.
preferred_tts_result_visibility ENUM(
'public',
'hidden',
'private'
) NOT NULL DEFAULT 'public',
-- (THIS MIGHT NOT BE USED)
-- NB: DO NOT SORT!
-- THIS MUST MATCH THE RESPECTIVE JOBS TABLE.
-- Visibility preference used at TTS inference time (which can be changed on the result itself).
-- Moderators will still see them.
preferred_w2l_result_visibility ENUM(
'public',
'hidden',
'private'
) NOT NULL DEFAULT 'public',
-- Auto play preferences
-- Tri-state because we want to potentially change the default behavior.
auto_play_audio_preference BOOLEAN DEFAULT NULL,
auto_play_video_preference BOOLEAN DEFAULT NULL,
-- Favorite TTS voice to use by default
-- maybe_preferred_tts_model_token VARCHAR(32) DEFAULT NULL,
-- Favorite W2L model to use by default
-- maybe_preferred_w2l_template_token VARCHAR(32) DEFAULT NULL,
-- Settings
-- DO NOT REORDER.
-- dark_mode_preference ENUM(
-- 'light-mode',
-- 'dark-mode',
-- 'use-clock'
-- ) NOT NULL DEFAULT 'light-mode',
-- ========== STATS ==========
-- For tracking stats.
-- The "cached" values are updated by a background job.
-- cached_tts_rendered_counter INT(10) NOT NULL DEFAULT 0,
-- cached_w2l_rendered_counter INT(10) NOT NULL DEFAULT 0,
-- ========== MODERATION DETAILS ==========
-- Different than deleted.
-- Users still show up, but can't do anything.
is_banned BOOLEAN NOT NULL DEFAULT false,
-- If a moderator has comments.
maybe_mod_comments VARCHAR(255) DEFAULT NULL,
-- The last moderator that made changes.
maybe_mod_user_token VARCHAR(32) DEFAULT NULL,
-- ========== VECTOR CLOCK ==========
-- Incremented with every update.
version INT NOT NULL DEFAULT 0,
-- ========== TIMESTAMPS ==========
created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-- If the user is deleted, we set this.
-- This is different than banned. These users won't show up at all.
user_deleted_at TIMESTAMP NULL,
mod_deleted_at TIMESTAMP NULL,
-- INDICES --
PRIMARY KEY (id),
UNIQUE KEY (token),
UNIQUE KEY (username),
UNIQUE KEY (email_address),
KEY fk_user_role_slug (user_role_slug)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
CREATE TABLE user_roles (
-- Not used for anything except replication.
id BIGINT(20) NOT NULL AUTO_INCREMENT,
-- Effective "primary key"
slug CHAR(16) NOT NULL,
name VARCHAR(255) NOT NULL,
-- Usage
can_use_tts BOOLEAN NOT NULL DEFAULT FALSE,
can_use_w2l BOOLEAN NOT NULL DEFAULT FALSE,
can_delete_own_tts_results BOOLEAN NOT NULL DEFAULT FALSE,
can_delete_own_w2l_results BOOLEAN NOT NULL DEFAULT FALSE,
can_delete_own_account BOOLEAN NOT NULL DEFAULT FALSE,
-- Contribution
can_upload_tts_models BOOLEAN NOT NULL DEFAULT FALSE,
can_upload_w2l_templates BOOLEAN NOT NULL DEFAULT FALSE,
can_delete_own_tts_models BOOLEAN NOT NULL DEFAULT FALSE,
can_delete_own_w2l_templates BOOLEAN NOT NULL DEFAULT FALSE,
-- Moderation
can_approve_w2l_templates BOOLEAN NOT NULL DEFAULT FALSE,
-- Edit includes "lock_from_use" and "lock_from_modification"
can_edit_other_users_profiles BOOLEAN NOT NULL DEFAULT FALSE,
can_edit_other_users_tts_models BOOLEAN NOT NULL DEFAULT FALSE,
can_edit_other_users_w2l_templates BOOLEAN NOT NULL DEFAULT FALSE,
can_delete_other_users_tts_models BOOLEAN NOT NULL DEFAULT FALSE,
can_delete_other_users_tts_results BOOLEAN NOT NULL DEFAULT FALSE,
can_delete_other_users_w2l_templates BOOLEAN NOT NULL DEFAULT FALSE,
can_delete_other_users_w2l_results BOOLEAN NOT NULL DEFAULT FALSE,
can_ban_users BOOLEAN NOT NULL DEFAULT FALSE,
can_delete_users BOOLEAN NOT NULL DEFAULT FALSE,
-- Incremented with every update.
version INT NOT NULL DEFAULT 0,
created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-- INDICES --
PRIMARY KEY (id),
UNIQUE KEY (slug)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
CREATE TABLE user_sessions (
-- Not used for anything except replication.
id BIGINT(20) NOT NULL AUTO_INCREMENT,
-- Session entropy
token VARCHAR(32) NOT NULL,
-- Foreign key to user
user_token VARCHAR(32) NOT NULL,
-- Track each session's creation IP.
-- Wide enough for IPv4/6
ip_address_creation VARCHAR(40) NOT NULL,
created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-- Session termination time.
-- This must be set by the server code, or the session is invalid
expires_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-- deletion = session termination
-- Typically these are destroyed by users, but if in the future we allow mods to
-- delete them, it doesn't really matter who did the deletion: sessions are not
-- designed to be recoverable.
deleted_at TIMESTAMP NULL,
-- INDICES --
PRIMARY KEY (id),
UNIQUE KEY (token),
KEY fk_user_token (user_token),
KEY index_ip_address_creation (ip_address_creation)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
@@ -1,110 +0,0 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
CREATE TABLE generic_download_jobs (
-- Not used for anything except replication.
id BIGINT(20) NOT NULL AUTO_INCREMENT,
-- Effective "primary key" (PUBLIC)
-- This is so the in-progress results can be looked up by the UI.
token VARCHAR(32) NOT NULL,
-- Idempotency token
-- This is so the frontend client doesn't submit duplicate jobs.
uuid_idempotency_token VARCHAR(36) NOT NULL,
-- ========== SUCCESS CASE ==========
-- If the job completes successfully, this is the result token.
-- This is only populated on a successful result.
on_success_downloaded_entity_token VARCHAR(32) DEFAULT NULL,
-- The type of the object will vary based on the type of the upload,
-- and we may include heuristics that auto-detect types in the future
on_success_downloaded_entity_type VARCHAR(32) DEFAULT NULL,
-- ========== UPLOAD DETAILS ==========
-- A "well defined" type of upload
-- The first upload type will be "hifigan_model"
download_type VARCHAR(32) NOT NULL,
-- Assume the same URL can be uploaded more than once (in case of errors or
-- people sharing models)
download_url VARCHAR(512) NOT NULL,
-- The user-supplied title of the upload
-- This might have different meanings for different upload types
-- The "name" of the voice model, which might be complicated.
-- If maybe_subject_token (etc.) is set, then it's authoritative instead.
title VARCHAR(255) NOT NULL,
-- ========== CREATOR DETAILS AND PREFERENCES ==========
-- Foreign key to user
creator_user_token VARCHAR(32) NOT NULL,
-- For abuse tracking.
-- Wide enough for IPv4/6
creator_ip_address VARCHAR(40) NOT NULL,
-- The creator can set a desired visibility for their data.
-- This does not always apply to every upload type.
-- Additionally, some upload types may require moderator approval prior
-- to being publicly listed, and this field has no bearing on that.
-- NB: DO NOT CHANGE THE ORDER OF THE ENUM VALUES DURING SCHEMA MIGRATIONS.
creator_set_visibility ENUM(
'public',
'hidden',
'private'
) NOT NULL DEFAULT 'public',
-- ========== JOB SYSTEM DETAILS ==========
-- Jobs begin as "pending", then transition to other states.
--
-- * Pending = job is ready to go
-- * Started = job is running
-- * Complete_Success = job is done (success)
-- * Complete_Failure = job is done (failure)
-- * Attempt_Failed = job failed but may retry.
-- * Dead = job failed permanently.
--
-- Pending -> Started -> Complete_Success
-- |-> Complete_Failure
-- \-> Attempt_Failed -> Started -> { Complete, Failed, Dead }
status ENUM(
'pending',
'started',
'complete_success',
'complete_failure',
'attempt_failed',
'dead') NOT NULL DEFAULT 'pending',
-- We can track this against a "max_attempt_count"
attempt_count INT(3) NOT NULL DEFAULT 0,
-- If there is a failure, tell the user why.
failure_reason VARCHAR(512) DEFAULT NULL,
created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-- Failed jobs will set a next attempt time.
-- Subsequent tries can increase the timeout.
-- Failures because of permissions require human intervention => [retry_at=null].
-- Failures because of invalid files are dead => [status=dead].
retry_at TIMESTAMP NULL,
-- INDICES --
PRIMARY KEY (id),
UNIQUE KEY (token),
UNIQUE KEY (uuid_idempotency_token),
KEY fk_on_download_type (download_type),
KEY fk_creator_user_token (creator_user_token),
KEY index_status (status),
KEY index_creator_ip_address (creator_ip_address)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
@@ -1,128 +0,0 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
CREATE TABLE vocoder_models (
-- Not used for anything except replication.
id BIGINT(20) NOT NULL AUTO_INCREMENT,
-- Effective "primary key" (PUBLIC)
token VARCHAR(32) NOT NULL,
-- The architecture of the vocoder.
-- Currently supported values: 'hifigan'
vocoder_type VARCHAR(32) NOT NULL,
-- ========== MUTABLE METADATA ==========
-- The "name" of the vocoder, which might be complicated.
title VARCHAR(255) NOT NULL,
-- The description of the model in markdown.
description_markdown TEXT NOT NULL,
-- Generated HTML (not user-editable).
description_rendered_html TEXT NOT NULL,
-- ========== MUTABLE MOD-ONLY METADATA ==========
-- Whether the vocoder is recommended for use
is_staff_recommended BOOLEAN NOT NULL DEFAULT FALSE,
-- ========== IMMUTABLE PROVENANCE AND METADATA ==========
-- Where the file was originally downloaded (if it was downloaded)
original_download_url VARCHAR(512) DEFAULT NULL,
-- The filename that was used at upload time (if available)
original_filename VARCHAR(255) DEFAULT NULL,
-- File characteristics
file_size_bytes INT(10) NOT NULL DEFAULT 0,
-- ========== CREATOR DETAILS ==========
-- The person that created the template.
creator_user_token VARCHAR(32) NOT NULL,
-- For abuse tracking.
-- Wide enough for IPv4/6
creator_ip_address_creation VARCHAR(40) NOT NULL,
creator_ip_address_last_update VARCHAR(40) NOT NULL,
-- (THIS MIGHT NOT BE USED)
-- NB: DO NOT SORT!
-- THIS MUST MATCH THE RESPECTIVE JOBS TABLE.
creator_set_visibility ENUM(
'public',
'hidden',
'private'
) NOT NULL DEFAULT 'public',
-- ========== BUCKET STORAGE ==========
-- The pytorch model
-- For now, this will be a hash of the file contents.
-- NB: NOT UNIQUE! We can allow duplicate uploads.
private_bucket_hash CHAR(64) NOT NULL,
-- The "full url" of the bucket path, not including the hostname
private_bucket_object_name VARCHAR(255) NOT NULL,
-- ========== MODERATION DETAILS ==========
-- Mods have locked the ability for non-authors (ie. people who didn't upload this)
-- to assign the vocoder for use with their TTS models.
-- TTS models that already incorporate the vocoder will not be affected.
-- The vocoder will remain visible.
-- This is independent of other visibility controls (is_mod_disabled_from_author_use,
-- deleted_at, and creator_set_visibility)
is_mod_disabled_from_public_use BOOLEAN NOT NULL DEFAULT FALSE,
-- Mods have locked the ability for the author (ie. the person that uploaded this)
-- to assign the vocoder for use with their TTS models.
-- TTS models that already incorporate the vocoder will not be affected.
-- The vocoder will remain visible.
-- This is independent of other visibility controls (is_mod_disabled_from_public_use,
-- deleted_at, and creator_set_visibility)
is_mod_disabled_from_author_use BOOLEAN NOT NULL DEFAULT FALSE,
-- Extremely popular models may be locked from deletion or modification by users.
-- If true, only moderators can edit or delete the vocoder.
is_mod_author_editing_locked BOOLEAN NOT NULL DEFAULT FALSE,
-- If a moderator has comments.
maybe_mod_comments VARCHAR(255) DEFAULT NULL,
-- The last moderator that made changes.
maybe_mod_user_token VARCHAR(32) DEFAULT NULL,
-- ========== VECTOR CLOCK ==========
-- Incremented with every update.
version INT NOT NULL DEFAULT 0,
-- ========== TIMESTAMPS ==========
created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-- If this is removed by a mod.
-- It completely disappears from the system.
user_deleted_at TIMESTAMP NULL,
mod_deleted_at TIMESTAMP NULL,
-- INDICES --
PRIMARY KEY (id),
UNIQUE KEY (token),
KEY fk_creator_user_token (creator_user_token),
KEY fk_maybe_mod_user_token (maybe_mod_user_token),
KEY index_creator_ip_address_creation (creator_ip_address_creation),
KEY index_creator_ip_address_last_update (creator_ip_address_last_update),
KEY index_creator_set_visibility (creator_set_visibility),
KEY index_private_bucket_hash (private_bucket_hash),
KEY index_is_mod_disabled_from_public_use (is_mod_disabled_from_public_use),
KEY index_is_mod_disabled_from_author_use (is_mod_disabled_from_author_use),
KEY index_is_mod_author_editing_locked (is_mod_author_editing_locked)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
@@ -1,124 +0,0 @@
-- NB: This is a manually squashed view of all the CREATE and ALTER statements,
-- with comments attached to the fields for centralized documentation.
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
CREATE TABLE tts_inference_jobs (
id BIGINT(20) NOT NULL AUTO_INCREMENT,
-- Effective "primary key" (PUBLIC)
-- This is so the in-progress results can be looked up by the UI.
token VARCHAR(32) NOT NULL,
-- Idempotency token from client
-- This is so the frontend client doesn't submit duplicate jobs.
uuid_idempotency_token VARCHAR(36) NOT NULL,
-- ========== SUCCESS CASE ==========
-- If the job completes successfully, this is the result token.
-- This is only populated on a successful result.
on_success_result_token VARCHAR(32) DEFAULT NULL,
-- ========== INFERENCE DETAILS ==========
-- The model to use.
-- This also determines which architecture we're using.
model_token VARCHAR(32) NOT NULL,
-- If set, use a different pretrained vocoder.
maybe_override_pretrained_vocoder VARCHAR(64) DEFAULT NULL,
-- The raw, unprocessed user input.
raw_inference_text TEXT NOT NULL,
-- ========== CREATOR DETAILS ==========
-- Foreign key to user
-- If no user is logged in, this is null.
maybe_creator_user_token VARCHAR(32) DEFAULT NULL,
-- Based on a cookie sent by the frontend.
-- We'll save this even if the user is logged in.
maybe_creator_anonymous_visitor_token VARCHAR(32) DEFAULT NULL,
-- For abuse tracking.
-- Wide enough for IPv4/6
creator_ip_address VARCHAR(40) NOT NULL,
-- (THIS MIGHT NOT BE USED)
-- NB: DO NOT SORT!
-- THIS MUST MATCH THE RESPECTIVE JOBS TABLE.
creator_set_visibility ENUM(
'public',
'hidden',
'private'
) NOT NULL DEFAULT 'public',
-- ========== SOURCE METADATA ==========
is_from_api BOOLEAN NOT NULL DEFAULT FALSE,
is_for_twitch BOOLEAN NOT NULL DEFAULT FALSE,
-- If true, the request gets routed to a special "debug" worker.
is_debug_request BOOLEAN NOT NULL DEFAULT FALSE,
-- ========== JOB SYSTEM DETAILS ==========
-- Jobs begin as "pending", then transition to other states.
--
-- * Pending = job is ready to go
-- * Started = job is running
-- * Complete_Success = job is done (success)
-- * Complete_Failure = job is done (failure)
-- * Attempt_Failed = job failed but may retry.
-- * Dead = job failed permanently.
--
-- Pending -> Started -> Complete_Success
-- |-> Complete_Failure
-- \-> Attempt_Failed -> Started -> { Complete, Failed, Dead }
status ENUM(
'pending',
'started',
'complete_success',
'complete_failure',
'attempt_failed',
'dead') NOT NULL DEFAULT 'pending',
-- Priority *increases*, so a level of 2 will be higher than 1.
-- These are the level semantics currently:
-- - All jobs from anonymous FakeYou users have level 0.
-- - All jobs from logged in FakeYou users have level 1.
-- - All jobs from Twitch TTS (unpaid) have level 10 (ten).
-- - (There will be future levels for paid Twitch and social FakeYou rewards.)
priority_level TINYINT UNSIGNED NOT NULL DEFAULT 0,
-- We can track this against a "max_attempt_count"
attempt_count INT(3) NOT NULL DEFAULT 0,
-- If there is a failure, tell the user why.
failure_reason VARCHAR(512) DEFAULT NULL,
created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-- Failed jobs will set a next attempt time.
-- Subsequent tries can increase the timeout.
-- Failures because of permissions require human intervention => [retry_at=null].
-- Failures because of invalid files are dead => [status=dead].
retry_at TIMESTAMP NULL,
-- INDICES --
PRIMARY KEY (id),
UNIQUE KEY (token),
UNIQUE KEY (uuid_idempotency_token),
KEY fk_on_success_result_token (on_success_result_token),
KEY fk_model_token (model_token),
KEY fk_maybe_creator_user_token (maybe_creator_user_token),
KEY index_status (status),
KEY index_creator_ip_address (creator_ip_address),
KEY index_is_debug_request (is_debug_request)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
@@ -1,217 +0,0 @@
-- NB: This is a manually squashed view of all the CREATE and ALTER statements,
-- with comments attached to the fields for centralized documentation.
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
CREATE TABLE tts_models (
-- Not used for anything except replication.
id BIGINT(20) NOT NULL AUTO_INCREMENT,
-- Effective "primary key" (PUBLIC)
token VARCHAR(32) NOT NULL,
-- NB: DO NOT CHANGE ORDER; APPEND ONLY!
-- THIS MUST MATCH THE RESPECTIVE JOBS TABLE.
tts_model_type ENUM(
'not-set',
'tacotron2',
'glowtts',
'glowtts-vocodes',
'talknet'
) NOT NULL DEFAULT 'not-set',
-- The name of the type of pipeline to use, eg "legacy_fakeyou", "legacy_vocodes", "english_v1", etc.
-- New pipelines may be added at any point in the future and the source of truth for them will mostly
-- live in the `storyteller-ml` repository.
-- Older models and brand new models will have this field set to null, and we'll infer which value to
-- lazily backfill based on the creation date and language setting.
text_pipeline_type VARCHAR(64) DEFAULT NULL,
-- For models distributed as archives/bundles (eg. TalkNet), we can pack
-- in a vocoder. Note that this vocoder does not have to be used.
has_self_contained_vocoder BOOLEAN NOT NULL DEFAULT FALSE,
-- For models distributed as archives/bundles (eg. TalkNet), we can pack
-- in a duration model.
has_self_contained_duration_model BOOLEAN NOT NULL DEFAULT FALSE,
-- For models distributed as archives/bundles (eg. TalkNet), we can pack
-- in a pitch model.
has_self_contained_pitch_model BOOLEAN NOT NULL DEFAULT FALSE,
-- NB(2022-07-05): THIS IS NOW MEANINGLESS AND SUPERSEDED BY `TEXT_PIPELINE_TYPE`.
-- NB: DO NOT CHANGE ORDER; APPEND ONLY!
-- How text should be handled.
text_preprocessing_algorithm ENUM(
'basic',
'arpabet'
) NOT NULL DEFAULT 'basic',
-- If set, use a different pretrained vocoder.
-- If not set, use the website default. (Currently HifiGan-SS)
maybe_default_pretrained_vocoder VARCHAR(64) DEFAULT NULL,
-- If set, we'll use a custom vocoder (from table vocoder_models) instead of a default vocoder.
-- If not set, we'll use `maybe_default_pretrained_vocoder` (or the website default).
maybe_custom_vocoder_token VARCHAR(32) DEFAULT NULL,
-- Optional Pointer to a newer version of the voice
-- If there's a newer version, we can disable this one.
-- maybe_updated_model_token VARCHAR(32) DEFAULT NULL,
-- We can set as a combination of ['username' + 'voice-name']
-- There can be public aliases for voices, eg. a voice's default model.
-- A user can change this.
-- As such, these should not be foreign keys.
-- updatable_slug VARCHAR(64) NOT NULL,
-- Can be linked to a well-known voice
-- maybe_subject_token VARCHAR(32) DEFAULT NULL,
-- maybe_actor_subject_token VARCHAR(32) DEFAULT NULL,
-- ========== UNSTRUCTURED METADATA ==========
-- The full IETF BCP47 language tag (eg. en, en-US, es-419, ja-JP, pt, etc.)
ietf_language_tag VARCHAR(64) NOT NULL DEFAULT 'en',
-- The IETF BCP47 language tag's primary language subtag (eg. "es-419" becomes "es")
ietf_primary_language_subtag VARCHAR(12) NOT NULL DEFAULT 'en',
-- The "name" of the voice model, which might be complicated.
-- If maybe_subject_token (etc.) is set, then it's authoritative instead.
title VARCHAR(255) NOT NULL,
-- The description of the model in markdown.
description_markdown TEXT NOT NULL,
-- Generated HTML (not user-editable).
description_rendered_html TEXT NOT NULL,
-- eg. Bill Clinton, Batman, or Goku.
voice_name VARCHAR(255) DEFAULT NULL,
-- Optional; eg. Sean Schemmel
actor_name VARCHAR(255) DEFAULT NULL,
-- Optional; eg. if the voice is "happy" or a singer "a-capella", etc.
characteristic VARCHAR(255) DEFAULT NULL,
-- Optional; eg. if you train the model more than once.
version_string VARCHAR(255) DEFAULT NULL,
-- Whether the voice features on the front of FakeYou or Storyteller Twitch TTS
is_front_page_featured BOOLEAN NOT NULL DEFAULT FALSE,
is_twitch_featured BOOLEAN NOT NULL DEFAULT FALSE,
-- A suggested bot command prefix, eg. 'sonic' that could be interpreted as '/sonic'
-- by a TTS system. These are unique strings that can only be applied to one model at
-- a time at most. Only moderators can set this, and it's only for the best voices.
maybe_suggested_unique_bot_command VARCHAR(255) DEFAULT NULL,
-- ========== IMMUTABLE PROVENANCE AND METADATA ==========
-- Where the file was originally downloaded (if it was downloaded)
original_download_url VARCHAR(512) DEFAULT NULL,
-- The filename that was used at upload time (if available)
original_filename VARCHAR(255) DEFAULT NULL,
-- File characteristics
file_size_bytes INT(10) NOT NULL DEFAULT 0,
-- ========== CREATOR DETAILS ==========
-- The person that created the template.
creator_user_token VARCHAR(32) NOT NULL,
-- For abuse tracking.
-- Wide enough for IPv4/6
creator_ip_address_creation VARCHAR(40) NOT NULL,
creator_ip_address_last_update VARCHAR(40) NOT NULL,
-- (THIS MIGHT NOT BE USED)
-- NB: DO NOT SORT!
-- THIS MUST MATCH THE RESPECTIVE JOBS TABLE.
creator_set_visibility ENUM(
'public',
'hidden',
'private'
) NOT NULL DEFAULT 'public',
-- ========== BUCKET STORAGE ==========
-- The pytorch model
-- For now, this will be a hash of the file contents.
-- NB: NOT UNIQUE! We can allow duplicate uploads.
private_bucket_hash CHAR(64) NOT NULL,
-- The "full url" version of the path
private_bucket_object_name VARCHAR(255) NOT NULL,
-- Whether the file is a zip archive (rather than a model file).
private_bucket_object_is_archive BOOLEAN NOT NULL DEFAULT FALSE,
-- ========== RATING AND RANKING ==========
-- Calculated average, on a scale of 0-100
-- Null with zero ratings.
-- calculated_average_score INT(3) DEFAULT NULL,
-- Other metrics
-- calculated_total_ratings_submitted_count INT(10) NOT NULL DEFAULT 0,
-- calculated_total_uses_count BIGINT(10) NOT NULL DEFAULT 0,
-- ========== MODERATION DETAILS ==========
-- Mods have to approve of tts models for them to show up in a public index.
-- Models can be used by the author (or other parties that know the URL) before
-- they're approved, but unapproved models won't show up in public indices.
-- This is independent of other visibility controls (is_mod_disabled, deleted_at,
-- and creator_set_visibility)
is_public_listing_approved BOOLEAN DEFAULT NULL,
-- Extremely popular models may be locked from deletion or modification by users.
is_locked_from_user_modification BOOLEAN NOT NULL DEFAULT FALSE,
-- In this case, a moderator disables it from being used for inference.
-- This also disables it for the creator.
-- Unlike deletion, it remains "visible" to those that have access.
is_locked_from_use BOOLEAN NOT NULL DEFAULT FALSE,
-- If a moderator has comments.
maybe_mod_comments VARCHAR(255) DEFAULT NULL,
-- The last moderator that made changes.
maybe_mod_user_token VARCHAR(32) DEFAULT NULL,
-- ========== VECTOR CLOCK ==========
-- Incremented with every update.
version INT NOT NULL DEFAULT 0,
-- ========== TIMESTAMPS ==========
created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-- If this is removed by a mod.
-- It completely disappears from the system.
user_deleted_at TIMESTAMP NULL,
mod_deleted_at TIMESTAMP NULL,
-- INDICES --
PRIMARY KEY (id),
UNIQUE KEY (token),
KEY fk_creator_user_token (creator_user_token),
KEY fk_maybe_mod_user_token (maybe_mod_user_token),
KEY fk_maybe_custom_vocoder_token (maybe_custom_vocoder_token),
KEY index_creator_ip_address_creation (creator_ip_address_creation),
KEY index_creator_ip_address_last_update (creator_ip_address_last_update),
KEY index_creator_set_visibility (creator_set_visibility),
KEY index_private_bucket_hash (private_bucket_hash),
KEY index_is_public_listing_approved (is_public_listing_approved),
KEY index_is_locked_from_user_modification (is_locked_from_user_modification),
KEY index_is_locked_from_use (is_locked_from_use)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
@@ -0,0 +1,43 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-- Select TTS models within a category
-- (NOTE CATEGORIES ARE *SOFT DELETED* AND THIS MAY MIS-ATTRIBUTE)
select
tts.token,
tts.ietf_language_tag,
tts.title
from tts_category_assignments as cat
join tts_models as tts
on tts.token = cat.model_token
where
cat.category_token = 'CAT:n06k9gfgq20';
-- Select TTS models within a category
select
tts.token,
tts.ietf_language_tag,
tts.title
from tts_category_assignments as cat
join tts_models as tts
on tts.token = cat.model_token
where
cat.category_token = 'CAT:jtdwpy6ptrn'
AND cat.deleted_at IS NULL;
-- Select TTS models within a category
-- Exclude given languages.
select
tts.token,
tts.ietf_language_tag,
tts.title
from tts_category_assignments as cat
join tts_models as tts
on tts.token = cat.model_token
where
cat.category_token = 'CAT:jtdwpy6ptrn'
AND tts.ietf_language_tag NOT IN ('es', 'es-419', 'es-ES', 'es-MX')
AND cat.deleted_at IS NULL;
+82
View File
@@ -0,0 +1,82 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-- Kill pending jobs
update tts_inference_jobs set status = 'dead' where status = 'pending';
-- Total pending jobs
select count(*)
from tts_inference_jobs
where status = 'pending';
-- Total pending API jobs
select count(*)
from tts_inference_jobs
where status = 'pending'
and is_from_api = true;
-- Top IP addresses making requests
select distinct creator_ip_address, count(*) as attempts
from tts_inference_jobs
where status = 'pending'
group by creator_ip_address
order by attempts desc
limit 50;
-- Top voices in requests
select distinct model_token, count(*) as attempts
from tts_inference_jobs
where status = 'pending'
group by model_token
order by attempts desc
limit 50;
-- Kill pending jobs
update tts_inference_jobs
set status = 'dead'
where status = 'pending';
-- Kill all waiting and in-progress jobs
update tts_inference_jobs
set status = 'dead'
where status IN ('pending', 'started', 'attempt_failed');
-- Sample the pending inference text
select creator_ip_address,
model_token,
maybe_creator_user_token,
raw_inference_text
from tts_inference_jobs
where status = 'pending';
-- Sample the pending inference text (truncated)
select creator_ip_address,
model_token,
maybe_creator_user_token,
TRIM(REPLACE(SUBSTRING(raw_inference_text, 1, 50), '\n', ''))
from tts_inference_jobs
where status = 'pending'
limit 100;
-- Sample long pending texts
select creator_ip_address,
model_token,
maybe_creator_user_token,
raw_inference_text
from tts_inference_jobs
where status = 'pending'
and length(raw_inference_text) > 100
limit 100;
-- Delete old TTS inference jobs (1)
DELETE FROM tts_inference_jobs
WHERE status IN ('dead', 'complete_success', 'complete_failure')
LIMIT 100000;
-- Delete old TTS inference jobs (2)
-- Roughly 20 seconds to delete 100k, 4 minutes for 1M.
DELETE FROM tts_inference_jobs
WHERE created_at < ( CURDATE() - INTERVAL 1 DAY )
LIMIT 100000;
+302
View File
@@ -0,0 +1,302 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
--
-- Top 100 models all time by use count
--
select
m.token,
m.text_pipeline_type,
m.ietf_language_tag,
m.title,
u.username,
r.use_count,
m.user_deleted_at,
m.mod_deleted_at,
m.created_at
from (
select model_token, count(*) as use_count
from tts_results
group by model_token
) as r
join tts_models as m
on m.token = r.model_token
join users as u
on u.token = m.creator_user_token
order by r.use_count desc
limit 100;
--
-- Same, but simpler...
--
select m.token, m.title, r.use_count from (
select model_token, count(*) as use_count from tts_results
group by model_token
order by use_count desc limit 100
) as r
join tts_models as m
on m.token = r.model_token;
--
-- Top 100 models by use count, last 5 days
-- Limited due to tmux scrollback.
--
select
m.token,
m.text_pipeline_type,
m.ietf_language_tag,
m.title,
u.username,
r.use_count,
m.created_at,
m.user_deleted_at,
m.mod_deleted_at
from (
select model_token, count(*) as use_count
from tts_results
where created_at > ( CURDATE() - INTERVAL 12 HOUR )
group by model_token
) as r
join tts_models as m
on m.token = r.model_token
join users as u
on u.token = m.creator_user_token
order by r.use_count desc
limit 25;
--
-- Top 20 ***NEW*** models to share in #announcements
-- Can be scoped by creator.
--
select
m.token,
m.text_pipeline_type,
m.ietf_language_tag,
m.title,
u.username,
r.use_count,
m.user_deleted_at,
m.mod_deleted_at,
m.created_at
from (
select model_token, count(*) as use_count
from tts_results
where created_at > ( CURDATE() - INTERVAL 5 DAY )
group by model_token
) as r
join tts_models as m
on m.token = r.model_token
join users as u
on u.token = m.creator_user_token
where m.created_at > ( CURDATE() - INTERVAL 31 DAY )
AND u.username IN ( 'vegito1089', 'justinjohn0306')
order by r.use_count desc
limit 100;
--
-- Top 100 models by use count, last 5 days, not spanish, etc.
-- Limited due to tmux scrollback.
--
select
m.token,
m.text_pipeline_type,
m.ietf_language_tag,
m.title,
u.username,
r.use_count,
m.user_deleted_at,
m.mod_deleted_at,
m.created_at
from (
select model_token, count(*) as use_count
from tts_results
where created_at > ( CURDATE() - INTERVAL 5 DAY )
group by model_token
) as r
join tts_models as m
on m.token = r.model_token
join users as u
on u.token = m.creator_user_token
where m.ietf_language_tag NOT IN ('es', 'es-419', 'es-ES', 'es-MX', 'pt-BR')
order by r.use_count desc
limit 100;
--
-- Top 100 models by use count, last 5 days, in specific language.
-- Limited due to tmux scrollback.
--
-- English: ('en', 'en-US', 'en-AU', 'en-CA', 'en-GB')
-- Spanish: ('es', 'es-419', 'es-AR', 'es-CL', 'es-CO', 'es-ES', 'es-MX', 'es-PE', 'es-US')
-- Italian: ('it', 'it-CH', 'it-IT')
-- Portuguese: ('pt', 'pt-BR')
--
select
m.token,
m.title,
m.text_pipeline_type,
m.ietf_language_tag,
u.username,
r.use_count,
m.user_deleted_at,
m.mod_deleted_at,
m.created_at
from (
select model_token, count(*) as use_count
from tts_results
where created_at > ( CURDATE() - INTERVAL 30 DAY )
group by model_token
) as r
join tts_models as m
on m.token = r.model_token
join users as u
on u.token = m.creator_user_token
where m.ietf_language_tag IN ('en', 'en-US', 'en-AU', 'en-CA', 'en-GB')
order by r.use_count desc
limit 100;
--
-- Most popular voices by use count over 5-day window, single language, single user.
--
select
m.token,
m.title,
m.ietf_language_tag,
u.username,
r.use_count,
m.user_deleted_at,
m.mod_deleted_at,
m.created_at
from (
select model_token, count(*) as use_count
from tts_results
where created_at > ( CURDATE() - INTERVAL 5 DAY )
group by model_token
) as r
join tts_models as m
on m.token = r.model_token
join users as u
on u.token = m.creator_user_token
where
m.ietf_language_tag NOT IN ('es', 'es-419', 'es-ES', 'es-MX', 'pt-BR')
AND u.username = 'vegito1089'
order by r.use_count desc
limit 100;
--
-- Most popular deleted models
--
select
m.token,
m.title,
m.ietf_language_tag,
u.username,
r.use_count,
m.user_deleted_at,
m.mod_deleted_at,
m.created_at
from (
select model_token, count(*) as use_count
from tts_results
where model_token IN (
select token
from tts_models
where
user_deleted_at IS NOT NULL
OR mod_deleted_at IS NOT NULL
)
group by model_token
) as r
join tts_models as m
on m.token = r.model_token
join users as u
on u.token = m.creator_user_token
order by r.use_count desc
limit 100;
--
-- Most popular deleted models (only by users, not mods)
-- Mod-deleted models were probably on purpose
--
select
m.token,
m.title,
m.ietf_language_tag,
u.username,
r.use_count,
m.user_deleted_at,
m.created_at
from (
select model_token, count(*) as use_count
from tts_results
where model_token IN (
select token
from tts_models
where
user_deleted_at IS NOT NULL
)
group by model_token
) as r
join tts_models as m
on m.token = r.model_token
join users as u
on u.token = m.creator_user_token
order by r.use_count desc
limit 100;
--
-- Models uploaded recently (to check if they use the right text_pipeline_type,
-- vocoder -todo-, etc.)
--
select
m.token,
m.title,
m.text_pipeline_type,
m.ietf_language_tag,
u.username,
r.use_count,
m.user_deleted_at,
m.mod_deleted_at,
m.created_at
from (
select model_token, count(*) as use_count
from tts_results
where created_at > ( CURDATE() - INTERVAL 5 DAY )
group by model_token
) as r
join tts_models as m
on m.token = r.model_token
join users as u
on u.token = m.creator_user_token
order by m.created_at desc
limit 100;
--
-- Models deleted recently (voice actor take down)
--
select
m.token,
m.title,
m.text_pipeline_type,
m.ietf_language_tag,
u.username,
r.use_count,
m.created_at,
m.user_deleted_at,
m.mod_deleted_at
from (
select model_token, count(*) as use_count
from tts_results
where created_at > ( CURDATE() - INTERVAL 30 DAY )
group by model_token
) as r
join tts_models as m
on m.token = r.model_token
join users as u
on u.token = m.creator_user_token
where m.mod_deleted_at > ( CURDATE() - INTERVAL 14 DAY )
or m.user_deleted_at > ( CURDATE() - INTERVAL 14 DAY )
order by r.use_count desc
limit 500;
+101
View File
@@ -0,0 +1,101 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
--
-- Usage count in the past 24 hours
--
select count(*) as use_count
from tts_results
where created_at > ( CURDATE() - INTERVAL 1 DAY )
--
-- Usage count in the past week
--
select count(*) as use_count
from tts_results
where created_at > ( CURDATE() - INTERVAL 7 DAY )
-- On-prem worker mix
select count(*) as use_count
from tts_results
where created_at > ( CURDATE() - INTERVAL 1 MINUTE )
and is_generated_on_prem IS TRUE
-- Calculate a percentage of on-prem worker capacity
select count(*) as on_prem_count
from (
select is_generated_on_prem
from tts_results
order by id desc limit 1000
) as sample
where sample.is_generated_on_prem IS TRUE;
-- Find TTS results for a single model
select count(*) from tts_results
where model_token = 'TM:ztt5s1be5tq6';
-- Find TTS results for a single model that are not deleted
select count(*) from tts_results
where model_token = 'TM:ztt5s1be5tq6'
and mod_deleted_at is NULL;
-- Sample results for a single model
select
TRIM(REPLACE(SUBSTRING(raw_inference_text, 1, 50), '\n', ''))
from tts_results
where model_token='TM:yt4gfbkngsjj'
order by id desc
limit 150;
-- Search for results by eminem
select
token,
created_at,
raw_inference_text
from tts_results
where
model_token IN ('TM:27fj0gsh11pd', 'TM:8h9bfjgabeer', 'TM:pdf9c1anbdjq')
AND raw_inference_text LIKE "%rave%"
AND raw_inference_text LIKE "%sound%"
AND created_at > ( CURDATE() - INTERVAL 5 MONTH )
ORDER BY created_at DESC
-- Delete TTS results for a single model
-- Do this in short batches so a lock isn't held for prohibitively long.
update tts_results
set mod_deleted_at = NOW()
where model_token = 'TM:ztt5s1be5tq6'
and mod_deleted_at IS NULL
limit 5000;
--- Search for particular text by a particular model
SELECT
raw_inference_text,
maybe_creator_user_token,
created_at
FROM
tts_results
WHERE
model_token = 'TM:ztt5s1be5tq6'
AND raw_inference_text LIKE '%fakeyou%'
---
-- WTF WHY IS THIS SLOW???
SELECT
res.id,
model.title,
res.raw_inference_text,
res.maybe_creator_user_token
FROM
tts_results AS res
JOIN
tts_models as model
ON
res.model_token = model.token
ORDER BY res.id
LIMIT 10;
@@ -0,0 +1,119 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-- TODO: Do an analysis of voice binned by # of paying customers that use it.
-- The most popular models amongst paying subscribers.
-- This should give us insight as to which models subscribers pay us for.
SELECT *
FROM (
SELECT
t.token,
t.title,
count(*) as use_count,
t.text_pipeline_type,
t.ietf_language_tag,
t.created_at,
t.user_deleted_at,
t.mod_deleted_at
FROM
tts_inference_jobs as j
JOIN
tts_models as t
ON
t.token = j.model_token
WHERE j.maybe_creator_user_token IN
(
select distinct user_token
from user_subscriptions
)
AND
j.created_at > ( CURDATE() - INTERVAL 1 DAY )
GROUP BY t.token
ORDER BY use_count DESC
) as x
WHERE
x.use_count > 10;
-- The first voice a paying customer uses
-- TODO: List *all* of the voices a paying customer uses before they subscribe, not just the first.
-- select first row of partially aggregate query: https://stackoverflow.com/a/73157541
SELECT *
FROM (
SELECT
t.token,
t.title,
count(*) as use_count,
t.text_pipeline_type,
t.ietf_language_tag,
t.created_at,
t.user_deleted_at,
t.mod_deleted_at
FROM tts_models AS t
JOIN
(
SELECT
model_token
FROM (
SELECT
model_token,
maybe_creator_user_token,
row_number() over(partition by maybe_creator_user_token order by id asc) as rownum
FROM
tts_inference_jobs
WHERE maybe_creator_user_token IN
(
select distinct user_token
from user_subscriptions
where created_at > (CURDATE() - INTERVAL 2 DAY)
)
) AS x
WHERE rownum = 1
ORDER BY model_token desc
) AS y
ON t.token = y.model_token
GROUP BY t.token
) AS z
ORDER BY use_count desc
-- The last voice a paying customer uses
-- select first row of partially aggregate query: https://stackoverflow.com/a/73157541
SELECT *
FROM (
SELECT
t.token,
t.title,
count(*) as use_count,
t.text_pipeline_type,
t.ietf_language_tag,
t.created_at,
t.user_deleted_at,
t.mod_deleted_at
FROM tts_models AS t
JOIN
(
SELECT
model_token
FROM (
SELECT
model_token,
maybe_creator_user_token,
row_number() over(partition by maybe_creator_user_token order by id desc) as rownum
FROM
tts_inference_jobs
WHERE maybe_creator_user_token IN
(
select distinct user_token
from user_subscriptions
)
) AS x
WHERE rownum = 1
ORDER BY model_token desc
) AS y
ON t.token = y.model_token
GROUP BY t.token
) AS z
ORDER BY use_count desc
@@ -0,0 +1,124 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-- Number of paid users (inaccurate)
select count(*) from users where maybe_stripe_customer_id IS NOT NULL;
-- Number of paid users (inaccurate)
select count(*) from user_subscriptions;
-- Number of paid users
-- NB: "active" status users are current, treating "past_due" as active too (for now)
select count(*) from user_subscriptions where maybe_stripe_subscription_status NOT IN ("canceled", "incomplete", "incomplete_expired");
-- ==================== TEXT TO SPEECH====================
-- All paid subscribers generating results in the last week
select u.username, count(*) as use_count
from users as u
join tts_inference_jobs as j
on u.token = j.maybe_creator_user_token
WHERE u.token IN (
select distinct user_token
from user_subscriptions
where maybe_stripe_subscription_status NOT IN ("canceled", "incomplete", "incomplete_expired")
)
AND j.created_at > NOW() - interval 7 day
GROUP BY u.username
ORDER BY use_count desc
-- Paid subscribers generating results in the last month (with # threshold)
select username, use_count
FROM (
select u.username, count(*) as use_count
from users as u
join tts_inference_jobs as j
on u.token = j.maybe_creator_user_token
WHERE u.token IN (
select distinct user_token
from user_subscriptions
where maybe_stripe_subscription_status NOT IN ("canceled", "incomplete", "incomplete_expired")
)
AND j.created_at > NOW() - interval 31 day
GROUP BY u.username
ORDER BY use_count desc
) as t
WHERE use_count > 10
-- Paid users generating results in the last month
select u.username, count(*) as use_count
from users as u
join tts_inference_jobs as j
on u.token = j.maybe_creator_user_token
WHERE u.token IN (
select distinct user_token
from user_subscriptions
where maybe_stripe_subscription_status NOT IN ("canceled", "incomplete", "incomplete_expired")
)
AND j.created_at > NOW() - interval 1 day
GROUP BY u.username
ORDER BY use_count desc
-- ==================== WAV2LIP ====================
select u.username, count(*) as use_count
from users as u
join w2l_inference_jobs as j
on u.token = j.maybe_creator_user_token
WHERE u.token IN (
select distinct user_token
from user_subscriptions
where maybe_stripe_subscription_status NOT IN ("canceled", "incomplete", "incomplete_expired")
)
AND j.created_at > NOW() - interval 31 day
GROUP BY u.username
ORDER BY use_count desc
select username, use_count
FROM (
select u.username, count(*) as use_count
from users as u
join w2l_inference_jobs as j
on u.token = j.maybe_creator_user_token
WHERE u.token IN (
select distinct user_token
from user_subscriptions
where maybe_stripe_subscription_status NOT IN ("canceled", "incomplete", "incomplete_expired")
)
AND j.created_at > NOW() - interval 31 day
GROUP BY u.username
ORDER BY use_count desc
) as t
WHERE use_count >=5;
-- ==================== TTS MODELS ====================
select u.username, count(*) as use_count
from users as u
join tts_model_upload_jobs as j
on u.token = j.creator_user_token
WHERE u.token IN (
select distinct user_token
from user_subscriptions
where maybe_stripe_subscription_status NOT IN ("canceled", "incomplete", "incomplete_expired")
)
AND j.created_at > NOW() - interval 1 day
GROUP BY u.username
ORDER BY use_count desc
-- ==================== W2L TEMPLATES ====================
select u.username, count(*) as use_count
from users as u
join w2l_template_upload_jobs as j
on u.token = j.creator_user_token
WHERE u.token IN (
select distinct user_token
from user_subscriptions
where maybe_stripe_subscription_status NOT IN ("canceled", "incomplete", "incomplete_expired")
)
AND j.created_at > NOW() - interval 1 day
GROUP BY u.username
ORDER BY use_count desc
@@ -0,0 +1,30 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-- NB: These are for use in Stripe Sigma, not MySQL
-- NB: You must use single quotes instead of double quotes when comparing string values.
-- Histogram of customers by country
select address_country, count(*)
from customers
group by address_country
select customer_id, subscriptions.status
from subscriptions
select distinct customer_id
from subscriptions
where subscriptions.status = 'active'
or subscriptions.status = 'past_due'
select address_country, count(*) as country_count
from customers
where id IN (
select distinct customer_id
from subscriptions
where subscriptions.status = 'active'
or subscriptions.status = 'past_due'
)
group by address_country
@@ -0,0 +1,44 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-- Top TTS model uploaders
select
u.id,
u.token,
u.username,
u.created_at,
u.maybe_stripe_customer_id,
u.maybe_loyalty_program_key,
m.upload_count
from users as u
join
(
select
count(*) as upload_count,
creator_user_token
from tts_models
group by creator_user_token
order by upload_count desc
) as m
on u.token = m.creator_user_token
where m.upload_count >= 5;
-- Upgrade top TTS model uploaders to a loyalty plan
update users
set maybe_loyalty_program_key = 'fakeyou_contributor'
where token IN (
select creator_user_token from
(
select count(*) as upload_count,
creator_user_token
from tts_models
group by creator_user_token
having upload_count >= 10
order by upload_count desc
) as t
);
@@ -0,0 +1,7 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-- Pending job count
select count(*) from w2l_inference_jobs where status='pending';
@@ -0,0 +1,28 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-- Get a count of pending jobs
select count(*) from w2l_template_upload_jobs where status='pending';
-- See pending download URLs:
select download_url from w2l_template_upload_jobs where status IN ('pending', 'started', 'attempt_failed');
-- See old jobs that might be stuck as "started"
select count(*)
from w2l_template_upload_jobs
where status='started'
and created_at < ( CURDATE() - INTERVAL 1 DAY );
-- Unstick old jobs that might be stuck as "started"
update w2l_template_upload_jobs
set status='dead'
where status='started'
and created_at < ( CURDATE() - INTERVAL 1 DAY );
-- Kill pending jobs with tiktok URLs:
-- These need to be blocked in the server and job directly.
update w2l_template_upload_jobs
set status='dead'
where status='pending'
and download_url LIKE '%tiktok%';
@@ -0,0 +1,238 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-- NB: See the "squashed" copy of this for better documentation
-- and the current state of the table.
CREATE TABLE users (
-- Not used for anything except replication.
id BIGINT(20) NOT NULL AUTO_INCREMENT,
-- Visible "primary key"
token VARCHAR(32) NOT NULL,
-- Username is a lookup key; display_name allows the user to add custom case.
username VARCHAR(20) NOT NULL,
display_name VARCHAR(20) NOT NULL,
email_address VARCHAR(255) NOT NULL,
email_confirmed BOOLEAN NOT NULL DEFAULT false,
-- The role assigned to the user confers permissions.
user_role_slug VARCHAR(16) NOT NULL,
-- ========== CREDENTIALS ==========
-- Bcrypt password hash. Granted, there are newer methods:
-- https://cheatsheetseries.owasp.org/cheatsheets/Password_Storage_Cheat_Sheet.html
-- Passwords may be a max of 64 characters per BCrypt.
password_hash BINARY(60) NOT NULL,
-- Incremented with every update to the password.
password_version INT NOT NULL DEFAULT 0,
-- ========== ABUSE TRACKING ==========
-- For abuse tracking.
-- Wide enough for IPv4/6
ip_address_creation VARCHAR(40) NOT NULL,
ip_address_last_login VARCHAR(40) NOT NULL,
ip_address_last_update VARCHAR(40) NOT NULL,
-- ========== DISPLAY / PROFILE ==========
-- Gravatar image hashes are precomputed.
email_gravatar_hash CHAR(32) NOT NULL,
-- The profile of the user in markdown (user editable).
profile_markdown TEXT NOT NULL,
-- Generated HTML (not user-editable).
profile_rendered_html TEXT NOT NULL,
-- An uploaded avatar. Public hash in our bucket.
-- avatar_public_bucket_hash CHAR(32) DEFAULT NULL,
-- ========== SOCIAL MEDIA ==========
-- Social media usernames
-- These are not confirmed. We'll need to build an OAuth system to handle that.
discord_username VARCHAR(36) DEFAULT NULL,
twitter_username VARCHAR(36) DEFAULT NULL,
twitch_username VARCHAR(36) DEFAULT NULL,
patreon_username VARCHAR(36) DEFAULT NULL,
github_username VARCHAR(36) DEFAULT NULL,
cashapp_username VARCHAR(36) DEFAULT NULL,
website_url VARCHAR(255) DEFAULT NULL,
-- ========== USER PREFERENCES ==========
-- If the user doesn't want to use gravatar and doesn't have an uploaded avatar.
disable_gravatar BOOLEAN NOT NULL DEFAULT false,
-- (THIS MIGHT NOT BE USED)
-- NB: DO NOT SORT!
-- THIS MUST MATCH THE RESPECTIVE JOBS TABLE.
-- Visibility preference used at TTS inference time (which can be changed on the result itself).
-- Moderators will still see them.
preferred_tts_result_visibility ENUM(
'public',
'hidden',
'private'
) NOT NULL DEFAULT 'public',
-- (THIS MIGHT NOT BE USED)
-- NB: DO NOT SORT!
-- THIS MUST MATCH THE RESPECTIVE JOBS TABLE.
-- Visibility preference used at TTS inference time (which can be changed on the result itself).
-- Moderators will still see them.
preferred_w2l_result_visibility ENUM(
'public',
'hidden',
'private'
) NOT NULL DEFAULT 'public',
-- Auto play preferences
-- Tri-state because we want to potentially change the default behavior.
auto_play_audio_preference BOOLEAN DEFAULT NULL,
auto_play_video_preference BOOLEAN DEFAULT NULL,
-- Favorite TTS voice to use by default
-- maybe_preferred_tts_model_token VARCHAR(32) DEFAULT NULL,
-- Favorite W2L model to use by default
-- maybe_preferred_w2l_template_token VARCHAR(32) DEFAULT NULL,
-- Settings
-- DO NOT REORDER.
-- dark_mode_preference ENUM(
-- 'light-mode',
-- 'dark-mode',
-- 'use-clock'
-- ) NOT NULL DEFAULT 'light-mode',
-- ========== STATS ==========
-- For tracking stats.
-- The "cached" values are updated by a background job.
-- cached_tts_rendered_counter INT(10) NOT NULL DEFAULT 0,
-- cached_w2l_rendered_counter INT(10) NOT NULL DEFAULT 0,
-- ========== MODERATION DETAILS ==========
-- Different than deleted.
-- Users still show up, but can't do anything.
is_banned BOOLEAN NOT NULL DEFAULT false,
-- If a moderator has comments.
maybe_mod_comments VARCHAR(255) DEFAULT NULL,
-- The last moderator that made changes.
maybe_mod_user_token VARCHAR(32) DEFAULT NULL,
-- ========== VECTOR CLOCK ==========
-- Incremented with every update.
version INT NOT NULL DEFAULT 0,
-- ========== TIMESTAMPS ==========
created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-- If the user is deleted, we set this.
-- This is different than banned. These users won't show up at all.
user_deleted_at TIMESTAMP NULL,
mod_deleted_at TIMESTAMP NULL,
-- INDICES --
PRIMARY KEY (id),
UNIQUE KEY (token),
UNIQUE KEY (username),
UNIQUE KEY (email_address),
KEY fk_user_role_slug (user_role_slug)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
CREATE TABLE user_roles (
-- Not used for anything except replication.
id BIGINT(20) NOT NULL AUTO_INCREMENT,
-- Effective "primary key"
slug CHAR(16) NOT NULL,
name VARCHAR(255) NOT NULL,
-- Usage
can_use_tts BOOLEAN NOT NULL DEFAULT FALSE,
can_use_w2l BOOLEAN NOT NULL DEFAULT FALSE,
can_delete_own_tts_results BOOLEAN NOT NULL DEFAULT FALSE,
can_delete_own_w2l_results BOOLEAN NOT NULL DEFAULT FALSE,
can_delete_own_account BOOLEAN NOT NULL DEFAULT FALSE,
-- Contribution
can_upload_tts_models BOOLEAN NOT NULL DEFAULT FALSE,
can_upload_w2l_templates BOOLEAN NOT NULL DEFAULT FALSE,
can_delete_own_tts_models BOOLEAN NOT NULL DEFAULT FALSE,
can_delete_own_w2l_templates BOOLEAN NOT NULL DEFAULT FALSE,
-- Moderation
can_approve_w2l_templates BOOLEAN NOT NULL DEFAULT FALSE,
-- Edit includes "lock_from_use" and "lock_from_modification"
can_edit_other_users_profiles BOOLEAN NOT NULL DEFAULT FALSE,
can_edit_other_users_tts_models BOOLEAN NOT NULL DEFAULT FALSE,
can_edit_other_users_w2l_templates BOOLEAN NOT NULL DEFAULT FALSE,
can_delete_other_users_tts_models BOOLEAN NOT NULL DEFAULT FALSE,
can_delete_other_users_tts_results BOOLEAN NOT NULL DEFAULT FALSE,
can_delete_other_users_w2l_templates BOOLEAN NOT NULL DEFAULT FALSE,
can_delete_other_users_w2l_results BOOLEAN NOT NULL DEFAULT FALSE,
can_ban_users BOOLEAN NOT NULL DEFAULT FALSE,
can_delete_users BOOLEAN NOT NULL DEFAULT FALSE,
-- Incremented with every update.
version INT NOT NULL DEFAULT 0,
created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-- INDICES --
PRIMARY KEY (id),
UNIQUE KEY (slug)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
CREATE TABLE user_sessions (
-- Not used for anything except replication.
id BIGINT(20) NOT NULL AUTO_INCREMENT,
-- Session entropy
token VARCHAR(32) NOT NULL,
-- Foreign key to user
user_token VARCHAR(32) NOT NULL,
-- Track each session's creation IP.
-- Wide enough for IPv4/6
ip_address_creation VARCHAR(40) NOT NULL,
created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-- Session termination time.
-- This must be set by the server code, or the session is invalid
expires_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-- deletion = session termination
-- Typically these are destroyed by users, but if in the future we allow mods to
-- delete them, it doesn't really matter who did the deletion: sessions are not
-- designed to be recoverable.
deleted_at TIMESTAMP NULL,
-- INDICES --
PRIMARY KEY (id),
UNIQUE KEY (token),
KEY fk_user_token (user_token),
KEY index_ip_address_creation (ip_address_creation)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;

Some files were not shown because too many files have changed in this diff Show More