Move functionality to add_json_from_dict()

Author: GodTamIt

src/document.rs

@@ -672,28 +672,37 @@ impl Document {
         self.add_value(field_name, bytes);
     }
 
-    /// Add a bytes value to the document.
+    /// Add a JSON value to the document.
     ///
     /// Args:
-    ///     field_name (str): The field for which we are adding the bytes.
-    ///     value (str | Dict[str, Any]): The json object that will be added
-    ///         to the document.
+    ///     field_name (str): The field for which we are adding the JSON.
+    ///     value (str): The JSON object that will be added to the document.
     ///
-    /// Raises a ValueError if the json is invalid.
-    fn add_json(&mut self, field_name: String, value: &PyAny) -> PyResult<()> {
-        type JsonMap = serde_json::Map<String, serde_json::Value>;
-
-        if let Ok(json_str) = value.extract::<&str>() {
-            let json_map: JsonMap =
-                serde_json::from_str(json_str).map_err(to_pyerr)?;
-            self.add_value(field_name, json_map);
-            Ok(())
-        } else if let Ok(json_map) = pythonize::depythonize::<JsonMap>(value) {
-            self.add_value(field_name, json_map);
-            Ok(())
-        } else {
-            Err(to_pyerr("Invalid JSON object. Expected valid JSON string or Dict[str, Any]."))
-        }
+    /// Raises a ValueError if the JSON is invalid.
+    fn add_json(&mut self, field_name: String, value: &str) -> PyResult<()> {
+        let json_map: serde_json::Map<String, serde_json::Value> =
+            serde_json::from_str(value).map_err(to_pyerr)?;
+        self.add_value(field_name, json_map);
+        Ok(())
+    }
+
+    /// Add a JSON value to the document from a dictionary of values.
+    ///
+    /// Args:
+    ///     field_name (str): The field for which we are adding the JSON.
+    ///     value (Dict[str, Any]): The JSON object that will be added to the
+    ///         document.
+    ///
+    /// Raises a ValueError if the JSON is invalid.
+    fn add_json_from_dict(
+        &mut self,
+        field_name: String,
+        value: &PyDict,
+    ) -> PyResult<()> {
+        let json_map: serde_json::Map<String, serde_json::Value> =
+            pythonize::depythonize(value).map_err(to_pyerr)?;
+        self.add_value(field_name, json_map);
+        Ok(())
     }
 
     /// Returns the number of added fields that have been added to the document

tests/tantivy_test.py

@@ -784,7 +784,7 @@ def test_query_from_json_field(self):
         writer.add_document(doc)
 
         doc = Document()
-        doc.add_json(
+        doc.add_json_from_dict(
             "attributes",
             {
                 "order": 1.2,