json-repair 0.28.0__tar.gz → 0.28.1__tar.gz

{json_repair-0.28.0/src/json_repair.egg-info → json_repair-0.28.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: json_repair
-Version: 0.28.0
+Version: 0.28.1
 Summary: A package to repair broken json strings
 Author-email: Stefano Baccianella <4247706+mangiucugna@users.noreply.github.com>
 License: MIT License

{json_repair-0.28.0 → json_repair-0.28.1}/pyproject.toml

@@ -3,7 +3,7 @@ requires = ["setuptools>=61.0"]
 build-backend = "setuptools.build_meta"
 [project]
 name = "json_repair"
-version = "0.28.0"
+version = "0.28.1"
 license = {file = "LICENSE"}
 authors = [
   { name="Stefano Baccianella", email="4247706+mangiucugna@users.noreply.github.com" },

{json_repair-0.28.0 → json_repair-0.28.1}/src/json_repair/json_repair.py

@@ -24,7 +24,7 @@ All supported use cases are in the unit tests
 
 import os
 import json
-from typing import Any, Dict, List, Optional, Union, TextIO, Tuple
+from typing import Any, Dict, List, Optional, Union, TextIO, Tuple, overload, Literal
 
 
 class StringFileWrapper:
@@ -177,7 +177,7 @@ class JSONParser:
             # <member> starts with a <string>
             key = ""
             while self.get_char_at():
-                key = self.parse_string()
+                key = str(self.parse_string())
 
                 if key != "" or (key == "" and self.get_char_at() == ":"):
                     # If the string is empty but there is a object divider, we are done here
@@ -255,7 +255,7 @@ class JSONParser:
         self.reset_context()
         return arr
 
-    def parse_string(self) -> Union[str, JSONReturnType]:
+    def parse_string(self) -> Union[str, bool, None]:
         # <string> is a string of valid characters enclosed in quotes
         # i.e. { name: "John" }
         # Somehow all weird cases in an invalid JSON happen to be resolved in this function, so be careful here
@@ -382,7 +382,7 @@ class JSONParser:
             string_acc += char
             self.index += 1
             char = self.get_char_at()
-            if len(string_acc) > 0 and string_acc[-1] == "\\":
+            if char and len(string_acc) > 0 and string_acc[-1] == "\\":
                 # This is a special case, if people use real strings this might happen
                 self.log("Found a stray escape sequence, normalizing it", "info")
                 string_acc = string_acc[:-1]
@@ -473,7 +473,7 @@ class JSONParser:
                                 "While parsing a string, we a misplaced quote that would have closed the string but has a different meaning here since this is the last element of the object, ignoring it",
                                 "info",
                             )
-                            string_acc += char
+                            string_acc += str(char)
                             self.index += 1
                             char = self.get_char_at()
                     elif next_c == rstring_delimiter:
@@ -503,7 +503,7 @@ class JSONParser:
                                     "While parsing a string, we a misplaced quote that would have closed the string but has a different meaning here, ignoring it",
                                     "info",
                                 )
-                                string_acc += char
+                                string_acc += str(char)
                                 self.index += 1
                                 char = self.get_char_at()
 
@@ -521,7 +521,8 @@ class JSONParser:
             if self.get_char_at() not in [":", ","]:
                 return ""
 
-        # A fallout of the previous special case in the while loop, we need to update the index only if we had a closing quote
+        # A fallout of the previous special case in the while loop,
+        # we need to update the index only if we had a closing quote
         if char != rstring_delimiter:
             self.log(
                 "While parsing a string, we missed the closing quote, ignoring",
@@ -563,6 +564,7 @@ class JSONParser:
         # <boolean> is one of the literal strings 'true', 'false', or 'null' (unquoted)
         starting_index = self.index
         char = (self.get_char_at() or "").lower()
+        value = None
         if char == "t":
             value = ("true", True)
         elif char == "f":
@@ -583,7 +585,7 @@ class JSONParser:
         self.index = starting_index
         return ""
 
-    def get_char_at(self, count: int = 0) -> Union[str, bool]:
+    def get_char_at(self, count: int = 0) -> Union[str, Literal[False]]:
         # Why not use something simpler? Because try/except in python is a faster alternative to an "if" statement that is often True
         try:
             return self.json_str[self.index + count]
@@ -630,6 +632,50 @@ class JSONParser:
             )
 
 
+@overload
+def repair_json(
+    json_str: str = "",
+    return_objects: Optional[Literal[False]] = False,
+    skip_json_loads: Optional[bool] = False,
+    logging: Optional[Literal[False]] = False,  # None is treated as False
+    json_fd: Optional[TextIO] = None,
+    ensure_ascii: Optional[bool] = True,
+) -> str: ...
+
+
+@overload
+def repair_json(
+    json_str: str = "",
+    return_objects: Literal[True] = True,
+    skip_json_loads: Optional[bool] = False,
+    logging: Optional[Literal[False]] = False,  # None is treated as False
+    json_fd: Optional[TextIO] = None,
+    ensure_ascii: Optional[bool] = True,
+) -> JSONReturnType: ...
+
+
+@overload
+def repair_json(
+    json_str: str = "",
+    return_objects: Optional[Literal[False]] = False,  # None is treated as False
+    skip_json_loads: Optional[bool] = False,
+    logging: Literal[True] = True,
+    json_fd: Optional[TextIO] = None,
+    ensure_ascii: Optional[bool] = True,
+) -> Tuple[str, List[Dict[str, str]]]: ...
+
+
+@overload
+def repair_json(
+    json_str: str = "",
+    return_objects: Literal[True] = True,
+    skip_json_loads: Optional[bool] = False,
+    logging: Literal[True] = True,
+    json_fd: Optional[TextIO] = None,
+    ensure_ascii: Optional[bool] = True,
+) -> Tuple[JSONReturnType, List[Dict[str, str]]]: ...
+
+
 def repair_json(
     json_str: str = "",
     return_objects: Optional[bool] = False,
@@ -643,7 +689,7 @@ def repair_json(
     It will return the fixed string by default.
     When `return_objects=True` is passed, it will return the decoded data structure instead.
     When `skip_json_loads=True` is passed, it will not call the built-in json.loads() function
-    When `logging=True` is passed, it will return an tuple with the repaired json and a log of all repair actions
+    When `logging=True` is passed, it will return a tuple with the repaired json and a log of all repair actions
     """
     parser = JSONParser(json_str, json_fd, logging)
     if skip_json_loads:
@@ -656,12 +702,29 @@ def repair_json(
                 parsed_json = json.loads(json_str)
         except json.JSONDecodeError:
             parsed_json = parser.parse()
-    # It's useful to return the actual object instead of the json string, it allows this lib to be a replacement of the json library
+    # It's useful to return the actual object instead of the json string,
+    # it allows this lib to be a replacement of the json library
     if return_objects or logging:
         return parsed_json
     return json.dumps(parsed_json, ensure_ascii=ensure_ascii)
 
 
+@overload
+def loads(
+    json_str: str,
+    skip_json_loads: Optional[bool] = False,
+    logging: Optional[Literal[False]] = False,  # None is treated as False
+) -> JSONReturnType: ...
+
+
+@overload
+def loads(
+    json_str: str,
+    skip_json_loads: Optional[bool] = False,
+    logging: Literal[True] = True,
+) -> Tuple[JSONReturnType, List[Dict[str, str]]]: ...
+
+
 def loads(
     json_str: str,
     skip_json_loads: Optional[bool] = False,
@@ -679,6 +742,20 @@ def loads(
     )
 
 
+@overload
+def load(
+    fd: TextIO,
+    skip_json_loads: Optional[bool] = False,
+    logging: Optional[Literal[False]] = False,
+) -> JSONReturnType: ...
+
+
+@overload
+def load(
+    fd: TextIO, skip_json_loads: Optional[bool] = False, logging: Literal[True] = True
+) -> Tuple[JSONReturnType, List[Dict[str, str]]]: ...
+
+
 def load(
     fd: TextIO, skip_json_loads: Optional[bool] = False, logging: Optional[bool] = False
 ) -> Union[JSONReturnType, Tuple[JSONReturnType, List[Dict[str, str]]]]:
@@ -694,6 +771,22 @@ def load(
     )
 
 
+@overload
+def from_file(
+    filename: str,
+    skip_json_loads: Optional[bool] = False,
+    logging: Optional[Literal[False]] = False,
+) -> JSONReturnType: ...
+
+
+@overload
+def from_file(
+    filename: str,
+    skip_json_loads: Optional[bool] = False,
+    logging: Literal[True] = True,
+) -> Tuple[JSONReturnType, List[Dict[str, str]]]: ...
+
+
 def from_file(
     filename: str,
     skip_json_loads: Optional[bool] = False,

{json_repair-0.28.0 → json_repair-0.28.1/src/json_repair.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: json_repair
-Version: 0.28.0
+Version: 0.28.1
 Summary: A package to repair broken json strings
 Author-email: Stefano Baccianella <4247706+mangiucugna@users.noreply.github.com>
 License: MIT License