From 96be8c19d5c5e3dcf7a94a27bb171f2434d96df5 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Wed, 18 Mar 2026 20:25:22 -0400 Subject: [PATCH] move deprecated crates --- Cargo.toml | 10 +++++----- .../api_clients/google_drive_downloader/Cargo.toml | 2 +- crates/api_clients/openart_client/Cargo.toml | 2 +- crates/api_clients/runwayml_client/Cargo.toml | 2 +- crates/desktop/tauri-realtime/Cargo.toml | 4 ++-- .../machine_learning/ml_models/Cargo.toml | 14 +++++++------- .../machine_learning/ml_models/src/lib.rs | 0 .../ml_models/src/ml/background_removal/mod.rs | 0 .../src/ml/background_removal/onnx_session.rs | 0 .../background_removal/remove_image_background.rs | 0 .../ml_models/src/ml/flux/flux_pipeline.rs | 0 .../machine_learning/ml_models/src/ml/flux/mod.rs | 0 .../src/ml/image/dynamic_image_to_tensor.rs | 0 .../src/ml/image/load_image_file_to_tensor.rs | 0 .../src/ml/image/load_image_file_to_tensor_2.rs | 0 .../machine_learning/ml_models/src/ml/image/mod.rs | 0 .../src/ml/image/save_image_from_tensor.rs | 0 .../src/ml/image/tensor_to_image_buffer.rs | 0 .../machine_learning/ml_models/src/ml/mod.rs | 0 .../ml_models/src/ml/model_cache.rs | 0 .../ml_models/src/ml/model_config.rs | 0 .../ml_models/src/ml/model_file.rs | 0 .../ml_models/src/ml/prompt_cache.rs | 0 .../src/ml/stable_diffusion/get_vae_scale.rs | 0 .../stable_diffusion/infer_clip_text_embeddings.rs | 0 .../src/ml/stable_diffusion/lcm_pipeline.rs | 0 .../ml_models/src/ml/stable_diffusion/mod.rs | 0 .../stable_diffusion/remap_lcm_strength_range.rs | 0 .../stable_diffusion/stable_diffusion_pipeline.rs | 0 .../ml_weights_registry/Cargo.toml | 0 .../ml_weights_registry/src/lib.rs | 0 .../src/weights_registry/flux_weights.rs | 0 .../src/weights_registry/mod.rs | 0 .../src/weights_registry/weight_descriptor.rs | 0 .../weights_registry/weight_descriptor_builder.rs | 0 .../src/weights_registry/weights.rs | 0 .../machine_learning/prompt_engineering/Cargo.toml | 0 .../prompt_engineering/src/classify_prompt.rs | 0 .../src/keywords/contains_children_keyword.rs | 2 +- .../keywords/contains_potential_minor_keyword.rs | 2 +- .../src/keywords/contains_racist_keyword.rs | 2 +- .../src/keywords/contains_sex_keyword.rs | 2 +- .../prompt_engineering/src/keywords/mod.rs | 0 .../machine_learning/prompt_engineering/src/lib.rs | 0 .../prompt_engineering/src/regexes/minor_regex.rs | 0 .../prompt_engineering/src/regexes/mod.rs | 0 .../prompt_engineering/src/regexes/nsfw_regex.rs | 0 .../src/regexes/potential_minor_regex.rs | 0 .../prompt_engineering/tests/borderline_tests.rs | 0 .../prompt_engineering/tests/csam_prompt_tests.rs | 0 .../prompt_engineering/tests/nsfw_prompt_tests.rs | 0 .../tests/racist_prompt_tests.rs | 0 .../prompt_engineering/tests/sfw_prompt_tests.rs | 0 .../prompt_engineering/tests/spicy_prompt_tests.rs | 0 .../{ => deprecated}/subprocess_common/Cargo.toml | 6 +++--- .../subprocess_common/src/command_exit_status.rs | 0 .../src/command_runner/command_args.rs | 0 .../src/command_runner/command_runner.rs | 0 .../src/command_runner/command_runner_args.rs | 0 .../src/command_runner/env_var_policy.rs | 0 .../subprocess_common/src/command_runner/mod.rs | 0 .../subprocess_common/src/docker_options.rs | 0 .../subprocess_common/src/executable_or_command.rs | 0 .../{ => deprecated}/subprocess_common/src/lib.rs | 0 .../service/job/deprecated/download_job/Cargo.toml | 2 +- .../job/deprecated/inference_job/Cargo.toml | 2 +- crates/service/web/storyteller_web/Cargo.toml | 2 +- 67 files changed, 27 insertions(+), 27 deletions(-) rename crates/lib/{ => deprecated}/machine_learning/ml_models/Cargo.toml (80%) rename crates/lib/{ => deprecated}/machine_learning/ml_models/src/lib.rs (100%) rename crates/lib/{ => deprecated}/machine_learning/ml_models/src/ml/background_removal/mod.rs (100%) rename crates/lib/{ => deprecated}/machine_learning/ml_models/src/ml/background_removal/onnx_session.rs (100%) rename crates/lib/{ => deprecated}/machine_learning/ml_models/src/ml/background_removal/remove_image_background.rs (100%) rename crates/lib/{ => deprecated}/machine_learning/ml_models/src/ml/flux/flux_pipeline.rs (100%) rename crates/lib/{ => deprecated}/machine_learning/ml_models/src/ml/flux/mod.rs (100%) rename crates/lib/{ => deprecated}/machine_learning/ml_models/src/ml/image/dynamic_image_to_tensor.rs (100%) rename crates/lib/{ => deprecated}/machine_learning/ml_models/src/ml/image/load_image_file_to_tensor.rs (100%) rename crates/lib/{ => deprecated}/machine_learning/ml_models/src/ml/image/load_image_file_to_tensor_2.rs (100%) rename crates/lib/{ => deprecated}/machine_learning/ml_models/src/ml/image/mod.rs (100%) rename crates/lib/{ => deprecated}/machine_learning/ml_models/src/ml/image/save_image_from_tensor.rs (100%) rename crates/lib/{ => deprecated}/machine_learning/ml_models/src/ml/image/tensor_to_image_buffer.rs (100%) rename crates/lib/{ => deprecated}/machine_learning/ml_models/src/ml/mod.rs (100%) rename crates/lib/{ => deprecated}/machine_learning/ml_models/src/ml/model_cache.rs (100%) rename crates/lib/{ => deprecated}/machine_learning/ml_models/src/ml/model_config.rs (100%) rename crates/lib/{ => deprecated}/machine_learning/ml_models/src/ml/model_file.rs (100%) rename crates/lib/{ => deprecated}/machine_learning/ml_models/src/ml/prompt_cache.rs (100%) rename crates/lib/{ => deprecated}/machine_learning/ml_models/src/ml/stable_diffusion/get_vae_scale.rs (100%) rename crates/lib/{ => deprecated}/machine_learning/ml_models/src/ml/stable_diffusion/infer_clip_text_embeddings.rs (100%) rename crates/lib/{ => deprecated}/machine_learning/ml_models/src/ml/stable_diffusion/lcm_pipeline.rs (100%) rename crates/lib/{ => deprecated}/machine_learning/ml_models/src/ml/stable_diffusion/mod.rs (100%) rename crates/lib/{ => deprecated}/machine_learning/ml_models/src/ml/stable_diffusion/remap_lcm_strength_range.rs (100%) rename crates/lib/{ => deprecated}/machine_learning/ml_models/src/ml/stable_diffusion/stable_diffusion_pipeline.rs (100%) rename crates/lib/{ => deprecated}/machine_learning/ml_weights_registry/Cargo.toml (100%) rename crates/lib/{ => deprecated}/machine_learning/ml_weights_registry/src/lib.rs (100%) rename crates/lib/{ => deprecated}/machine_learning/ml_weights_registry/src/weights_registry/flux_weights.rs (100%) rename crates/lib/{ => deprecated}/machine_learning/ml_weights_registry/src/weights_registry/mod.rs (100%) rename crates/lib/{ => deprecated}/machine_learning/ml_weights_registry/src/weights_registry/weight_descriptor.rs (100%) rename crates/lib/{ => deprecated}/machine_learning/ml_weights_registry/src/weights_registry/weight_descriptor_builder.rs (100%) rename crates/lib/{ => deprecated}/machine_learning/ml_weights_registry/src/weights_registry/weights.rs (100%) rename crates/lib/{ => deprecated}/machine_learning/prompt_engineering/Cargo.toml (100%) rename crates/lib/{ => deprecated}/machine_learning/prompt_engineering/src/classify_prompt.rs (100%) rename crates/lib/{ => deprecated}/machine_learning/prompt_engineering/src/keywords/contains_children_keyword.rs (78%) rename crates/lib/{ => deprecated}/machine_learning/prompt_engineering/src/keywords/contains_potential_minor_keyword.rs (78%) rename crates/lib/{ => deprecated}/machine_learning/prompt_engineering/src/keywords/contains_racist_keyword.rs (79%) rename crates/lib/{ => deprecated}/machine_learning/prompt_engineering/src/keywords/contains_sex_keyword.rs (79%) rename crates/lib/{ => deprecated}/machine_learning/prompt_engineering/src/keywords/mod.rs (100%) rename crates/lib/{ => deprecated}/machine_learning/prompt_engineering/src/lib.rs (100%) rename crates/lib/{ => deprecated}/machine_learning/prompt_engineering/src/regexes/minor_regex.rs (100%) rename crates/lib/{ => deprecated}/machine_learning/prompt_engineering/src/regexes/mod.rs (100%) rename crates/lib/{ => deprecated}/machine_learning/prompt_engineering/src/regexes/nsfw_regex.rs (100%) rename crates/lib/{ => deprecated}/machine_learning/prompt_engineering/src/regexes/potential_minor_regex.rs (100%) rename crates/lib/{ => deprecated}/machine_learning/prompt_engineering/tests/borderline_tests.rs (100%) rename crates/lib/{ => deprecated}/machine_learning/prompt_engineering/tests/csam_prompt_tests.rs (100%) rename crates/lib/{ => deprecated}/machine_learning/prompt_engineering/tests/nsfw_prompt_tests.rs (100%) rename crates/lib/{ => deprecated}/machine_learning/prompt_engineering/tests/racist_prompt_tests.rs (100%) rename crates/lib/{ => deprecated}/machine_learning/prompt_engineering/tests/sfw_prompt_tests.rs (100%) rename crates/lib/{ => deprecated}/machine_learning/prompt_engineering/tests/spicy_prompt_tests.rs (100%) rename crates/lib/{ => deprecated}/subprocess_common/Cargo.toml (84%) rename crates/lib/{ => deprecated}/subprocess_common/src/command_exit_status.rs (100%) rename crates/lib/{ => deprecated}/subprocess_common/src/command_runner/command_args.rs (100%) rename crates/lib/{ => deprecated}/subprocess_common/src/command_runner/command_runner.rs (100%) rename crates/lib/{ => deprecated}/subprocess_common/src/command_runner/command_runner_args.rs (100%) rename crates/lib/{ => deprecated}/subprocess_common/src/command_runner/env_var_policy.rs (100%) rename crates/lib/{ => deprecated}/subprocess_common/src/command_runner/mod.rs (100%) rename crates/lib/{ => deprecated}/subprocess_common/src/docker_options.rs (100%) rename crates/lib/{ => deprecated}/subprocess_common/src/executable_or_command.rs (100%) rename crates/lib/{ => deprecated}/subprocess_common/src/lib.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index ab5bc7fd32..4b0ead81b3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -79,15 +79,15 @@ members = [ "crates/lib/jobs_common", "crates/lib/jwt_light", "crates/lib/logging", - "crates/lib/machine_learning/ml_weights_registry", - "crates/lib/machine_learning/prompt_engineering", + "crates/lib/deprecated/machine_learning/ml_weights_registry", + "crates/lib/deprecated/machine_learning/prompt_engineering", "crates/lib/markdown", "crates/schema/database/migration", "crates/lib/password", "crates/lib/server_environment", "crates/lib/sqlx_mysql_helpers", "crates/lib/storyteller_root", - "crates/lib/subprocess_common", + "crates/lib/deprecated/subprocess_common", "crates/lib/test_data", "crates/lib/testing", "crates/lib/deprecated/tts_common", @@ -96,7 +96,7 @@ members = [ "crates/lib/user_input_common", "crates/lib/users", #"crates/lib/api_clients/fakeyou_client", - #"crates/lib/machine_learning/ml_models", + #"crates/lib/deprecated/machine_learning/ml_models", # Schema (database): queries, database layouts, Redis keys, etc. "crates/schema/database/elasticsearch_schema", @@ -251,7 +251,7 @@ primitives = { path = "crates/lib/data/primitives" } seedance2pro_client = { path = "crates/api_clients/seedance2pro_client" } shared_service_components = { path = "crates/lib/shared_service_components" } sqlite_tasks = { path = "crates/schema/database/sqlite_tasks" } -subprocess_common = { path = "crates/lib/subprocess_common" } +subprocess_common = { path = "crates/lib/deprecated/subprocess_common" } test_data = { path = "crates/lib/test_data" } testing = { path = "crates/lib/testing" } tokens = { path = "crates/schema/public/tokens" } diff --git a/crates/api_clients/google_drive_downloader/Cargo.toml b/crates/api_clients/google_drive_downloader/Cargo.toml index ce1b7ece05..76b6dbc8f8 100644 --- a/crates/api_clients/google_drive_downloader/Cargo.toml +++ b/crates/api_clients/google_drive_downloader/Cargo.toml @@ -22,7 +22,7 @@ workspace-build-acceleration.workspace = true # Internal crockford.workspace = true errors.workspace = true -subprocess_common = { path = "../../lib/subprocess_common" } +subprocess_common = { path = "../../lib/deprecated/subprocess_common" } # External anyhow.workspace = true diff --git a/crates/api_clients/openart_client/Cargo.toml b/crates/api_clients/openart_client/Cargo.toml index 8bbe824514..7af8844c5a 100644 --- a/crates/api_clients/openart_client/Cargo.toml +++ b/crates/api_clients/openart_client/Cargo.toml @@ -20,7 +20,7 @@ workspace-build-acceleration.workspace = true crockford.workspace = true errors.workspace = true uuid_utils.workspace = true -subprocess_common = { path = "../../lib/subprocess_common" } +subprocess_common = { path = "../../lib/deprecated/subprocess_common" } # External anyhow.workspace = true diff --git a/crates/api_clients/runwayml_client/Cargo.toml b/crates/api_clients/runwayml_client/Cargo.toml index 8f75e32703..c50eb1ba70 100644 --- a/crates/api_clients/runwayml_client/Cargo.toml +++ b/crates/api_clients/runwayml_client/Cargo.toml @@ -21,7 +21,7 @@ crockford.workspace = true errors.workspace = true uuid_utils.workspace = true jwt_light.workspace = true -subprocess_common = { path = "../../lib/subprocess_common" } +subprocess_common = { path = "../../lib/deprecated/subprocess_common" } # External anyhow.workspace = true diff --git a/crates/desktop/tauri-realtime/Cargo.toml b/crates/desktop/tauri-realtime/Cargo.toml index c3184bfa7b..226fb2cf74 100644 --- a/crates/desktop/tauri-realtime/Cargo.toml +++ b/crates/desktop/tauri-realtime/Cargo.toml @@ -24,7 +24,7 @@ tauri-build = { version = "2.1.1", features = [] } crockford = { path = "../../lib/data/crockford" } filesys = { path = "../../lib/files/filesys" } memory_caching = { path = "../../lib/caching/memory_caching" } -ml_weights_registry = { path = "../../lib/machine_learning/ml_weights_registry" } +ml_weights_registry = { path = "../../lib/deprecated/machine_learning/ml_weights_registry" } primitives = { path = "../../lib/data/primitives" } # Internal ML @@ -64,7 +64,7 @@ tokio-util = { version = "0.7", features = ["codec"] } # tracing-subscriber = { version = "0.3", features = [ "env-filter", "fmt" ] } [target.'cfg(not(target_os = "macos"))'.dependencies] -ml_models = { path = "../../lib/machine_learning/ml_models" } +ml_models = { path = "../../lib/deprecated/machine_learning/ml_models" } [dev-dependencies] libloading = "0.8.6" diff --git a/crates/lib/machine_learning/ml_models/Cargo.toml b/crates/lib/deprecated/machine_learning/ml_models/Cargo.toml similarity index 80% rename from crates/lib/machine_learning/ml_models/Cargo.toml rename to crates/lib/deprecated/machine_learning/ml_models/Cargo.toml index b7faf6b1a1..fccc24d5d6 100644 --- a/crates/lib/machine_learning/ml_models/Cargo.toml +++ b/crates/lib/deprecated/machine_learning/ml_models/Cargo.toml @@ -22,11 +22,11 @@ normal = ["workspace-build-acceleration"] workspace-build-acceleration = { workspace = true } # Internal -filesys = { path = "../../files/filesys" } -image_algorithms = { path = "../../deprecated/image_algorithms" } -memory_caching = { path = "../../caching/memory_caching" } +filesys = { path = "../../../files/filesys" } +image_algorithms = { path = "../image_algorithms" } +memory_caching = { path = "../../../caching/memory_caching" } ml_weights_registry = { path = "../ml_weights_registry" } -primitives = { path = "../../data/primitives" } +primitives = { path = "../../../data/primitives" } # Bypass cudarc issues on Windows https://github.com/coreylowman/cudarc/issues/332 cudarc = "0.13.7" @@ -35,9 +35,9 @@ cudarc = "0.13.7" anyhow = { workspace = true } base64 = { workspace = true } bytes = "1.10" -candle-core = { path = "../../../vendor/candle/candle-core", features = ["cuda"] } -candle-nn = { path = "../../../vendor/candle/candle-nn", features = ["cuda"] } -candle-transformers = { path = "../../../vendor/candle/candle-transformers", features = ["cuda"] } +candle-core = { path = "../../../../vendor/candle/candle-core", features = ["cuda"] } +candle-nn = { path = "../../../../vendor/candle/candle-nn", features = ["cuda"] } +candle-transformers = { path = "../../../../vendor/candle/candle-transformers", features = ["cuda"] } const_format = "0.2.34" directories = "6.0.0" dirs = "6.0.0" diff --git a/crates/lib/machine_learning/ml_models/src/lib.rs b/crates/lib/deprecated/machine_learning/ml_models/src/lib.rs similarity index 100% rename from crates/lib/machine_learning/ml_models/src/lib.rs rename to crates/lib/deprecated/machine_learning/ml_models/src/lib.rs diff --git a/crates/lib/machine_learning/ml_models/src/ml/background_removal/mod.rs b/crates/lib/deprecated/machine_learning/ml_models/src/ml/background_removal/mod.rs similarity index 100% rename from crates/lib/machine_learning/ml_models/src/ml/background_removal/mod.rs rename to crates/lib/deprecated/machine_learning/ml_models/src/ml/background_removal/mod.rs diff --git a/crates/lib/machine_learning/ml_models/src/ml/background_removal/onnx_session.rs b/crates/lib/deprecated/machine_learning/ml_models/src/ml/background_removal/onnx_session.rs similarity index 100% rename from crates/lib/machine_learning/ml_models/src/ml/background_removal/onnx_session.rs rename to crates/lib/deprecated/machine_learning/ml_models/src/ml/background_removal/onnx_session.rs diff --git a/crates/lib/machine_learning/ml_models/src/ml/background_removal/remove_image_background.rs b/crates/lib/deprecated/machine_learning/ml_models/src/ml/background_removal/remove_image_background.rs similarity index 100% rename from crates/lib/machine_learning/ml_models/src/ml/background_removal/remove_image_background.rs rename to crates/lib/deprecated/machine_learning/ml_models/src/ml/background_removal/remove_image_background.rs diff --git a/crates/lib/machine_learning/ml_models/src/ml/flux/flux_pipeline.rs b/crates/lib/deprecated/machine_learning/ml_models/src/ml/flux/flux_pipeline.rs similarity index 100% rename from crates/lib/machine_learning/ml_models/src/ml/flux/flux_pipeline.rs rename to crates/lib/deprecated/machine_learning/ml_models/src/ml/flux/flux_pipeline.rs diff --git a/crates/lib/machine_learning/ml_models/src/ml/flux/mod.rs b/crates/lib/deprecated/machine_learning/ml_models/src/ml/flux/mod.rs similarity index 100% rename from crates/lib/machine_learning/ml_models/src/ml/flux/mod.rs rename to crates/lib/deprecated/machine_learning/ml_models/src/ml/flux/mod.rs diff --git a/crates/lib/machine_learning/ml_models/src/ml/image/dynamic_image_to_tensor.rs b/crates/lib/deprecated/machine_learning/ml_models/src/ml/image/dynamic_image_to_tensor.rs similarity index 100% rename from crates/lib/machine_learning/ml_models/src/ml/image/dynamic_image_to_tensor.rs rename to crates/lib/deprecated/machine_learning/ml_models/src/ml/image/dynamic_image_to_tensor.rs diff --git a/crates/lib/machine_learning/ml_models/src/ml/image/load_image_file_to_tensor.rs b/crates/lib/deprecated/machine_learning/ml_models/src/ml/image/load_image_file_to_tensor.rs similarity index 100% rename from crates/lib/machine_learning/ml_models/src/ml/image/load_image_file_to_tensor.rs rename to crates/lib/deprecated/machine_learning/ml_models/src/ml/image/load_image_file_to_tensor.rs diff --git a/crates/lib/machine_learning/ml_models/src/ml/image/load_image_file_to_tensor_2.rs b/crates/lib/deprecated/machine_learning/ml_models/src/ml/image/load_image_file_to_tensor_2.rs similarity index 100% rename from crates/lib/machine_learning/ml_models/src/ml/image/load_image_file_to_tensor_2.rs rename to crates/lib/deprecated/machine_learning/ml_models/src/ml/image/load_image_file_to_tensor_2.rs diff --git a/crates/lib/machine_learning/ml_models/src/ml/image/mod.rs b/crates/lib/deprecated/machine_learning/ml_models/src/ml/image/mod.rs similarity index 100% rename from crates/lib/machine_learning/ml_models/src/ml/image/mod.rs rename to crates/lib/deprecated/machine_learning/ml_models/src/ml/image/mod.rs diff --git a/crates/lib/machine_learning/ml_models/src/ml/image/save_image_from_tensor.rs b/crates/lib/deprecated/machine_learning/ml_models/src/ml/image/save_image_from_tensor.rs similarity index 100% rename from crates/lib/machine_learning/ml_models/src/ml/image/save_image_from_tensor.rs rename to crates/lib/deprecated/machine_learning/ml_models/src/ml/image/save_image_from_tensor.rs diff --git a/crates/lib/machine_learning/ml_models/src/ml/image/tensor_to_image_buffer.rs b/crates/lib/deprecated/machine_learning/ml_models/src/ml/image/tensor_to_image_buffer.rs similarity index 100% rename from crates/lib/machine_learning/ml_models/src/ml/image/tensor_to_image_buffer.rs rename to crates/lib/deprecated/machine_learning/ml_models/src/ml/image/tensor_to_image_buffer.rs diff --git a/crates/lib/machine_learning/ml_models/src/ml/mod.rs b/crates/lib/deprecated/machine_learning/ml_models/src/ml/mod.rs similarity index 100% rename from crates/lib/machine_learning/ml_models/src/ml/mod.rs rename to crates/lib/deprecated/machine_learning/ml_models/src/ml/mod.rs diff --git a/crates/lib/machine_learning/ml_models/src/ml/model_cache.rs b/crates/lib/deprecated/machine_learning/ml_models/src/ml/model_cache.rs similarity index 100% rename from crates/lib/machine_learning/ml_models/src/ml/model_cache.rs rename to crates/lib/deprecated/machine_learning/ml_models/src/ml/model_cache.rs diff --git a/crates/lib/machine_learning/ml_models/src/ml/model_config.rs b/crates/lib/deprecated/machine_learning/ml_models/src/ml/model_config.rs similarity index 100% rename from crates/lib/machine_learning/ml_models/src/ml/model_config.rs rename to crates/lib/deprecated/machine_learning/ml_models/src/ml/model_config.rs diff --git a/crates/lib/machine_learning/ml_models/src/ml/model_file.rs b/crates/lib/deprecated/machine_learning/ml_models/src/ml/model_file.rs similarity index 100% rename from crates/lib/machine_learning/ml_models/src/ml/model_file.rs rename to crates/lib/deprecated/machine_learning/ml_models/src/ml/model_file.rs diff --git a/crates/lib/machine_learning/ml_models/src/ml/prompt_cache.rs b/crates/lib/deprecated/machine_learning/ml_models/src/ml/prompt_cache.rs similarity index 100% rename from crates/lib/machine_learning/ml_models/src/ml/prompt_cache.rs rename to crates/lib/deprecated/machine_learning/ml_models/src/ml/prompt_cache.rs diff --git a/crates/lib/machine_learning/ml_models/src/ml/stable_diffusion/get_vae_scale.rs b/crates/lib/deprecated/machine_learning/ml_models/src/ml/stable_diffusion/get_vae_scale.rs similarity index 100% rename from crates/lib/machine_learning/ml_models/src/ml/stable_diffusion/get_vae_scale.rs rename to crates/lib/deprecated/machine_learning/ml_models/src/ml/stable_diffusion/get_vae_scale.rs diff --git a/crates/lib/machine_learning/ml_models/src/ml/stable_diffusion/infer_clip_text_embeddings.rs b/crates/lib/deprecated/machine_learning/ml_models/src/ml/stable_diffusion/infer_clip_text_embeddings.rs similarity index 100% rename from crates/lib/machine_learning/ml_models/src/ml/stable_diffusion/infer_clip_text_embeddings.rs rename to crates/lib/deprecated/machine_learning/ml_models/src/ml/stable_diffusion/infer_clip_text_embeddings.rs diff --git a/crates/lib/machine_learning/ml_models/src/ml/stable_diffusion/lcm_pipeline.rs b/crates/lib/deprecated/machine_learning/ml_models/src/ml/stable_diffusion/lcm_pipeline.rs similarity index 100% rename from crates/lib/machine_learning/ml_models/src/ml/stable_diffusion/lcm_pipeline.rs rename to crates/lib/deprecated/machine_learning/ml_models/src/ml/stable_diffusion/lcm_pipeline.rs diff --git a/crates/lib/machine_learning/ml_models/src/ml/stable_diffusion/mod.rs b/crates/lib/deprecated/machine_learning/ml_models/src/ml/stable_diffusion/mod.rs similarity index 100% rename from crates/lib/machine_learning/ml_models/src/ml/stable_diffusion/mod.rs rename to crates/lib/deprecated/machine_learning/ml_models/src/ml/stable_diffusion/mod.rs diff --git a/crates/lib/machine_learning/ml_models/src/ml/stable_diffusion/remap_lcm_strength_range.rs b/crates/lib/deprecated/machine_learning/ml_models/src/ml/stable_diffusion/remap_lcm_strength_range.rs similarity index 100% rename from crates/lib/machine_learning/ml_models/src/ml/stable_diffusion/remap_lcm_strength_range.rs rename to crates/lib/deprecated/machine_learning/ml_models/src/ml/stable_diffusion/remap_lcm_strength_range.rs diff --git a/crates/lib/machine_learning/ml_models/src/ml/stable_diffusion/stable_diffusion_pipeline.rs b/crates/lib/deprecated/machine_learning/ml_models/src/ml/stable_diffusion/stable_diffusion_pipeline.rs similarity index 100% rename from crates/lib/machine_learning/ml_models/src/ml/stable_diffusion/stable_diffusion_pipeline.rs rename to crates/lib/deprecated/machine_learning/ml_models/src/ml/stable_diffusion/stable_diffusion_pipeline.rs diff --git a/crates/lib/machine_learning/ml_weights_registry/Cargo.toml b/crates/lib/deprecated/machine_learning/ml_weights_registry/Cargo.toml similarity index 100% rename from crates/lib/machine_learning/ml_weights_registry/Cargo.toml rename to crates/lib/deprecated/machine_learning/ml_weights_registry/Cargo.toml diff --git a/crates/lib/machine_learning/ml_weights_registry/src/lib.rs b/crates/lib/deprecated/machine_learning/ml_weights_registry/src/lib.rs similarity index 100% rename from crates/lib/machine_learning/ml_weights_registry/src/lib.rs rename to crates/lib/deprecated/machine_learning/ml_weights_registry/src/lib.rs diff --git a/crates/lib/machine_learning/ml_weights_registry/src/weights_registry/flux_weights.rs b/crates/lib/deprecated/machine_learning/ml_weights_registry/src/weights_registry/flux_weights.rs similarity index 100% rename from crates/lib/machine_learning/ml_weights_registry/src/weights_registry/flux_weights.rs rename to crates/lib/deprecated/machine_learning/ml_weights_registry/src/weights_registry/flux_weights.rs diff --git a/crates/lib/machine_learning/ml_weights_registry/src/weights_registry/mod.rs b/crates/lib/deprecated/machine_learning/ml_weights_registry/src/weights_registry/mod.rs similarity index 100% rename from crates/lib/machine_learning/ml_weights_registry/src/weights_registry/mod.rs rename to crates/lib/deprecated/machine_learning/ml_weights_registry/src/weights_registry/mod.rs diff --git a/crates/lib/machine_learning/ml_weights_registry/src/weights_registry/weight_descriptor.rs b/crates/lib/deprecated/machine_learning/ml_weights_registry/src/weights_registry/weight_descriptor.rs similarity index 100% rename from crates/lib/machine_learning/ml_weights_registry/src/weights_registry/weight_descriptor.rs rename to crates/lib/deprecated/machine_learning/ml_weights_registry/src/weights_registry/weight_descriptor.rs diff --git a/crates/lib/machine_learning/ml_weights_registry/src/weights_registry/weight_descriptor_builder.rs b/crates/lib/deprecated/machine_learning/ml_weights_registry/src/weights_registry/weight_descriptor_builder.rs similarity index 100% rename from crates/lib/machine_learning/ml_weights_registry/src/weights_registry/weight_descriptor_builder.rs rename to crates/lib/deprecated/machine_learning/ml_weights_registry/src/weights_registry/weight_descriptor_builder.rs diff --git a/crates/lib/machine_learning/ml_weights_registry/src/weights_registry/weights.rs b/crates/lib/deprecated/machine_learning/ml_weights_registry/src/weights_registry/weights.rs similarity index 100% rename from crates/lib/machine_learning/ml_weights_registry/src/weights_registry/weights.rs rename to crates/lib/deprecated/machine_learning/ml_weights_registry/src/weights_registry/weights.rs diff --git a/crates/lib/machine_learning/prompt_engineering/Cargo.toml b/crates/lib/deprecated/machine_learning/prompt_engineering/Cargo.toml similarity index 100% rename from crates/lib/machine_learning/prompt_engineering/Cargo.toml rename to crates/lib/deprecated/machine_learning/prompt_engineering/Cargo.toml diff --git a/crates/lib/machine_learning/prompt_engineering/src/classify_prompt.rs b/crates/lib/deprecated/machine_learning/prompt_engineering/src/classify_prompt.rs similarity index 100% rename from crates/lib/machine_learning/prompt_engineering/src/classify_prompt.rs rename to crates/lib/deprecated/machine_learning/prompt_engineering/src/classify_prompt.rs diff --git a/crates/lib/machine_learning/prompt_engineering/src/keywords/contains_children_keyword.rs b/crates/lib/deprecated/machine_learning/prompt_engineering/src/keywords/contains_children_keyword.rs similarity index 78% rename from crates/lib/machine_learning/prompt_engineering/src/keywords/contains_children_keyword.rs rename to crates/lib/deprecated/machine_learning/prompt_engineering/src/keywords/contains_children_keyword.rs index 4ad13e84e0..1d9169c7ad 100644 --- a/crates/lib/machine_learning/prompt_engineering/src/keywords/contains_children_keyword.rs +++ b/crates/lib/deprecated/machine_learning/prompt_engineering/src/keywords/contains_children_keyword.rs @@ -2,7 +2,7 @@ use std::collections::HashSet; use once_cell::sync::Lazy; -const TERMS : &str = include_str!("../../../../../../includes/binary_includes/safety/dictionary_children_terms.txt"); +const TERMS : &str = include_str!("../../../../../../../includes/binary_includes/safety/dictionary_children_terms.txt"); pub (crate) fn contains_children_keyword(prompt_tokens: &[String]) -> bool { static TERM_DICTIONARY : Lazy> = Lazy::new(|| { diff --git a/crates/lib/machine_learning/prompt_engineering/src/keywords/contains_potential_minor_keyword.rs b/crates/lib/deprecated/machine_learning/prompt_engineering/src/keywords/contains_potential_minor_keyword.rs similarity index 78% rename from crates/lib/machine_learning/prompt_engineering/src/keywords/contains_potential_minor_keyword.rs rename to crates/lib/deprecated/machine_learning/prompt_engineering/src/keywords/contains_potential_minor_keyword.rs index 96d4293c50..462a80e1e2 100644 --- a/crates/lib/machine_learning/prompt_engineering/src/keywords/contains_potential_minor_keyword.rs +++ b/crates/lib/deprecated/machine_learning/prompt_engineering/src/keywords/contains_potential_minor_keyword.rs @@ -2,7 +2,7 @@ use std::collections::HashSet; use once_cell::sync::Lazy; -const TERMS: &str = include_str!("../../../../../../includes/binary_includes/safety/dictionary_potential_minor_terms.txt"); +const TERMS: &str = include_str!("../../../../../../../includes/binary_includes/safety/dictionary_potential_minor_terms.txt"); pub (crate) fn contains_potential_minor_keyword(prompt_tokens: &[String]) -> bool { static TERM_DICTIONARY: Lazy> = Lazy::new(|| { diff --git a/crates/lib/machine_learning/prompt_engineering/src/keywords/contains_racist_keyword.rs b/crates/lib/deprecated/machine_learning/prompt_engineering/src/keywords/contains_racist_keyword.rs similarity index 79% rename from crates/lib/machine_learning/prompt_engineering/src/keywords/contains_racist_keyword.rs rename to crates/lib/deprecated/machine_learning/prompt_engineering/src/keywords/contains_racist_keyword.rs index d04337cd66..cd5f4d5ad9 100644 --- a/crates/lib/machine_learning/prompt_engineering/src/keywords/contains_racist_keyword.rs +++ b/crates/lib/deprecated/machine_learning/prompt_engineering/src/keywords/contains_racist_keyword.rs @@ -2,7 +2,7 @@ use std::collections::HashSet; use once_cell::sync::Lazy; -const TERMS : &str = include_str!("../../../../../../includes/binary_includes/safety/dictionary_racist_terms.txt"); +const TERMS : &str = include_str!("../../../../../../../includes/binary_includes/safety/dictionary_racist_terms.txt"); pub (crate) fn contains_racist_keyword(prompt_tokens: &[String]) -> bool { static TERM_DICTIONARY : Lazy> = Lazy::new(|| { diff --git a/crates/lib/machine_learning/prompt_engineering/src/keywords/contains_sex_keyword.rs b/crates/lib/deprecated/machine_learning/prompt_engineering/src/keywords/contains_sex_keyword.rs similarity index 79% rename from crates/lib/machine_learning/prompt_engineering/src/keywords/contains_sex_keyword.rs rename to crates/lib/deprecated/machine_learning/prompt_engineering/src/keywords/contains_sex_keyword.rs index b4825b8430..1eba7d66c7 100644 --- a/crates/lib/machine_learning/prompt_engineering/src/keywords/contains_sex_keyword.rs +++ b/crates/lib/deprecated/machine_learning/prompt_engineering/src/keywords/contains_sex_keyword.rs @@ -2,7 +2,7 @@ use std::collections::HashSet; use once_cell::sync::Lazy; -const TERMS : &str = include_str!("../../../../../../includes/binary_includes/safety/dictionary_sex_terms.txt"); +const TERMS : &str = include_str!("../../../../../../../includes/binary_includes/safety/dictionary_sex_terms.txt"); pub (crate) fn contains_sex_keyword(prompt_tokens: &[String]) -> bool { static TERM_DICTIONARY : Lazy> = Lazy::new(|| { TERMS.lines() diff --git a/crates/lib/machine_learning/prompt_engineering/src/keywords/mod.rs b/crates/lib/deprecated/machine_learning/prompt_engineering/src/keywords/mod.rs similarity index 100% rename from crates/lib/machine_learning/prompt_engineering/src/keywords/mod.rs rename to crates/lib/deprecated/machine_learning/prompt_engineering/src/keywords/mod.rs diff --git a/crates/lib/machine_learning/prompt_engineering/src/lib.rs b/crates/lib/deprecated/machine_learning/prompt_engineering/src/lib.rs similarity index 100% rename from crates/lib/machine_learning/prompt_engineering/src/lib.rs rename to crates/lib/deprecated/machine_learning/prompt_engineering/src/lib.rs diff --git a/crates/lib/machine_learning/prompt_engineering/src/regexes/minor_regex.rs b/crates/lib/deprecated/machine_learning/prompt_engineering/src/regexes/minor_regex.rs similarity index 100% rename from crates/lib/machine_learning/prompt_engineering/src/regexes/minor_regex.rs rename to crates/lib/deprecated/machine_learning/prompt_engineering/src/regexes/minor_regex.rs diff --git a/crates/lib/machine_learning/prompt_engineering/src/regexes/mod.rs b/crates/lib/deprecated/machine_learning/prompt_engineering/src/regexes/mod.rs similarity index 100% rename from crates/lib/machine_learning/prompt_engineering/src/regexes/mod.rs rename to crates/lib/deprecated/machine_learning/prompt_engineering/src/regexes/mod.rs diff --git a/crates/lib/machine_learning/prompt_engineering/src/regexes/nsfw_regex.rs b/crates/lib/deprecated/machine_learning/prompt_engineering/src/regexes/nsfw_regex.rs similarity index 100% rename from crates/lib/machine_learning/prompt_engineering/src/regexes/nsfw_regex.rs rename to crates/lib/deprecated/machine_learning/prompt_engineering/src/regexes/nsfw_regex.rs diff --git a/crates/lib/machine_learning/prompt_engineering/src/regexes/potential_minor_regex.rs b/crates/lib/deprecated/machine_learning/prompt_engineering/src/regexes/potential_minor_regex.rs similarity index 100% rename from crates/lib/machine_learning/prompt_engineering/src/regexes/potential_minor_regex.rs rename to crates/lib/deprecated/machine_learning/prompt_engineering/src/regexes/potential_minor_regex.rs diff --git a/crates/lib/machine_learning/prompt_engineering/tests/borderline_tests.rs b/crates/lib/deprecated/machine_learning/prompt_engineering/tests/borderline_tests.rs similarity index 100% rename from crates/lib/machine_learning/prompt_engineering/tests/borderline_tests.rs rename to crates/lib/deprecated/machine_learning/prompt_engineering/tests/borderline_tests.rs diff --git a/crates/lib/machine_learning/prompt_engineering/tests/csam_prompt_tests.rs b/crates/lib/deprecated/machine_learning/prompt_engineering/tests/csam_prompt_tests.rs similarity index 100% rename from crates/lib/machine_learning/prompt_engineering/tests/csam_prompt_tests.rs rename to crates/lib/deprecated/machine_learning/prompt_engineering/tests/csam_prompt_tests.rs diff --git a/crates/lib/machine_learning/prompt_engineering/tests/nsfw_prompt_tests.rs b/crates/lib/deprecated/machine_learning/prompt_engineering/tests/nsfw_prompt_tests.rs similarity index 100% rename from crates/lib/machine_learning/prompt_engineering/tests/nsfw_prompt_tests.rs rename to crates/lib/deprecated/machine_learning/prompt_engineering/tests/nsfw_prompt_tests.rs diff --git a/crates/lib/machine_learning/prompt_engineering/tests/racist_prompt_tests.rs b/crates/lib/deprecated/machine_learning/prompt_engineering/tests/racist_prompt_tests.rs similarity index 100% rename from crates/lib/machine_learning/prompt_engineering/tests/racist_prompt_tests.rs rename to crates/lib/deprecated/machine_learning/prompt_engineering/tests/racist_prompt_tests.rs diff --git a/crates/lib/machine_learning/prompt_engineering/tests/sfw_prompt_tests.rs b/crates/lib/deprecated/machine_learning/prompt_engineering/tests/sfw_prompt_tests.rs similarity index 100% rename from crates/lib/machine_learning/prompt_engineering/tests/sfw_prompt_tests.rs rename to crates/lib/deprecated/machine_learning/prompt_engineering/tests/sfw_prompt_tests.rs diff --git a/crates/lib/machine_learning/prompt_engineering/tests/spicy_prompt_tests.rs b/crates/lib/deprecated/machine_learning/prompt_engineering/tests/spicy_prompt_tests.rs similarity index 100% rename from crates/lib/machine_learning/prompt_engineering/tests/spicy_prompt_tests.rs rename to crates/lib/deprecated/machine_learning/prompt_engineering/tests/spicy_prompt_tests.rs diff --git a/crates/lib/subprocess_common/Cargo.toml b/crates/lib/deprecated/subprocess_common/Cargo.toml similarity index 84% rename from crates/lib/subprocess_common/Cargo.toml rename to crates/lib/deprecated/subprocess_common/Cargo.toml index 69f3d6da4f..2a95352f60 100644 --- a/crates/lib/subprocess_common/Cargo.toml +++ b/crates/lib/deprecated/subprocess_common/Cargo.toml @@ -18,10 +18,10 @@ normal = ["workspace-build-acceleration"] [dependencies] # Internal -errors = { path = "../errors" } -filesys = { path = "../files/filesys" } +errors = { path = "../../errors" } +filesys = { path = "../../files/filesys" } -workspace-build-acceleration = { version = "0.1", path = "../../workspace-build-acceleration" } +workspace-build-acceleration = { version = "0.1", path = "../../../workspace-build-acceleration" } # External log = "0.4.14" diff --git a/crates/lib/subprocess_common/src/command_exit_status.rs b/crates/lib/deprecated/subprocess_common/src/command_exit_status.rs similarity index 100% rename from crates/lib/subprocess_common/src/command_exit_status.rs rename to crates/lib/deprecated/subprocess_common/src/command_exit_status.rs diff --git a/crates/lib/subprocess_common/src/command_runner/command_args.rs b/crates/lib/deprecated/subprocess_common/src/command_runner/command_args.rs similarity index 100% rename from crates/lib/subprocess_common/src/command_runner/command_args.rs rename to crates/lib/deprecated/subprocess_common/src/command_runner/command_args.rs diff --git a/crates/lib/subprocess_common/src/command_runner/command_runner.rs b/crates/lib/deprecated/subprocess_common/src/command_runner/command_runner.rs similarity index 100% rename from crates/lib/subprocess_common/src/command_runner/command_runner.rs rename to crates/lib/deprecated/subprocess_common/src/command_runner/command_runner.rs diff --git a/crates/lib/subprocess_common/src/command_runner/command_runner_args.rs b/crates/lib/deprecated/subprocess_common/src/command_runner/command_runner_args.rs similarity index 100% rename from crates/lib/subprocess_common/src/command_runner/command_runner_args.rs rename to crates/lib/deprecated/subprocess_common/src/command_runner/command_runner_args.rs diff --git a/crates/lib/subprocess_common/src/command_runner/env_var_policy.rs b/crates/lib/deprecated/subprocess_common/src/command_runner/env_var_policy.rs similarity index 100% rename from crates/lib/subprocess_common/src/command_runner/env_var_policy.rs rename to crates/lib/deprecated/subprocess_common/src/command_runner/env_var_policy.rs diff --git a/crates/lib/subprocess_common/src/command_runner/mod.rs b/crates/lib/deprecated/subprocess_common/src/command_runner/mod.rs similarity index 100% rename from crates/lib/subprocess_common/src/command_runner/mod.rs rename to crates/lib/deprecated/subprocess_common/src/command_runner/mod.rs diff --git a/crates/lib/subprocess_common/src/docker_options.rs b/crates/lib/deprecated/subprocess_common/src/docker_options.rs similarity index 100% rename from crates/lib/subprocess_common/src/docker_options.rs rename to crates/lib/deprecated/subprocess_common/src/docker_options.rs diff --git a/crates/lib/subprocess_common/src/executable_or_command.rs b/crates/lib/deprecated/subprocess_common/src/executable_or_command.rs similarity index 100% rename from crates/lib/subprocess_common/src/executable_or_command.rs rename to crates/lib/deprecated/subprocess_common/src/executable_or_command.rs diff --git a/crates/lib/subprocess_common/src/lib.rs b/crates/lib/deprecated/subprocess_common/src/lib.rs similarity index 100% rename from crates/lib/subprocess_common/src/lib.rs rename to crates/lib/deprecated/subprocess_common/src/lib.rs diff --git a/crates/service/job/deprecated/download_job/Cargo.toml b/crates/service/job/deprecated/download_job/Cargo.toml index b374c1e294..633aa55015 100644 --- a/crates/service/job/deprecated/download_job/Cargo.toml +++ b/crates/service/job/deprecated/download_job/Cargo.toml @@ -37,7 +37,7 @@ mimetypes.workspace = true mysql_queries = { path = "../../../../schema/database/mysql_queries" } reusable_types = { path = "../../../../schema/public/reusable_types" } storyteller_root = { path = "../../../../lib/storyteller_root" } -subprocess_common = { path = "../../../../lib/subprocess_common" } +subprocess_common = { path = "../../../../lib/deprecated/subprocess_common" } tokens.workspace = true # External diff --git a/crates/service/job/deprecated/inference_job/Cargo.toml b/crates/service/job/deprecated/inference_job/Cargo.toml index 68835e13be..8b3ee1d05a 100644 --- a/crates/service/job/deprecated/inference_job/Cargo.toml +++ b/crates/service/job/deprecated/inference_job/Cargo.toml @@ -45,7 +45,7 @@ mysql_queries = { path = "../../../../schema/database/mysql_queries" } primitives.workspace = true redis_common = { path = "../../../../schema/database/redis_common" } redis_schema = { path = "../../../../schema/database/redis_schema" } -subprocess_common = { path = "../../../../lib/subprocess_common" } +subprocess_common = { path = "../../../../lib/deprecated/subprocess_common" } thumbnail_generator = { path = "../../../../api_clients/thumbnail_generator"} tokens.workspace = true tts_common = { path = "../../../../lib/deprecated/tts_common" } diff --git a/crates/service/web/storyteller_web/Cargo.toml b/crates/service/web/storyteller_web/Cargo.toml index e50f1e0f51..6916cc9c16 100644 --- a/crates/service/web/storyteller_web/Cargo.toml +++ b/crates/service/web/storyteller_web/Cargo.toml @@ -67,7 +67,7 @@ mimetypes.workspace = true mysql_queries.workspace = true password = { path = "../../../lib/password" } primitives = { path = "../../../lib/data/primitives" } -prompt_engineering = { path = "../../../lib/machine_learning/prompt_engineering" } +prompt_engineering = { path = "../../../lib/deprecated/machine_learning/prompt_engineering" } redis_caching = { path = "../../../lib/caching/redis_caching" } redis_common = { path = "../../../schema/database/redis_common" } redis_schema = { path = "../../../schema/database/redis_schema" }