-40

Cargo.lock

reviewed

··· 2738 2738 ] 2739 2739 2740 2740 [[package]] 2741 2741 - name = "parakeet-lexgen" 2742 2742 - version = "0.1.0" 2743 2743 - dependencies = [ 2744 2744 - "clap", 2745 2745 - "eyre", 2746 2746 - "serde", 2747 2747 - "serde_json", 2748 2748 - "thiserror 2.0.12", 2749 2749 - "walkdir", 2750 2750 - ] 2751 2751 - 2752 2752 - [[package]] 2753 2741 name = "parking_lot" 2754 2742 version = "0.11.2" 2755 2743 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 3607 3595 version = "1.0.18" 3608 3596 source = "registry+https://github.com/rust-lang/crates.io-index" 3609 3597 checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" 3610 3610 - 3611 3611 - [[package]] 3612 3612 - name = "same-file" 3613 3613 - version = "1.0.6" 3614 3614 - source = "registry+https://github.com/rust-lang/crates.io-index" 3615 3615 - checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" 3616 3616 - dependencies = [ 3617 3617 - "winapi-util", 3618 3618 - ] 3619 3598 3620 3599 [[package]] 3621 3600 name = "schannel" ··· 4806 4785 checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" 4807 4786 4808 4787 [[package]] 4809 4809 - name = "walkdir" 4810 4810 - version = "2.5.0" 4811 4811 - source = "registry+https://github.com/rust-lang/crates.io-index" 4812 4812 - checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" 4813 4813 - dependencies = [ 4814 4814 - "same-file", 4815 4815 - "winapi-util", 4816 4816 - ] 4817 4817 - 4818 4818 - [[package]] 4819 4788 name = "want" 4820 4789 version = "0.3.1" 4821 4790 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 4993 4962 version = "0.4.0" 4994 4963 source = "registry+https://github.com/rust-lang/crates.io-index" 4995 4964 checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" 4996 4996 - 4997 4997 - [[package]] 4998 4998 - name = "winapi-util" 4999 4999 - version = "0.1.9" 5000 5000 - source = "registry+https://github.com/rust-lang/crates.io-index" 5001 5001 - checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" 5002 5002 - dependencies = [ 5003 5003 - "windows-sys 0.59.0", 5004 5004 - ] 5005 4965 5006 4966 [[package]] 5007 4967 name = "winapi-x86_64-pc-windows-gnu"

+1 -10

Cargo.toml

reviewed

··· 1 1 [workspace] 2 2 resolver = "2" 3 3 4 4 - members = [ 5 5 - "consumer", 6 6 - "dataloader-rs", 7 7 - "did-resolver", 8 8 - "lexica", 9 9 - "parakeet", 10 10 - "parakeet-db", 11 11 - "parakeet-index", 12 12 - "parakeet-lexgen" 13 13 - ] 4 4 + members = ["crates/*"]

consumer/Cargo.toml crates/consumer/Cargo.toml

reviewed

consumer/Dockerfile crates/consumer/Dockerfile

reviewed

consumer/justfile crates/consumer/justfile

reviewed

consumer/src/backfill/downloader.rs crates/consumer/src/backfill/downloader.rs

reviewed

consumer/src/backfill/mod.rs crates/consumer/src/backfill/mod.rs

reviewed

consumer/src/backfill/repo.rs crates/consumer/src/backfill/repo.rs

reviewed

consumer/src/backfill/types.rs crates/consumer/src/backfill/types.rs

reviewed

consumer/src/cmd.rs crates/consumer/src/cmd.rs

reviewed

consumer/src/config.rs crates/consumer/src/config.rs

reviewed

consumer/src/db/actor.rs crates/consumer/src/db/actor.rs

reviewed

consumer/src/db/backfill.rs crates/consumer/src/db/backfill.rs

reviewed

consumer/src/db/copy.rs crates/consumer/src/db/copy.rs

reviewed

consumer/src/db/gates.rs crates/consumer/src/db/gates.rs

reviewed

consumer/src/db/labels.rs crates/consumer/src/db/labels.rs

reviewed

consumer/src/db/mod.rs crates/consumer/src/db/mod.rs

reviewed

consumer/src/db/record.rs crates/consumer/src/db/record.rs

reviewed

consumer/src/db/sql/bookmarks_upsert.sql crates/consumer/src/db/sql/bookmarks_upsert.sql

reviewed

consumer/src/db/sql/feedgen_upsert.sql crates/consumer/src/db/sql/feedgen_upsert.sql

reviewed

consumer/src/db/sql/label_copy_upsert.sql crates/consumer/src/db/sql/label_copy_upsert.sql

reviewed

consumer/src/db/sql/label_defs_upsert.sql crates/consumer/src/db/sql/label_defs_upsert.sql

reviewed

consumer/src/db/sql/label_service_upsert.sql crates/consumer/src/db/sql/label_service_upsert.sql

reviewed

consumer/src/db/sql/list_upsert.sql crates/consumer/src/db/sql/list_upsert.sql

reviewed

consumer/src/db/sql/post_insert.sql crates/consumer/src/db/sql/post_insert.sql

reviewed

consumer/src/db/sql/postgate_upsert.sql crates/consumer/src/db/sql/postgate_upsert.sql

reviewed

consumer/src/db/sql/profile_upsert.sql crates/consumer/src/db/sql/profile_upsert.sql

reviewed

consumer/src/db/sql/starterpack_upsert.sql crates/consumer/src/db/sql/starterpack_upsert.sql

reviewed

consumer/src/db/sql/status_upsert.sql crates/consumer/src/db/sql/status_upsert.sql

reviewed

consumer/src/db/sql/threadgate_upsert.sql crates/consumer/src/db/sql/threadgate_upsert.sql

reviewed

consumer/src/firehose/error.rs crates/consumer/src/firehose/error.rs

reviewed

consumer/src/firehose/mod.rs crates/consumer/src/firehose/mod.rs

reviewed

consumer/src/firehose/types.rs crates/consumer/src/firehose/types.rs

reviewed

consumer/src/indexer/mod.rs crates/consumer/src/indexer/mod.rs

reviewed

consumer/src/indexer/records.rs crates/consumer/src/indexer/records.rs

reviewed

consumer/src/indexer/types.rs crates/consumer/src/indexer/types.rs

reviewed

consumer/src/instrumentation.rs crates/consumer/src/instrumentation.rs

reviewed

consumer/src/label_indexer/mod.rs crates/consumer/src/label_indexer/mod.rs

reviewed

consumer/src/main.rs crates/consumer/src/main.rs

reviewed

consumer/src/utils.rs crates/consumer/src/utils.rs

reviewed

dataloader-rs/.gitignore crates/dataloader-rs/.gitignore

reviewed

dataloader-rs/Cargo.toml crates/dataloader-rs/Cargo.toml

reviewed

dataloader-rs/LICENSE-APACHE crates/dataloader-rs/LICENSE-APACHE

reviewed

dataloader-rs/LICENSE-MIT crates/dataloader-rs/LICENSE-MIT

reviewed

dataloader-rs/README.md crates/dataloader-rs/README.md

reviewed

dataloader-rs/src/async_cached.rs crates/dataloader-rs/src/async_cached.rs

reviewed

dataloader-rs/src/batch_fn.rs crates/dataloader-rs/src/batch_fn.rs

reviewed

dataloader-rs/src/cached.rs crates/dataloader-rs/src/cached.rs

reviewed

dataloader-rs/src/lib.rs crates/dataloader-rs/src/lib.rs

reviewed

dataloader-rs/src/non_cached.rs crates/dataloader-rs/src/non_cached.rs

reviewed

dataloader-rs/src/runtime.rs crates/dataloader-rs/src/runtime.rs

reviewed

did-resolver/Cargo.toml crates/did-resolver/Cargo.toml

reviewed

did-resolver/src/error.rs crates/did-resolver/src/error.rs

reviewed

did-resolver/src/lib.rs crates/did-resolver/src/lib.rs

reviewed

did-resolver/src/types.rs crates/did-resolver/src/types.rs

reviewed

+1 -1

diesel.toml

reviewed

··· 2 2 # see https://diesel.rs/guides/configuring-diesel-cli 3 3 4 4 [print_schema] 5 5 - file = "parakeet-db/src/schema.rs" 5 5 + file = "crates/parakeet-db/src/schema.rs" 6 6 custom_type_derives = ["diesel::query_builder::QueryId"] 7 7 patch_file = "fk.patch" 8 8

+3 -3

justfile

reviewed

··· 1 1 - mod consumer 2 2 - mod parakeet 3 3 - mod parakeet-index 1 1 + mod consumer 'crates/consumer' 2 2 + mod parakeet 'crates/parakeet' 3 3 + mod parakeet-index 'crates/parakeet-index' 4 4 5 5 alias run-consumer := consumer::run 6 6 alias run-parakeet := parakeet::run

lexica/Cargo.toml crates/lexica/Cargo.toml

reviewed

lexica/src/app_bsky/actor.rs crates/lexica/src/app_bsky/actor.rs

reviewed

lexica/src/app_bsky/bookmark.rs crates/lexica/src/app_bsky/bookmark.rs

reviewed

lexica/src/app_bsky/embed.rs crates/lexica/src/app_bsky/embed.rs

reviewed

lexica/src/app_bsky/feed.rs crates/lexica/src/app_bsky/feed.rs

reviewed

lexica/src/app_bsky/graph.rs crates/lexica/src/app_bsky/graph.rs

reviewed

lexica/src/app_bsky/labeler.rs crates/lexica/src/app_bsky/labeler.rs

reviewed

lexica/src/app_bsky/mod.rs crates/lexica/src/app_bsky/mod.rs

reviewed

lexica/src/app_bsky/richtext.rs crates/lexica/src/app_bsky/richtext.rs

reviewed

lexica/src/app_bsky/unspecced.rs crates/lexica/src/app_bsky/unspecced.rs

reviewed

lexica/src/com_atproto/label.rs crates/lexica/src/com_atproto/label.rs

reviewed

lexica/src/com_atproto/mod.rs crates/lexica/src/com_atproto/mod.rs

reviewed

lexica/src/com_atproto/moderation.rs crates/lexica/src/com_atproto/moderation.rs

reviewed

lexica/src/community_lexicon/bookmarks.rs crates/lexica/src/community_lexicon/bookmarks.rs

reviewed

lexica/src/community_lexicon/mod.rs crates/lexica/src/community_lexicon/mod.rs

reviewed

lexica/src/lib.rs crates/lexica/src/lib.rs

reviewed

lexica/src/utils.rs crates/lexica/src/utils.rs

reviewed

parakeet-db/Cargo.toml crates/parakeet-db/Cargo.toml

reviewed

parakeet-db/src/lib.rs crates/parakeet-db/src/lib.rs

reviewed

parakeet-db/src/models.rs crates/parakeet-db/src/models.rs

reviewed

parakeet-db/src/schema.rs crates/parakeet-db/src/schema.rs

reviewed

parakeet-db/src/types.rs crates/parakeet-db/src/types.rs

reviewed

parakeet-index/Cargo.toml crates/parakeet-index/Cargo.toml

reviewed

parakeet-index/Dockerfile crates/parakeet-index/Dockerfile

reviewed

parakeet-index/build.rs crates/parakeet-index/build.rs

reviewed

parakeet-index/justfile crates/parakeet-index/justfile

reviewed

parakeet-index/proto/parakeet.proto crates/parakeet-index/proto/parakeet.proto

reviewed

parakeet-index/src/lib.rs crates/parakeet-index/src/lib.rs

reviewed

parakeet-index/src/main.rs crates/parakeet-index/src/main.rs

reviewed

parakeet-index/src/server/config.rs crates/parakeet-index/src/server/config.rs

reviewed

parakeet-index/src/server/db.rs crates/parakeet-index/src/server/db.rs

reviewed

parakeet-index/src/server/instrumentation.rs crates/parakeet-index/src/server/instrumentation.rs

reviewed

parakeet-index/src/server/mod.rs crates/parakeet-index/src/server/mod.rs

reviewed

parakeet-index/src/server/service.rs crates/parakeet-index/src/server/service.rs

reviewed

parakeet-index/src/server/utils.rs crates/parakeet-index/src/server/utils.rs

reviewed

-12

parakeet-lexgen/Cargo.toml

reviewed

··· 1 1 - [package] 2 2 - name = "parakeet-lexgen" 3 3 - version = "0.1.0" 4 4 - edition = "2021" 5 5 - 6 6 - [dependencies] 7 7 - clap = { version = "4.5.26", features = ["derive"] } 8 8 - eyre = "0.6.12" 9 9 - serde = { version = "1.0.217", features = ["derive"] } 10 10 - serde_json = "1.0.136" 11 11 - thiserror = "2.0.11" 12 12 - walkdir = "2.5.0"

-89

parakeet-lexgen/src/main.rs

reviewed

··· 1 1 - use clap::Parser; 2 2 - use std::collections::BTreeMap; 3 3 - use walkdir::WalkDir; 4 4 - 5 5 - mod types; 6 6 - mod validate; 7 7 - 8 8 - #[derive(Debug, Parser)] 9 9 - struct Cli { 10 10 - sources: Vec<String>, 11 11 - #[clap(short, long)] 12 12 - out: String, 13 13 - /// Turn off lexicon validation - this may cause Rust compilation to fail on generated types. 14 14 - #[clap(short, long)] 15 15 - no_validate: bool, 16 16 - } 17 17 - 18 18 - #[derive(Debug, thiserror::Error)] 19 19 - enum Error { 20 20 - #[error("{0}")] 21 21 - Serde(#[from] serde_json::Error), 22 22 - #[error("{0}")] 23 23 - Io(#[from] std::io::Error), 24 24 - } 25 25 - 26 26 - fn main() -> eyre::Result<()> { 27 27 - let args = Cli::parse(); 28 28 - 29 29 - let lexicon_files = args 30 30 - .sources 31 31 - .iter() 32 32 - .flat_map(|source| WalkDir::new(source).into_iter()) 33 33 - .filter_map(|entry| entry.ok()) 34 34 - .filter_map(|entry| { 35 35 - let path = entry.path(); 36 36 - 37 37 - // attempt filtering down to json files 38 38 - // ends_with matching isn't the greatest, but it should get us most of the way 39 39 - match path.is_file() && entry.file_name().to_string_lossy().ends_with(".json") { 40 40 - true => Some(path.to_path_buf()), 41 41 - false => None, 42 42 - } 43 43 - }) 44 44 - .collect::<Vec<_>>(); 45 45 - 46 46 - let (parsed, errors) = lexicon_files 47 47 - .into_iter() 48 48 - .map(|path| { 49 49 - let filename = path.display().to_string(); 50 50 - 51 51 - let file = 52 52 - std::fs::File::open(path).map_err(|err| (filename.clone(), Error::from(err)))?; 53 53 - 54 54 - let res = serde_json::from_reader::<_, types::Lexicon>(file) 55 55 - .map_err(|err| (filename, Error::from(err)))?; 56 56 - 57 57 - Ok(res) 58 58 - }) 59 59 - .map(|v| match v { 60 60 - Ok(v) => (Some(v), None), 61 61 - Err(e) => (None, Some(e)), 62 62 - }) 63 63 - .unzip::<_, _, Vec<_>, Vec<_>>(); 64 64 - 65 65 - // report the errors 66 66 - for error in errors { 67 67 - if let Some((filename, error)) = error { 68 68 - eprintln!("Lexicon {filename} parse failed: {error}"); 69 69 - } 70 70 - } 71 71 - 72 72 - // pull all the valid lexicon files into a big map so we can run validation 73 73 - let parsed = parsed 74 74 - .into_iter() 75 75 - .filter_map(|maybe_lexicon| match maybe_lexicon { 76 76 - Some(lexicon) => Some((lexicon.id.clone(), lexicon)), 77 77 - None => None, 78 78 - }) 79 79 - .collect::<BTreeMap<_, _>>(); 80 80 - 81 81 - if !args.no_validate { 82 82 - let failed = validate::validate(&parsed); 83 83 - for (fail_nsid, fail_err) in failed { 84 84 - eprintln!("Lexicon {fail_nsid} failed validation: {fail_err:?}"); 85 85 - } 86 86 - } 87 87 - 88 88 - Ok(()) 89 89 - }

-225

parakeet-lexgen/src/types.rs

reviewed

··· 1 1 - use serde::Deserialize; 2 2 - use std::collections::BTreeMap; 3 3 - 4 4 - #[derive(Debug, Deserialize)] 5 5 - pub struct Lexicon { 6 6 - /// Lexicon language version 7 7 - pub lexicon: i32, 8 8 - // Lexicon NSID 9 9 - pub id: String, 10 10 - pub revision: Option<i32>, 11 11 - pub description: Option<String>, 12 12 - pub defs: BTreeMap<String, LexiconDef>, 13 13 - } 14 14 - 15 15 - #[derive(Debug, Deserialize)] 16 16 - #[serde(tag = "type")] 17 17 - #[serde(rename_all = "lowercase")] 18 18 - pub enum LexiconDef { 19 19 - Query(LexiconQuery), 20 20 - Procedure(LexiconProcedure), 21 21 - Subscription(LexiconSubscription), 22 22 - Record(LexiconRecord), 23 23 - String(LexiconString), 24 24 - Array(LexiconArray), 25 25 - Object(LexiconObject), 26 26 - Token { description: Option<String> }, 27 27 - } 28 28 - 29 29 - #[derive(Debug, Deserialize)] 30 30 - #[serde(tag = "type")] 31 31 - #[serde(rename_all = "kebab-case")] 32 32 - pub enum LexiconSchema { 33 33 - Null { 34 34 - description: Option<String>, 35 35 - }, 36 36 - Boolean { 37 37 - description: Option<String>, 38 38 - default: Option<bool>, 39 39 - #[serde(rename = "const")] 40 40 - constant: Option<bool>, 41 41 - }, 42 42 - Integer(LexiconInteger), 43 43 - String(LexiconString), 44 44 - Bytes { 45 45 - description: Option<String>, 46 46 - #[serde(rename = "maxLength")] 47 47 - max_length: Option<i32>, 48 48 - #[serde(rename = "minLength")] 49 49 - min_length: Option<i32>, 50 50 - }, 51 51 - CidLink { 52 52 - description: Option<String>, 53 53 - }, 54 54 - Array(LexiconArray), 55 55 - Object(LexiconObject), 56 56 - Blob { 57 57 - description: Option<String>, 58 58 - accept: Option<Vec<String>>, 59 59 - #[serde(rename = "maxSize")] 60 60 - max_size: Option<i32>, 61 61 - }, 62 62 - Ref { 63 63 - description: Option<String>, 64 64 - #[serde(rename = "ref")] 65 65 - ref_to: String, 66 66 - }, 67 67 - Union(LexiconUnion), 68 68 - Unknown { 69 69 - description: Option<String>, 70 70 - }, 71 71 - } 72 72 - 73 73 - #[derive(Debug, Deserialize)] 74 74 - #[serde(rename_all = "lowercase")] 75 75 - pub enum RKey { 76 76 - Tid, 77 77 - Nsid, 78 78 - Any, 79 79 - } 80 80 - 81 81 - #[derive(Debug, Deserialize)] 82 82 - #[serde(untagged)] 83 83 - pub enum RecordKey { 84 84 - Typed(RKey), 85 85 - Other(String), 86 86 - } 87 87 - 88 88 - #[derive(Debug, Deserialize)] 89 89 - #[serde(rename_all = "kebab-case")] 90 90 - pub enum StringFormats { 91 91 - AtIdentifier, 92 92 - AtUri, 93 93 - Cid, 94 94 - Datetime, 95 95 - Did, 96 96 - Handle, 97 97 - Nsid, 98 98 - Tid, 99 99 - RecordKey, 100 100 - Uri, 101 101 - Language, 102 102 - } 103 103 - 104 104 - #[derive(Debug, Deserialize)] 105 105 - pub struct HttpApiExchange { 106 106 - pub description: Option<String>, 107 107 - pub encoding: String, 108 108 - pub schema: Option<LexiconSchema>, 109 109 - } 110 110 - 111 111 - #[derive(Debug, Deserialize)] 112 112 - pub struct LexiconError { 113 113 - pub name: String, 114 114 - pub description: Option<String>, 115 115 - } 116 116 - 117 117 - #[derive(Debug, Deserialize)] 118 118 - pub struct LexiconSubMessage { 119 119 - pub description: Option<String>, 120 120 - pub schema: Option<LexiconUnion>, 121 121 - } 122 122 - 123 123 - #[derive(Debug, Deserialize)] 124 124 - pub struct LexiconRecord { 125 125 - pub description: Option<String>, 126 126 - pub key: RecordKey, 127 127 - pub record: LexiconObject, 128 128 - } 129 129 - 130 130 - #[derive(Debug, Deserialize)] 131 131 - pub struct LexiconQuery { 132 132 - pub description: Option<String>, 133 133 - pub parameters: Option<LexiconParams>, 134 134 - pub output: Option<HttpApiExchange>, 135 135 - pub errors: Option<Vec<LexiconError>>, 136 136 - } 137 137 - 138 138 - #[derive(Debug, Deserialize)] 139 139 - pub struct LexiconProcedure { 140 140 - pub description: Option<String>, 141 141 - pub parameters: Option<LexiconParams>, 142 142 - pub output: Option<HttpApiExchange>, 143 143 - pub input: Option<HttpApiExchange>, 144 144 - pub errors: Option<Vec<LexiconError>>, 145 145 - } 146 146 - 147 147 - #[derive(Debug, Deserialize)] 148 148 - pub struct LexiconSubscription { 149 149 - pub description: Option<String>, 150 150 - pub parameters: Option<LexiconParams>, 151 151 - pub message: BTreeMap<String, LexiconSubMessage>, 152 152 - pub errors: Option<Vec<LexiconError>>, 153 153 - } 154 154 - 155 155 - #[derive(Debug, Deserialize)] 156 156 - pub struct LexiconInteger { 157 157 - pub description: Option<String>, 158 158 - 159 159 - pub minimum: Option<i64>, 160 160 - pub maximum: Option<i64>, 161 161 - #[serde(rename = "enum")] 162 162 - pub values: Option<Vec<i64>>, 163 163 - pub default: Option<i64>, 164 164 - #[serde(rename = "const")] 165 165 - pub constant: Option<i64>, 166 166 - } 167 167 - 168 168 - #[derive(Debug, Deserialize)] 169 169 - #[serde(rename_all = "camelCase")] 170 170 - pub struct LexiconString { 171 171 - pub description: Option<String>, 172 172 - 173 173 - pub format: Option<StringFormats>, 174 174 - 175 175 - pub max_length: Option<i32>, 176 176 - pub min_length: Option<i32>, 177 177 - pub max_graphemes: Option<i32>, 178 178 - pub min_graphemes: Option<i32>, 179 179 - 180 180 - pub known_values: Option<Vec<String>>, 181 181 - #[serde(rename = "enum")] 182 182 - pub values: Option<Vec<String>>, 183 183 - 184 184 - pub default: Option<String>, 185 185 - #[serde(rename = "const")] 186 186 - pub constant: Option<String>, 187 187 - } 188 188 - 189 189 - #[derive(Debug, Deserialize)] 190 190 - #[serde(rename_all = "camelCase")] 191 191 - pub struct LexiconArray { 192 192 - pub description: Option<String>, 193 193 - 194 194 - pub min_length: Option<i32>, 195 195 - pub max_length: Option<i32>, 196 196 - pub items: Box<LexiconSchema>, 197 197 - } 198 198 - 199 199 - #[derive(Debug, Deserialize)] 200 200 - #[serde(tag = "type")] 201 201 - #[serde(rename = "object")] 202 202 - pub struct LexiconObject { 203 203 - pub description: Option<String>, 204 204 - pub properties: BTreeMap<String, LexiconSchema>, 205 205 - pub required: Option<Vec<String>>, 206 206 - pub nullable: Option<Vec<String>>, 207 207 - } 208 208 - 209 209 - #[derive(Debug, Deserialize)] 210 210 - #[serde(tag = "type")] 211 211 - #[serde(rename = "params")] 212 212 - pub struct LexiconParams { 213 213 - pub description: Option<String>, 214 214 - pub properties: BTreeMap<String, LexiconSchema>, 215 215 - } 216 216 - 217 217 - #[derive(Debug, Deserialize)] 218 218 - #[serde(tag = "type")] 219 219 - #[serde(rename = "union")] 220 220 - pub struct LexiconUnion { 221 221 - pub description: Option<String>, 222 222 - pub refs: Vec<String>, 223 223 - #[serde(default)] 224 224 - pub closed: bool, 225 225 - }

-229

parakeet-lexgen/src/validate.rs

reviewed

··· 1 1 - use crate::types::{ 2 2 - Lexicon, LexiconDef, LexiconObject, LexiconProcedure, LexiconQuery, LexiconSchema, 3 3 - LexiconString, LexiconSubscription, LexiconUnion, RecordKey, 4 4 - }; 5 5 - use std::collections::BTreeMap; 6 6 - 7 7 - #[derive(Debug)] 8 8 - pub enum ValidationError { 9 9 - InvalidReference(String), 10 10 - MissingProperty, 11 11 - MissingReference(String), 12 12 - RecordKey, 13 13 - StringConstAndDefault, 14 14 - } 15 15 - 16 16 - /// validates lexicon definition files - returns keys for any that don't 17 17 - pub fn validate(lexica: &BTreeMap<String, Lexicon>) -> Vec<(String, ValidationError)> { 18 18 - let mut errors = Vec::new(); 19 19 - 20 20 - for (lexicon_id, lexicon) in lexica { 21 21 - for (name, def) in &lexicon.defs { 22 22 - let pass = match def { 23 23 - LexiconDef::Query(query) => validate_query(query, lexica, lexicon_id), 24 24 - LexiconDef::Procedure(proc) => validate_procedure(proc, lexica, lexicon_id), 25 25 - LexiconDef::Subscription(sub) => validate_subscription(sub, lexica, lexicon_id), 26 26 - LexiconDef::Record(rec) => { 27 27 - // validate the rkey 28 28 - let rkey_okay = match &rec.key { 29 29 - // typed is always okay - serde validates 30 30 - RecordKey::Typed(_) => None, 31 31 - // we may want to validate literals according to record key syntax but idk? 32 32 - RecordKey::Other(text) if text.starts_with("literal:") => None, 33 33 - RecordKey::Other(_) => Some(ValidationError::RecordKey), 34 34 - }; 35 35 - 36 36 - // and the schema def 37 37 - let obj_okay = validate_object(&rec.record, lexica, lexicon_id); 38 38 - 39 39 - rkey_okay.or(obj_okay) 40 40 - } 41 41 - LexiconDef::String(lex_str) => validate_string(lex_str, lexica, lexicon_id), 42 42 - LexiconDef::Array(array) => validate_schema(&array.items, lexica, lexicon_id), 43 43 - LexiconDef::Object(obj) => validate_object(obj, lexica, lexicon_id), 44 44 - LexiconDef::Token { .. } => continue, 45 45 - }; 46 46 - 47 47 - if let Some(err) = pass { 48 48 - errors.push((format!("{lexicon_id}#{name}"), err)); 49 49 - } 50 50 - } 51 51 - } 52 52 - 53 53 - errors 54 54 - } 55 55 - 56 56 - fn validate_schema( 57 57 - schema: &LexiconSchema, 58 58 - lexica: &BTreeMap<String, Lexicon>, 59 59 - this_lex: &str, 60 60 - ) -> Option<ValidationError> { 61 61 - match schema { 62 62 - LexiconSchema::String(lex_str) => validate_string(lex_str, lexica, this_lex), 63 63 - LexiconSchema::Array(array) => validate_schema(&array.items, lexica, this_lex), 64 64 - LexiconSchema::Object(obj) => validate_object(obj, lexica, this_lex), 65 65 - LexiconSchema::Ref { ref_to, .. } => lookup(ref_to, this_lex, lexica), 66 66 - LexiconSchema::Union(union) => validate_union(union, lexica, this_lex), 67 67 - LexiconSchema::Null { .. } 68 68 - | LexiconSchema::Boolean { .. } 69 69 - | LexiconSchema::Integer(_) 70 70 - | LexiconSchema::Bytes { .. } 71 71 - | LexiconSchema::CidLink { .. } 72 72 - | LexiconSchema::Blob { .. } 73 73 - | LexiconSchema::Unknown { .. } => None, 74 74 - } 75 75 - } 76 76 - 77 77 - fn validate_query( 78 78 - query: &LexiconQuery, 79 79 - lexica: &BTreeMap<String, Lexicon>, 80 80 - this_lex: &str, 81 81 - ) -> Option<ValidationError> { 82 82 - if let Some(params) = &query.parameters { 83 83 - validate_schema_btree(params.properties.values(), lexica, this_lex)?; 84 84 - } 85 85 - if let Some(output) = &query.output { 86 86 - if let Some(schema) = &output.schema { 87 87 - validate_schema(schema, lexica, this_lex)?; 88 88 - } 89 89 - } 90 90 - 91 91 - None 92 92 - } 93 93 - 94 94 - fn validate_procedure( 95 95 - proc: &LexiconProcedure, 96 96 - lexica: &BTreeMap<String, Lexicon>, 97 97 - this_lex: &str, 98 98 - ) -> Option<ValidationError> { 99 99 - if let Some(params) = &proc.parameters { 100 100 - validate_schema_btree(params.properties.values(), lexica, this_lex)?; 101 101 - } 102 102 - 103 103 - if let Some(input) = &proc.input { 104 104 - if let Some(schema) = &input.schema { 105 105 - validate_schema(schema, lexica, this_lex)?; 106 106 - } 107 107 - } 108 108 - 109 109 - if let Some(output) = &proc.output { 110 110 - if let Some(schema) = &output.schema { 111 111 - validate_schema(schema, lexica, this_lex)?; 112 112 - } 113 113 - } 114 114 - 115 115 - None 116 116 - } 117 117 - 118 118 - fn validate_subscription( 119 119 - sub: &LexiconSubscription, 120 120 - lexica: &BTreeMap<String, Lexicon>, 121 121 - this_lex: &str, 122 122 - ) -> Option<ValidationError> { 123 123 - if let Some(params) = &sub.parameters { 124 124 - validate_schema_btree(params.properties.values(), lexica, this_lex)?; 125 125 - } 126 126 - 127 127 - sub.message.values().find_map(|item| { 128 128 - item.schema 129 129 - .as_ref() 130 130 - .map(|union| validate_union(&union, lexica, this_lex)) 131 131 - .unwrap_or_default() 132 132 - }) 133 133 - } 134 134 - 135 135 - fn validate_object( 136 136 - object: &LexiconObject, 137 137 - lexica: &BTreeMap<String, Lexicon>, 138 138 - this_lex: &str, 139 139 - ) -> Option<ValidationError> { 140 140 - // check that everything in required and nullable exists in properties 141 141 - if let Some(required) = &object.required { 142 142 - for key in required { 143 143 - if !object.properties.contains_key(key) { 144 144 - return Some(ValidationError::MissingProperty); 145 145 - } 146 146 - } 147 147 - } 148 148 - if let Some(nullable) = &object.nullable { 149 149 - for key in nullable { 150 150 - if !object.properties.contains_key(key) { 151 151 - return Some(ValidationError::MissingProperty); 152 152 - } 153 153 - } 154 154 - } 155 155 - 156 156 - // and now validate properties 157 157 - validate_schema_btree(object.properties.values(), lexica, this_lex) 158 158 - } 159 159 - 160 160 - fn validate_string( 161 161 - lex_string: &LexiconString, 162 162 - lexica: &BTreeMap<String, Lexicon>, 163 163 - this_lex: &str, 164 164 - ) -> Option<ValidationError> { 165 165 - if lex_string.constant.is_some() && lex_string.default.is_some() { 166 166 - return Some(ValidationError::StringConstAndDefault); 167 167 - } 168 168 - 169 169 - if let Some(known_values) = &lex_string.known_values { 170 170 - known_values.iter().find_map(|value| { 171 171 - if value.contains("#") { 172 172 - lookup(value, this_lex, lexica) 173 173 - } else { 174 174 - None 175 175 - } 176 176 - }) 177 177 - } else { 178 178 - None 179 179 - } 180 180 - } 181 181 - 182 182 - fn validate_union( 183 183 - union: &LexiconUnion, 184 184 - lexica: &BTreeMap<String, Lexicon>, 185 185 - this_lex: &str, 186 186 - ) -> Option<ValidationError> { 187 187 - union 188 188 - .refs 189 189 - .iter() 190 190 - .find_map(|value| lookup(value, this_lex, lexica)) 191 191 - } 192 192 - 193 193 - fn lookup( 194 194 - reference: &str, 195 195 - this_lex: &str, 196 196 - lexica: &BTreeMap<String, Lexicon>, 197 197 - ) -> Option<ValidationError> { 198 198 - let reference = if reference.contains("#") { 199 199 - match reference.strip_prefix("#") { 200 200 - Some(local_ref) => format!("{this_lex}#{local_ref}"), 201 201 - None => reference.to_string(), 202 202 - } 203 203 - } else { 204 204 - format!("{}#main", reference) 205 205 - }; 206 206 - 207 207 - if let Some((nsid, name)) = reference.split_once("#") { 208 208 - match lexica.get(nsid) { 209 209 - Some(def) => match def.defs.contains_key(name) { 210 210 - true => None, 211 211 - false => Some(ValidationError::MissingReference(reference)), 212 212 - }, 213 213 - None => Some(ValidationError::MissingReference(reference)), 214 214 - } 215 215 - } else { 216 216 - Some(ValidationError::InvalidReference(reference)) 217 217 - } 218 218 - } 219 219 - 220 220 - fn validate_schema_btree<'a, T>( 221 221 - mut schema: T, 222 222 - lexica: &BTreeMap<String, Lexicon>, 223 223 - this_lex: &str, 224 224 - ) -> Option<ValidationError> 225 225 - where 226 226 - T: Iterator<Item = &'a LexiconSchema>, 227 227 - { 228 228 - schema.find_map(|schema| validate_schema(schema, lexica, this_lex)) 229 229 - }

parakeet/Cargo.toml crates/parakeet/Cargo.toml

reviewed

parakeet/Dockerfile crates/parakeet/Dockerfile

reviewed

parakeet/justfile crates/parakeet/justfile

reviewed

parakeet/src/cache.rs crates/parakeet/src/cache.rs

reviewed

parakeet/src/config.rs crates/parakeet/src/config.rs

reviewed

parakeet/src/db.rs crates/parakeet/src/db.rs

reviewed

parakeet/src/hydration/embed.rs crates/parakeet/src/hydration/embed.rs

reviewed

parakeet/src/hydration/feedgen.rs crates/parakeet/src/hydration/feedgen.rs

reviewed

parakeet/src/hydration/labeler.rs crates/parakeet/src/hydration/labeler.rs

reviewed

parakeet/src/hydration/list.rs crates/parakeet/src/hydration/list.rs

reviewed

parakeet/src/hydration/mod.rs crates/parakeet/src/hydration/mod.rs

reviewed

parakeet/src/hydration/posts.rs crates/parakeet/src/hydration/posts.rs

reviewed

parakeet/src/hydration/profile.rs crates/parakeet/src/hydration/profile.rs

reviewed

parakeet/src/hydration/starter_packs.rs crates/parakeet/src/hydration/starter_packs.rs

reviewed

parakeet/src/instrumentation.rs crates/parakeet/src/instrumentation.rs

reviewed

parakeet/src/loaders.rs crates/parakeet/src/loaders.rs

reviewed

parakeet/src/main.rs crates/parakeet/src/main.rs

reviewed

parakeet/src/sql/list_states.sql crates/parakeet/src/sql/list_states.sql

reviewed

parakeet/src/sql/post_state.sql crates/parakeet/src/sql/post_state.sql

reviewed

parakeet/src/sql/profile_state.sql crates/parakeet/src/sql/profile_state.sql

reviewed

parakeet/src/sql/thread.sql crates/parakeet/src/sql/thread.sql

reviewed

parakeet/src/sql/thread_branching.sql crates/parakeet/src/sql/thread_branching.sql

reviewed

parakeet/src/sql/thread_parent.sql crates/parakeet/src/sql/thread_parent.sql

reviewed

parakeet/src/sql/thread_v2_hidden_children.sql crates/parakeet/src/sql/thread_v2_hidden_children.sql

reviewed

parakeet/src/xrpc/app_bsky/actor.rs crates/parakeet/src/xrpc/app_bsky/actor.rs

reviewed

parakeet/src/xrpc/app_bsky/bookmark.rs crates/parakeet/src/xrpc/app_bsky/bookmark.rs

reviewed

parakeet/src/xrpc/app_bsky/feed/feedgen.rs crates/parakeet/src/xrpc/app_bsky/feed/feedgen.rs

reviewed

parakeet/src/xrpc/app_bsky/feed/likes.rs crates/parakeet/src/xrpc/app_bsky/feed/likes.rs

reviewed

parakeet/src/xrpc/app_bsky/feed/mod.rs crates/parakeet/src/xrpc/app_bsky/feed/mod.rs

reviewed

parakeet/src/xrpc/app_bsky/feed/posts.rs crates/parakeet/src/xrpc/app_bsky/feed/posts.rs

reviewed

parakeet/src/xrpc/app_bsky/graph/lists.rs crates/parakeet/src/xrpc/app_bsky/graph/lists.rs

reviewed

parakeet/src/xrpc/app_bsky/graph/mod.rs crates/parakeet/src/xrpc/app_bsky/graph/mod.rs

reviewed

parakeet/src/xrpc/app_bsky/graph/mutes.rs crates/parakeet/src/xrpc/app_bsky/graph/mutes.rs

reviewed

parakeet/src/xrpc/app_bsky/graph/relations.rs crates/parakeet/src/xrpc/app_bsky/graph/relations.rs

reviewed

parakeet/src/xrpc/app_bsky/graph/starter_packs.rs crates/parakeet/src/xrpc/app_bsky/graph/starter_packs.rs

reviewed

parakeet/src/xrpc/app_bsky/labeler.rs crates/parakeet/src/xrpc/app_bsky/labeler.rs

reviewed

parakeet/src/xrpc/app_bsky/mod.rs crates/parakeet/src/xrpc/app_bsky/mod.rs

reviewed

parakeet/src/xrpc/app_bsky/unspecced/mod.rs crates/parakeet/src/xrpc/app_bsky/unspecced/mod.rs

reviewed

parakeet/src/xrpc/app_bsky/unspecced/thread_v2.rs crates/parakeet/src/xrpc/app_bsky/unspecced/thread_v2.rs

reviewed

parakeet/src/xrpc/cdn.rs crates/parakeet/src/xrpc/cdn.rs

reviewed

parakeet/src/xrpc/com_atproto/identity.rs crates/parakeet/src/xrpc/com_atproto/identity.rs

reviewed

parakeet/src/xrpc/com_atproto/mod.rs crates/parakeet/src/xrpc/com_atproto/mod.rs

reviewed

parakeet/src/xrpc/com_atproto/repo.rs crates/parakeet/src/xrpc/com_atproto/repo.rs

reviewed

parakeet/src/xrpc/community_lexicon/bookmarks.rs crates/parakeet/src/xrpc/community_lexicon/bookmarks.rs

reviewed

parakeet/src/xrpc/community_lexicon/mod.rs crates/parakeet/src/xrpc/community_lexicon/mod.rs

reviewed

parakeet/src/xrpc/error.rs crates/parakeet/src/xrpc/error.rs

reviewed

parakeet/src/xrpc/extract.rs crates/parakeet/src/xrpc/extract.rs

reviewed

parakeet/src/xrpc/jwt.rs crates/parakeet/src/xrpc/jwt.rs

reviewed

parakeet/src/xrpc/mod.rs crates/parakeet/src/xrpc/mod.rs

reviewed