Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: starting out with v1 API OpenAPI #492

Merged
merged 9 commits into from
Jul 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
647 changes: 644 additions & 3 deletions Cargo.lock

Large diffs are not rendered by default.

9 changes: 6 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ biocommons-bioutils = "0.1.0"
boolvec = "0.2"
byteorder = "1.4"
chrono = { version = "0.4", features = ["serde"] }
clap = { version = "4.5", features = ["derive", "env"] }
clap-verbosity-flag = "2.2"
clap = { version = "4.5", features = ["derive", "env"] }
csv = "1.2"
enum-map = { version = "2.7.3", features = ["serde"] }
env_logger = "0.11"
Expand All @@ -42,16 +42,19 @@ pbjson = "0.7"
pbjson-types = "0.7"
prost = "0.13"
rayon = "1.8"
rocksdb = { version = "0.22", features = ["multi-threaded-cf"] }
rocksdb-utils-lookup = "0.4"
rocksdb = { version = "0.22", features = ["multi-threaded-cf"] }
rustc-hash = "2.0.0"
serde = { version = "1.0", features = ["derive"] }
serde_json = { version = "1.0", features = ["preserve_order"] }
serde = { version = "1.0", features = ["derive"] }
serde_with = { version = "3.9", features = ["alloc", "macros", "indexmap_2"], default-features = false }
serde_yaml = "0.9"
strum = { version = "0.26", features = ["strum_macros", "derive"] }
thiserror = "1.0"
tracing = "0.1"
tracing-subscriber = "0.3"
utoipa-swagger-ui = { version = "7.1.0", features = ["actix-web"] }
utoipa = { version = "4.2", features = ["actix_extras", "chrono", "indexmap", "preserve_order", "yaml"] }

[dependencies.noodles]
version = "0.77.0"
Expand Down
3 changes: 3 additions & 0 deletions build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ fn main() -> Result<(), anyhow::Error> {
"annonars/clinvar/minimal.proto",
"annonars/clinvar/per_gene.proto",
"annonars/clinvar/sv.proto",
"annonars/common/versions.proto",
"annonars/cons/base.proto",
"annonars/dbsnp/base.proto",
"annonars/functional/refseq.proto",
Expand Down Expand Up @@ -50,6 +51,8 @@ fn main() -> Result<(), anyhow::Error> {
// Override prost-types with pbjson-types
.compile_well_known_types()
.extern_path(".google.protobuf", "::pbjson_types")
// Derive the types for utoipa.
.message_attribute(".", "#[derive(utoipa::ToSchema)]")
// Define the protobuf files to compile.
.compile_protos(&proto_files, &[root])?;

Expand Down
37 changes: 37 additions & 0 deletions protos/annonars/common/versions.proto
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
syntax = "proto3";

package annonars.common.versions;

// Source that data was created from.
message CreatedFrom {
// The name of the data source.
string name = 1;
// The version of the data source.
string version = 2;
}

// Version specification.
message VersionSpec {
// Identifier of the data.
string identifier = 1;
// Title of the data.
string title = 2;
// Creator of the data.
string creator = 3;
// Contributors of the data.
repeated string contributor = 4;
// Format of the data.
string format = 5;
// Date of the data.
string date = 6;
// Version of the data.
string version = 7;
// Optional genome release.
optional string genome_release = 8;
// Data description.
string description = 9;
// Data source.
repeated string source = 10;
// Created from information.
repeated CreatedFrom created_from = 11;
}
2 changes: 2 additions & 0 deletions src/common/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ pub enum OutputFormat {
strum::Display,
strum::EnumString,
enum_map::Enum,
serde::Serialize,
utoipa::ToSchema,
)]
#[strum(serialize_all = "lowercase")]
pub enum GenomeRelease {
Expand Down
28 changes: 25 additions & 3 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@
Regions(Regions),
/// "db-utils" sub commands
DbUtils(DbUtils),
/// "run-server" command.
RunServer(server::Args),
/// "server" sub command.
Server(Server),
}

/// Parsing of "gene" subcommand
Expand Down Expand Up @@ -315,6 +315,23 @@
DumpMeta(db_utils::cli::dump_meta::Args),
}

/// Parsing of "server" subcommands.
#[derive(Debug, Args, Clone)]
struct Server {
/// The sub command to run.
#[command(subcommand)]
command: ServerCommands,
}

/// Enum supporting the parsing of "server *" subcommands.
#[derive(Debug, Subcommand, Clone)]
enum ServerCommands {
/// "run" sub command.
Run(server::run::Args),
/// Dump the schema.
Schema(crate::server::schema::Args),
}

Check warning on line 333 in src/main.rs

View workflow job for this annotation

GitHub Actions / clippy

large size difference between variants

warning: large size difference between variants --> src/main.rs:328:1 | 328 | / enum ServerCommands { 329 | | /// "run" sub command. 330 | | Run(server::run::Args), | | ---------------------- the largest variant contains at least 344 bytes 331 | | /// Dump the schema. 332 | | Schema(crate::server::schema::Args), | | ----------------------------------- the second-largest variant contains at least 24 bytes 333 | | } | |_^ the entire enum is at least 344 bytes | = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#large_enum_variant = note: `#[warn(clippy::large_enum_variant)]` on by default help: consider boxing the large fields to reduce the total size of the enum | 330 | Run(Box<server::run::Args>), | ~~~~~~~~~~~~~~~~~~~~~~

pub fn main() -> Result<(), anyhow::Error> {
let cli = Cli::parse();

Expand Down Expand Up @@ -417,7 +434,12 @@
db_utils::cli::dump_meta::run(&cli.common, args)?
}
},
Commands::RunServer(args) => server::run(&cli.common, args)?,
Commands::Server(args) => match &args.command {
ServerCommands::Run(args) => server::run::run(&cli.common, args)?,
ServerCommands::Schema(args) => {
server::schema::run(&cli.common, args)?;
}
},
}

Ok::<(), Error>(())
Expand Down
10 changes: 10 additions & 0 deletions src/pbs/common.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
//! Code generate for protobufs by `prost-build`.

/// Information about versions.
pub mod versions {
include!(concat!(env!("OUT_DIR"), "/annonars.common.versions.rs"));
include!(concat!(
env!("OUT_DIR"),
"/annonars.common.versions.serde.rs"
));
}
1 change: 1 addition & 0 deletions src/pbs/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

pub mod clinvar;
pub mod clinvar_data;
pub mod common;
pub mod cons;
pub mod dbsnp;
pub mod functional;
Expand Down
12 changes: 12 additions & 0 deletions src/regions/.editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# EditorConfig is awesome: https://EditorConfig.org

# top-most EditorConfig file
root = true

[*]
indent_style = space
indent_size = 4
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = false
insert_final_newline = false
41 changes: 0 additions & 41 deletions src/server/actix_server/mod.rs

This file was deleted.

Loading
Loading