Extract actix backend into a feature

examples/simple_server/src/main.rs

@@ -7,7 +7,7 @@ use dicom::{
 };
 use dicom_object::FileDicomObject;
 use dicomweb_server::{
-    dicomweb_config, study_filter, QidoInstanceQuery, QidoSeriesQuery, QidoStudyQuery,
+    actix::dicomweb_config, study_filter, QidoInstanceQuery, QidoSeriesQuery, QidoStudyQuery,
     INSTANCE_TAGS, SERIES_TAGS, STUDY_TAGS,
 };
 use itertools::Itertools;

server/Cargo.toml

@@ -5,11 +5,16 @@ edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
+[features]
+default = ["actix"]
+actix = ["dep:actix-web", "dep:actix-multipart", "dep:actix-utils"]
+
 [dependencies]
-actix-multipart = "0.6.1"
-actix-utils = "3.0.1"
-actix-web = "4.5.1"
+actix-multipart = { version = "0.6.1", optional = true }
+actix-utils = { version = "3.0.1", optional = true }
+actix-web = { version = "4.5.1", optional = true }
 bytes = "1.5.0"
+derive_more = "0.99.17"
 dicom = "0.6.3"
 dicom-json = "0.1.1"
 dicom-object = "0.6.3"

server/src/multipart/extractor.rs → server/src/actix/extractor.rs

@@ -3,7 +3,7 @@
 use actix_utils::future::{ready, Ready};
 use actix_web::{dev::Payload, Error, FromRequest, HttpRequest};
 
-use crate::multipart::MultipartReader;
+use super::MultipartReader;
 
 impl FromRequest for MultipartReader {
     type Error = Error;

server/src/actix/mod.rs

@@ -0,0 +1,28 @@
+mod extractor;
+mod multipart;
+mod qido;
+mod stow;
+mod wado;
+
+use multipart::*;
+use qido::*;
+use stow::*;
+use wado::*;
+
+pub use qido::qido_config;
+pub use stow::stow_config;
+pub use wado::wado_config;
+
+pub fn dicomweb_config(cfg: &mut actix_web::web::ServiceConfig) {
+    cfg.service(store_instances)
+        .service(store_instances_for_study)
+        .service(search_studies_all)
+        .service(search_series_all)
+        .service(search_series_study_level)
+        .service(search_instances_all)
+        .service(search_instances_study_level)
+        .service(search_instances_series_level)
+        .service(retrieve_instance)
+        .service(retrieve_series)
+        .service(retrieve_study);
+}

server/src/actix/multipart/mod.rs

@@ -0,0 +1,5 @@
+mod reader;
+mod writer;
+
+pub use reader::*;
+pub use writer::*;

server/src/qido.rs → server/src/actix/qido.rs

@@ -1,24 +1,8 @@
 use actix_web::{get, web, HttpResponse, Responder};
 use dicom_json::DicomJson;
-use dicom_object::{InMemDicomObject, Tag};
-use serde::Deserialize;
-
-use crate::DicomWebServer;
-
-/// QIDO-RS
-///
-/// See https://www.dicomstandard.org/using/dicomweb/query-qido-rs for more information
-/// More detail can be found in PS3.18 10.6.
-#[derive(Deserialize, Debug)]
-pub struct QidoStudyQuery {
-    pub limit: Option<usize>,
-    pub offset: Option<usize>,
-    pub fuzzymatching: Option<bool>,
-    #[serde(skip_deserializing)]
-    pub includefields: Vec<String>,
-    #[serde(skip_deserializing)]
-    pub matches: Vec<(Tag, String)>,
-}
+use dicom_object::InMemDicomObject;
+
+use crate::{DicomWebServer, QidoInstanceQuery, QidoSeriesQuery, QidoStudyQuery};
 
 #[get("/studies")]
 pub async fn search_studies_all(
@@ -45,16 +29,6 @@ pub async fn search_studies_all(
     }
 }
 
-#[derive(Deserialize, Debug)]
-pub struct QidoSeriesQuery {
-    limit: Option<usize>,
-    offset: Option<usize>,
-    includefield: Option<String>,
-    modality: Option<String>,
-    series_instance_uid: Option<String>,
-    series_description: Option<String>,
-}
-
 #[get("/studies/{study_uid}/series")]
 pub async fn search_series_study_level(
     callbacks: web::Data<DicomWebServer>,
@@ -132,15 +106,6 @@ pub async fn search_series_all(
     }
 }
 
-#[derive(Deserialize, Debug)]
-pub struct QidoInstanceQuery {
-    limit: Option<usize>,
-    offset: Option<usize>,
-    includefield: Option<String>,
-    sop_instance_uid: Option<String>,
-    instance_number: Option<String>,
-}
-
 #[get("/studies/{study_uid}/series/{series_uid}/instances")]
 pub async fn search_instances_series_level(
     callbacks: web::Data<DicomWebServer>,

server/src/stow.rs → server/src/actix/stow.rs

@@ -8,7 +8,9 @@ use dicom_json::DicomJson;
 use dicom_object::{FileDicomObject, InMemDicomObject};
 use futures_util::StreamExt;
 
-use crate::{multipart::MultipartReader, DicomWebServer};
+use crate::DicomWebServer;
+
+use super::MultipartReader;
 
 async fn collect_dicom_files(
     request: HttpRequest,

server/src/wado.rs → server/src/actix/wado.rs

@@ -2,7 +2,7 @@ use std::io::Write;
 
 use actix_web::{get, web, HttpResponse, Responder};
 
-use crate::{multipart::MultipartWriter, DicomWebServer};
+use crate::{actix::MultipartWriter, DicomWebServer};
 
 /// WADO-RS
 ///

server/src/lib.rs

@@ -1,20 +1,48 @@
 use dicom::{dictionary_std::tags, object::InMemDicomObject};
+use serde::Deserialize;
 
 mod filter;
-mod multipart;
-mod qido;
-mod stow;
-mod wado;
 
 use dicom_object::{FileDicomObject, Tag};
-use qido::*;
-use stow::*;
-use wado::*;
 
 pub use filter::study_filter;
-pub use qido::{qido_config, QidoInstanceQuery, QidoSeriesQuery, QidoStudyQuery};
-pub use stow::stow_config;
-pub use wado::wado_config;
+
+#[cfg(feature = "actix")]
+pub mod actix;
+
+/// QIDO-RS
+///
+/// See https://www.dicomstandard.org/using/dicomweb/query-qido-rs for more information
+/// More detail can be found in PS3.18 10.6.
+#[derive(Deserialize, Debug)]
+pub struct QidoStudyQuery {
+    pub limit: Option<usize>,
+    pub offset: Option<usize>,
+    pub fuzzymatching: Option<bool>,
+    #[serde(skip_deserializing)]
+    pub includefields: Vec<String>,
+    #[serde(skip_deserializing)]
+    pub matches: Vec<(Tag, String)>,
+}
+
+#[derive(Deserialize, Debug)]
+pub struct QidoSeriesQuery {
+    limit: Option<usize>,
+    offset: Option<usize>,
+    includefield: Option<String>,
+    modality: Option<String>,
+    series_instance_uid: Option<String>,
+    series_description: Option<String>,
+}
+
+#[derive(Deserialize, Debug)]
+pub struct QidoInstanceQuery {
+    limit: Option<usize>,
+    offset: Option<usize>,
+    includefield: Option<String>,
+    sop_instance_uid: Option<String>,
+    instance_number: Option<String>,
+}
 
 /// DICOMWeb Server
 /// Provide the callbacks for the QIDO-RS and WADO-RS endpoints.
@@ -76,17 +104,3 @@ pub const INSTANCE_TAGS: [Tag; 3] = [
     tags::SOP_INSTANCE_UID,
     tags::INSTANCE_NUMBER,
 ];
-
-pub fn dicomweb_config(cfg: &mut actix_web::web::ServiceConfig) {
-    cfg.service(store_instances)
-        .service(store_instances_for_study)
-        .service(search_studies_all)
-        .service(search_series_all)
-        .service(search_series_study_level)
-        .service(search_instances_all)
-        .service(search_instances_study_level)
-        .service(search_instances_series_level)
-        .service(retrieve_instance)
-        .service(retrieve_series)
-        .service(retrieve_study);
-}