Skip to content

Performance #467

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dimbleby wants to merge 7 commits into
base: master
Choose a base branch
from
+333 −370
Open

Performance #467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5949b83
perf: eliminate copy from super-table merge path
dimbleby Mar 22, 2026
1231c3b
perf: optimize parser hot paths
dimbleby Mar 22, 2026
c58785d
perf: eliminate TOMLChar class and iterator-based source
dimbleby Mar 22, 2026
03c73af
perf: eliminate unnecessary object creation in hot paths
dimbleby Mar 22, 2026
c888700
perf: eliminate double-parsing of table headers and speculative errors
dimbleby Mar 22, 2026
f14445c
perf: skip formatting checks during parsing in Container.append
dimbleby Mar 22, 2026
9c27cc2
perf: inline Source access in parser hot paths
dimbleby Mar 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
103 changes: 48 additions & 55 deletions tomlkit/container.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,25 +182,25 @@ def append(
assert isinstance(key, Key)
item.name = key.key

prev = self._previous_item()
prev_ws = isinstance(prev, Whitespace) or ends_with_whitespace(prev)
if isinstance(item, Table):
if not self._parsed:
if not self._parsed:
prev = self._previous_item()
prev_ws = isinstance(prev, Whitespace) or ends_with_whitespace(prev)
if isinstance(item, Table):
item.invalidate_display_name()
if (
self._body
and not (self._parsed or item.trivia.indent or prev_ws)
and key is not None
and not key.is_dotted()
):
item.trivia.indent = "\n"
if (
self._body
and not (item.trivia.indent or prev_ws)
and key is not None
and not key.is_dotted()
):
item.trivia.indent = "\n"

if isinstance(item, AoT) and self._body and not self._parsed:
item.invalidate_display_name()
if item and not ("\n" in item[0].trivia.indent or prev_ws):
item[0].trivia.indent = "\n" + item[0].trivia.indent
if isinstance(item, AoT) and self._body:
item.invalidate_display_name()
if item and not ("\n" in item[0].trivia.indent or prev_ws):
item[0].trivia.indent = "\n" + item[0].trivia.indent

if key is not None and key in self:
if key is not None and key in self._map:
current_idx = self._map[key]
if isinstance(current_idx, tuple):
current_body_element = self._body[current_idx[-1]]
Expand Down Expand Up @@ -258,17 +258,10 @@ def append(

return self

# Create a new element to replace the old one
current = copy.deepcopy(current)
# Merge the new super table's entries into
# the existing one.
for k, v in item.value.body:
current.append(k, v)
self._body[
(
current_idx[-1]
if isinstance(current_idx, tuple)
else current_idx
)
] = (current_body_element[0], current)

return self
elif (
Expand Down Expand Up @@ -296,35 +289,31 @@ def append(
else:
raise KeyAlreadyPresent(key)

is_table = isinstance(item, (Table, AoT))
if (
key is not None
and self._body
and not self._parsed
and (not is_table or key.is_dotted())
):
# If there is already at least one table in the current container
# and the given item is not a table, we need to find the last
# item that is not a table and insert after it
# If no such item exists, insert at the top of the table
last_index = self._get_last_index_before_table()

if last_index < len(self._body):
after_item = self._body[last_index][1]
if not (
isinstance(after_item, Whitespace)
or "\n" in after_item.trivia.indent
):
after_item.trivia.indent = "\n" + after_item.trivia.indent
return self._insert_at(last_index, key, item)
else:
previous_item = self._body[-1][1]
if not (
isinstance(previous_item, Whitespace)
or ends_with_whitespace(previous_item)
or "\n" in previous_item.trivia.trail
):
previous_item.trivia.trail += "\n"
if not self._parsed:
is_table = isinstance(item, (Table, AoT))
if key is not None and self._body and (not is_table or key.is_dotted()):
# If there is already at least one table in the current container
# and the given item is not a table, we need to find the last
# item that is not a table and insert after it
# If no such item exists, insert at the top of the table
last_index = self._get_last_index_before_table()

if last_index < len(self._body):
after_item = self._body[last_index][1]
if not (
isinstance(after_item, Whitespace)
or "\n" in after_item.trivia.indent
):
after_item.trivia.indent = "\n" + after_item.trivia.indent
return self._insert_at(last_index, key, item)
else:
previous_item = self._body[-1][1]
if not (
isinstance(previous_item, Whitespace)
or ends_with_whitespace(previous_item)
or "\n" in previous_item.trivia.trail
):
previous_item.trivia.trail += "\n"

self._raw_append(key, item)
return self
Expand Down Expand Up @@ -856,6 +845,7 @@ def __copy__(self) -> Self:

c._body += self.body
c._map.update(self._map)
c._table_keys = list(self._table_keys)

return c

Expand Down Expand Up @@ -885,13 +875,16 @@ class OutOfOrderTableProxy(_CustomDict): # type: ignore[type-arg]
@staticmethod
def validate(container: Container, indices: tuple[int, ...]) -> None:
"""Validate out of order tables in the given container"""
# Append all items to a temp container to see if there is any error
# Append all items to a temp container to see if there is any error.
# Shallow-copy Tables so the merge path doesn't mutate originals.
temp_container = Container(True)
for i in indices:
_, item = container._body[i]

if isinstance(item, Table):
for k, v in item.value.body:
if isinstance(v, Table):
v = copy.copy(v)
temp_container.append(k, v, validate=True)

temp_container._validate_out_of_order_table()
Expand Down
18 changes: 9 additions & 9 deletions tomlkit/items.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import dataclasses
import inspect
import re
import string

from collections.abc import Collection
from collections.abc import Iterable
Expand All @@ -32,6 +31,7 @@
from tomlkit._utils import escape_string
from tomlkit.exceptions import ConvertError
from tomlkit.exceptions import InvalidStringError
from tomlkit.toml_char import BARE


if TYPE_CHECKING:
Expand Down Expand Up @@ -280,16 +280,16 @@ def unit(self) -> str:
return self.value[0]

def is_basic(self) -> bool:
return self in {StringType.SLB, StringType.MLB}
return self is StringType.SLB or self is StringType.MLB

def is_literal(self) -> bool:
return self in {StringType.SLL, StringType.MLL}
return self is StringType.SLL or self is StringType.MLL

def is_singleline(self) -> bool:
return self in {StringType.SLB, StringType.SLL}
return self is StringType.SLB or self is StringType.SLL

def is_multiline(self) -> bool:
return self in {StringType.MLB, StringType.MLL}
return self is StringType.MLB or self is StringType.MLL

def toggle(self) -> StringType:
return {
Expand Down Expand Up @@ -404,9 +404,7 @@ def __init__(
raise TypeError("Keys must be strings")

if t is None:
if not k or any(
c not in string.ascii_letters + string.digits + "-" + "_" for c in k
):
if not k or any(c not in BARE for c in k):
t = KeyType.Basic
else:
t = KeyType.Bare
Expand Down Expand Up @@ -1919,7 +1917,9 @@ def raw_append(self, key: Key | str | None, _item: Any) -> Table:

if isinstance(key, Key):
key = next(iter(key)).key
_item = self._value[key]
# Get the stored value directly from the Container's dict,
# avoiding __getitem__ which would create a throwaway SingleKey.
_item = dict.__getitem__(self._value, key)

if key is not None:
dict.__setitem__(self, key, _item)
Expand Down
Loading
Loading