Some more housekeeping, changes to improve performance slightly. Not …

…enough to warrant a release though
mangiucugna · May 4, 2024 · a3b53c5 · a3b53c5
1 parent cf04bfa
commit a3b53c5
Show file tree

Hide file tree

Showing 6 changed files with 580 additions and 847 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,5 +5,6 @@
 __pycache__
 .gitattributes
 .pytest_cache
+build/
 dist/
 src/json_repair.egg-info/
diff --git a/src/json_repair/json_repair.py b/src/json_repair/json_repair.py
@@ -438,7 +438,7 @@ def get_char_at(self, count: int = 0) -> Union[str, bool]:
                 return False
             return char
         else:
-            # Why not use something simpler? Because we might be out of bounds and doing this check all the time is annoying
+            # 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]
             except IndexError:
@@ -448,11 +448,23 @@ def skip_whitespaces_at(self) -> None:
         """
         This function quickly iterates on whitespaces, syntactic sugar to make the code more concise
         """
-
-        char = self.get_char_at()
-        while char and char.isspace():
-            self.index += 1
+        if self.json_fd:
             char = self.get_char_at()
+            while char and char.isspace():
+                self.index += 1
+                char = self.get_char_at()
+        else:
+            # If this is not a file stream, we do this monster here to make this function much much faster
+            try:
+                char = self.json_str[self.index]
+            except IndexError:
+                return
+            while char.isspace():
+                self.index += 1
+                try:
+                    char = self.json_str[self.index]
+                except IndexError:
+                    return
 
     def set_context(self, value: str) -> None:
         # If a value is provided update the context variable and save in stack

diff --git a/tests/invalid.json b/tests/invalid.json
@@ -0,0 +1,271 @@
+[
+    {
+      "_id": "655b66256574f09bdae8abe8",
+      "index": 0,
+      "guid": "31082ae3-b0f3-4406-90f4-cc450bd4379d",
+      "isActive": false,
+      "balance": "$2,562.78",
+      "picture": "http://placehold.it/32x32",
+      "age": 32,
+      "eyeColor": "brown",
+      "name": "Glover Rivas",
+      "gender": "male",
+      "company": "EMPIRICA",
+      "email": "[email protected]",
+      "phone": "+1 (842) 507-3063",
+      "address": "536 Montague Terrace, Jenkinsville, Kentucky, 2235",
+      "about": "Mollit consectetur excepteur voluptate tempor dolore ullamco enim irure ullamco non enim officia. Voluptate occaecat proident laboris ea Lorem cupidatat reprehenderit nisi nisi aliqua. Amet nulla ipsum deserunt excepteur amet ad aute aute ex. Et enim minim sit veniam est quis dolor nisi sunt quis eiusmod in. Amet eiusmod cillum sunt occaecat dolor laboris voluptate in eiusmod irure aliqua duis.",
+      "registered": "2023-11-18T09:32:36 -01:00",
+      "latitude": 36.26102,
+      "longitude": -91.304608,
+      "tags": [
+        "non",
+        "tempor",
+        "do",
+        "ullamco",
+        "dolore",
+        "sunt",
+        "ipsum"
+      ],
+      "friends": [
+        {
+          "id": 0,
+          "name": "Cara Shepherd"
+        },
+        {
+          "id": 1,
+          "name": "Mason Farley"
+        },
+        {
+          "id": 2,
+          "name": "Harriet Cochran"
+        }
+      ],
+      "greeting": "Hello, Glover Rivas! You have 7 unread messages.",
+      "favoriteFruit": "strawberry"
+    },
+    {
+      "_id": "655b662585364bc57278bb6f",
+      "index": 1,
+      "guid": "0dea7a3a-f812-4dde-b78d-7a9b58e5da05",
+      "isActive": true,
+      "balance": "$1,359.48",
+      "picture": "http://placehold.it/32x32",
+      "age": 38,
+      "eyeColor": "brown",
+      "name": "Brandi Moreno",
+      "gender": "female",
+      "company": "MARQET",
+      "email": "[email protected]",
+      "phone": "+1 (850) 434-2077",
+      "address": "537 Doone Court, Waiohinu, Michigan, 3215",
+      "about": "Irure proident adipisicing do Lorem do incididunt in laborum in eiusmod eiusmod ad elit proident. Eiusmod dolor ex magna magna occaecat. Nulla deserunt velit ex exercitation et irure sunt. Cupidatat ut excepteur ea quis labore sint cupidatat incididunt amet eu consectetur cillum ipsum proident. Occaecat exercitation aute laborum dolor proident reprehenderit laborum in voluptate culpa. Exercitation nulla adipisicing culpa aute est deserunt ea nisi deserunt consequat occaecat ut et non. Incididunt ex exercitation dolor dolor anim cillum dolore.",
+      "registered": "2015-09-03T11:47:15 -02:00",
+      "latitude": -19.768953,
+      "longitude": 8.948458,
+      "tags": [
+        "laboris",
+        "occaecat",
+        "laborum",
+        "laborum",
+        "ex",
+        "cillum",
+        "occaecat"
+      ],
+      "friends": [
+        {
+          "id": 0,
+          "name": "Erna Kelly"
+        },
+        {
+          "id": 1,
+          "name": "Black Mays"
+        },
+        {
+          "id": 2,
+          "name": "Davis Buck"
+        }
+      ],
+      "greeting": "Hello, Brandi Moreno! You have 1 unread messages.",
+      "favoriteFruit": "apple"
+    },
+    {
+      "_id": "655b6625870da431bcf5e0c2",
+      "index": 2,
+      "guid": "b17f6e3f-c898-4334-abbf-05cf222f143b",
+      "isActive": false,
+      "balance": "$1,493.77",
+      "picture": "http://placehold.it/32x32",
+      "age": 20,
+      "eyeColor": "brown",
+      "name": "Moody Meadows",
+      "gender": "male",
+      "company": "OPTIQUE",
+      "email": "[email protected]",
+      "phone": "+1 (993) 566-3041",
+      "address": "766 Osborn Street, Bath, Maine, 7666",
+      "about": "Non commodo excepteur nostrud qui adipisicing aliquip dolor minim nulla culpa proident. In ad cupidatat ea mollit ex est do deserunt proident nostrud. Cillum id id eiusmod amet exercitation nostrud cillum sunt deserunt dolore deserunt eiusmod mollit. Ut ex tempor ad laboris voluptate labore id officia fugiat exercitation amet.",
+      "registered": "2015-01-16T02:48:28 -01:00",
+      "latitude": -25.847327,
+      "longitude": 63.95991,
+      "tags": [
+        "aute",
+        "commodo",
+        "adipisicing",
+        "nostrud",
+        "duis",
+        "mollit",
+        "ut"
+      ],
+      "friends": [
+        {
+          "id": 0,
+          "name": "Lacey Cash"
+        },
+        {
+          "id": 1,
+          "name": "Gabrielle Harmon"
+        },
+        {
+          "id": 2,
+          "name": "Ellis Lambert"
+        }
+      ],
+      "greeting": "Hello, Moody Meadows! You have 4 unread messages.",
+      "favoriteFruit": "strawberry"
+    },
+    {
+      "_id": "655b6625f3e1bf422220854e",
+      "index": 3,
+      "guid": "92229883-2bfd-4974-a08c-1b506b372e46",
+      "isActive": false,
+      "balance": "$2,215.34",
+      "picture": "http://placehold.it/32x32",
+      "age": 22,
+      "eyeColor": "brown",
+      "name": "Heath Nguyen",
+      "gender": "male",
+      "company": "BLEENDOT",
+      "email": "[email protected]",
+      "phone": "+1 (989) 512-2797",
+      "address": "135 Milton Street, Graniteville, Nebraska, 276",
+      "about": "Consequat aliquip irure Lorem cupidatat nulla magna ullamco nulla voluptate adipisicing anim consectetur tempor aliquip. Magna aliqua nulla eu tempor esse proident. Proident fugiat ad ex Lorem reprehenderit dolor aliquip labore labore aliquip. Deserunt aute enim ea minim officia anim culpa sint commodo. Cillum consectetur excepteur aliqua exercitation Lorem veniam voluptate.",
+      "registered": "2016-07-06T01:31:07 -02:00",
+      "latitude": -60.997048,
+      "longitude": -102.397885,
+      "tags": [
+        "do",
+        "ad",
+        "consequat",
+        "irure",
+        "tempor",
+        "elit",
+        "minim"
+      ],
+      "friends": [
+        {
+          "id": 0,
+          "name": "Walker Hernandez"
+        },
+        {
+          "id": 1,
+          "name": "Maria Lane"
+        },
+        {
+          "id": 2,
+          "name": "Mcknight Barron"
+        }
+      ],
+      "greeting": "Hello, Heath Nguyen! You have 4 unread messages.",
+      "favoriteFruit": "apple"
+    },
+    {
+      "_id": "655b6625519a5b5e4b6742bf",
+      "index": 4,
+      "guid": "c5dc685f-6d0d-4173-b4cf-f5df29a1e8ef",
+      "isActive": true,
+      "balance": "$1,358.90",
+      "picture": "http://placehold.it/32x32",
+      "age": 33,
+      "eyeColor": "brown",
+      "name": "Deidre Duke",
+      "gender": "female",
+      "company": "OATFARM",
+      "email": "[email protected]",
+      "phone": "+1 (875) 587-3256",
+      "address": "487 Schaefer Street, Wattsville, West Virginia, 4506",
+      "about": "Laboris eu nulla esse magna sit eu deserunt non est aliqua exercitation commodo. Ad occaecat qui qui laborum dolore anim Lorem. Est qui occaecat irure enim deserunt enim aliqua ex deserunt incididunt esse. Quis in minim laboris proident non mollit. Magna ea do labore commodo. Et elit esse esse occaecat officia ipsum nisi.",
+      "registered": "2021-09-12T04:17:08 -02:00",
+      "latitude": 68.609781,
+      "longitude": -87.509134,
+      "tags": [
+        "mollit",
+        "cupidatat",
+        "irure",
+        "sit",
+        "consequat",
+        "anim",
+        "fugiat"
+      ],
+      "friends": [
+        {
+          "id": 0,
+          "name": "Bean Paul"
+        },
+        {
+          "id": 1,
+          "name": "Cochran Hubbard"
+        },
+        {
+          "id": 2,
+          "name": "Rodgers Atkinson"
+        }
+      ],
+      "greeting": "Hello, Deidre Duke! You have 6 unread messages.",
+      "favoriteFruit": "apple"
+    },
+    {
+      "_id": "655b6625a19b3f7e5f82f0ea",
+      "index": 5,
+      "guid": "75f3c264-baa1-47a0-b21c-4edac23d9935",
+      "isActive": true,
+      "balance": "$3,554.36",
+      "picture": "http://placehold.it/32x32",
+      "age": 26,
+      "eyeColor": "blue",
+      "name": "Lydia Holland",
+      "gender": "female",
+      "company": "ESCENTA",
+      "email": "[email protected]",
+      "phone": "+1 (927) 482-3436",
+      "address": "554 Rockaway Parkway, Kohatk, Montana, 6316",
+      "about": "Consectetur ea est labore commodo laborum mollit pariatur non enim. Est dolore et non laboris tempor. Ea incididunt ut adipisicing cillum labore officia tempor eiusmod commodo. Cillum fugiat ex consectetur ut nostrud anim nostrud exercitation ut duis in ea. Eu et id fugiat est duis eiusmod ullamco quis officia minim sint ea nisi in.",
+      "registered": "2018-03-13T01:48:56 -01:00",
+      "latitude": -88.495799,
+      "longitude": 71.840667,
+      "tags": [
+        "veniam",
+        "minim",
+        "consequat",
+        "consequat",
+        "incididunt",
+        "consequat",
+        "elit"
+      ],
+      "friends": [
+        {
+          "id": 0,
+          "name": "Debra Massey"
+        },
+        {
+          "id": 1,
+          "name": Weiss Savage
+        },
+        {
+          "id": 2,
+          "name": "Shannon Guerra"
+        }
+      ],
+      "greeting": "Hello, Lydia Holland! You have 5 unread messages.",
+      "favoriteFruit": "banana"
+    }