Move json_handling to corelibs_json module

src/corelibs/json_handling/jmespath_helper.py

@@ -2,11 +2,12 @@
 helper functions for jmespath interfaces
 """
 
+from warnings import deprecated
 from typing import Any
-import jmespath
-import jmespath.exceptions
+from corelibs_json.jmespath_support import jmespath_search as jmespath_search_ng
 
 
+@deprecated("Use corelibs_json.jmespath_support.jmespath_search instead")
 def jmespath_search(search_data: dict[Any, Any] | list[Any], search_params: str) -> Any:
     """
     jmespath search wrapper
@@ -22,18 +23,6 @@ def jmespath_search(search_data: dict[Any, Any] | list[Any], search_params: str)
     Returns:
         Any: dict/list/etc, None if nothing found
     """
-    try:
-        search_result = jmespath.search(search_params, search_data)
-    except jmespath.exceptions.LexerError as excp:
-        raise ValueError(f"Compile failed: {search_params}: {excp}") from excp
-    except jmespath.exceptions.ParseError as excp:
-        raise ValueError(f"Parse failed: {search_params}: {excp}") from excp
-    except jmespath.exceptions.JMESPathTypeError as excp:
-        raise ValueError(f"Search failed with JMESPathTypeError: {search_params}: {excp}") from excp
-    except TypeError as excp:
-        raise ValueError(f"Type error for search_params: {excp}") from excp
-    return search_result
-
-# TODO: compile jmespath setup
+    return jmespath_search_ng(search_data, search_params)
 
 # __END__

src/corelibs/json_handling/json_helper.py

@@ -2,35 +2,37 @@
 json encoder for datetime
 """
 
+from warnings import warn, deprecated
 from typing import Any
-from json import JSONEncoder, dumps
-from datetime import datetime, date
-import copy
-from jsonpath_ng import parse  # pyright: ignore[reportMissingTypeStubs, reportUnknownVariableType]
+from corelibs_json.json_support import (
+    default_isoformat as default_isoformat_ng,
+    DateTimeEncoder as DateTimeEncoderCoreLibs,
+    json_dumps as json_dumps_ng,
+    modify_with_jsonpath as modify_with_jsonpath_ng,
+)
 
 
 # subclass JSONEncoder
-class DateTimeEncoder(JSONEncoder):
+class DateTimeEncoder(DateTimeEncoderCoreLibs):
     """
     Override the default method
     dumps(..., cls=DateTimeEncoder, ...)
     """
-    def default(self, o: Any) -> str | None:
-        if isinstance(o, (date, datetime)):
-            return o.isoformat()
-        return None
 
 
+warn("Use corelibs_json.json_support.DateTimeEncoder instead", DeprecationWarning, stacklevel=2)
+
+
+@deprecated("Use corelibs_json.json_support.default_isoformat instead")
 def default_isoformat(obj: Any) -> str | None:
     """
     default override
     dumps(..., default=default, ...)
     """
-    if isinstance(obj, (date, datetime)):
-        return obj.isoformat()
-    return None
+    return default_isoformat_ng(obj)
 
 
+@deprecated("Use corelibs_json.json_support.json_dumps instead")
 def json_dumps(data: Any):
     """
     wrapper for json.dumps with sure dump without throwing Exceptions
@@ -41,22 +43,15 @@ def json_dumps(data: Any):
     Returns:
         _type_ -- _description_
     """
-    return dumps(data, ensure_ascii=False, default=str)
+    return json_dumps_ng(data)
 
 
+@deprecated("Use corelibs_json.json_support.modify_with_jsonpath instead")
 def modify_with_jsonpath(data: dict[Any, Any], path: str, new_value: Any):
     """
     Modify dictionary using JSONPath (more powerful than JMESPath for modifications)
     """
-    result = copy.deepcopy(data)
-    jsonpath_expr = parse(path)  # pyright: ignore[reportUnknownVariableType]
-
-    # Find and update all matches
-    matches = jsonpath_expr.find(result)  # pyright: ignore[reportUnknownMemberType, reportUnknownVariableType]
-    for match in matches:  # pyright: ignore[reportUnknownVariableType]
-        match.full_path.update(result, new_value)  # pyright: ignore[reportUnknownMemberType]
-
-    return result
+    return modify_with_jsonpath_ng(data, path, new_value)
 
 # __END__