Migrate-pro-api

services/benches/quota_check.rs

@@ -19,10 +19,10 @@ use geoengine_services::{
         users::{UserAuth, UserDb},
         util::{
             config::QuotaTrackingMode,
-            tests::{add_ndvi_to_datasets, send_pro_test_request, with_pro_temp_context},
+            tests::{add_ndvi_to_datasets, with_pro_temp_context},
         },
     },
-    util::config,
+    util::{config, tests::send_test_request},
     workflows::{registry::WorkflowRegistry, workflow::Workflow},
 };
 
@@ -100,7 +100,7 @@ async fn bench() {
                 serde_urlencoded::to_string(params).unwrap()
             ))
             .append_header((header::AUTHORIZATION, Bearer::new(session.id.to_string())));
-        let res = send_pro_test_request(req, app_ctx).await;
+        let res = send_test_request(req, app_ctx).await;
 
         assert_eq!(res.status(), 200);
         assert_eq!(

services/src/api/apidoc.rs

@@ -1,15 +1,18 @@
-use super::handlers;
-use super::handlers::plots::WrappedPlotOutput;
-use super::handlers::spatial_references::{AxisOrder, SpatialReferenceSpecification};
-use super::handlers::tasks::{TaskAbortOptions, TaskResponse};
-use super::handlers::upload::{UploadFileLayersResponse, UploadFilesResponse};
-use super::handlers::wfs::{CollectionType, GeoJson};
-use super::handlers::workflows::{ProvenanceEntry, RasterStreamWebsocketResultType};
-use super::model::responses::{ErrorResponse, PngResponse, ZipResponse};
+use crate::api::handlers;
+use crate::api::handlers::datasets::VolumeFileLayersResponse;
+use crate::api::handlers::permissions::{PermissionListOptions, PermissionRequest, Resource};
+use crate::api::handlers::plots::WrappedPlotOutput;
+use crate::api::handlers::spatial_references::{AxisOrder, SpatialReferenceSpecification};
+use crate::api::handlers::tasks::{TaskAbortOptions, TaskResponse};
+use crate::api::handlers::upload::{UploadFileLayersResponse, UploadFilesResponse};
+use crate::api::handlers::users::AddRole;
+use crate::api::handlers::users::{Quota, UpdateQuota, UsageSummaryGranularity};
+use crate::api::handlers::wfs::{CollectionType, GeoJson};
+use crate::api::handlers::workflows::{ProvenanceEntry, RasterStreamWebsocketResultType};
 use crate::api::model::datatypes::{
     AxisLabels, BandSelection, BoundingBox2D, Breakpoint, CacheTtlSeconds,
     ClassificationMeasurement, Colorizer, ContinuousMeasurement, Coordinate2D, DataId,
-    DataProviderId, DatasetId, DateTimeParseFormat, ExternalDataId, FeatureDataType,
+    DataProviderId, DatasetId, DateTime, DateTimeParseFormat, ExternalDataId, FeatureDataType,
     GdalConfigOption, LayerId, LinearGradient, LogarithmicGradient, Measurement, MultiLineString,
     MultiPoint, MultiPolygon, NamedData, NoGeometry, Palette, PlotOutputFormat, PlotQueryRectangle,
     RasterColorizer, RasterDataType, RasterPropertiesEntryType, RasterPropertiesKey,
@@ -29,26 +32,38 @@ use crate::api::model::operators::{
 };
 use crate::api::model::responses::datasets::DatasetNameResponse;
 use crate::api::model::responses::{
-    BadRequestQueryResponse, IdResponse, PayloadTooLargeResponse, UnauthorizedAdminResponse,
-    UnauthorizedUserResponse, UnsupportedMediaTypeForJsonResponse,
+    BadRequestQueryResponse, ErrorResponse, IdResponse, PayloadTooLargeResponse, PngResponse,
+    UnauthorizedAdminResponse, UnauthorizedUserResponse, UnsupportedMediaTypeForJsonResponse,
+    ZipResponse,
 };
 use crate::api::model::services::{
     AddDataset, CreateDataset, DataPath, DatasetDefinition, MetaDataDefinition, MetaDataSuggestion,
     Provenance, ProvenanceOutput, Provenances, UpdateDataset, Volume,
 };
 use crate::api::ogc::{util::OgcBoundingBox, wcs, wfs, wms};
-use crate::contexts::{SessionId, SimpleSession};
+use crate::contexts::SessionId;
 use crate::datasets::listing::{DatasetListing, OrderBy};
 use crate::datasets::storage::{AutoCreateDataset, Dataset, SuggestMetaData};
 use crate::datasets::upload::{UploadId, VolumeName};
 use crate::datasets::{DatasetName, RasterDatasetFromWorkflow, RasterDatasetFromWorkflowResult};
 use crate::layers::layer::{
     AddLayer, AddLayerCollection, CollectionItem, Layer, LayerCollection, LayerCollectionListing,
-    LayerListing, Property, ProviderLayerCollectionId, ProviderLayerId,
+    LayerListing, Property, ProviderLayerCollectionId, ProviderLayerId, UpdateLayer,
+    UpdateLayerCollection,
 };
 use crate::layers::listing::{
     LayerCollectionId, ProviderCapabilities, SearchCapabilities, SearchType, SearchTypes,
 };
+use crate::machine_learning::name::MlModelName;
+use crate::machine_learning::{MlModel, MlModelId, MlModelMetadata};
+use crate::pro::permissions::{
+    Permission, PermissionListing, ResourceId, Role, RoleDescription, RoleId,
+};
+use crate::pro::quota::{ComputationQuota, DataUsage, DataUsageSummary, OperatorQuota};
+use crate::pro::users::{
+    AuthCodeRequestURL, AuthCodeResponse, UserCredentials, UserId, UserInfo, UserRegistration,
+    UserSession,
+};
 use crate::projects::{
     ColorParam, CreateProject, DerivedColor, DerivedNumber, LayerUpdate, LayerVisibility,
     LineSymbology, NumberParam, Plot, PlotUpdate, PointSymbology, PolygonSymbology, Project,
@@ -84,17 +99,17 @@ use utoipa::{Modify, OpenApi};
         handlers::layers::add_existing_collection_to_collection,
         handlers::layers::remove_collection_from_collection,
         handlers::layers::layer_to_dataset,
-        handlers::session::anonymous_handler,
-        handlers::session::session_handler,
-        handlers::session::session_project_handler,
-        handlers::session::session_view_handler,
+        handlers::layers::update_layer,
+        handlers::layers::update_collection,
+        handlers::layers::remove_layer,
         handlers::tasks::abort_handler,
         handlers::tasks::list_handler,
         handlers::tasks::status_handler,
         handlers::wcs::wcs_capabilities_handler,
         handlers::wcs::wcs_describe_coverage_handler,
         handlers::wcs::wcs_get_coverage_handler,
         handlers::wfs::wfs_capabilities_handler,
+        handlers::wfs::wfs_capabilities_handler,
         handlers::wfs::wfs_feature_handler,
         handlers::wms::wms_capabilities_handler,
         handlers::wms::wms_legend_graphic_handler,
@@ -106,6 +121,27 @@ use utoipa::{Modify, OpenApi};
         handlers::workflows::raster_stream_websocket,
         handlers::workflows::register_workflow_handler,
         handlers::workflows::get_workflow_all_metadata_zip_handler,
+        handlers::users::anonymous_handler,
+        handlers::users::login_handler,
+        handlers::users::logout_handler,
+        handlers::users::quota_handler,
+        handlers::users::oidc_login,
+        handlers::users::oidc_init,
+        handlers::users::quota_handler,
+        handlers::users::get_user_quota_handler,
+        handlers::users::update_user_quota_handler,
+        handlers::users::register_user_handler,
+        handlers::users::session_handler,
+        handlers::users::add_role_handler,
+        handlers::users::get_role_by_name_handler,
+        handlers::users::remove_role_handler,
+        handlers::users::assign_role_handler,
+        handlers::users::revoke_role_handler,
+        handlers::users::get_role_descriptions,
+        handlers::users::computations_quota_handler,
+        handlers::users::computation_quota_handler,
+        handlers::users::data_usage_summary_handler,
+        handlers::users::data_usage_handler,
         handlers::datasets::delete_dataset_handler,
         handlers::datasets::list_datasets_handler,
         handlers::datasets::list_volumes_handler,
@@ -118,6 +154,10 @@ use utoipa::{Modify, OpenApi};
         handlers::datasets::update_loading_info_handler,
         handlers::datasets::update_dataset_symbology_handler,
         handlers::datasets::update_dataset_provenance_handler,
+        handlers::datasets::list_volume_file_layers_handler,
+        handlers::machine_learning::add_ml_model,
+        handlers::machine_learning::get_ml_model,
+        handlers::machine_learning::list_ml_models,
         handlers::spatial_references::get_spatial_reference_specification_handler,
         handlers::plots::get_plot_handler,
         handlers::projects::list_projects_handler,
@@ -129,7 +169,10 @@ use utoipa::{Modify, OpenApi};
         handlers::projects::load_project_version_handler,
         handlers::upload::list_upload_files_handler,
         handlers::upload::list_upload_file_layers_handler,
-        handlers::upload::upload_handler
+        handlers::upload::upload_handler,
+        handlers::permissions::add_permission_handler,
+        handlers::permissions::remove_permission_handler,
+        handlers::permissions::get_resource_permissions_handler
     ),
     components(
         responses(
@@ -140,16 +183,31 @@ use utoipa::{Modify, OpenApi};
             IdResponse::<LayerId>,
             IdResponse::<LayerCollectionId>,
             IdResponse::<ProjectId>,
+            IdResponse::<RoleId>,
             DatasetNameResponse,
             UnauthorizedAdminResponse,
             UnauthorizedUserResponse,
             BadRequestQueryResponse,
             PngResponse,
-            ZipResponse
+            ZipResponse,
+            AuthCodeRequestURL
         ),
         schemas(
             ErrorResponse,
-            SimpleSession,
+            UserSession,
+            UserCredentials,
+            UserRegistration,
+            DateTime,
+            UserInfo,
+            Quota,
+            UpdateQuota,
+            ComputationQuota,
+            OperatorQuota,
+            DataUsage,
+            DataUsageSummary,
+            UsageSummaryGranularity,
+            AuthCodeResponse,
+            AuthCodeRequestURL,
 
             DataId,
             DataProviderId,
@@ -159,9 +217,11 @@ use utoipa::{Modify, OpenApi};
             ExternalDataId,
             LayerId,
             ProjectId,
+            RoleId,
             SessionId,
             TaskId,
             UploadId,
+            UserId,
             WorkflowId,
             ProviderLayerId,
             ProviderLayerCollectionId,
@@ -225,6 +285,8 @@ use utoipa::{Modify, OpenApi};
             CollectionItem,
             AddLayer,
             AddLayerCollection,
+            UpdateLayer,
+            UpdateLayerCollection,
             SearchCapabilities,
             ProviderCapabilities,
             SearchTypes,
@@ -280,6 +342,8 @@ use utoipa::{Modify, OpenApi};
 
             UploadFilesResponse,
             UploadFileLayersResponse,
+            VolumeFileLayersResponse,
+
             CreateDataset,
             UpdateDataset,
             AutoCreateDataset,
@@ -296,7 +360,6 @@ use utoipa::{Modify, OpenApi};
             GdalDatasetParameters,
             TimeStep,
             GdalSourceTimePlaceholder,
-            GdalDatasetParameters,
             GdalLoadingInfoTemporalSlice,
             FileNotFoundHandling,
             GdalDatasetGeoTransform,
@@ -336,19 +399,33 @@ use utoipa::{Modify, OpenApi};
             WrappedPlotOutput,
 
             CreateProject,
-            ProjectListing,
+            Project,
             UpdateProject,
-            PlotUpdate,
+            ProjectListing,
+            ProjectVersion,
             LayerUpdate,
-            Project,
-            ProjectUpdateToken,
             PlotUpdate,
+            ProjectUpdateToken,
+            Plot,
             ProjectLayer,
             LayerVisibility,
-            Plot,
-            ProjectVersion,
             RasterStreamWebsocketResultType,
             CacheTtlSeconds,
+
+            PermissionRequest,
+            Resource,
+            ResourceId,
+            Permission,
+            PermissionListing,
+            PermissionListOptions,
+            AddRole,
+            RoleDescription,
+            Role,
+
+            MlModel,
+            MlModelId,
+            MlModelName,
+            MlModelMetadata
         ),
     ),
     modifiers(&SecurityAddon, &ApiDocInfo, &OpenApiServerInfo, &TransformSchemasWithTag),
@@ -404,8 +481,8 @@ impl Modify for ApiDocInfo {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::contexts::PostgresContext;
-    use crate::ge_context;
+    use crate::pro::contexts::ProPostgresContext;
+    use crate::pro::ge_context;
     use crate::util::tests::send_test_request;
     use tokio_postgres::NoTls;
 
@@ -415,8 +492,8 @@ mod tests {
     }
 
     #[ge_context::test]
-    async fn can_run_examples(app_ctx: PostgresContext<NoTls>) {
-        crate::util::openapi_examples::can_run_examples(
+    async fn can_run_examples(app_ctx: ProPostgresContext<NoTls>) {
+        crate::pro::util::openapi_examples::can_run_pro_examples(
             app_ctx,
             ApiDoc::openapi(),
             send_test_request,

services/src/api/cli/add_from_directory.rs

@@ -2,51 +2,64 @@ use crate::datasets::storage::{DatasetDb, DatasetDefinition};
 use crate::error::Result;
 use crate::layers::external::TypedDataProviderDefinition;
 use crate::layers::storage::LayerProviderDb;
+use crate::pro::permissions::{Permission, PermissionDb, Role};
+use geoengine_datatypes::dataset::DatasetId;
+use geoengine_datatypes::error::BoxedResultExt;
+use geoengine_datatypes::util::helpers::ge_report;
 use log::{error, info, warn};
-use std::ffi::OsStr;
 use std::{
     fs::{self, DirEntry, File},
     io::BufReader,
     path::PathBuf,
 };
 
-pub async fn add_datasets_from_directory<D: DatasetDb>(dataset_db: &mut D, file_path: PathBuf) {
-    async fn add_dataset_definition_from_dir_entry<D: DatasetDb>(
+pub async fn add_datasets_from_directory<D: DatasetDb + PermissionDb>(
+    dataset_db: &mut D,
+    file_path: PathBuf,
+) {
+    async fn add_dataset_definition_from_dir_entry<D: DatasetDb + PermissionDb>(
         db: &mut D,
         entry: &DirEntry,
     ) -> Result<()> {
         let def: DatasetDefinition =
             serde_json::from_reader(BufReader::new(File::open(entry.path())?))?;
 
-        db.add_dataset(def.properties.clone(), def.meta_data.clone())
-            .await?;
+        let dataset_id: DatasetId = db
+            .add_dataset(def.properties.clone(), def.meta_data.clone())
+            .await?
+            .id;
+
+        db.add_permission(
+            Role::registered_user_role_id(),
+            dataset_id,
+            Permission::Read,
+        )
+        .await
+        .boxed_context(crate::error::PermissionDb)?;
+
+        db.add_permission(Role::anonymous_role_id(), dataset_id, Permission::Read)
+            .await
+            .boxed_context(crate::error::PermissionDb)?;
 
         Ok(())
     }
 
-    let Ok(dir) = fs::read_dir(&file_path) else {
-        error!(
-            "Skipped adding datasets from directory `{:?}` because it can't be read",
-            file_path
-        );
+    let Ok(dir) = fs::read_dir(file_path) else {
+        warn!("Skipped adding datasets from directory because it can't be read");
         return;
     };
 
     for entry in dir {
-        match entry {
-            Ok(entry) if entry.path().extension() == Some(OsStr::new("json")) => {
-                if let Err(e) = add_dataset_definition_from_dir_entry(dataset_db, &entry).await {
-                    warn!(
-                        "Skipped adding dataset from file `{:?}` error `{:?}`",
-                        entry.path(),
-                        e
-                    );
-                }
-            }
-            Err(e) => {
-                warn!("Skipped adding dataset from directory entry `{:?}`", e);
+        if let Ok(entry) = entry {
+            if let Err(e) = add_dataset_definition_from_dir_entry(dataset_db, &entry).await {
+                warn!(
+                    "Skipped adding dataset from directory entry: {:?} error: {}",
+                    entry,
+                    ge_report(e)
+                );
             }
-            _ => {}
+        } else {
+            warn!("Skipped adding dataset from directory entry: {:?}", entry);
         }
     }
 }