feat: move pixi build type conversions into its own crate

Cargo.toml

@@ -145,6 +145,7 @@ zstd = { version = "0.13.2", default-features = false }
 
 fancy_display = { path = "crates/fancy_display" }
 pixi_build_frontend = { path = "crates/pixi_build_frontend" }
+pixi_build_type_conversions = { path = "crates/pixi_build_type_conversions" }
 pixi_build_types = { path = "crates/pixi_build_types" }
 pixi_config = { path = "crates/pixi_config" }
 pixi_consts = { path = "crates/pixi_consts" }

crates/pixi_build_frontend/Cargo.toml

@@ -13,10 +13,11 @@ version = "0.1.0"
 dashmap = { workspace = true }
 fs-err = { workspace = true, features = ["tokio"] }
 futures = { workspace = true }
-indexmap = { workspace = true }
 itertools = { workspace = true }
 jsonrpsee = { workspace = true, features = ["client"] }
 miette = { workspace = true, features = ["fancy", "serde"] }
+pixi_build_type_conversions = { workspace = true }
+pixi_build_types = { path = "../pixi_build_types" }
 pixi_config = { workspace = true }
 pixi_consts = { workspace = true }
 pixi_manifest = { workspace = true }
@@ -44,9 +45,6 @@ url = "2.5.4"
 which = { workspace = true }
 
 
-pixi_build_types = { path = "../pixi_build_types" }
-
-
 [dev-dependencies]
 bytes = { workspace = true }
 insta = { workspace = true, features = ["yaml", "filters", "json"] }

crates/pixi_build_frontend/src/lib.rs

@@ -1,6 +1,5 @@
 mod backend_override;
 mod build_frontend;
-mod into_build_types;
 mod jsonrpc;
 pub mod protocol;
 mod protocols;
@@ -25,7 +24,6 @@ use url::Url;
 pub use crate::protocol::Protocol;
 
 pub use backend_override::BackendOverride;
-pub use into_build_types::to_project_model_v1;
 pub use protocol_builder::EnabledProtocols;
 
 /// A backend communication protocol that can run in the same process.

crates/pixi_build_frontend/src/protocols/mod.rs

@@ -12,11 +12,11 @@ use jsonrpsee::{
     },
     types::ErrorCode,
 };
+use pixi_build_type_conversions::to_project_model_v1;
 use pixi_manifest::PackageManifest;
 
 use crate::{
     jsonrpc::{stdio_transport, RpcParams},
-    to_project_model_v1,
     tool::Tool,
     CondaBuildReporter, CondaMetadataReporter,
 };
@@ -31,7 +31,7 @@ use pixi_build_types::{
         conda_metadata::{CondaMetadataParams, CondaMetadataResult},
         initialize::{InitializeParams, InitializeResult},
     },
-    BackendCapabilities, FrontendCapabilities, VersionedProjectModel,
+    BackendCapabilities, FrontendCapabilities,
 };
 use stderr::{stderr_null, stderr_stream};
 use thiserror::Error;
@@ -228,8 +228,7 @@ impl JsonRPCBuildProtocol {
             })?;
 
         // TODO: select the correct protocol version based on the capabilities
-        let project_model = package_manifest
-            .map(|manifest| VersionedProjectModel::V1(to_project_model_v1(manifest)));
+        let project_model = package_manifest.map(to_project_model_v1);
         // Invoke the initialize method on the backend to establish the connection.
         let _result: InitializeResult = client
             .request(

crates/pixi_build_type_conversions/Cargo.toml

@@ -0,0 +1,22 @@
+[package]
+authors.workspace = true
+description = "Conversions from pixi manifest types into build build protocol types"
+edition.workspace = true
+homepage.workspace = true
+license.workspace = true
+name = "pixi_build_type_conversions"
+readme.workspace = true
+repository.workspace = true
+version = "0.1.0"
+
+[dependencies]
+indexmap = { workspace = true }
+pixi_build_types = { workspace = true }
+pixi_manifest = { workspace = true }
+pixi_spec = { workspace = true }
+rattler_conda_types = { workspace = true }
+serde_json = { workspace = true }
+
+[dev-dependencies]
+insta = { workspace = true, features = ["json"] }
+rstest = { workspace = true }

crates/pixi_build_type_conversions/src/lib.rs

@@ -0,0 +1,3 @@
+mod project_model;
+
+pub use project_model::to_project_model_v1;

crates/pixi_build_frontend/src/into_build_types.rs → crates/pixi_build_type_conversions/src/project_model.rs

@@ -108,8 +108,8 @@ fn to_targets_v1(targets: &Targets<PackageTarget>) -> pbt::TargetsV1 {
 }
 
 /// Converts a [`PackageManifest`] to a [`pbt::ProjectModelV1`].
-pub fn to_project_model_v1(manifest: &PackageManifest) -> pbt::ProjectModelV1 {
-    pbt::ProjectModelV1 {
+pub fn to_project_model_v1(manifest: &PackageManifest) -> pbt::VersionedProjectModel {
+    let project = pbt::ProjectModelV1 {
         name: manifest.package.name.clone(),
         version: manifest.package.version.clone(),
         description: manifest.package.description.clone(),
@@ -122,7 +122,8 @@ pub fn to_project_model_v1(manifest: &PackageManifest) -> pbt::ProjectModelV1 {
         documentation: manifest.package.documentation.clone(),
         configuration: serde_json::Value::Null,
         targets: to_targets_v1(&manifest.targets),
-    }
+    };
+    pbt::VersionedProjectModel::V1(project)
 }
 
 #[cfg(test)]

crates/pixi_build_type_conversions/src/snapshots/pixi_build_type_conversions__project_model__tests__conversions_v1_docs@pixi_build_cpp.snap

@@ -0,0 +1,76 @@
+---
+source: crates/pixi_build_type_conversions/src/project_model.rs
+expression: project_model
+---
+{
+  "version": "1",
+  "name": "python_bindings",
+  "version": "0.1.0",
+  "description": null,
+  "authors": null,
+  "license": null,
+  "license_file": null,
+  "readme": null,
+  "homepage": null,
+  "repository": null,
+  "documentation": null,
+  "configuration": null,
+  "targets": {
+    "default_target": {
+      "host_dependencies": {
+        "cmake": {
+          "detailedVersion": {
+            "version": ">=3.20,<3.27",
+            "build": null,
+            "build_number": null,
+            "file_name": null,
+            "channel": null,
+            "subdir": null,
+            "md5": null,
+            "sha256": null
+          }
+        },
+        "nanobind": {
+          "detailedVersion": {
+            "version": ">=2.4.0,<2.5.0",
+            "build": null,
+            "build_number": null,
+            "file_name": null,
+            "channel": null,
+            "subdir": null,
+            "md5": null,
+            "sha256": null
+          }
+        },
+        "python_abi": {
+          "detailedVersion": {
+            "version": ">=3.12,<3.13",
+            "build": null,
+            "build_number": null,
+            "file_name": null,
+            "channel": null,
+            "subdir": null,
+            "md5": null,
+            "sha256": null
+          }
+        }
+      },
+      "build_dependencies": {},
+      "run_dependencies": {
+        "python": {
+          "detailedVersion": {
+            "version": ">=3.12,<3.13",
+            "build": null,
+            "build_number": null,
+            "file_name": null,
+            "channel": null,
+            "subdir": null,
+            "md5": null,
+            "sha256": null
+          }
+        }
+      }
+    },
+    "targets": {}
+  }
+}

crates/pixi_build_type_conversions/src/snapshots/pixi_build_type_conversions__project_model__tests__conversions_v1_docs@pixi_build_python.snap

@@ -0,0 +1,52 @@
+---
+source: crates/pixi_build_type_conversions/src/project_model.rs
+expression: project_model
+---
+{
+  "version": "1",
+  "name": "rich_example",
+  "version": "0.1.0",
+  "description": null,
+  "authors": null,
+  "license": null,
+  "license_file": null,
+  "readme": null,
+  "homepage": null,
+  "repository": null,
+  "documentation": null,
+  "configuration": null,
+  "targets": {
+    "default_target": {
+      "host_dependencies": {
+        "hatchling": {
+          "detailedVersion": {
+            "version": "==1.26.3",
+            "build": null,
+            "build_number": null,
+            "file_name": null,
+            "channel": null,
+            "subdir": null,
+            "md5": null,
+            "sha256": null
+          }
+        }
+      },
+      "build_dependencies": {},
+      "run_dependencies": {
+        "rich": {
+          "detailedVersion": {
+            "version": ">=13.9.4,<14",
+            "build": null,
+            "build_number": null,
+            "file_name": null,
+            "channel": null,
+            "subdir": null,
+            "md5": null,
+            "sha256": null
+          }
+        }
+      }
+    },
+    "targets": {}
+  }
+}

crates/pixi_build_type_conversions/src/snapshots/pixi_build_type_conversions__project_model__tests__conversions_v1_docs@pixi_build_workspace.snap

@@ -0,0 +1,52 @@
+---
+source: crates/pixi_build_type_conversions/src/project_model.rs
+expression: project_model
+---
+{
+  "version": "1",
+  "name": "rich_example",
+  "version": "0.1.0",
+  "description": null,
+  "authors": null,
+  "license": null,
+  "license_file": null,
+  "readme": null,
+  "homepage": null,
+  "repository": null,
+  "documentation": null,
+  "configuration": null,
+  "targets": {
+    "default_target": {
+      "host_dependencies": {
+        "hatchling": {
+          "detailedVersion": {
+            "version": "==1.26.3",
+            "build": null,
+            "build_number": null,
+            "file_name": null,
+            "channel": null,
+            "subdir": null,
+            "md5": null,
+            "sha256": null
+          }
+        }
+      },
+      "build_dependencies": {},
+      "run_dependencies": {
+        "rich": {
+          "detailedVersion": {
+            "version": ">=13.9.4,<14",
+            "build": null,
+            "build_number": null,
+            "file_name": null,
+            "channel": null,
+            "subdir": null,
+            "md5": null,
+            "sha256": null
+          }
+        }
+      }
+    },
+    "targets": {}
+  }
+}

crates/pixi_build_type_conversions/src/snapshots/pixi_build_type_conversions__project_model__tests__conversions_v1_examples@boltons.snap

@@ -0,0 +1,41 @@
+---
+source: crates/pixi_build_type_conversions/src/project_model.rs
+expression: project_model
+---
+{
+  "version": "1",
+  "name": "boltons",
+  "version": "0.1.0",
+  "description": "Add a short description here",
+  "authors": [
+    "nichmor <[email protected]>"
+  ],
+  "license": null,
+  "license_file": null,
+  "readme": null,
+  "homepage": null,
+  "repository": null,
+  "documentation": null,
+  "configuration": null,
+  "targets": {
+    "default_target": {
+      "host_dependencies": {
+        "hatchling": {
+          "detailedVersion": {
+            "version": "*",
+            "build": null,
+            "build_number": null,
+            "file_name": null,
+            "channel": null,
+            "subdir": null,
+            "md5": null,
+            "sha256": null
+          }
+        }
+      },
+      "build_dependencies": {},
+      "run_dependencies": {}
+    },
+    "targets": {}
+  }
+}