Move GenericStringModel to warp_server_client.

Author: vorporeal

app/src/cloud_object/mod.rs

@@ -807,17 +807,6 @@ where
         Box::new(self.clone())
     }
 }
-impl<T, S> ServerObjectModel for GenericStringModel<T, S>
-where
-    T: StringModel<
-        CloudObjectType = GenericCloudObject<GenericStringObjectId, GenericStringModel<T, S>>,
-    >,
-    S: Serializer<T>,
-{
-    fn object_type(&self) -> ObjectType {
-        <Self as CloudModelType>::object_type(self)
-    }
-}
 
 impl ServerObjectModel for CloudFolderModel {
     fn object_type(&self) -> ObjectType {

app/src/cloud_object/model/generic_string_model.rs

@@ -5,6 +5,7 @@ use anyhow::Result;
 use async_trait::async_trait;
 use warp_server_client::cloud_object::CloudObjectUpsertParams;
 // Re-exported from warp_server_client.
+pub use warp_server_client::cloud_object::{GenericStringModel, Serializer};
 pub use warp_server_client::ids::GenericStringObjectId;
 
 use crate::appearance::Appearance;
@@ -119,27 +120,6 @@ pub trait StringModel: Clone + Debug + PartialEq + Send + Sync + 'static {
     fn uniqueness_key(&self) -> Option<GenericStringObjectUniqueKey>;
 }
 
-/// A serializer goes from a model to a string and back.
-pub trait Serializer<M>: Debug + Clone + 'static {
-    fn serialize(model: &M) -> SerializedModel;
-    fn deserialize_owned(serialized: &str) -> Result<M>
-    where
-        Self: Sized;
-}
-
-/// A `GenericStringModel` is a generic implementation of model types that can serialize to/from string.
-/// given a particular serializer.
-#[derive(Clone, Debug, PartialEq, Default)]
-pub struct GenericStringModel<M, S>
-where
-    M: StringModel<
-        CloudObjectType = GenericCloudObject<GenericStringObjectId, GenericStringModel<M, S>>,
-    >,
-    S: Serializer<M>,
-{
-    pub string_model: M,
-}
-
 impl<M, S> CloudStringObject for GenericCloudObject<GenericStringObjectId, GenericStringModel<M, S>>
 where
     M: StringModel<
@@ -346,25 +326,3 @@ where
         self.string_model.to_warp_drive_item(id, appearance, object)
     }
 }
-
-impl<M, S> GenericStringModel<M, S>
-where
-    M: StringModel<
-        CloudObjectType = GenericCloudObject<GenericStringObjectId, GenericStringModel<M, S>>,
-    >,
-    S: Serializer<M>,
-{
-    pub fn deserialize_owned(serialized: &str) -> Result<Self> {
-        S::deserialize_owned(serialized).map(Self::new)
-    }
-
-    pub fn new(model: M) -> Self {
-        Self {
-            string_model: model,
-        }
-    }
-
-    pub fn json_model(&self) -> &M {
-        &self.string_model
-    }
-}

app/src/cloud_object/model/json_model.rs

@@ -1,5 +1,6 @@
 use serde::de::DeserializeOwned;
 use serde::Serialize;
+use warp_server_client::cloud_object::GenericStringObjectFormat;
 
 use super::generic_string_model::{Serializer, StringModel};
 use crate::cloud_object::JsonObjectType;
@@ -15,6 +16,9 @@ pub trait JsonModel: StringModel + Serialize + DeserializeOwned + 'static {
 pub struct JsonSerializer;
 
 impl<M: JsonModel> Serializer<M> for JsonSerializer {
+    fn model_format() -> GenericStringObjectFormat {
+        M::model_format()
+    }
     fn serialize(model: &M) -> SerializedModel {
         SerializedModel::new(serde_json::to_string(model).expect("model should serialize"))
     }

app/src/search/ai_context_menu/rules/data_source_tests.rs

@@ -38,14 +38,12 @@ type ServerAIFact = GenericServerObject<
 fn mock_server_ai_fact(id: i64, name: &str, content: &str, revision: Revision) -> ServerAIFact {
     GenericServerObject::new(
         SyncId::ServerId(id.into()),
-        GenericStringModel {
-            string_model: AIFact::Memory(AIMemory {
-                name: Some(name.to_string()),
-                content: content.to_string(),
-                is_autogenerated: false,
-                suggested_logging_id: None,
-            }),
-        },
+        GenericStringModel::new(AIFact::Memory(AIMemory {
+            name: Some(name.to_string()),
+            content: content.to_string(),
+            is_autogenerated: false,
+            suggested_logging_id: None,
+        })),
         ServerMetadata {
             uid: ServerId::default(),
             revision,

crates/warp_server_client/src/cloud_object/generic_string_model.rs

@@ -0,0 +1,55 @@
+use std::{fmt::Debug, marker::PhantomData};
+
+use anyhow::Result;
+
+use super::{GenericStringObjectFormat, ObjectType, SerializedModel, ServerObjectModel};
+
+/// A serializer goes from a model to a string and back.
+pub trait Serializer<M>: Debug + Clone + 'static {
+    fn model_format() -> GenericStringObjectFormat;
+    fn serialize(model: &M) -> SerializedModel;
+    fn deserialize_owned(serialized: &str) -> Result<M>
+    where
+        Self: Sized;
+}
+
+/// A `GenericStringModel` is a generic implementation of model types that can serialize to/from string.
+/// given a particular serializer.
+#[derive(Clone, Debug, PartialEq, Default)]
+pub struct GenericStringModel<M, S>
+where
+    S: Serializer<M>,
+{
+    pub string_model: M,
+    _serializer: PhantomData<fn() -> S>,
+}
+
+impl<M, S> GenericStringModel<M, S>
+where
+    S: Serializer<M>,
+{
+    pub fn deserialize_owned(serialized: &str) -> Result<Self> {
+        S::deserialize_owned(serialized).map(Self::new)
+    }
+
+    pub fn new(model: M) -> Self {
+        Self {
+            string_model: model,
+            _serializer: PhantomData,
+        }
+    }
+
+    pub fn json_model(&self) -> &M {
+        &self.string_model
+    }
+}
+
+impl<M, S> ServerObjectModel for GenericStringModel<M, S>
+where
+    M: Debug + Clone + Send + Sync + 'static,
+    S: Serializer<M>,
+{
+    fn object_type(&self) -> ObjectType {
+        ObjectType::GenericStringObject(S::model_format())
+    }
+}

crates/warp_server_client/src/cloud_object/mod.rs

@@ -26,11 +26,13 @@ use crate::ids::{FolderId, ServerId, SyncId};
 
 mod creation;
 mod generic_cloud_object;
+mod generic_string_model;
 mod server_object;
 mod update;
 
 pub use creation::*;
 pub use generic_cloud_object::*;
+pub use generic_string_model::*;
 pub use server_object::*;
 pub use update::*;
 /// The type of object id each ObjectType corresponds to.