Make some more types serializable

Author: haecker-felix

crates/pixi_api/src/context.rs

@@ -2,10 +2,11 @@ use std::collections::HashMap;
 
 use indexmap::{IndexMap, IndexSet};
 use miette::IntoDiagnostic;
-use pixi_core::workspace::{UpdateDeps, WorkspaceMut};
+use pixi_core::workspace::{PypiDeps, UpdateDeps, WorkspaceMut};
 use pixi_core::{Workspace, environment::LockFileUsage};
 use pixi_manifest::{
-    EnvironmentName, Feature, FeatureName, PrioritizedChannel, TargetSelector, Task, TaskName,
+    EnvironmentName, Feature, FeatureName, PrioritizedChannel, SpecType, TargetSelector, Task,
+    TaskName,
 };
 use pixi_pypi_spec::{PixiPypiSpec, PypiPackageName};
 use pixi_spec::PixiSpec;
@@ -143,8 +144,8 @@ impl<I: Interface> WorkspaceContext<I> {
 
     pub async fn add_conda_deps(
         &self,
-        specs: IndexMap<PackageName, rattler_conda_types::MatchSpec>,
-        spec_type: pixi_manifest::SpecType,
+        specs: IndexMap<PackageName, MatchSpec>,
+        spec_type: SpecType,
         dep_options: DependencyOptions,
         git_options: GitOptions,
     ) -> miette::Result<Option<UpdateDeps>> {
@@ -161,7 +162,7 @@ impl<I: Interface> WorkspaceContext<I> {
 
     pub async fn add_pypi_deps(
         &self,
-        pypi_deps: pixi_core::workspace::PypiDeps,
+        pypi_deps: PypiDeps,
         editable: bool,
         options: DependencyOptions,
     ) -> miette::Result<Option<UpdateDeps>> {
@@ -177,8 +178,8 @@ impl<I: Interface> WorkspaceContext<I> {
 
     pub async fn remove_conda_deps(
         &self,
-        specs: IndexMap<PackageName, rattler_conda_types::MatchSpec>,
-        spec_type: pixi_manifest::SpecType,
+        specs: IndexMap<PackageName, MatchSpec>,
+        spec_type: SpecType,
         dep_options: DependencyOptions,
     ) -> miette::Result<()> {
         crate::workspace::remove::remove_conda_deps(
@@ -193,7 +194,7 @@ impl<I: Interface> WorkspaceContext<I> {
 
     pub async fn remove_pypi_deps(
         &self,
-        pypi_deps: pixi_core::workspace::PypiDeps,
+        pypi_deps: PypiDeps,
         options: DependencyOptions,
     ) -> miette::Result<()> {
         crate::workspace::remove::remove_pypi_deps(

crates/pixi_api/src/workspace/add/options.rs

@@ -2,9 +2,10 @@ use pixi_core::environment::LockFileUsage;
 use pixi_manifest::FeatureName;
 use pixi_spec::GitReference;
 use rattler_conda_types::Platform;
+use serde::{Deserialize, Serialize};
 use url::Url;
 
-#[derive(Clone, Debug)]
+#[derive(Deserialize, Serialize, Clone, Debug)]
 pub struct DependencyOptions {
     /// The feature for which the dependency should be modified.
     pub feature: FeatureName,
@@ -15,7 +16,7 @@ pub struct DependencyOptions {
     pub lock_file_usage: LockFileUsage,
 }
 
-#[derive(Clone, Debug)]
+#[derive(Deserialize, Serialize, Clone, Debug)]
 pub struct GitOptions {
     pub git: Option<Url>,
     pub reference: GitReference,

crates/pixi_manifest/src/spec_type.rs

@@ -1,4 +1,6 @@
-#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
+use serde::{Deserialize, Serialize};
+
+#[derive(Deserialize, Serialize, Debug, Copy, Clone, Hash, PartialEq, Eq)]
 /// What kind of dependency spec do we have
 pub enum SpecType {
     /// Host dependencies are used that are needed by the host environment when