Merge branch 'feature/weights_endpoints' of https://github.com/storytold/storyteller-rust into feature/weights_endpoints

Save TTS results as media files

.sqlx/query-0d780caac7560f84efb50bd2ed876cbdd728b32e26b73dfbb3009ada12985405.json

@@ -1,12 +1,12 @@
 {
   "db_name": "MySQL",
-  "query": "\nINSERT INTO generic_inference_jobs\nSET\n  token = ?,\n  uuid_idempotency_token = ?,\n\n  inference_category = ?,\n  maybe_model_type = ?,\n  maybe_model_token = ?,\n\n  maybe_input_source_token = ?,\n  maybe_input_source_token_type = ?,\n\n  maybe_raw_inference_text = ?,\n\n  maybe_inference_args = ?,\n\n  maybe_creator_user_token = ?,\n  maybe_creator_anonymous_visitor_token = ?,\n  creator_ip_address = ?,\n\n  creator_set_visibility = ?,\n\n  priority_level = ?,\n  is_keepalive_required = ?,\n\n  is_debug_request = ?,\n  maybe_routing_tag = ?,\n\n  status = \"pending\"\n        ",
+  "query": "\nINSERT INTO generic_inference_jobs\nSET\n  token = ?,\n  uuid_idempotency_token = ?,\n\n  inference_category = ?,\n  maybe_model_type = ?,\n  maybe_model_token = ?,\n\n  maybe_input_source_token = ?,\n  maybe_input_source_token_type = ?,\n\n  maybe_raw_inference_text = ?,\n\n  maybe_inference_args = ?,\n\n  maybe_creator_user_token = ?,\n  maybe_creator_anonymous_visitor_token = ?,\n  creator_ip_address = ?,\n\n  creator_set_visibility = ?,\n\n  priority_level = ?,\n  is_keepalive_required = ?,\n  max_duration_seconds = ?,\n\n  is_debug_request = ?,\n  maybe_routing_tag = ?,\n\n  status = \"pending\"\n        ",
   "describe": {
     "columns": [],
     "parameters": {
-      "Right": 17
+      "Right": 18
     },
     "nullable": []
   },
-  "hash": "b1750559783bcd55b2ae139372a4782ae363787a840a32f5c17c8408dbf15bc7"
+  "hash": "0d780caac7560f84efb50bd2ed876cbdd728b32e26b73dfbb3009ada12985405"
 }

.sqlx/query-274cfb1e3caca706e3dbc3d95064e0f4b354c936f8de948070854920f265cc41.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "MySQL",
+  "query": "\n        INSERT INTO model_weights\n        SET\n          token = ?,\n          weights_type = ?,\n          weights_category = ?,\n          title = ?,\n          maybe_thumbnail_token = ?,\n          description_markdown = ?,\n          description_rendered_html = ?,\n          creator_user_token = ?,\n          creator_ip_address = ?,\n          creator_set_visibility = ?,\n          maybe_last_update_user_token = ?,\n          original_download_url = ?,\n          original_filename = ?,\n          file_size_bytes = ?,\n          file_checksum_sha2 = ?,\n          private_bucket_hash = ?,\n          maybe_private_bucket_prefix = ?,\n          maybe_private_bucket_extension = ?,\n          cached_user_ratings_total_count = ?,\n          cached_user_ratings_positive_count = ?,\n          cached_user_ratings_negative_count = ?,\n          maybe_cached_user_ratings_ratio = ?,\n          version = ?\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 23
+    },
+    "nullable": []
+  },
+  "hash": "274cfb1e3caca706e3dbc3d95064e0f4b354c936f8de948070854920f265cc41"
+}

.sqlx/query-3d586592422727dcc928574966bdf5081ac69fdbb856fffcbd68187fd99c4642.json

@@ -0,0 +1,355 @@
+{
+  "db_name": "MySQL",
+  "query": "\n            SELECT              \n                mw.token as `token: tokens::tokens::model_weights::ModelWeightToken`,\n                mw.title,\n                mw.weights_type as `weights_type: enums::by_table::model_weights::weights_types::WeightsType`,\n                mw.weights_category as `weights_category: enums::by_table::model_weights::weights_category::WeightsCategory`,\n                mw.maybe_thumbnail_token,\n                mw.description_markdown,\n                mw.description_rendered_html,\n                users.token as `creator_user_token: tokens::tokens::users::UserToken`,\n                users.username as creator_username,\n                users.display_name as creator_display_name,\n                users.email_gravatar_hash as creator_email_gravatar_hash,\n                mw.creator_ip_address,\n                mw.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n                mw.maybe_last_update_user_token as `maybe_last_update_user_token: tokens::tokens::users::UserToken`,\n                mw.original_download_url,\n                mw.original_filename,\n                mw.file_size_bytes,\n                mw.file_checksum_sha2,\n                mw.private_bucket_hash,\n                mw.maybe_private_bucket_prefix,\n                mw.maybe_private_bucket_extension,\n                mw.cached_user_ratings_negative_count,\n                mw.cached_user_ratings_positive_count,\n                mw.cached_user_ratings_total_count,\n                mw.maybe_cached_user_ratings_ratio,\n                mw.cached_user_ratings_last_updated_at,\n                mw.version,\n                mw.created_at,\n                mw.updated_at,\n                mw.user_deleted_at,\n                mw.mod_deleted_at\n            FROM model_weights as mw\n            JOIN users\n                ON users.token = mw.creator_user_token\n            WHERE\n                users.username = ?\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "token: tokens::tokens::model_weights::ModelWeightToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 1,
+        "name": "title",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 1020
+        }
+      },
+      {
+        "ordinal": 2,
+        "name": "weights_type: enums::by_table::model_weights::weights_types::WeightsType",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 3,
+        "name": "weights_category: enums::by_table::model_weights::weights_category::WeightsCategory",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 4,
+        "name": "maybe_thumbnail_token",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 5,
+        "name": "description_markdown",
+        "type_info": {
+          "type": "Blob",
+          "flags": "NOT_NULL | BLOB | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 262140
+        }
+      },
+      {
+        "ordinal": 6,
+        "name": "description_rendered_html",
+        "type_info": {
+          "type": "Blob",
+          "flags": "NOT_NULL | BLOB | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 262140
+        }
+      },
+      {
+        "ordinal": 7,
+        "name": "creator_user_token: tokens::tokens::users::UserToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 8,
+        "name": "creator_username",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 80
+        }
+      },
+      {
+        "ordinal": 9,
+        "name": "creator_display_name",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 80
+        }
+      },
+      {
+        "ordinal": 10,
+        "name": "creator_email_gravatar_hash",
+        "type_info": {
+          "type": "String",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 11,
+        "name": "creator_ip_address",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 160
+        }
+      },
+      {
+        "ordinal": 12,
+        "name": "creator_set_visibility: enums::common::visibility::Visibility",
+        "type_info": {
+          "type": "String",
+          "flags": "NOT_NULL | BINARY | ENUM",
+          "char_set": 224,
+          "max_size": 28
+        }
+      },
+      {
+        "ordinal": 13,
+        "name": "maybe_last_update_user_token: tokens::tokens::users::UserToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 14,
+        "name": "original_download_url",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 2048
+        }
+      },
+      {
+        "ordinal": 15,
+        "name": "original_filename",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 1020
+        }
+      },
+      {
+        "ordinal": 16,
+        "name": "file_size_bytes",
+        "type_info": {
+          "type": "Long",
+          "flags": "NOT_NULL",
+          "char_set": 63,
+          "max_size": 10
+        }
+      },
+      {
+        "ordinal": 17,
+        "name": "file_checksum_sha2",
+        "type_info": {
+          "type": "String",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 256
+        }
+      },
+      {
+        "ordinal": 18,
+        "name": "private_bucket_hash",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 19,
+        "name": "maybe_private_bucket_prefix",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 64
+        }
+      },
+      {
+        "ordinal": 20,
+        "name": "maybe_private_bucket_extension",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 64
+        }
+      },
+      {
+        "ordinal": 21,
+        "name": "cached_user_ratings_negative_count",
+        "type_info": {
+          "type": "Long",
+          "flags": "NOT_NULL | UNSIGNED",
+          "char_set": 63,
+          "max_size": 10
+        }
+      },
+      {
+        "ordinal": 22,
+        "name": "cached_user_ratings_positive_count",
+        "type_info": {
+          "type": "Long",
+          "flags": "NOT_NULL | UNSIGNED",
+          "char_set": 63,
+          "max_size": 10
+        }
+      },
+      {
+        "ordinal": 23,
+        "name": "cached_user_ratings_total_count",
+        "type_info": {
+          "type": "Long",
+          "flags": "NOT_NULL | UNSIGNED",
+          "char_set": 63,
+          "max_size": 10
+        }
+      },
+      {
+        "ordinal": 24,
+        "name": "maybe_cached_user_ratings_ratio",
+        "type_info": {
+          "type": "Float",
+          "flags": "",
+          "char_set": 63,
+          "max_size": 12
+        }
+      },
+      {
+        "ordinal": 25,
+        "name": "cached_user_ratings_last_updated_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | BINARY | TIMESTAMP",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 26,
+        "name": "version",
+        "type_info": {
+          "type": "Long",
+          "flags": "NOT_NULL",
+          "char_set": 63,
+          "max_size": 11
+        }
+      },
+      {
+        "ordinal": 27,
+        "name": "created_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | BINARY | TIMESTAMP",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 28,
+        "name": "updated_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | BINARY | TIMESTAMP | ON_UPDATE_NOW",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 29,
+        "name": "user_deleted_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "BINARY",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 30,
+        "name": "mod_deleted_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "BINARY",
+          "char_set": 63,
+          "max_size": 19
+        }
+      }
+    ],
+    "parameters": {
+      "Right": 1
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      true,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      true,
+      true,
+      true,
+      false,
+      false,
+      false,
+      true,
+      true,
+      false,
+      false,
+      false,
+      true,
+      false,
+      false,
+      false,
+      false,
+      true,
+      true
+    ]
+  },
+  "hash": "3d586592422727dcc928574966bdf5081ac69fdbb856fffcbd68187fd99c4642"
+}

.sqlx/query-3dfc7f22c16543116c4ca17f5bee0336f5cfa1522681ba1bb6b1874cd8f13297.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "MySQL",
+  "query": "\nUPDATE model_weights\nSET\n  mod_deleted_at = NULL\nWHERE\n  token = ?\nLIMIT 1\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 1
+    },
+    "nullable": []
+  },
+  "hash": "3dfc7f22c16543116c4ca17f5bee0336f5cfa1522681ba1bb6b1874cd8f13297"
+}

.sqlx/query-4ed42766cc0ca2234b7bc1837d645d05198d483564b39a2a8b8034df25e287a4.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "MySQL",
+  "query": "\n        UPDATE model_weights\n        SET\n            title = ?,\n            description_markdown = ?,\n            maybe_thumbnail_token = ?,\n            description_rendered_html = ?,\n            creator_set_visibility = ?,\n            version = version + 1\n        WHERE token = ?\n        LIMIT 1\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 6
+    },
+    "nullable": []
+  },
+  "hash": "4ed42766cc0ca2234b7bc1837d645d05198d483564b39a2a8b8034df25e287a4"
+}

.sqlx/query-6a94791c8a8f66ee54bb367a4e8c71106bbcbbb205f54c14e3657279e83dabb6.json

@@ -0,0 +1,322 @@
+{
+  "db_name": "MySQL",
+  "query": "\n        SELECT\n        wt.token as `token: tokens::tokens::model_weights::ModelWeightToken`,\n        wt.title,\n        wt.weights_type as `weights_type: enums::by_table::model_weights::weights_types::WeightsType`,\n        wt.weights_category as `weights_category: enums::by_table::model_weights::weights_category::WeightsCategory`,\n        wt.maybe_thumbnail_token,\n        wt.description_markdown,\n        wt.description_rendered_html,\n        wt.creator_user_token as `creator_user_token: tokens::tokens::users::UserToken`,\n        wt.creator_ip_address,\n        wt.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n        wt.maybe_last_update_user_token as `maybe_last_update_user_token: tokens::tokens::users::UserToken`,\n        wt.original_download_url,\n        wt.original_filename,\n        wt.file_size_bytes,\n        wt.file_checksum_sha2,\n        wt.private_bucket_hash,\n        wt.maybe_private_bucket_prefix,\n        wt.maybe_private_bucket_extension,\n        wt.cached_user_ratings_negative_count,\n        wt.cached_user_ratings_positive_count,\n        wt.cached_user_ratings_total_count,\n        wt.maybe_cached_user_ratings_ratio,\n        wt.cached_user_ratings_last_updated_at,\n        wt.version,\n        wt.created_at,\n        wt.updated_at,\n        wt.user_deleted_at,\n        wt.mod_deleted_at\n        FROM model_weights as wt\n        WHERE\n            wt.token = ?\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "token: tokens::tokens::model_weights::ModelWeightToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 1,
+        "name": "title",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 1020
+        }
+      },
+      {
+        "ordinal": 2,
+        "name": "weights_type: enums::by_table::model_weights::weights_types::WeightsType",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 3,
+        "name": "weights_category: enums::by_table::model_weights::weights_category::WeightsCategory",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 4,
+        "name": "maybe_thumbnail_token",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 5,
+        "name": "description_markdown",
+        "type_info": {
+          "type": "Blob",
+          "flags": "NOT_NULL | BLOB | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 262140
+        }
+      },
+      {
+        "ordinal": 6,
+        "name": "description_rendered_html",
+        "type_info": {
+          "type": "Blob",
+          "flags": "NOT_NULL | BLOB | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 262140
+        }
+      },
+      {
+        "ordinal": 7,
+        "name": "creator_user_token: tokens::tokens::users::UserToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 8,
+        "name": "creator_ip_address",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 160
+        }
+      },
+      {
+        "ordinal": 9,
+        "name": "creator_set_visibility: enums::common::visibility::Visibility",
+        "type_info": {
+          "type": "String",
+          "flags": "NOT_NULL | BINARY | ENUM",
+          "char_set": 224,
+          "max_size": 28
+        }
+      },
+      {
+        "ordinal": 10,
+        "name": "maybe_last_update_user_token: tokens::tokens::users::UserToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 11,
+        "name": "original_download_url",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 2048
+        }
+      },
+      {
+        "ordinal": 12,
+        "name": "original_filename",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 1020
+        }
+      },
+      {
+        "ordinal": 13,
+        "name": "file_size_bytes",
+        "type_info": {
+          "type": "Long",
+          "flags": "NOT_NULL",
+          "char_set": 63,
+          "max_size": 10
+        }
+      },
+      {
+        "ordinal": 14,
+        "name": "file_checksum_sha2",
+        "type_info": {
+          "type": "String",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 256
+        }
+      },
+      {
+        "ordinal": 15,
+        "name": "private_bucket_hash",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 16,
+        "name": "maybe_private_bucket_prefix",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 64
+        }
+      },
+      {
+        "ordinal": 17,
+        "name": "maybe_private_bucket_extension",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 64
+        }
+      },
+      {
+        "ordinal": 18,
+        "name": "cached_user_ratings_negative_count",
+        "type_info": {
+          "type": "Long",
+          "flags": "NOT_NULL | UNSIGNED",
+          "char_set": 63,
+          "max_size": 10
+        }
+      },
+      {
+        "ordinal": 19,
+        "name": "cached_user_ratings_positive_count",
+        "type_info": {
+          "type": "Long",
+          "flags": "NOT_NULL | UNSIGNED",
+          "char_set": 63,
+          "max_size": 10
+        }
+      },
+      {
+        "ordinal": 20,
+        "name": "cached_user_ratings_total_count",
+        "type_info": {
+          "type": "Long",
+          "flags": "NOT_NULL | UNSIGNED",
+          "char_set": 63,
+          "max_size": 10
+        }
+      },
+      {
+        "ordinal": 21,
+        "name": "maybe_cached_user_ratings_ratio",
+        "type_info": {
+          "type": "Float",
+          "flags": "",
+          "char_set": 63,
+          "max_size": 12
+        }
+      },
+      {
+        "ordinal": 22,
+        "name": "cached_user_ratings_last_updated_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | BINARY | TIMESTAMP",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 23,
+        "name": "version",
+        "type_info": {
+          "type": "Long",
+          "flags": "NOT_NULL",
+          "char_set": 63,
+          "max_size": 11
+        }
+      },
+      {
+        "ordinal": 24,
+        "name": "created_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | BINARY | TIMESTAMP",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 25,
+        "name": "updated_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | BINARY | TIMESTAMP | ON_UPDATE_NOW",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 26,
+        "name": "user_deleted_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "BINARY",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 27,
+        "name": "mod_deleted_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "BINARY",
+          "char_set": 63,
+          "max_size": 19
+        }
+      }
+    ],
+    "parameters": {
+      "Right": 1
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      true,
+      false,
+      false,
+      false,
+      false,
+      false,
+      true,
+      true,
+      true,
+      false,
+      false,
+      false,
+      true,
+      true,
+      false,
+      false,
+      false,
+      true,
+      false,
+      false,
+      false,
+      false,
+      true,
+      true
+    ]
+  },
+  "hash": "6a94791c8a8f66ee54bb367a4e8c71106bbcbbb205f54c14e3657279e83dabb6"
+}

.sqlx/query-7487c997706788c670a76da81ce90532b9748c8afcc707436d1f04ed976ce30e.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "MySQL",
+  "query": "\nUPDATE model_weights\nSET\n  user_deleted_at = CURRENT_TIMESTAMP\nWHERE\n  token = ?\nLIMIT 1\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 1
+    },
+    "nullable": []
+  },
+  "hash": "7487c997706788c670a76da81ce90532b9748c8afcc707436d1f04ed976ce30e"
+}

.sqlx/query-7dbfbb21d502aad7859016fd287c57010296011928cf21b036a8dc57f1ef619d.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "MySQL",
+  "query": "\nUPDATE model_weights\nSET\n  user_deleted_at = NULL\nWHERE\n  token = ?\nLIMIT 1\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 1
+    },
+    "nullable": []
+  },
+  "hash": "7dbfbb21d502aad7859016fd287c57010296011928cf21b036a8dc57f1ef619d"
+}

.sqlx/query-9d2c8d49cf9840a547230e5c6febc041f39cd069bcb7a4a94ffb4f1cb3be6d7c.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "MySQL",
+  "query": "\nUPDATE model_weights\nSET\n  mod_deleted_at = CURRENT_TIMESTAMP\nWHERE\n  token = ?\nLIMIT 1\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 1
+    },
+    "nullable": []
+  },
+  "hash": "9d2c8d49cf9840a547230e5c6febc041f39cd069bcb7a4a94ffb4f1cb3be6d7c"
+}

.sqlx/query-a6ed8524fb5339fed17bec6611f8f56b6bdee35bac63c9eacbe21eb032a6a831.json

@@ -0,0 +1,355 @@
+{
+  "db_name": "MySQL",
+  "query": "\n            SELECT\n                mw.token as `token: tokens::tokens::model_weights::ModelWeightToken`,\n                mw.title,\n                mw.weights_type as `weights_type: enums::by_table::model_weights::weights_types::WeightsType`,\n                mw.weights_category as `weights_category: enums::by_table::model_weights::weights_category::WeightsCategory`,\n                mw.maybe_thumbnail_token,\n                mw.description_markdown,\n                mw.description_rendered_html,\n                users.token as `creator_user_token: tokens::tokens::users::UserToken`,\n                users.username as creator_username,\n                users.display_name as creator_display_name,\n                users.email_gravatar_hash as creator_email_gravatar_hash,\n                mw.creator_ip_address,\n                mw.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n                mw.maybe_last_update_user_token as `maybe_last_update_user_token: tokens::tokens::users::UserToken`,\n                mw.original_download_url,\n                mw.original_filename,\n                mw.file_size_bytes,\n                mw.file_checksum_sha2,\n                mw.private_bucket_hash,\n                mw.maybe_private_bucket_prefix,\n                mw.maybe_private_bucket_extension,\n                mw.cached_user_ratings_negative_count,\n                mw.cached_user_ratings_positive_count,\n                mw.cached_user_ratings_total_count,\n                mw.maybe_cached_user_ratings_ratio,\n                mw.cached_user_ratings_last_updated_at,\n                mw.version,\n                mw.created_at,\n                mw.updated_at,\n                mw.user_deleted_at,\n                mw.mod_deleted_at\n            FROM model_weights as mw\n            JOIN users\n                ON users.token = mw.creator_user_token\n            WHERE\n                users.username = ?\n                AND mw.user_deleted_at IS NULL\n                AND mw.mod_deleted_at IS NULL\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "token: tokens::tokens::model_weights::ModelWeightToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 1,
+        "name": "title",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 1020
+        }
+      },
+      {
+        "ordinal": 2,
+        "name": "weights_type: enums::by_table::model_weights::weights_types::WeightsType",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 3,
+        "name": "weights_category: enums::by_table::model_weights::weights_category::WeightsCategory",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 4,
+        "name": "maybe_thumbnail_token",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 5,
+        "name": "description_markdown",
+        "type_info": {
+          "type": "Blob",
+          "flags": "NOT_NULL | BLOB | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 262140
+        }
+      },
+      {
+        "ordinal": 6,
+        "name": "description_rendered_html",
+        "type_info": {
+          "type": "Blob",
+          "flags": "NOT_NULL | BLOB | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 262140
+        }
+      },
+      {
+        "ordinal": 7,
+        "name": "creator_user_token: tokens::tokens::users::UserToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 8,
+        "name": "creator_username",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 80
+        }
+      },
+      {
+        "ordinal": 9,
+        "name": "creator_display_name",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 80
+        }
+      },
+      {
+        "ordinal": 10,
+        "name": "creator_email_gravatar_hash",
+        "type_info": {
+          "type": "String",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 11,
+        "name": "creator_ip_address",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 160
+        }
+      },
+      {
+        "ordinal": 12,
+        "name": "creator_set_visibility: enums::common::visibility::Visibility",
+        "type_info": {
+          "type": "String",
+          "flags": "NOT_NULL | BINARY | ENUM",
+          "char_set": 224,
+          "max_size": 28
+        }
+      },
+      {
+        "ordinal": 13,
+        "name": "maybe_last_update_user_token: tokens::tokens::users::UserToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 14,
+        "name": "original_download_url",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 2048
+        }
+      },
+      {
+        "ordinal": 15,
+        "name": "original_filename",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 1020
+        }
+      },
+      {
+        "ordinal": 16,
+        "name": "file_size_bytes",
+        "type_info": {
+          "type": "Long",
+          "flags": "NOT_NULL",
+          "char_set": 63,
+          "max_size": 10
+        }
+      },
+      {
+        "ordinal": 17,
+        "name": "file_checksum_sha2",
+        "type_info": {
+          "type": "String",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 256
+        }
+      },
+      {
+        "ordinal": 18,
+        "name": "private_bucket_hash",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 19,
+        "name": "maybe_private_bucket_prefix",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 64
+        }
+      },
+      {
+        "ordinal": 20,
+        "name": "maybe_private_bucket_extension",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 64
+        }
+      },
+      {
+        "ordinal": 21,
+        "name": "cached_user_ratings_negative_count",
+        "type_info": {
+          "type": "Long",
+          "flags": "NOT_NULL | UNSIGNED",
+          "char_set": 63,
+          "max_size": 10
+        }
+      },
+      {
+        "ordinal": 22,
+        "name": "cached_user_ratings_positive_count",
+        "type_info": {
+          "type": "Long",
+          "flags": "NOT_NULL | UNSIGNED",
+          "char_set": 63,
+          "max_size": 10
+        }
+      },
+      {
+        "ordinal": 23,
+        "name": "cached_user_ratings_total_count",
+        "type_info": {
+          "type": "Long",
+          "flags": "NOT_NULL | UNSIGNED",
+          "char_set": 63,
+          "max_size": 10
+        }
+      },
+      {
+        "ordinal": 24,
+        "name": "maybe_cached_user_ratings_ratio",
+        "type_info": {
+          "type": "Float",
+          "flags": "",
+          "char_set": 63,
+          "max_size": 12
+        }
+      },
+      {
+        "ordinal": 25,
+        "name": "cached_user_ratings_last_updated_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | BINARY | TIMESTAMP",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 26,
+        "name": "version",
+        "type_info": {
+          "type": "Long",
+          "flags": "NOT_NULL",
+          "char_set": 63,
+          "max_size": 11
+        }
+      },
+      {
+        "ordinal": 27,
+        "name": "created_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | BINARY | TIMESTAMP",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 28,
+        "name": "updated_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | BINARY | TIMESTAMP | ON_UPDATE_NOW",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 29,
+        "name": "user_deleted_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "BINARY",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 30,
+        "name": "mod_deleted_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "BINARY",
+          "char_set": 63,
+          "max_size": 19
+        }
+      }
+    ],
+    "parameters": {
+      "Right": 1
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      true,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      true,
+      true,
+      true,
+      false,
+      false,
+      false,
+      true,
+      true,
+      false,
+      false,
+      false,
+      true,
+      false,
+      false,
+      false,
+      false,
+      true,
+      true
+    ]
+  },
+  "hash": "a6ed8524fb5339fed17bec6611f8f56b6bdee35bac63c9eacbe21eb032a6a831"
+}

.sqlx/query-f0b5767d52c389660d1859e628c746f6f33a9e1c25f21f66aeeb0784df768c8e.json

@@ -0,0 +1,322 @@
+{
+  "db_name": "MySQL",
+  "query": "\n        SELECT\n        wt.token as `token: tokens::tokens::model_weights::ModelWeightToken`,\n        wt.title,\n        wt.weights_type as `weights_type: enums::by_table::model_weights::weights_types::WeightsType`,\n        wt.weights_category as `weights_category: enums::by_table::model_weights::weights_category::WeightsCategory`,\n        wt.maybe_thumbnail_token,\n        wt.description_markdown,\n        wt.description_rendered_html,\n        wt.creator_user_token as `creator_user_token: tokens::tokens::users::UserToken`,\n        wt.creator_ip_address,\n        wt.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n        wt.maybe_last_update_user_token as `maybe_last_update_user_token: tokens::tokens::users::UserToken`,\n        wt.original_download_url,\n        wt.original_filename,\n        wt.file_size_bytes,\n        wt.file_checksum_sha2,\n        wt.private_bucket_hash,\n        wt.maybe_private_bucket_prefix,\n        wt.maybe_private_bucket_extension,\n        wt.cached_user_ratings_negative_count,\n        wt.cached_user_ratings_positive_count,\n        wt.cached_user_ratings_total_count,\n        wt.maybe_cached_user_ratings_ratio,\n        wt.cached_user_ratings_last_updated_at,\n        wt.version,\n        wt.created_at,\n        wt.updated_at,\n        wt.user_deleted_at,\n        wt.mod_deleted_at\n        FROM model_weights as wt\n        WHERE\n            wt.token = ?\n            AND wt.user_deleted_at IS NULL\n            AND wt.mod_deleted_at IS NULL\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "token: tokens::tokens::model_weights::ModelWeightToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 1,
+        "name": "title",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 1020
+        }
+      },
+      {
+        "ordinal": 2,
+        "name": "weights_type: enums::by_table::model_weights::weights_types::WeightsType",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 3,
+        "name": "weights_category: enums::by_table::model_weights::weights_category::WeightsCategory",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 4,
+        "name": "maybe_thumbnail_token",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 5,
+        "name": "description_markdown",
+        "type_info": {
+          "type": "Blob",
+          "flags": "NOT_NULL | BLOB | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 262140
+        }
+      },
+      {
+        "ordinal": 6,
+        "name": "description_rendered_html",
+        "type_info": {
+          "type": "Blob",
+          "flags": "NOT_NULL | BLOB | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 262140
+        }
+      },
+      {
+        "ordinal": 7,
+        "name": "creator_user_token: tokens::tokens::users::UserToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 8,
+        "name": "creator_ip_address",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 160
+        }
+      },
+      {
+        "ordinal": 9,
+        "name": "creator_set_visibility: enums::common::visibility::Visibility",
+        "type_info": {
+          "type": "String",
+          "flags": "NOT_NULL | BINARY | ENUM",
+          "char_set": 224,
+          "max_size": 28
+        }
+      },
+      {
+        "ordinal": 10,
+        "name": "maybe_last_update_user_token: tokens::tokens::users::UserToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 11,
+        "name": "original_download_url",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 2048
+        }
+      },
+      {
+        "ordinal": 12,
+        "name": "original_filename",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 1020
+        }
+      },
+      {
+        "ordinal": 13,
+        "name": "file_size_bytes",
+        "type_info": {
+          "type": "Long",
+          "flags": "NOT_NULL",
+          "char_set": 63,
+          "max_size": 10
+        }
+      },
+      {
+        "ordinal": 14,
+        "name": "file_checksum_sha2",
+        "type_info": {
+          "type": "String",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 256
+        }
+      },
+      {
+        "ordinal": 15,
+        "name": "private_bucket_hash",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 16,
+        "name": "maybe_private_bucket_prefix",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 64
+        }
+      },
+      {
+        "ordinal": 17,
+        "name": "maybe_private_bucket_extension",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 64
+        }
+      },
+      {
+        "ordinal": 18,
+        "name": "cached_user_ratings_negative_count",
+        "type_info": {
+          "type": "Long",
+          "flags": "NOT_NULL | UNSIGNED",
+          "char_set": 63,
+          "max_size": 10
+        }
+      },
+      {
+        "ordinal": 19,
+        "name": "cached_user_ratings_positive_count",
+        "type_info": {
+          "type": "Long",
+          "flags": "NOT_NULL | UNSIGNED",
+          "char_set": 63,
+          "max_size": 10
+        }
+      },
+      {
+        "ordinal": 20,
+        "name": "cached_user_ratings_total_count",
+        "type_info": {
+          "type": "Long",
+          "flags": "NOT_NULL | UNSIGNED",
+          "char_set": 63,
+          "max_size": 10
+        }
+      },
+      {
+        "ordinal": 21,
+        "name": "maybe_cached_user_ratings_ratio",
+        "type_info": {
+          "type": "Float",
+          "flags": "",
+          "char_set": 63,
+          "max_size": 12
+        }
+      },
+      {
+        "ordinal": 22,
+        "name": "cached_user_ratings_last_updated_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | BINARY | TIMESTAMP",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 23,
+        "name": "version",
+        "type_info": {
+          "type": "Long",
+          "flags": "NOT_NULL",
+          "char_set": 63,
+          "max_size": 11
+        }
+      },
+      {
+        "ordinal": 24,
+        "name": "created_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | BINARY | TIMESTAMP",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 25,
+        "name": "updated_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | BINARY | TIMESTAMP | ON_UPDATE_NOW",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 26,
+        "name": "user_deleted_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "BINARY",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 27,
+        "name": "mod_deleted_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "BINARY",
+          "char_set": 63,
+          "max_size": 19
+        }
+      }
+    ],
+    "parameters": {
+      "Right": 1
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      true,
+      false,
+      false,
+      false,
+      false,
+      false,
+      true,
+      true,
+      true,
+      false,
+      false,
+      false,
+      true,
+      true,
+      false,
+      false,
+      false,
+      true,
+      false,
+      false,
+      false,
+      false,
+      true,
+      true
+    ]
+  },
+  "hash": "f0b5767d52c389660d1859e628c746f6f33a9e1c25f21f66aeeb0784df768c8e"
+}

Cargo.toml

@@ -27,6 +27,7 @@ members = [
   "crates/lib/bootstrap",
   "crates/lib/caching/memory_caching",
   "crates/lib/caching/redis_caching",
+  "crates/lib/collections",
   "crates/lib/concurrency",
   "crates/lib/cookies",
   "crates/lib/crockford",
@@ -85,8 +86,9 @@ members = [
   "crates/service/plugins/users",
 
   # Vendored code
+  "crates/vendor/limitation",
   "crates/vendor/newrelic-telemetry-sdk-rust",
 
-  # Vendored code
-  "my-workspace-hack",
+  # cargo-hakari workspace hack (compilation speedup hack)
+  "crates/my-workspace-hack",
 ]

_develop/docs/README.md

@@ -29,7 +29,9 @@ Web API Overview
         * `tts-inference-job` - (*deprecated*) Async TTS inference of Tacotron2 models only
         * `w2l-download-job` - (*deprecated*) Async download of videos and images
         * `w2l-inference-job` - (*deprecated*) Async W2L inference
-
+    * Documentation Server:
+        * `docs` - this will run a local swagger server with the endpoints that you have access to, http://127.0.0.1:8989/api-docs/openapi.json use this to port everything over to the post man.
+        
 ### PowerStream
 
 * [PowerStream](https://power.stream) (deprecated) is powered by the following applications:

_develop/docs/local_development/general_setup.md

@@ -380,3 +380,16 @@ of this error message. You can essentially ignore it.
 ### [Fix] Can't connect to local MySQL after install on Ubuntu
 
 - 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).
+
+### API Server
+```
+cargo run --bin docs
+```
+This setups an api server with swagger docs to show you responses and requests with each associated endpoint
+It is run at http://127.0.0.1:8989/
+To obtain the json for the postman collection go to this url http://127.0.0.1:8989/api-docs/openapi.json
+We use this: `https://github.com/juhaku/utoipa`
+The documentation example is in: 
+`crates/service/web/storyteller_web/src/http_server/endpoints/voice_designer/inference/enqueue_tts_request.rs`
+Write into the api doc to: 
+`crates/service/web/storyteller_web/src/api_doc.rs`

_sql/actions/generic_inference_jobs.sql

@@ -8,11 +8,25 @@ update generic_inference_jobs set status = 'dead' where maybe_routing_tag IS NOT
 -- Get pending jobs
 select count(*) from generic_inference_jobs where status = 'pending';
 
+-- Kill outstanding jobs
 update generic_inference_jobs
 set status = 'dead'
 where status IN ('pending', 'started', 'attempt_failed');
 
+-- Kill outstanding jobs of type
 update generic_inference_jobs
 set status = 'dead'
 where status IN ('pending', 'started', 'attempt_failed')
 and maybe_model_type IN ('sad_talker', 'so_vits_svc');
+
+-- Tacotron 2 TTS
+update generic_inference_jobs
+set status = 'dead'
+where status IN ('pending', 'started', 'attempt_failed')
+  and maybe_model_type IN ('tacotron2');
+
+-- Sad Talker Face Animation
+update generic_inference_jobs
+set status = 'dead'
+where status IN ('pending', 'started', 'attempt_failed')
+  and maybe_model_type IN ('sad_talker');

codegen_database.sh

@@ -7,7 +7,7 @@ set -euxo pipefail
 
 # NB: Database used by desktop app for AiChatBot sidecar.
 # Make sure it has been migrated (use aichatbot-sidecar app directory as root).
-SQLITE_DATABASE_PATH=./runtime_data/database.db
+# SQLITE_DATABASE_PATH=./runtime_data/database.db
 
 # NB: OpenSSL is broken on Ubuntu 22.04 (this is documented elsewhere)
 # See https://askubuntu.com/a/1403961

crates/_types/buckets/Cargo.toml

@@ -17,7 +17,7 @@ path = "src/lib.rs"
 # Internal
 crockford = { path = "../../lib/crockford" }
 errors = { path = "../../lib/errors" }
-my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" }
+my-workspace-hack = { version = "0.1", path = "../../my-workspace-hack" }
 
 # External
 # (none yet)

crates/_types/buckets/src/public/mod.rs

@@ -2,4 +2,5 @@ pub mod media_files;
 pub mod media_uploads;
 pub mod public_path;
 pub mod voice_conversion_results;
-pub mod zs_voices;
+pub mod zs_voices;
+pub mod weight_uploads;

crates/_types/buckets/src/public/weight_uploads/directory.rs

@@ -0,0 +1,77 @@
+use crockford::crockford_entropy_lower;
+// TODO Thoughts NOTE:
+// I am wondering if it be easier if we just had a single struct and impl to handle downloads from public and private buckets.
+// essentially, the only difference is the prefix and file postfix and the path of where the file goes and the path will be constructed from there.
+// then you can tie in the downloader as a single object that can be used for both public and private buckets.
+
+use crate::public::public_path::PublicPath;
+use crate::util::hashed_directory_path_long_string::hashed_directory_path_long_string;
+
+const WEIGHT_UPLOAD_DIRECTORY : &str = "/weight_upload";
+
+/// Directory for user media uploads.
+/// Each uploaded file gets its own directory so that we can store the original
+/// file alongside re-processed derivatives.
+#[derive(Clone)]
+pub struct WeightUploadDirectory {
+  object_hash: String,
+  directory: String,
+}
+
+impl PublicPath for WeightUploadDirectory {}
+
+impl WeightUploadDirectory {
+
+  pub fn generate_new() -> Self {
+    let entropy = crockford_entropy_lower(32);
+    Self::from_object_hash(&entropy)
+  }
+
+  pub fn from_object_hash(object_hash: &str) -> Self {
+    // TODO: Path construction could be cleaner.
+    let middle = hashed_directory_path_long_string(object_hash);
+    let directory = format!("{}/{}{}", WEIGHT_UPLOAD_DIRECTORY, middle, object_hash);
+    Self {
+      object_hash: object_hash.to_string(),
+      directory,
+    }
+  }
+
+  pub fn get_directory_path_str(&self) -> &str {
+    &self.directory
+  }
+
+  pub fn get_object_hash(&self) -> &str {
+    &self.object_hash
+  }
+}
+
+#[cfg(test)]
+mod tests {
+  use crate::public::weight_uploads::directory::WeightUploadDirectory;
+
+  #[test]
+  pub fn generate_new_entropy() {
+    let directory = WeightUploadDirectory::generate_new();
+    assert_eq!(directory.get_object_hash().len(), 32);
+  }
+
+  #[test]
+  pub fn get_directory_path_str() {
+    let directory = WeightUploadDirectory::from_object_hash("abcdefghijk");
+    assert_eq!(directory.get_directory_path_str(), "/weight_upload/a/b/c/d/e/abcdefghijk");
+  }
+
+  #[test]
+  pub fn get_directory_path_str_short_name() {
+    let directory = WeightUploadDirectory::from_object_hash("foo");
+    assert_eq!(directory.get_directory_path_str(), "/weight_upload/f/o/foo");
+  }
+
+  #[test]
+  pub fn get_object_hash() {
+    let hash = "abcdefghijk";
+    let directory = WeightUploadDirectory::from_object_hash(hash);
+    assert_eq!(directory.get_object_hash(), hash);
+  }
+}

crates/_types/buckets/src/public/weight_uploads/mod.rs

@@ -0,0 +1,2 @@
+pub mod directory;
+pub mod original_file;

crates/_types/buckets/src/public/weight_uploads/original_file.rs

@@ -0,0 +1,99 @@
+use std::path::PathBuf;
+
+use crockford::crockford_entropy_lower;
+
+use crate::public::weight_uploads::directory::WeightUploadDirectory;
+use crate::public::public_path::PublicPath;
+
+const ORIGINAL_FILE_BASENAME : &str = "original_upload.bin";
+
+#[derive(Clone)]
+pub struct WeightUploadOriginalFilePath {
+  directory: WeightUploadDirectory,
+  full_object_path: String,
+}
+
+impl PublicPath for WeightUploadOriginalFilePath {}
+
+impl WeightUploadOriginalFilePath {
+
+  pub fn generate_new() -> Self {
+    let entropy = crockford_entropy_lower(32);
+    Self::from_object_hash(&entropy)
+  }
+
+  pub fn from_object_hash(hash: &str) -> Self {
+    // TODO: Path construction could be cleaner.
+    let directory = WeightUploadDirectory::from_object_hash(hash);
+    let full_object_path = format!("{}/{}", directory.get_directory_path_str(), ORIGINAL_FILE_BASENAME);
+    Self {
+      directory,
+      full_object_path,
+    }
+  }
+
+  pub fn get_full_object_path_str(&self) -> &str {
+    &self.full_object_path
+  }
+
+  pub fn to_full_object_pathbuf(&self) -> PathBuf {
+    PathBuf::from(&self.full_object_path)
+  }
+
+  pub fn get_directory(&self) -> &WeightUploadDirectory {
+    &self.directory
+  }
+
+  pub fn get_object_hash(&self) -> &str {
+    &self.directory.get_object_hash()
+  }
+
+  pub fn get_basename() -> &'static str {
+    ORIGINAL_FILE_BASENAME
+  }
+}
+
+#[cfg(test)]
+mod tests {
+  use std::path::PathBuf;
+  use crate::public::weight_uploads::original_file::WeightUploadOriginalFilePath;
+
+  #[test]
+  pub fn generate_new_entropy() {
+    let file = WeightUploadOriginalFilePath::generate_new();
+    assert_eq!(file.get_object_hash().len(), 32);
+    assert_eq!(file.get_directory().get_object_hash().len(), 32);
+  }
+
+  #[test]
+  pub fn get_full_object_path_str() {
+    let file = WeightUploadOriginalFilePath::from_object_hash("abcdefghijk");
+    assert_eq!(file.get_full_object_path_str(), "/weight_upload/a/b/c/d/e/abcdefghijk/original_upload.bin");
+  }
+
+  #[test]
+  pub fn to_full_object_pathbuf() {
+    let file = WeightUploadOriginalFilePath::from_object_hash("abcdefghijk");
+    assert_eq!(file.to_full_object_pathbuf(), PathBuf::from("/weight_upload/a/b/c/d/e/abcdefghijk/original_upload.bin"));
+  }
+
+  #[test]
+  pub fn get_full_object_path_str_short_name() {
+    let file = WeightUploadOriginalFilePath::from_object_hash("foo");
+    assert_eq!(file.get_full_object_path_str(), "/weight_upload/f/o/foo/original_upload.bin");
+  }
+
+  #[test]
+  pub fn get_full_object_path_str_starts_with_directory() {
+    let file = WeightUploadOriginalFilePath::from_object_hash("abcdefghijk");
+    let full_path = file.get_full_object_path_str();
+    assert!(full_path.starts_with(file.get_directory().get_directory_path_str()))
+  }
+
+  #[test]
+  pub fn get_object_hash() {
+    let hash = "abcdefghijk";
+    let file = WeightUploadOriginalFilePath::from_object_hash(hash);
+    assert_eq!(file.get_object_hash(), hash);
+  }
+}

crates/_types/enums/Cargo.toml

@@ -17,14 +17,12 @@ path = "src/lib.rs"
 serde = "1.0.125"
 serde_derive = "1.0.125"
 
-# MySql Database
-# "offline" supports typesafe builds without a live database
-# "rustls" doesn't appear to work with IP addresses, per:
-# https://github.com/launchbadge/sqlx/issues/1095#issuecomment-798050828
 sqlx = { version = "0.7.2", features = [ "mysql", "sqlite", "runtime-tokio-native-tls", "chrono" ] }
 sqlx-core = { version = "0.7.2" }
 sqlx-mysql= { version = "0.7.2" }
+
 my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" }
+utoipa = { version = "4", features = ["chrono","actix_extras"] }
 
 [dev-dependencies]
 

crates/_types/enums/src/by_table/generic_inference_jobs/inference_category.rs

@@ -13,10 +13,11 @@ use strum::EnumIter;
 ///
 /// DO NOT CHANGE VALUES WITHOUT A MIGRATION STRATEGY.
 #[cfg_attr(test, derive(EnumIter, EnumCount))]
-#[derive(Clone, Copy, Eq, PartialEq, Hash, Ord, PartialOrd, Deserialize, Serialize)]
+#[derive(Clone, Copy, Eq, PartialEq, Hash, Ord, PartialOrd, Deserialize, Serialize, Default)]
 pub enum InferenceCategory {
   /// Eg. SadTalker and possibly Wav2Lip
   #[serde(rename = "lipsync_animation")]
+  #[default]
   LipsyncAnimation,
 
   #[serde(rename = "text_to_speech")]

crates/_types/enums/src/by_table/generic_synthetic_ids/id_category.rs

@@ -21,6 +21,11 @@ pub enum IdCategory {
   #[serde(rename = "lipsync_animation")]
   LipsyncAnimationResult,
 
+  /// Results from tacotron2
+  /// Applies for RVC and SVC
+  #[serde(rename = "tts_result")]
+  TtsResult,
+
   /// Results from voice conversion (which may live in the media_files table)
   /// Applies for RVC and SVC
   #[serde(rename = "voice_conversion")]
@@ -52,6 +57,7 @@ impl IdCategory {
     match self {
       Self::MediaFile => "media_file",
       Self::LipsyncAnimationResult => "lipsync_animation",
+      Self::TtsResult => "tts_result",
       Self::VoiceConversionResult => "voice_conversion",
       Self::ZeroShotVoiceDataset => "zs_dataset",
       Self::ZeroShotVoiceEmbedding => "zs_voice",
@@ -64,6 +70,7 @@ impl IdCategory {
     match value {
       "media_file" => Ok(Self::MediaFile),
       "lipsync_animation" => Ok(Self::LipsyncAnimationResult),
+      "tts_result" => Ok(Self::TtsResult),
       "voice_conversion" => Ok(Self::VoiceConversionResult),
       "zs_dataset" => Ok(Self::ZeroShotVoiceDataset),
       "zs_voice" => Ok(Self::ZeroShotVoiceEmbedding),
@@ -79,6 +86,7 @@ impl IdCategory {
     BTreeSet::from([
       Self::MediaFile,
       Self::LipsyncAnimationResult,
+      Self::TtsResult,
       Self::VoiceConversionResult,
       Self::ZeroShotTtsResult,
       Self::ZeroShotVoiceDataset,
@@ -100,6 +108,7 @@ mod tests {
   fn test_serialization() {
     assert_serialization(IdCategory::MediaFile, "media_file");
     assert_serialization(IdCategory::LipsyncAnimationResult, "lipsync_animation");
+    assert_serialization(IdCategory::TtsResult, "tts_result");
     assert_serialization(IdCategory::VoiceConversionResult, "voice_conversion");
     assert_serialization(IdCategory::ZeroShotVoiceDataset, "zs_dataset");
     assert_serialization(IdCategory::ZeroShotVoiceEmbedding, "zs_voice");
@@ -111,6 +120,7 @@ mod tests {
     fn to_str() {
       assert_eq!(IdCategory::MediaFile.to_str(), "media_file");
       assert_eq!(IdCategory::LipsyncAnimationResult.to_str(), "lipsync_animation");
+      assert_eq!(IdCategory::TtsResult.to_str(), "tts_result");
       assert_eq!(IdCategory::VoiceConversionResult.to_str(), "voice_conversion");
       assert_eq!(IdCategory::ZeroShotVoiceDataset.to_str(), "zs_dataset");
       assert_eq!(IdCategory::ZeroShotVoiceEmbedding.to_str(), "zs_voice");
@@ -122,6 +132,7 @@ mod tests {
     fn from_str() {
       assert_eq!(IdCategory::from_str("media_file").unwrap(), IdCategory::MediaFile);
       assert_eq!(IdCategory::from_str("lipsync_animation").unwrap(), IdCategory::LipsyncAnimationResult);
+      assert_eq!(IdCategory::from_str("tts_result").unwrap(), IdCategory::TtsResult);
       assert_eq!(IdCategory::from_str("voice_conversion").unwrap(), IdCategory::VoiceConversionResult);
       assert_eq!(IdCategory::from_str("zs_dataset").unwrap(), IdCategory::ZeroShotVoiceDataset);
       assert_eq!(IdCategory::from_str("zs_voice").unwrap(), IdCategory::ZeroShotVoiceEmbedding);
@@ -133,9 +144,10 @@ mod tests {
     fn all_variants() {
       // Static check
       let mut variants = IdCategory::all_variants();
-      assert_eq!(variants.len(), 6);
+      assert_eq!(variants.len(), 8);
       assert_eq!(variants.pop_first(), Some(IdCategory::MediaFile));
       assert_eq!(variants.pop_first(), Some(IdCategory::LipsyncAnimationResult));
+      assert_eq!(variants.pop_first(), Some(IdCategory::TtsResult));
       assert_eq!(variants.pop_first(), Some(IdCategory::VoiceConversionResult));
       assert_eq!(variants.pop_first(), Some(IdCategory::ZeroShotTtsResult));
       assert_eq!(variants.pop_first(), Some(IdCategory::ZeroShotVoiceDataset));

crates/_types/enums/src/by_table/media_files/media_file_origin_category.rs

@@ -1,4 +1,5 @@
 use std::collections::BTreeSet;
+
 use serde::Deserialize;
 use serde::Serialize;
 #[cfg(test)]
@@ -29,6 +30,7 @@ pub enum MediaFileOriginCategory {
 // TODO(bt, 2022-12-21): This desperately needs MySQL integration tests!
 impl_enum_display_and_debug_using_to_str!(MediaFileOriginCategory);
 impl_mysql_enum_coders!(MediaFileOriginCategory);
+impl_mysql_from_row!(MediaFileOriginCategory);
 
 /// NB: Legacy API for older code.
 impl MediaFileOriginCategory {

crates/_types/enums/src/by_table/media_files/media_file_origin_model_type.rs

@@ -24,6 +24,10 @@ pub enum MediaFileOriginModelType {
   /// so-vits-svc voice conversion models
   #[serde(rename = "so_vits_svc")]
   SoVitsSvc,
+
+  #[serde(rename = "tacotron2")]
+  Tacotron2,
+
   #[serde(rename = "vall_e_x")]
   VallEX,
 }
@@ -31,6 +35,7 @@ pub enum MediaFileOriginModelType {
 // TODO(bt, 2022-12-21): This desperately needs MySQL integration tests!
 impl_enum_display_and_debug_using_to_str!(MediaFileOriginModelType);
 impl_mysql_enum_coders!(MediaFileOriginModelType);
+impl_mysql_from_row!(MediaFileOriginModelType);
 
 /// NB: Legacy API for older code.
 impl MediaFileOriginModelType {
@@ -39,6 +44,7 @@ impl MediaFileOriginModelType {
       Self::RvcV2  => "rvc_v2",
       Self::SadTalker => "sad_talker",
       Self::SoVitsSvc => "so_vits_svc",
+      Self::Tacotron2 => "tacotron2",
       Self::VallEX => "vall_e_x"
     }
   }
@@ -48,6 +54,7 @@ impl MediaFileOriginModelType {
       "rvc_v2" => Ok(Self::RvcV2),
       "sad_talker" => Ok(Self::SadTalker),
       "so_vits_svc" => Ok(Self::SoVitsSvc),
+      "tacotron2" => Ok(Self::Tacotron2),
       "vall_e_x" => Ok(Self::VallEX),
       _ => Err(format!("invalid value: {:?}", value)),
     }
@@ -60,6 +67,7 @@ impl MediaFileOriginModelType {
       Self::RvcV2,
       Self::SadTalker,
       Self::SoVitsSvc,
+      Self::Tacotron2,
       Self::VallEX
     ])
   }
@@ -83,6 +91,7 @@ mod tests {
       assert_eq!(MediaFileOriginModelType::RvcV2.to_str(), "rvc_v2");
       assert_eq!(MediaFileOriginModelType::SadTalker.to_str(), "sad_talker");
       assert_eq!(MediaFileOriginModelType::SoVitsSvc.to_str(), "so_vits_svc");
+      assert_eq!(MediaFileOriginModelType::Tacotron2.to_str(), "tacotron2");
       assert_eq!(MediaFileOriginModelType::VallEX.to_str(), "vall_e_x");
   }
 
@@ -91,17 +100,19 @@ mod tests {
       assert_eq!(MediaFileOriginModelType::from_str("rvc_v2").unwrap(), MediaFileOriginModelType::RvcV2);
       assert_eq!(MediaFileOriginModelType::from_str("sad_talker").unwrap(), MediaFileOriginModelType::SadTalker);
       assert_eq!(MediaFileOriginModelType::from_str("so_vits_svc").unwrap(), MediaFileOriginModelType::SoVitsSvc);
+      assert_eq!(MediaFileOriginModelType::from_str("tacotron2").unwrap(), MediaFileOriginModelType::Tacotron2);
       assert_eq!(MediaFileOriginModelType::from_str("vall_e_x").unwrap(), MediaFileOriginModelType::VallEX);
-    assert!(MediaFileOriginModelType::from_str("foo").is_err());
+      assert!(MediaFileOriginModelType::from_str("foo").is_err());
     }
 
     #[test]
     fn all_variants() {
       let mut variants = MediaFileOriginModelType::all_variants();
-      assert_eq!(variants.len(), 4);
+      assert_eq!(variants.len(), 5);
       assert_eq!(variants.pop_first(), Some(MediaFileOriginModelType::RvcV2));
       assert_eq!(variants.pop_first(), Some(MediaFileOriginModelType::SadTalker));
       assert_eq!(variants.pop_first(), Some(MediaFileOriginModelType::SoVitsSvc));
+      assert_eq!(variants.pop_first(), Some(MediaFileOriginModelType::Tacotron2));
       assert_eq!(variants.pop_first(), Some(MediaFileOriginModelType::VallEX));
       assert_eq!(variants.pop_first(), None);
     }

crates/_types/enums/src/by_table/media_files/media_file_origin_product_category.rs

@@ -21,6 +21,10 @@ pub enum MediaFileOriginProductCategory {
   #[serde(rename = "face_animator")]
   FaceAnimator,
 
+  /// Text to speech (Tacotron2, not voice designer / VallE-X)
+  #[serde(rename = "tts")]
+  TextToSpeech,
+
   // TODO: This should be a temporary category until we migrate the DB to remove this default value
   /// Unknown which product is attached to the file (generated the file, the file was
   /// uploaded on behalf of, etc.)
@@ -39,12 +43,14 @@ pub enum MediaFileOriginProductCategory {
 // TODO(bt, 2022-12-21): This desperately needs MySQL integration tests!
 impl_enum_display_and_debug_using_to_str!(MediaFileOriginProductCategory);
 impl_mysql_enum_coders!(MediaFileOriginProductCategory);
+impl_mysql_from_row!(MediaFileOriginProductCategory);
 
 /// NB: Legacy API for older code.
 impl MediaFileOriginProductCategory {
   pub fn to_str(&self) -> &'static str {
     match self {
       Self::FaceAnimator => "face_animator",
+      Self::TextToSpeech => "tts",
       Self::Unknown => "unknown",
       Self::VoiceConversion => "voice_conversion",
       Self::ZeroShotVoice => "zs_voice",
@@ -54,6 +60,7 @@ impl MediaFileOriginProductCategory {
   pub fn from_str(value: &str) -> Result<Self, String> {
     match value {
       "face_animator" => Ok(Self::FaceAnimator),
+      "tts" => Ok(Self::TextToSpeech),
       "unknown" => Ok(Self::Unknown),
       "voice_conversion" => Ok(Self::VoiceConversion),
       "zs_voice" => Ok(Self::ZeroShotVoice),
@@ -66,6 +73,7 @@ impl MediaFileOriginProductCategory {
     // NB: BTreeSet::from() isn't const, but not worth using LazyStatic, etc.
     BTreeSet::from([
       Self::FaceAnimator,
+      Self::TextToSpeech,
       Self::Unknown,
       Self::VoiceConversion,
       Self::ZeroShotVoice,
@@ -84,6 +92,7 @@ mod tests {
     #[test]
     fn test_serialization() {
       assert_serialization(MediaFileOriginProductCategory::FaceAnimator, "face_animator");
+      assert_serialization(MediaFileOriginProductCategory::TextToSpeech, "tts");
       assert_serialization(MediaFileOriginProductCategory::Unknown, "unknown");
       assert_serialization(MediaFileOriginProductCategory::VoiceConversion, "voice_conversion");
       assert_serialization(MediaFileOriginProductCategory::ZeroShotVoice, "zs_voice");
@@ -92,6 +101,7 @@ mod tests {
     #[test]
     fn to_str() {
       assert_eq!(MediaFileOriginProductCategory::FaceAnimator.to_str(), "face_animator");
+      assert_eq!(MediaFileOriginProductCategory::TextToSpeech.to_str(), "tts");
       assert_eq!(MediaFileOriginProductCategory::Unknown.to_str(), "unknown");
       assert_eq!(MediaFileOriginProductCategory::VoiceConversion.to_str(), "voice_conversion");
       assert_eq!(MediaFileOriginProductCategory::ZeroShotVoice.to_str(), "zs_voice");
@@ -100,6 +110,7 @@ mod tests {
     #[test]
     fn from_str() {
       assert_eq!(MediaFileOriginProductCategory::from_str("face_animator").unwrap(), MediaFileOriginProductCategory::FaceAnimator);
+      assert_eq!(MediaFileOriginProductCategory::from_str("tts").unwrap(), MediaFileOriginProductCategory::TextToSpeech);
       assert_eq!(MediaFileOriginProductCategory::from_str("unknown").unwrap(), MediaFileOriginProductCategory::Unknown);
       assert_eq!(MediaFileOriginProductCategory::from_str("voice_conversion").unwrap(), MediaFileOriginProductCategory::VoiceConversion);
       assert_eq!(MediaFileOriginProductCategory::from_str("zs_voice").unwrap(), MediaFileOriginProductCategory::ZeroShotVoice);
@@ -108,8 +119,9 @@ mod tests {
     #[test]
     fn all_variants() {
       let mut variants = MediaFileOriginProductCategory::all_variants();
-      assert_eq!(variants.len(), 4);
+      assert_eq!(variants.len(), 5);
       assert_eq!(variants.pop_first(), Some(MediaFileOriginProductCategory::FaceAnimator));
+      assert_eq!(variants.pop_first(), Some(MediaFileOriginProductCategory::TextToSpeech));
       assert_eq!(variants.pop_first(), Some(MediaFileOriginProductCategory::Unknown));
       assert_eq!(variants.pop_first(), Some(MediaFileOriginProductCategory::VoiceConversion));
       assert_eq!(variants.pop_first(), Some(MediaFileOriginProductCategory::ZeroShotVoice));

crates/_types/enums/src/by_table/media_files/media_file_type.rs

@@ -25,6 +25,7 @@ pub enum MediaFileType {
 // TODO(bt, 2022-12-21): This desperately needs MySQL integration tests!
 impl_enum_display_and_debug_using_to_str!(MediaFileType);
 impl_mysql_enum_coders!(MediaFileType);
+impl_mysql_from_row!(MediaFileType);
 
 /// NB: Legacy API for older code.
 impl MediaFileType {

crates/_types/enums/src/by_table/media_uploads/media_upload_type.rs

@@ -20,6 +20,9 @@ pub enum MediaUploadType {
 
   /// Video files: mp4, etc.
   Video,
+
+  // Binary files: safetensors ... weights, etc.
+  Binary,
 }
 
 // TODO(bt, 2022-12-21): This desperately needs MySQL integration tests!
@@ -33,6 +36,7 @@ impl MediaUploadType {
       Self::Audio => "audio",
       Self::Image => "image",
       Self::Video => "video",
+      Self::Binary => "binary",
     }
   }
 
@@ -41,6 +45,7 @@ impl MediaUploadType {
       "audio" => Ok(Self::Audio),
       "image" => Ok(Self::Image),
       "video" => Ok(Self::Video),
+      "binary" => Ok(Self::Binary),
       _ => Err(format!("invalid value: {:?}", value)),
     }
   }
@@ -56,6 +61,7 @@ mod tests {
     assert_serialization(MediaUploadType::Audio, "audio");
     assert_serialization(MediaUploadType::Image, "image");
     assert_serialization(MediaUploadType::Video, "video");
+    assert_serialization(MediaUploadType::Binary, "binary");
   }
 
   #[test]
@@ -63,6 +69,7 @@ mod tests {
     assert_eq!(MediaUploadType::Audio.to_str(), "audio");
     assert_eq!(MediaUploadType::Image.to_str(), "image");
     assert_eq!(MediaUploadType::Video.to_str(), "video");
+    assert_eq!(MediaUploadType::Binary.to_str(), "binary");
   }
 
   #[test]
@@ -70,6 +77,7 @@ mod tests {
     assert_eq!(MediaUploadType::from_str("audio").unwrap(), MediaUploadType::Audio);
     assert_eq!(MediaUploadType::from_str("image").unwrap(), MediaUploadType::Image);
     assert_eq!(MediaUploadType::from_str("video").unwrap(), MediaUploadType::Video);
+    assert_eq!(MediaUploadType::from_str("binary").unwrap(), MediaUploadType::Binary);
     assert!(MediaUploadType::from_str("foo").is_err());
   }
 }

crates/_types/enums/src/by_table/model_weights/mod.rs

@@ -1,2 +1,3 @@
 pub mod weights_types;
 pub mod weights_category;
+pub mod weights_file_type;

crates/_types/enums/src/by_table/model_weights/weights_category.rs

@@ -5,8 +5,10 @@ use strum::EnumCount;
 #[cfg(test)]
 use strum::EnumIter;
 
+
+use utoipa::ToSchema;
 #[cfg_attr(test, derive(EnumIter, EnumCount))]
-#[derive(Clone, Copy, Eq, PartialEq, Hash, Ord, PartialOrd, Deserialize, Serialize)]
+#[derive(Clone, Copy, Eq, PartialEq, Hash, Ord, PartialOrd, Deserialize, Serialize, ToSchema)]
 pub enum WeightsCategory {
     #[serde(rename = "image_generation")]
     ImageGeneration,

crates/_types/enums/src/by_table/model_weights/weights_file_type.rs

@@ -0,0 +1,68 @@
+use std::collections::BTreeSet;
+
+#[cfg(test)]
+use strum::EnumCount;
+#[cfg(test)]
+use strum::EnumIter;
+// TODO we will need to scan the checkpoints for malicious code.  We can't just trust the file extension.
+#[cfg_attr(test, derive(EnumIter, EnumCount))]
+#[derive(Clone, Copy, Eq, PartialEq, Hash, Ord, PartialOrd, Deserialize, Serialize)]
+pub enum WeightsFileType {
+    #[serde(rename = "checkpoint")]
+    Checkpoint,
+    #[serde(rename = "safetensors")]
+    SafeTensors,
+}
+
+impl WeightsFileType {
+    pub fn to_str(&self) -> &'static str {
+        match self {
+            Self::Checkpoint => "checkpoint",
+            Self::SafeTensors => "safetensors",
+        }
+    }
+
+    pub fn from_str(value: &str) -> Result<Self, String> {
+        match value {
+            "checkpoint" => Ok(Self::Checkpoint),
+            "safetensors" => Ok(Self::SafeTensors),
+            _ => Err(format!("invalid value: {:?}", value)),
+        }
+    }
+
+    pub fn all_variants() -> BTreeSet<Self> {
+        BTreeSet::from([
+            Self::Checkpoint,
+            Self::SafeTensors,
+        ])
+    }
+}
+
+impl_enum_display_and_debug_using_to_str!(WeightsFileType);
+impl_mysql_enum_coders!(WeightsFileType);
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_to_str() {
+        assert_eq!(WeightsFileType::Checkpoint.to_str(), "checkpoint");
+        assert_eq!(WeightsFileType::SafeTensors.to_str(), "safetensors");
+    }
+
+    #[test]
+    fn test_from_str() {
+        assert_eq!(WeightsFileType::from_str("checkpoint").unwrap(), WeightsFileType::Checkpoint);
+        assert_eq!(WeightsFileType::from_str("safetensors").unwrap(), WeightsFileType::SafeTensors);
+        assert!(WeightsFileType::from_str("invalid").is_err());
+    }
+
+    #[test]
+    fn test_all_variants() {
+        let variants = WeightsFileType::all_variants();
+        assert_eq!(variants.len(), 2);
+        assert!(variants.contains(&WeightsFileType::Checkpoint));
+        assert!(variants.contains(&WeightsFileType::SafeTensors));
+    }
+}

crates/_types/enums/src/by_table/model_weights/weights_types.rs

@@ -4,10 +4,10 @@ use std::collections::BTreeSet;
 use strum::EnumCount;
 #[cfg(test)]
 use strum::EnumIter;
-
+use utoipa::ToSchema;
 
 #[cfg_attr(test, derive(EnumIter, EnumCount))]
-#[derive(Clone, Copy, Eq, PartialEq, Hash, Ord, PartialOrd, Deserialize, Serialize)]
+#[derive(Clone, Copy, Eq, PartialEq, Hash, Ord, PartialOrd, Deserialize, Serialize,ToSchema)]
 pub enum WeightsType {
     #[serde(rename = "hifigan_tt2")]
     HifiganTacotron2,
@@ -23,6 +23,8 @@ pub enum WeightsType {
     Tacotron2,
     #[serde(rename = "loRA")]
     LoRA,
+    #[serde(rename = "vall_e")]
+    VallE,
 }
 
 
@@ -36,6 +38,7 @@ impl WeightsType {
             Self::SoVitsSvc => "so_vits_svc",
             Self::Tacotron2 => "tt2",
             Self::LoRA => "loRA",
+            Self::VallE => "vall_e",
         }
     }
 
@@ -48,6 +51,7 @@ impl WeightsType {
             "so_vits_svc" => Ok(Self::SoVitsSvc),
             "tt2" => Ok(Self::Tacotron2),
             "loRA" => Ok(Self::LoRA),
+            "vall_e" => Ok(Self::VallE),
             _ => Err(format!("invalid value: {:?}", value)),
         }
     }
@@ -61,6 +65,7 @@ impl WeightsType {
             Self::SoVitsSvc,
             Self::Tacotron2,
             Self::LoRA,
+            Self::VallE
         ])
     }
 }
@@ -82,6 +87,7 @@ mod tests {
         assert_eq!(WeightsType::SoVitsSvc.to_str(), "so_vits_svc");
         assert_eq!(WeightsType::Tacotron2.to_str(), "tt2");
         assert_eq!(WeightsType::LoRA.to_str(), "loRA");
+        assert_eq!(WeightsType::VallE.to_str(), "vall_e");
     }
 
     #[test]
@@ -93,6 +99,7 @@ mod tests {
         assert_eq!(WeightsType::from_str("so_vits_svc").unwrap(), WeightsType::SoVitsSvc);
         assert_eq!(WeightsType::from_str("tt2").unwrap(), WeightsType::Tacotron2);
         assert_eq!(WeightsType::from_str("loRA").unwrap(), WeightsType::LoRA);
+        assert_eq!(WeightsType::from_str("vall_e").unwrap(), WeightsType::VallE);
         assert!(WeightsType::from_str("invalid").is_err());
     }
 
@@ -107,5 +114,6 @@ mod tests {
         assert!(variants.contains(&WeightsType::SoVitsSvc));
         assert!(variants.contains(&WeightsType::Tacotron2));
         assert!(variants.contains(&WeightsType::LoRA));
+        assert!(variants.contains(&WeightsType::VallE));
     }
 }

crates/_types/enums/src/common/job_status_plus.rs

@@ -34,6 +34,12 @@ impl_mysql_enum_coders!(JobStatusPlus);
 
 // NB: We can derive `sqlx::Type` instead of using `impl_mysql_enum_coders`
 
+impl Default for JobStatusPlus {
+  fn default() -> Self {
+    Self::Pending
+  }
+}
+
 impl JobStatusPlus {
   pub fn to_str(&self) -> &'static str {
     match self {
@@ -86,6 +92,11 @@ mod tests {
   mod explicit_checks {
     use super::*;
 
+    #[test]
+    fn test_default() {
+      assert_eq!(JobStatusPlus::default(), JobStatusPlus::Pending);
+    }
+
     #[test]
     fn test_serialization() {
       assert_serialization(JobStatusPlus::Pending, "pending");

crates/_types/enums/src/common/visibility.rs

@@ -15,9 +15,10 @@ use strum::EnumIter;
 /// See also: https://docs.rs/sqlx/0.4.0-beta.1/sqlx/trait.Type.html
 ///
 /// *DO NOT CHANGE VALUES WITHOUT A MIGRATION STRATEGY!*
-///
+
+use utoipa::ToSchema;
 #[cfg_attr(test, derive(EnumIter, EnumCount))]
-#[derive(Clone, Copy, Eq, PartialEq, Deserialize, Serialize, sqlx::Type)]
+#[derive(Clone, Copy, Eq, PartialEq, Deserialize, Serialize, sqlx::Type,ToSchema)]
 #[serde(rename_all = "lowercase")]
 #[sqlx(rename_all = "lowercase")]
 pub enum Visibility {
@@ -38,6 +39,7 @@ pub enum Visibility {
 
 
 impl_enum_display_and_debug_using_to_str!(Visibility);
+impl_mysql_from_row!(Visibility);
 
 // For reference, here's what the serde implementation might be if manually written.
 // This may be useful for designing composite types in the future:

crates/_types/enums/src/lib.rs

@@ -32,3 +32,4 @@ mod macros;
 
 pub mod by_table;
 pub mod common;
+pub mod traits;

crates/_types/enums/src/macros/impl_mysql_from_row.rs

@@ -0,0 +1,63 @@
+
+/// Implement `MySqlFromRow` on a type.
+macro_rules! impl_mysql_from_row {
+  ($t:ident) => {
+
+    // Try to convert a MySQL row and named field into the value type (for non-nullable fields).
+    impl crate::traits::mysql_from_row::MySqlFromRow<$t> for $t {
+      fn try_from_mysql_row(row: &sqlx_mysql::MySqlRow, field_name: &str) -> Result<$t, sqlx::Error> {
+        use sqlx::{Error, Row};
+
+        // NB(bt,2023-12-05): For now only string encodings are considered.
+        // We may want to revisit in the future if we deal with binary data.
+        let value : String = row.try_get(field_name)?;
+
+        let output_type = Self::from_str(&value)
+            .map_err(|err| {
+              Error::ColumnDecode {
+                index: format!("mysql_from_row failure on field {}: {:?}", field_name, err),
+                source: format!("mysql_from_row failure on field {}: {:?}", field_name, err).into(),
+              }
+            })?;
+
+        Ok(output_type)
+      }
+
+      // Try to convert a MySQL row and named field into the value type (for nullable fields).
+      fn try_from_mysql_row_nullable(row: &sqlx_mysql::MySqlRow, field_name: &str) -> Result<Option<$t>, sqlx::Error> {
+        use sqlx::{Error, Row};
+
+        // NB(bt,2023-12-05): For now only string encodings are considered.
+        // We may want to revisit in the future if we deal with binary data.
+        // NB(2): Nullable fields decode as Option<T>.
+        let maybe_value : Option<String> = row.try_get(field_name)?;
+
+        let value = match maybe_value {
+          Some(value) => value,
+          None => return Ok(None),
+        };
+
+        let output_type = Self::from_str(&value)
+            .map_err(|err| {
+              Error::ColumnDecode {
+                index: format!("mysql_from_row failure on field {}: {:?}", field_name, err),
+                source: format!("mysql_from_row failure on field {}: {:?}", field_name, err).into(),
+              }
+            })?;
+
+        Ok(Some(output_type))
+      }
+    }
+
+    //// TODO: Tests.
+    //#[cfg(test)]
+    //#[test]
+    //fn test_name() {
+    //  use strum::IntoEnumIterator;
+    //  for variant in $t::iter() {
+    //    assert_eq!(format!("{}", variant), variant.to_str());
+    //  }
+    //}
+
+  }
+}

crates/_types/enums/src/macros/mod.rs

@@ -1,3 +1,4 @@
 #[macro_use] pub mod impl_enum_display_and_debug_using_to_str;
 #[macro_use] pub mod impl_mysql_enum_coders;
+#[macro_use] pub mod impl_mysql_from_row;
 #[macro_use] pub mod impl_sqlite_enum_coders;

crates/_types/enums/src/traits/mod.rs

@@ -0,0 +1 @@
+pub mod mysql_from_row;

crates/_types/enums/src/traits/mysql_from_row.rs

@@ -0,0 +1,11 @@
+use sqlx_mysql::MySqlRow;
+
+/// This is a trait (in conjunction with the macro implementation) that makes up for sqlx's
+/// QueryBuilder not playing well with FromRow implementation or derivation of named types.
+pub trait MySqlFromRow<T> {
+
+  /// Attempt to parse a named column from a MySqlRow into the type.
+  fn try_from_mysql_row(row: &MySqlRow, field_name: &str) -> Result<T, sqlx::Error>;
+
+  fn try_from_mysql_row_nullable(row: &MySqlRow, field_name: &str) -> Result<Option<T>, sqlx::Error>;
+}

crates/_types/reusable_types/Cargo.toml

@@ -18,7 +18,7 @@ path = "src/lib.rs"
 # (none)
 
 # External
-chrono = { version = "=0.4.22", features = ["serde"] }
+chrono = { version = "0.4.22", features = ["serde"] }
 
 # Serialization
 serde = "1.0.125"
@@ -26,7 +26,7 @@ serde_derive = "1.0.125"
 
 # MySql Database
 sqlx = { version = "0.7.2", features = [ "mysql", "runtime-tokio", "tls-rustls", "chrono" ] }
-my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" }
+my-workspace-hack = { version = "0.1", path = "../../my-workspace-hack" }
 
 [dev-dependencies]
 # Test serialization

crates/_types/tokens/Cargo.toml

@@ -18,15 +18,13 @@ serde = "1.0.125"
 serde_derive = "1.0.125"
 
 # Random
-rand = "0.8.3"
+rand = "0.8.5"
 
-# MySql Database
-# "offline" supports typesafe builds without a live database
-# "rustls" doesn't appear to work with IP addresses, per:
-# https://github.com/launchbadge/sqlx/issues/1095#issuecomment-798050828
 sqlx = { version = "0.7.2", features = [ "mysql", "runtime-tokio", "tls-rustls", "chrono" ] }
 sqlx-core = { version = "0.7.2" }
-my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" }
+my-workspace-hack = { version = "0.1", path = "../../my-workspace-hack" }
+
+utoipa = { version = "4", features = ["chrono","actix_extras"] }
 
 [dev-dependencies]
 

crates/_types/tokens/src/tokens/anonymous_visitor_tracking.rs

@@ -8,7 +8,7 @@ use crate::prefixes::TokenPrefix;
 /// A rare instance that is *not* a primary key.
 /// These are generated as cookies to track users for a better logged out experience and for analytics.
 /// We use these as indices into several columns (ML result types, uploads, etc.)
-#[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash, sqlx::Type, Debug, Serialize, Deserialize)]
+#[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash, sqlx::Type, Debug, Serialize, Deserialize, Default)]
 #[sqlx(transparent)]
 pub struct AnonymousVisitorTrackingToken(pub String);
 

crates/_types/tokens/src/tokens/generic_inference_jobs.rs

@@ -4,9 +4,10 @@ use serde::Deserialize;
 use serde::Serialize;
 
 use crate::prefixes::TokenPrefix;
+use utoipa::ToSchema;
 
 /// The primary key for "generic" inference jobs.
-#[derive(Clone, PartialEq, Eq, sqlx::Type, Debug, Serialize, Deserialize)]
+#[derive(Clone, PartialEq, Eq, sqlx::Type, Debug, Serialize, Deserialize, Default, ToSchema)]
 #[sqlx(transparent)]
 pub struct InferenceJobToken(String);
 

crates/_types/tokens/src/tokens/model_weights.rs

@@ -5,8 +5,9 @@ use serde::Serialize;
 
 use crate::prefixes::TokenPrefix;
 
+use utoipa::ToSchema;
 /// The primary key for the  "model_weights" table.
-#[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash, sqlx::Type, Debug, Serialize, Deserialize)]
+#[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash, sqlx::Type, Debug, Serialize, Deserialize,ToSchema)]
 #[sqlx(transparent)]
 pub struct ModelWeightToken(pub String);
 

crates/_types/tokens/src/tokens/users.rs

@@ -4,9 +4,9 @@ use serde::Deserialize;
 use serde::Serialize;
 
 use crate::prefixes::TokenPrefix;
-
+use utoipa::ToSchema;
 /// The primary key for users.
-#[derive(Clone, PartialEq, Eq, sqlx::Type, Debug, Serialize, Deserialize)]
+#[derive(Clone, PartialEq, Eq, sqlx::Type, Debug, Serialize, Deserialize, Default,ToSchema)]
 #[sqlx(transparent)]
 pub struct UserToken(pub String);
 

crates/_types/tokens/src/tokens/weight_uploads.rs

@@ -0,0 +1,14 @@
+use std::fmt::Debug;
+
+use serde::Deserialize;
+use serde::Serialize;
+
+use crate::prefixes::TokenPrefix;
+
+/// The primary key for user weight uploads
+#[derive(Clone, PartialEq, Eq, sqlx::Type, Debug, Serialize, Deserialize)]
+#[sqlx(transparent)]
+pub struct WeightUploadToken(pub String);
+
+impl_string_token!(WeightUploadToken);
+impl_crockford_generator!(WeightUploadToken, 32usize, TokenPrefix::WeightUpload, CrockfordLower);

crates/cli/database_backup/Cargo.toml

@@ -28,4 +28,4 @@ log = "0.4.14"
 # Serialization
 serde = "1.0.125"
 serde_derive = "1.0.125"
-my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" }
+my-workspace-hack = { version = "0.1", path = "../../my-workspace-hack" }

crates/cli/database_cleanup/Cargo.toml

@@ -28,4 +28,4 @@ log = "0.4.14"
 # Serialization
 serde = "1.0.125"
 serde_derive = "1.0.125"
-my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" }
+my-workspace-hack = { version = "0.1", path = "../../my-workspace-hack" }

crates/cli/dev_database_seed/Cargo.toml

@@ -36,14 +36,10 @@ clap = "2.34.0" # TODO: This is really out of date, but has conflicts when updat
 # NB: We switched to Tokio from `async-std` for broader ecosystem support.
 tokio = { version = "1.6.0", features = ["macros"] }
 
-# MySql Database
-# "offline" supports typesafe builds without a live database
-# "rustls" doesn't appear to work with IP addresses, per:
-# https://github.com/launchbadge/sqlx/issues/1095#issuecomment-798050828
 sqlx = { version = "0.7.2", features = [ "mysql", "runtime-tokio", "tls-rustls", "chrono" ] }
 
 elasticsearch = "8.5.0-alpha.1"
-my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" }
+my-workspace-hack = { version = "0.1", path = "../../my-workspace-hack" }
 
 [dev-dependencies]
 # None yet

crates/cli/dev_database_seed/src/main.rs

@@ -5,19 +5,14 @@ use sqlx::mysql::MySqlPoolOptions;
 use config::shared_constants::{DEFAULT_MYSQL_CONNECTION_STRING, DEFAULT_RUST_LOG};
 use errors::AnyhowResult;
 
-
-use crate::seeding::model_weights::seed_weights;
-use crate::seeding::model_weights::seed_weights_for_user_token;
-
 use crate::bucket_clients::get_bucket_clients;
 use crate::cli_args::parse_cli_args;
+use crate::seeding::model_weights::seed_weights;
 use crate::seeding::tts_tacotron2::seed_tts_tacotron2;
-
 use crate::seeding::users::seed_user_accounts;
 use crate::seeding::voice_conversion::seed_voice_conversion;
 use crate::seeding::zero_shot_tts::seed_zero_shot_tts;
 
-
 pub mod bucket_clients;
 
 pub mod cli_args;
@@ -61,7 +56,6 @@ pub async fn main() -> AnyhowResult<()> {
   seed_voice_conversion(&pool).await?;
 
   seed_weights(&pool).await?;
-  
 
   seed_tts_tacotron2(&pool, maybe_bucket_clients.as_ref()).await?;
 

crates/cli/dev_database_seed/src/seeding/model_weights.rs

@@ -1,10 +1,13 @@
+use std::vec;
+
+use buckets::public::media_files::original_file;
 use log::info;
 
 use tokens::tokens::users::UserToken;
 use sqlx::{ MySql, Pool };
 use enums::by_table::model_weights::{
-    weights_types::WeightsType,
-    weights_category::WeightsCategory,
+    weights_types::{WeightsType, self},
+    weights_category::{WeightsCategory, self},
 };
 use errors::{ anyhow, AnyhowResult };
 
@@ -15,6 +18,342 @@ use enums::common::visibility::Visibility;
 
 use mysql_queries::queries::users::user::get_user_token_by_username::get_user_token_by_username;
 
+pub async fn seed_weights_for_paging(  mysql_pool: &Pool<MySql>,user_token: UserToken) -> AnyhowResult<()> {
+    let sd1_5_markdown_description = r#"
+# Dragonfruit AI Models Update and Workflow
+
+## Last Update for Dragonfruit Models
+- **Note:** This might be the last update for a while, focusing next on a realistic merge (WIP).
+- **Future Plans:** Possible update to Z.5D v2 after completing the realistic merge.
+
+## New Models Announcement
+- **Upcoming Models:** Separate from the Dragonfruit branch, so stay tuned!
+
+## DragonfruitGT v1 (Z v2)
+- **Focus:** More fantasy, richer color range, improved landscapes, more masculine men.
+- **Alternative:** Use DragonfruitOG v2.0 for thicker lines, simpler colors.
+
+## GT v1.0 (Z v2.0) Features
+- Improved backgrounds
+- Deeper contrast and color
+- Bolder lines and more detail
+
+### Settings for GT
+- Steps: 30-50
+- Clip skip: 2
+- Upscaler: Euler a / DPM++ 2M SDE Karras
+- Extensions: Adetailer, VAE: berrysmix
+
+## Workflow for Images
+1. **BerryMix VAE:** Ensure correct color.
+2. **Adetailer Extension:** Improve faces, bodies, and hands. Also available on Civitai and Huggingface.
+3. **Hires Fix:** Denoising strength 0.3 - 0.35, using upscaler "x_NMKD-Superscale-SP_178000_G".
+4. **Img2img Transfer:** Use denoising strength 0.3-0.35 with the same prompt and settings. Adjust height after hires.
+5. **Second Img2img Transfer:** Low denoising strength 0.1-3.0. Use SD upscale script with "RealESRGAN_x4plus_anime_6B" sampler for size increase.
+
+## DragonfruitZ.5D v1.0
+- **Style:** 2.5D model, merging DragonfruitZ with realistic elements.
+- **Features:** Skin color variety, masculine men, landscapes, fantasy, NSFW content, detailed faces.
+
+### Settings for Z.5D
+- Steps: 30
+- Clip skip: 2
+- Upscaler: Euler a
+- Extensions: Adetailer, VAE: berrysmix
+
+## DragonfruitOG v2.0
+- **Refinement:** Of the original Dragonfruit model.
+- **Style:** Bold, clean lines and bold colors with decreased detail for simplicity.
+- **Improvements:** Teeth, skin color variety, landscapes, fantasy elements, NSFW content.
+
+## DragonfruitZ v1.0
+- **Alternative Version:** More fantasy and color range, better landscapes, more masculine men.
+- **Suggestion:** Use Dragonfruit (Unisex) v2 for thicker lines and simpler colors.
+
+## Dragonfruit OG v1.0
+- **Focus:** More unisex, suitable for creating male characters.
+- **Personal Note:** First merge, aimed at 2D, flat, colorful, thick lined styles.
+
+### Personal Settings
+- Steps: 20-30
+- Clip skip: 2
+- Upscaler: Euler a / DPM++ 2M SDE Karras
+- Extensions: Adetailer, VAE: berrysmix
+
+*Thank you for your continued support and feedback!*
+"#;
+
+let sd1_5_image_token = "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/be706282-2978-42a0-aaa2-73881aad94e9/width=1024/00049-2287632957-1girl,face,curly%20hair,red%20hair,white%20background,.jpeg";
+
+    let user_token = user_token;
+
+    // create a loop that loops from 1 to 100
+    for i in 1..=100 {
+        // create a new weight
+        
+        let weights_category = match i {
+            1..=20 => WeightsCategory::VoiceConversion,
+            21..=40 => WeightsCategory::TextToSpeech,
+            41..=60 => WeightsCategory::ImageGeneration,
+            61..=80 => WeightsCategory::ImageGeneration,
+            81..=100 => WeightsCategory::ImageGeneration,
+            _ => WeightsCategory::ImageGeneration
+        };
+
+        let weights_types = match i {
+            1..=20 => WeightsType::RvcV2,
+            21..=40 => WeightsType::HifiganTacotron2,
+            41..=60 => WeightsType::StableDiffusion15,
+            61..=80 => WeightsType::StableDiffusionXL,
+            81..=100 => WeightsType::LoRA,
+            _ => WeightsType::LoRA
+        };
+
+        let mut model_weight_token;
+        let mut title;
+        let mut description;
+        let mut description_rendered_html;
+        let mut original_filename;
+        let mut original_download_url;
+        let mut thumbnail_token;
+        
+        let mut private_bucket_hash:String = "".to_string();
+        let mut private_bucket_prefix;
+        let mut private_bucket_extension;
+
+        let mut cached_user_ratings_total_count;
+        let mut cached_user_ratings_positive_count;
+        let mut cached_user_ratings_negative_count;
+        let mut cached_user_ratings_ratio;
+        let mut version;
+
+        match i {
+            1..=20 => {
+                // voice conversion model
+                let rvc_markdown_description = r#"
+                # RVC v2
+                - **Improved Quality:** The special edition offers significantly better quality with fewer issues. It's the model as initially envisioned.
+                - Gawr Gura MOS 4
+                "#;
+
+                model_weight_token = ModelWeightToken(format!("{}", i));
+                title = format!("Gawr Gura: {}", i);
+                description = format!("Description Number {} The special edition offers significantly better quality with fewer issues. It's the model as initially envisioned.", i);
+                description_rendered_html = rvc_markdown_description;
+                
+                original_filename = format!("gura_gwar{}.safetensors", i);
+                original_download_url = format!("www.google.ca");
+
+                // NOTE TO SELF this will be a join for later on for now they can use this.
+                thumbnail_token = "";
+                
+                // private_bucket_hash = format!("bucket_hash{}", i);
+                private_bucket_prefix = format!("_fake");
+                private_bucket_extension = format!("rvcV2");
+                cached_user_ratings_total_count = i;
+                cached_user_ratings_positive_count = i;
+                cached_user_ratings_negative_count = i;
+                cached_user_ratings_ratio = i as u32 / 100;
+                version = i as i32;
+                println!("Seeding RVCv2 model {}", i);
+            },
+            21..=40 =>{
+                // TTS
+                model_weight_token = ModelWeightToken(format!("{}", i));
+                title = format!("dragonfruitGTv1: {}", i);
+                
+                description = format!("Description Number {}:", i);
+            
+                let tts_markdown_description = r#"
+                # HifiGAN Tacotron2
+                - **Improved Quality:** The special edition offers significantly better quality with fewer issues. It's the model as initially envisioned.
+                - Goku MOS 4
+                "#;
+
+                description_rendered_html = tts_markdown_description;
+                
+                original_filename = format!("filename{}.txt", i);
+                original_download_url = format!("https://civitai.com/api/download/models/149193?type=Model&format=SafeTensor&size=pruned&fp=fp16");
+
+                // NOTE TO SELF this will be a join for later on for now they can use this.
+                thumbnail_token = "";
+                
+                // private_bucket_hash = format!("bucket_hash{}", i);
+                private_bucket_prefix = format!("_fake");
+                private_bucket_extension = format!("tt2");
+
+                cached_user_ratings_total_count = i;
+                cached_user_ratings_positive_count = i;
+                cached_user_ratings_negative_count = i;
+                cached_user_ratings_ratio = i as u32 / 100;
+                version = i as i32;
+                println!("Seeding TT2 model {}", i);
+            },
+            41..=60 => {
+                // SD 1.5
+                model_weight_token = ModelWeightToken(format!("{}", i));
+                title = format!("dragonfruitGTv1: {}", i);
+                
+                description = format!("Description Number {}:", i);
+                
+                description_rendered_html = sd1_5_markdown_description;
+                
+                original_filename = format!("filename{}.txt", i);
+                original_download_url = format!("https://civitai.com/api/download/models/149193?type=Model&format=SafeTensor&size=pruned&fp=fp16");
+
+                // NOTE TO SELF this will be a join for later on for now they can use this.
+                thumbnail_token = ""; //sd1_5_image_token;
+                 
+                // private_bucket_hash = format!("bucket_hash{}", i);
+                private_bucket_prefix = format!("_fake");
+                private_bucket_extension = format!("sd15");
+
+                cached_user_ratings_total_count = i;
+                cached_user_ratings_positive_count = i;
+                cached_user_ratings_negative_count = i;
+                cached_user_ratings_ratio = i as u32 / 100;
+                version = i as i32;
+                println!("Seeding SD15 model {}", i);
+            },
+            61..=80 => {
+                // SD XL
+                let sdxl_markdown_description = r#"
+                # Special Edition Release Announcement
+
+                ## What's New?
+                - **Improved Quality:** The special edition offers significantly better quality with fewer issues. It's the model as initially envisioned.
+
+                ## Tips for Use
+                1. **Simple Prompts:** Avoid adding words like "detailed, realistic..." or specifying a specific artist. Simply describe what you want to see.
+                2. **CFG Scale:** A range between 3 and 8.5 is effective (recommended: 7).
+                3. **Minimum Steps:** Ensure at least 36 steps for optimal results.
+                4. **Compatibility:**
+                - Works excellently with Hires fix.
+                - Great results with unaestheticXLv31 embedding, although sometimes better without it.
+                5. **Sampling Method:** Either DPM++ 2M SDE Karras or DPM++ 2M Karras.
+
+                Have fun! 😊
+                "#;
+                let sdxl_image_token = "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/be706282-2978-42a0-aaa2-73881aad94e9/width=1024/00049-2287632957-1girl,face,curly%20hair,red%20hair,white%20background,.jpeg";
+
+                model_weight_token = ModelWeightToken(format!("{}", i));
+                title = format!("SDXL_Niji_Special Edition: {}", i);
+                description = format!("Description Number {}:", i);
+
+                // private_bucket_hash = format!("bucket_hash{}", i);
+                private_bucket_prefix = format!("_fake");
+                private_bucket_extension = format!("sdxl");
+  
+                description_rendered_html = sdxl_markdown_description;
+                  
+                original_filename = format!("filename{}.txt", i);
+                original_download_url = format!("https://civitai.com/api/download/models/149193?type=Model&format=SafeTensor&size=pruned&fp=fp16");
+  
+                // NOTE TO SELF this will be a join for later on for now they can use this.
+                thumbnail_token = "";
+
+                cached_user_ratings_total_count = i;
+                cached_user_ratings_positive_count = i;
+                cached_user_ratings_negative_count = i;
+                cached_user_ratings_ratio = i as u32 / 100;
+                version = i as i32;
+                println!("Seeding SDXL model {}", i);
+            },
+            81..=100 => {
+                // LoRA
+                let lora_markdown_description = r#"
+                - **Improved Quality:** The special edition offers significantly better quality with fewer issues. It's the model as initially envisioned.
+                - LoRA Gawr Gura
+                "#;
+
+                let lora_image_token = "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/123645df-dee2-4239-863a-76a150b09c32/width=1024/00000-2171948503.jpeg";
+                model_weight_token = ModelWeightToken(format!("{}", i));
+                title = format!("Gawr Gura LoRA: {}", i);
+                
+                description = format!("Description Number {}:", i);
+
+                description_rendered_html = lora_markdown_description;
+                
+                original_filename = format!("filename{}.txt", i);
+                original_download_url = format!("https://civitai.com/api/download/models/149193?type=Model&format=SafeTensor&size=pruned&fp=fp16");
+
+                // NOTE TO SELF this will be a join for later on for now they can use this.
+                thumbnail_token = ""; // lora_image_token;
+                
+                // private_bucket_hash = format!("bucket_hash{}", i);
+                private_bucket_prefix = format!("_fake");
+                private_bucket_extension = format!("loRA");
+
+                cached_user_ratings_total_count = i;
+                cached_user_ratings_positive_count = i;
+                cached_user_ratings_negative_count = i;
+                cached_user_ratings_ratio = i as u32 / 100;
+                version = i as i32;
+                println!("Seeding LoRA model {}", i);
+            },
+            _ => {
+                // We went out of range so have more gwar gura
+                let rvc_markdown_description = r#"
+                # RVC v2
+                - **Improved Quality:** The special edition offers significantly better quality with fewer issues. It's the model as initially envisioned.
+                - Gawr Gura MOS 4
+                "#;
+
+                model_weight_token = ModelWeightToken(format!("{}", i));
+                title = format!("Gawr Gura: {}", i);
+                description = format!("Description Number {} The special edition offers significantly better quality with fewer issues. It's the model as initially envisioned.", i);
+                description_rendered_html = rvc_markdown_description;
+                
+                original_filename = format!("gura_gwar{}.safetensors", i);
+                original_download_url = format!("www.google.ca");
+
+                // NOTE TO SELF this will be a join for later on for now they can use this.
+                thumbnail_token = "";
+                
+                // private_bucket_hash = format!("bucket_hash{}", i);
+                private_bucket_prefix = format!("_fake");
+                private_bucket_extension = format!("rvcV2");
+                cached_user_ratings_total_count = i;
+                cached_user_ratings_positive_count = i;
+                cached_user_ratings_negative_count = i;
+                cached_user_ratings_ratio = i as u32 / 100;
+                version = i as i32;
+
+                println!("Out of range");
+            }
+        }
+     
+            let args = CreateModelWeightsArgs {
+                token: &model_weight_token, // replace with actual ModelWeightToken
+                weights_type: weights_types, // replace with actual WeightsType
+                weights_category: weights_category, // replace with actual WeightsCategory
+                title: title,
+                maybe_thumbnail_token: Some(thumbnail_token.to_string()),
+                description_markdown: description,
+                description_rendered_html: description_rendered_html.to_string(),
+                creator_user_token: Some(&user_token), // replace with actual UserToken
+                creator_ip_address: "192.168.1.1",
+                creator_set_visibility: Visibility::Public,
+                maybe_last_update_user_token: Some(user_token.to_string()),
+                original_download_url: Some(original_download_url),
+                original_filename: Some(original_filename),
+                file_size_bytes: 1024,
+                file_checksum_sha2: "checksum1".to_string(),
+                private_bucket_hash: "bucket_hash1".to_string(),
+                maybe_private_bucket_prefix: Some(private_bucket_prefix),
+                maybe_private_bucket_extension: Some(private_bucket_extension),
+                cached_user_ratings_total_count: cached_user_ratings_total_count,
+                cached_user_ratings_positive_count: cached_user_ratings_positive_count,
+                cached_user_ratings_negative_count: cached_user_ratings_negative_count,
+                maybe_cached_user_ratings_ratio: Some(cached_user_ratings_ratio as f32),
+                version: version,
+                mysql_pool: &mysql_pool, // replace with actual MySqlPool
+            };
+        
+            create_weight(args).await;
+        }
+    Ok(())
+}
 pub async fn seed_weights_for_user_token(
     mysql_pool: &Pool<MySql>,
     user_token: UserToken
@@ -165,16 +504,9 @@ pub async fn seed_weights_for_user_token(
     }
     Ok(())
 }
-pub async fn seed_weights(mysql_pool: &Pool<MySql>) -> AnyhowResult<()> {
-    info!("Seeding weights...");
 
-    let user_token = match get_user_token_by_username(HANASHI_USERNAME, mysql_pool).await? {
-        None => {
-            return Err(anyhow!("could not find user hanashi"));
-        }
-        Some(token) => token,
-    };
 
+pub async fn original_seed_weights(mysql_pool: &Pool<MySql>,user_token: UserToken) -> AnyhowResult<()> {
     let model_weight_token1 = ModelWeightToken("1".to_string());
     let creator_token1 = UserToken("creatorToken1".to_string());
 
@@ -327,9 +659,22 @@ pub async fn seed_weights(mysql_pool: &Pool<MySql>) -> AnyhowResult<()> {
         create_weight(model_weights_arg).await?;
     }
 
-    // adds this to HANASHI
-    get_user_token_by_username(HANASHI_USERNAME, mysql_pool).await?;
-    seed_weights_for_user_token(mysql_pool, user_token).await?;
+    Ok(())
+
+}
+pub async fn seed_weights(mysql_pool: &Pool<MySql>) -> AnyhowResult<()> {
+    info!("Seeding weights...");
+    
+    let user_token = match get_user_token_by_username(HANASHI_USERNAME, mysql_pool).await? {
+        None => {
+            return Err(anyhow!("could not find user hanashi"));
+        }
+        Some(token) => token,
+    };
+
+    //original_seed_weights(mysql_pool,user_token).await?;
+    //seed_weights_for_user_token(mysql_pool, user_token).await?;
+    seed_weights_for_paging(mysql_pool,user_token).await?;
 
     Ok(())
 }

crates/cli/dev_upload_media_file/Cargo.toml

@@ -33,12 +33,8 @@ log = "0.4.14"
 # NB: We switched to Tokio from `async-std` for broader ecosystem support.
 tokio = { version = "1.6.0", features = ["macros"] }
 
-# MySql Database
-# "offline" supports typesafe builds without a live database
-# "rustls" doesn't appear to work with IP addresses, per:
-# https://github.com/launchbadge/sqlx/issues/1095#issuecomment-798050828
 sqlx = { version = "0.7.2", features = [ "mysql", "runtime-tokio", "tls-rustls", "chrono" ] }
-my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" }
+my-workspace-hack = { version = "0.1", path = "../../my-workspace-hack" }
 
 [dev-dependencies]
 # None yet

crates/cli/elasticsearch-cli/Cargo.toml

@@ -33,10 +33,6 @@ strum = { version = "0.25", features = ["derive"] }
 # NB: We switched to Tokio from `async-std` for broader ecosystem support.
 tokio = { version = "1.6.0", features = ["macros"] }
 
-# MySql Database
-# "offline" supports typesafe builds without a live database
-# "rustls" doesn't appear to work with IP addresses, per:
-# https://github.com/launchbadge/sqlx/issues/1095#issuecomment-798050828
 sqlx = { version = "0.7.2", features = [ "mysql", "runtime-tokio", "tls-rustls", "chrono" ] }
 
 elasticsearch = "8.5.0-alpha.1"
@@ -45,7 +41,7 @@ elasticsearch = "8.5.0-alpha.1"
 serde = "1.0.125"
 serde_derive = "1.0.125"
 serde_json = "1.0.108"
-my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" }
+my-workspace-hack = { version = "0.1", path = "../../my-workspace-hack" }
 
 [dev-dependencies]
 # None yet

crates/cli/kubectl-pod-cleanup/Cargo.toml

@@ -21,9 +21,9 @@ errors = { path = "../../lib/errors" }
 # External
 log = "0.4.20"
 once_cell = "1.18.0"
-rand = "0.8.1"
+rand = "0.8.5"
 regex = "1.10.0"
-my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" }
+my-workspace-hack = { version = "0.1", path = "../../my-workspace-hack" }
 
 # Async Runtime
 # NB: Not using Tokio here since everything is blocking so far.

crates/cli/lru-delete-models/Cargo.toml

@@ -20,7 +20,7 @@ logging = { path = "../../lib/logging" }
 # External
 clap = { version = "4.4.7", features = ["derive"] }
 walkdir = "2.4.0"
-my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" }
+my-workspace-hack = { version = "0.1", path = "../../my-workspace-hack" }
 
 [dev-dependencies]
 # None yet

crates/cli/scrape_test/Cargo.toml

@@ -21,4 +21,4 @@ web_scrapers = { path = "../../lib/web_scrapers" }
 # External
 clap = "2.34.0" # TODO: This is really out of date, but has conflicts when updated
 tokio = { version = "1.6.0", features = ["macros"] }
-my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" }
+my-workspace-hack = { version = "0.1", path = "../../my-workspace-hack" }

crates/lib/actix_helpers/Cargo.toml

@@ -34,7 +34,7 @@ futures-util = "0.3.29"
 # Serialization
 serde = "1.0.125"
 serde_json = "1.0.108"
-my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" }
+my-workspace-hack = { version = "0.1", path = "../../my-workspace-hack" }
 
 [dev-dependencies]
 # None yet

crates/lib/api_clients/cloud_storage/Cargo.toml

@@ -28,4 +28,4 @@ rust-s3 = { version = "0.33.0" }
 # Runtime
 # NB: We switched to Tokio from `async-std` for broader ecosystem support.
 tokio = { version = "1.6.0", features = ["macros"] }
-my-workspace-hack = { version = "0.1", path = "../../../../my-workspace-hack" }
+my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" }

crates/lib/api_clients/fakeyou_client/Cargo.toml

@@ -20,7 +20,7 @@ tokens = { path = "../../../_types/tokens" }
 
 # External
 bytes = "1.3"
-chrono = { version = "=0.4.22", features = ["serde"] }
+chrono = { version = "0.4.22", features = ["serde"] }
 log = "0.4.14"
 once_cell = "1.9.0"
 

crates/lib/api_clients/google_drive_common/Cargo.toml

@@ -22,5 +22,5 @@ subprocess_common = { path = "../../subprocess_common" }
 anyhow = "1.0.75"
 log = "0.4.14"
 tempdir = "0.3.7"
-my-workspace-hack = { version = "0.1", path = "../../../../my-workspace-hack" }
+my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" }
 

crates/lib/api_clients/twitch_common/Cargo.toml

@@ -31,4 +31,4 @@ twitch_oauth2 = "0.6.0-rc.2"
 # Serialization
 serde = "1.0.125"
 serde_derive = "1.0.125"
-my-workspace-hack = { version = "0.1", path = "../../../../my-workspace-hack" }
+my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" }

crates/lib/bootstrap/Cargo.toml

@@ -23,7 +23,7 @@ server_environment = { path = "../server_environment" }
 dotenv = "0.15.0"
 hostname = "0.3.1"
 log = "0.4.14"
-my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" }
+my-workspace-hack = { version = "0.1", path = "../../my-workspace-hack" }
 
 [dev-dependencies]
 # None yet

crates/lib/caching/memory_caching/Cargo.toml

@@ -22,4 +22,4 @@ anyhow = "1.0.75"
 
 # In-memory caching
 lru_time_cache = "0.11.11"
-my-workspace-hack = { version = "0.1", path = "../../../../my-workspace-hack" }
+my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" }

crates/lib/caching/redis_caching/Cargo.toml

@@ -23,7 +23,7 @@ r2d2_redis = "0.14.0"
 serde = "1.0.125"
 serde_derive = "1.0.125"
 serde_json = "1.0.108"
-my-workspace-hack = { version = "0.1", path = "../../../../my-workspace-hack" }
+my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" }
 
 [dev-dependencies]
 # None yet

crates/lib/collections/Cargo.toml

@@ -0,0 +1,26 @@
+[package]
+name = "collections"
+edition = "2018"
+version = "0.0.1"
+authors = [
+    "Brandon Thomas <bt@brand.io>",
+    "Brandon Thomas <echelon@gmail.com>",
+]
+publish = false
+
+[lib]
+# NB: Public "collections" crate is not yet taken (!!), so we're fine to use this internally for now.
+name = "collections"
+path = "src/lib.rs"
+
+[dependencies]
+# Internal
+errors = { path = "../errors" }
+my-workspace-hack = { version = "0.1", path = "../../my-workspace-hack" }
+
+# External
+# KEEP THIS TO A MINIMUM OR NIL.
+rand = "0.8.5"
+
+[dev-dependencies]
+# None yet

crates/lib/collections/src/lib.rs

@@ -0,0 +1,22 @@
+//! collections
+//!
+//! The purpose of this library is to provide "extra" data structures or utilities related to
+//! data structures. There should be minimal dependency introduction here.
+//!
+
+// Never allow these
+#![forbid(private_in_public)]
+#![forbid(unused_must_use)] // NB: It's unsafe to not close/check some things
+
+// Okay to toggle
+#![forbid(unreachable_patterns)]
+#![forbid(unused_imports)]
+#![forbid(unused_mut)]
+#![forbid(unused_variables)]
+
+// Always allow
+#![allow(dead_code)]
+#![allow(non_snake_case)]
+
+pub mod multiple_random_from_vec;
+pub mod random_from_vec;

crates/lib/collections/src/multiple_random_from_vec.rs

@@ -12,7 +12,7 @@ pub fn multiple_random_from_vec<T>(vec: &Vec<T>, amount: usize) -> Vec<&T> {
 
 #[cfg(test)]
 mod tests {
-  use crate::collections::multiple_random_from_vec::multiple_random_from_vec;
+  use crate::multiple_random_from_vec::multiple_random_from_vec;
 
   #[test]
   fn pulls_item_from_vec() {

crates/lib/collections/src/random_from_vec.rs

@@ -7,7 +7,7 @@ pub fn random_from_vec<T>(vec: &Vec<T>) -> Option<&T> {
 
 #[cfg(test)]
 mod tests {
-  use crate::collections::random_from_vec::random_from_vec;
+  use crate::random_from_vec::random_from_vec;
 
   #[test]
   fn pulls_item_from_vec() {

crates/lib/concurrency/Cargo.toml

@@ -14,7 +14,7 @@ path = "src/lib.rs"
 
 [dependencies]
 # Internal
-my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" }
+my-workspace-hack = { version = "0.1", path = "../../my-workspace-hack" }
 
 # External
 # (None yet)

crates/lib/cookies/Cargo.toml

@@ -21,7 +21,7 @@ errors = { path = "../errors" }
 hmac = "0.10.0" # jwt signing
 jwt = "0.13.0"
 sha2 = "0.9.5" # hmac signing
-my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" }
+my-workspace-hack = { version = "0.1", path = "../../my-workspace-hack" }
 
 [dev-dependencies]
 # None yet

crates/lib/crockford/Cargo.toml

@@ -15,8 +15,8 @@ name = "crockford"
 path = "src/lib.rs"
 
 [dependencies]
-rand = "0.8.3"
-my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" }
+rand = "0.8.5"
+my-workspace-hack = { version = "0.1", path = "../../my-workspace-hack" }
 
 [dev-dependencies]
 # None yet

crates/lib/datetimes/Cargo.toml

@@ -13,9 +13,9 @@ name = "datetimes"
 path = "src/lib.rs"
 
 [dependencies]
-chrono = { version = "=0.4.22", features = ["serde"] }
+chrono = { version = "0.4.22", features = ["serde"] }
 once_cell = "1.18.0"
-my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" }
+my-workspace-hack = { version = "0.1", path = "../../my-workspace-hack" }
 
 [dev-dependencies]
 # (none)

crates/lib/deprecated/config/Cargo.toml

@@ -21,4 +21,4 @@ easyenv = { path = "../../../lib/easyenv" }
 # External
 anyhow = "1.0.75"
 url = "2.4.1"
-my-workspace-hack = { version = "0.1", path = "../../../../my-workspace-hack" }
+my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" }

crates/lib/deprecated/container_common/Cargo.toml

@@ -17,14 +17,14 @@ path = "src/lib.rs"
 # External
 anyhow = "1.0.75"
 once_cell = "1.18.0"
-rand = "0.8.3"
+rand = "0.8.5"
 uuid = { version = "0.8.2", features = ["v4"] }
 log = "0.4.14"
 
 # Serialization
 serde = { version = "1.0.125", features = ["derive"] }
 toml = "0.5.8"
-my-workspace-hack = { version = "0.1", path = "../../../../my-workspace-hack" }
+my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" }
 
 [dev-dependencies]
 

crates/lib/deprecated/container_common/src/collections/mod.rs

@@ -1,2 +0,0 @@
-pub mod multiple_random_from_vec;
-pub mod random_from_vec;

crates/lib/deprecated/container_common/src/filesystem/check_directory_exists.rs

@@ -1,15 +0,0 @@
-use std::path::PathBuf;
-
-use anyhow::bail;
-
-use crate::anyhow_result::AnyhowResult;
-
-pub fn check_directory_exists(path: &PathBuf) -> AnyhowResult<()> {
-  if !path.exists() {
-    bail!("Path doesn't exist: {:?}", path);
-  }
-  if !path.is_dir() {
-    bail!("Path isn't a directory: {:?}", path);
-  }
-  Ok(())
-}

crates/lib/deprecated/container_common/src/filesystem/mod.rs

@@ -1,5 +0,0 @@
-pub mod check_directory_exists;
-pub mod check_file_exists;
-pub mod safe_delete_possible_temp_file;
-pub mod safe_delete_temp_directory;
-pub mod safe_delete_temp_file;

crates/lib/deprecated/container_common/src/lib.rs

@@ -1,7 +1,5 @@
 pub mod anyhow_result;
-pub mod collections;
 pub mod files;
-pub mod filesystem;
 pub mod i18n;
 pub mod numerics;
 pub mod thread;

crates/lib/deprecated/container_common/src/token/mod.rs

@@ -1,3 +1,2 @@
 pub mod random_crockford_token;
-pub mod random_prefix_crockford_token;
 pub mod random_uuid;

crates/lib/deprecated/container_common/src/token/random_prefix_crockford_token.rs

@@ -1,100 +0,0 @@
-use anyhow::anyhow;
-use rand::Rng;
-
-use crate::anyhow_result::AnyhowResult;
-
-// Crockford characters
-const CROCKFORD_UPPERCASE_CHARSET: &[u8] = b"0123456789ABCDEFGHJKMNPQRSTVWXYZ";
-
-const CROCKFORD_LOWERCASE_CHARSET: &[u8] = b"0123456789abcdefghjkmnpqrstvwxyz";
-
-// Random part can't be any less than this.
-const MIN_ENTROPY_LENGTH : usize = 8;
-
-#[deprecated(note = "see internal 'crockford' and 'token' crates")]
-pub fn random_prefix_crockford_token(prefix: &str, length: usize, uppercase: bool) -> AnyhowResult<String> {
-  let mut prefix = prefix.trim().to_string();
-
-  if prefix.is_empty() {
-    return Err(anyhow!("prefix not set; use other crockford functions"));
-  }
-
-  if !prefix.ends_with(":") {
-    prefix = format!("{}:", prefix);
-  }
-
-  let entropy_length : usize = length.saturating_sub(prefix.len());
-
-  if entropy_length < MIN_ENTROPY_LENGTH {
-    return Err(anyhow!("not enough entropy in token"));
-  }
-
-  let mut rng = rand::thread_rng();
-
-  let charset = if uppercase { CROCKFORD_UPPERCASE_CHARSET } else { CROCKFORD_LOWERCASE_CHARSET };
-
-  let entropy_part: String = (0..entropy_length)
-    .map(|_| {
-      let idx = rng.gen_range(0..charset.len());
-      charset[idx] as char
-    })
-    .collect();
-
-  let token = format!("{}{}", prefix, entropy_part);
-  Ok(token)
-}
-
-#[cfg(test)]
-mod tests {
-  use crate::token::random_prefix_crockford_token::random_prefix_crockford_token;
-
-  #[test]
-  fn no_prefix_error() {
-    assert!(random_prefix_crockford_token("", 0, false).is_err());
-    assert!(random_prefix_crockford_token("", 10, false).is_err());
-    assert!(random_prefix_crockford_token("", 32, false).is_err());
-    assert!(random_prefix_crockford_token("", 0, true).is_err());
-    assert!(random_prefix_crockford_token("", 10, true).is_err());
-    assert!(random_prefix_crockford_token("", 32, true).is_err());
-  }
-
-  #[test]
-  fn not_enough_entropy_error() {
-    assert!(random_prefix_crockford_token("foo", 0, false).is_err());
-    assert!(random_prefix_crockford_token("foo", 5, false).is_err());
-    assert!(random_prefix_crockford_token("foo", 11, false).is_err());
-    assert!(random_prefix_crockford_token("foo:", 11, false).is_err());
-    assert!(random_prefix_crockford_token("foo", 0, true).is_err());
-    assert!(random_prefix_crockford_token("foo", 5, true).is_err());
-    assert!(random_prefix_crockford_token("foo", 11, true).is_err());
-    assert!(random_prefix_crockford_token("foo:", 11, true).is_err());
-  }
-
-  #[test]
-  fn starts_with() {
-    assert!(random_prefix_crockford_token("w", 10, false).unwrap().starts_with("w:"));
-    assert!(random_prefix_crockford_token("w", 10, false).unwrap().starts_with("w:"));
-    assert!(random_prefix_crockford_token("prefix", 16, false).unwrap().starts_with("prefix:"));
-    assert!(random_prefix_crockford_token("prefix:", 16, false).unwrap().starts_with("prefix:"));
-    assert!(random_prefix_crockford_token("w", 10, true).unwrap().starts_with("w:"));
-    assert!(random_prefix_crockford_token("w", 10, true).unwrap().starts_with("w:"));
-    assert!(random_prefix_crockford_token("prefix", 16, true).unwrap().starts_with("prefix:"));
-    assert!(random_prefix_crockford_token("prefix:", 16, true).unwrap().starts_with("prefix:"));
-  }
-
-  #[test]
-  fn length() {
-    assert_eq!(random_prefix_crockford_token("w", 10, false).unwrap().len(), 10);
-    assert_eq!(random_prefix_crockford_token("w:", 10, false).unwrap().len(), 10);
-    assert_eq!(random_prefix_crockford_token("prefix", 16, false).unwrap().len(), 16);
-    assert_eq!(random_prefix_crockford_token("prefix:", 16, false).unwrap().len(), 16);
-    assert_eq!(random_prefix_crockford_token("asdf:", 32, false).unwrap().len(), 32);
-    assert_eq!(random_prefix_crockford_token("asdf", 32, false).unwrap().len(), 32);
-    assert_eq!(random_prefix_crockford_token("w", 10, true).unwrap().len(), 10);
-    assert_eq!(random_prefix_crockford_token("w:", 10, true).unwrap().len(), 10);
-    assert_eq!(random_prefix_crockford_token("prefix", 16, true).unwrap().len(), 16);
-    assert_eq!(random_prefix_crockford_token("prefix:", 16, true).unwrap().len(), 16);
-    assert_eq!(random_prefix_crockford_token("asdf:", 32, true).unwrap().len(), 32);
-    assert_eq!(random_prefix_crockford_token("asdf", 32, true).unwrap().len(), 32);
-  }
-}

crates/lib/deprecated/http_server_common/Cargo.toml

@@ -21,7 +21,7 @@ reusable_types = { path = "../../../_types/reusable_types" }
 # External
 anyhow = "1.0.75"
 base64 = "0.21.0"
-chrono = { version = "=0.4.22", features = ["serde"] }
+chrono = { version = "0.4.22", features = ["serde"] }
 log = "0.4.14"
 once_cell = "1.18.0"
 regex = "1.5.4"
@@ -39,7 +39,7 @@ language-tags = "0.3.2" # Parsing single tags richly
 serde = "1.0.125"
 serde_derive = "1.0.125"
 serde_json = "1.0.108"
-my-workspace-hack = { version = "0.1", path = "../../../../my-workspace-hack" }
+my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" }
 
 [dev-dependencies]
 actix-rt = "2.9.0"

crates/lib/easyenv/Cargo.toml

@@ -18,9 +18,9 @@ storyteller_root = { path = "../storyteller_root" }
 
 # External
 dotenv = "0.15.0"
-env_logger = "0.10.0"
+env_logger = "0.10.1"
 log = "0.4.14"
-my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" }
+my-workspace-hack = { version = "0.1", path = "../../my-workspace-hack" }
 
 [dev-dependencies]
 # None yet

crates/lib/elasticsearch_schema/Cargo.toml

@@ -23,10 +23,10 @@ elasticsearch = "8.5.0-alpha.1"
 log = "0.4.14"
 
 # Serialization
-chrono = { version = "=0.4.22", features = ["serde"] }
+chrono = { version = "0.4.22", features = ["serde"] }
 serde = { version = "1.0.152", features = ["derive"] }
 serde_json = "1.0.108"
-my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" }
+my-workspace-hack = { version = "0.1", path = "../../my-workspace-hack" }
 
 [dev-dependencies]
 # None yet

crates/lib/email_sender/Cargo.toml

@@ -11,5 +11,5 @@ path = "src/lib.rs"
 
 [dependencies]
 errors = { path = "../errors" }
-lettre = "0.11.0"
-my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" }
+lettre = "0.11.2"
+my-workspace-hack = { version = "0.1", path = "../../my-workspace-hack" }

crates/lib/errors/Cargo.toml

@@ -18,7 +18,7 @@ path = "src/lib.rs"
 # Consider the dependencies here wisely.
 # Ideally we have almost nothing as a dependency of this crate.
 anyhow = "1.0.75"
-my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" }
+my-workspace-hack = { version = "0.1", path = "../../my-workspace-hack" }
 
 [dev-dependencies]
 # None yet

crates/lib/files/archives/Cargo.toml

@@ -20,7 +20,7 @@ errors = { path = "../../errors" }
 
 # External
 zip = "0.6.6"
-my-workspace-hack = { version = "0.1", path = "../../../../my-workspace-hack" }
+my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" }
 
 [dev-dependencies]
 # None yet

crates/lib/files/filesys/Cargo.toml

@@ -16,7 +16,8 @@ path = "src/lib.rs"
 [dependencies]
 # Internal
 errors = { path = "../../errors" }
-my-workspace-hack = { version = "0.1", path = "../../../../my-workspace-hack" }
+my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" }
+log = "0.4.20"
 
 # External
 # KEEP THIS TO A MINIMUM OR NIL.

crates/lib/files/filesys/src/check_directory_exists.rs

@@ -0,0 +1,15 @@
+use std::path::Path;
+
+use errors::{AnyhowResult, bail};
+
+pub fn check_directory_exists<P: AsRef<Path>>(path: P) -> AnyhowResult<()> {
+  let check_path = path.as_ref();
+
+  if !check_path.exists() {
+    bail!("Path doesn't exist: {:?}", check_path);
+  }
+  if !check_path.is_dir() {
+    bail!("Path isn't a directory: {:?}", check_path);
+  }
+  Ok(())
+}

crates/lib/files/filesys/src/check_file_exists.rs

@@ -1,8 +1,7 @@
 use std::path::PathBuf;
 
-use anyhow::bail;
-
-use crate::anyhow_result::AnyhowResult;
+use errors::AnyhowResult;
+use errors::bail;
 
 pub fn check_file_exists(path: &PathBuf) -> AnyhowResult<()> {
   if !path.exists() {

crates/lib/files/filesys/src/file_size.rs

@@ -7,6 +7,7 @@ use errors::{anyhow, AnyhowResult};
 pub fn file_size<P: AsRef<Path>>(filename: P) -> AnyhowResult<u64> {
   let metadata = std::fs::metadata(filename.as_ref())?;
 
+  // TODO(bt,2023-11-29): Return io::Result and errors here.
   if !metadata.is_file() {
     Err(anyhow!("path {:?} is not a file", filename.as_ref()))
   } else if metadata.is_symlink() {

crates/lib/files/filesys/src/is_filesystem_full_error.rs

@@ -0,0 +1,16 @@
+
+// Nearly a third of `ErrorKind` is nightly rust, so we're going to have to match on
+// unix error codes until the rest of the ErrorKind enum variants are stable.
+// The error codes are maintained in sys/unix/mod.rs - decode_error_kind(i32)
+
+const E_FILESYSTEM_QUOTA_EXCEEDED : i32 = 122; // pub const EDQUOT: ::c_int = 122;
+const E_STORAGE_FULL : i32 = 28; // pub const ENOSPC: ::c_int = 28;
+
+/// Reports if an io::Error was caused by the filesystem being full.
+pub fn is_filesystem_full_error(err: &std::io::Error) -> bool {
+  match err.raw_os_error() {
+    Some(E_FILESYSTEM_QUOTA_EXCEEDED) => true,
+    Some(E_STORAGE_FULL) => true,
+    _ => false,
+  }
+}

crates/lib/files/filesys/src/lib.rs

@@ -18,11 +18,17 @@
 #![allow(dead_code)]
 #![allow(non_snake_case)]
 
+pub mod check_file_exists;
 pub mod create_dir_all_if_missing;
 pub mod directory_exists;
 pub mod file_exists;
 pub mod file_read_bytes;
 pub mod file_size;
 pub mod filename_concat;
+pub mod is_filesystem_full_error;
 pub mod path_to_string;
 pub mod rename_across_devices;
+pub mod check_directory_exists;
+pub mod safe_delete_temp_file;
+pub mod safe_delete_possible_temp_file;
+pub mod safe_delete_temp_directory;

crates/lib/files/filesys/src/rename_across_devices.rs

@@ -1,30 +1,80 @@
+use std::error::Error;
+use std::fmt;
 use std::path::Path;
 
+use log::error;
+
+use crate::is_filesystem_full_error::is_filesystem_full_error;
+
+#[derive(Debug)]
+pub enum RenameError {
+  StorageFull,
+  IoError(std::io::Error),
+}
+
+impl Error for RenameError {}
+
+impl fmt::Display for RenameError {
+  fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+    match self {
+      RenameError::StorageFull => write!(f, "RenameError: storage is full"),
+      RenameError::IoError(err) => write!(f, "{:?}", err),
+    }
+  }
+}
+
+impl From<std::io::Error> for RenameError {
+  fn from(error: std::io::Error) -> Self {
+    RenameError::IoError(error)
+  }
+}
+
 /// Rename a file.
 /// Ordinary rename will fail in Linux if it is across physical devices.
 /// This function will perform a copy followed by delete in that case.
-pub fn rename_across_devices<P: AsRef<Path>, Q: AsRef<Path>>(from: P, to: Q) -> std::io::Result<()> {
+/// In both cases, this function will overwrite the destination if it already exists.
+pub fn rename_across_devices<P: AsRef<Path>, Q: AsRef<Path>>(from: P, to: Q) -> Result<(), RenameError> {
   let result = std::fs::rename(&from, &to);
 
-  let err = match result.as_ref() {
+  let err = match result {
     Ok(_) => return Ok(()), // Rename succeeded.
     Err(err) => err,
   };
 
+  // Nearly a third of `ErrorKind` is nightly rust, so we're going to have to match on
+  // unix error codes until the rest of the ErrorKind enum variants are stable.
+  // The error codes are maintained in sys/unix/mod.rs - decode_error_kind(i32)
+  const E_CROSSES_DEVICES : i32 = 18; // pub const EXDEV: ::c_int = 18;
+
+  if is_filesystem_full_error(&err) {
+    error!("Filesystem is full during rename.");
+    return Err(RenameError::StorageFull);
+  }
+
   match err.raw_os_error() {
-    Some(18) => {
-      // NO-OP: pass-through
-      // NB: We can clean this up in the future when `err.kind() == ErrorKind::CrossDevices`
-      // stabilizes. For now we can assume code "18" means we're trying to rename across devices.
+    Some(E_CROSSES_DEVICES) => {
+      // NB: Fall through.
     }
     _ => {
       // Something else happened. Return original error.
-      return result;
+      return Err(RenameError::IoError(err));
     }
   }
 
-  let _num_bytes = std::fs::copy(&from, &to)?;
+  // NB: In production we've seen std::fs::copy silently succeed, yet copy zero bytes. The reason
+  // is more than likely that the filesystem is full. We'll check the number of copied bytes to
+  // confirm. Moreover, the Rust docs say wrt std::fs::copy, "On success, the total number of bytes
+  // copied is returned and it is equal to the length of the to file as reported by metadata."
+  let original_file_size = std::fs::metadata(from.as_ref())?.len();
 
+  let num_bytes_copied = std::fs::copy(&from, &to)?;
+
+  if num_bytes_copied != original_file_size {
+    error!("Filesystem is full during copy. Not all bytes copied.");
+    return Err(RenameError::StorageFull);
+  }
+
+  // An emulated "rename" would delete the source file.
   std::fs::remove_file(&from)?;
 
   Ok(())

crates/lib/files/filesys/src/safe_delete_possible_temp_file.rs

@@ -1,6 +1,6 @@
 use std::path::Path;
 
-use crate::filesystem::safe_delete_temp_file::safe_delete_temp_file;
+use crate::safe_delete_temp_file::safe_delete_temp_file;
 
 pub fn safe_delete_possible_temp_file<P: AsRef<Path>>(maybe_file_path: Option<P>) {
   if let Some(file_path) = maybe_file_path {

crates/lib/files/hashing/Cargo.toml

@@ -22,7 +22,7 @@ bcrypt = "0.8" # password hashes
 data-encoding = "2.3.2"
 md-5 = "0.9.1" # DO NOT USE FOR SERIOUS CRYPTO (we use this for gravatar)
 ring = "0.17.0-alpha.10"
-my-workspace-hack = { version = "0.1", path = "../../../../my-workspace-hack" }
+my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" }
 
 [dev-dependencies]
 # None yet

crates/lib/files/images/Cargo.toml

@@ -21,7 +21,7 @@ errors = { path = "../../errors" }
 
 # External
 image = "0.24.1"
-my-workspace-hack = { version = "0.1", path = "../../../../my-workspace-hack" }
+my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" }
 
 [dev-dependencies]
 testing = { path = "../../testing" }