Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

SimplifyGenerateJsonSchema.literal_schema() implementation#11321

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.

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

Already on GitHub?Sign in to your account

Conversation

misrasaurabh1
Copy link
Contributor

📄GenerateJsonSchema.literal_schema inpydantic/json_schema.py

✨ Performance Summary:

  • Speed Increase: 📈11% (0.11x faster)
  • Runtime Reduction: ⏱️ From1.41 millisecond down to1.27 millisecond (best of57 runs)

📝Explanation and details

To optimize the code for speed, we can make several improvements.

  1. Avoid the Usage of Expensive Operations in Loops.
    • Use set comprehensions directly.
    • Avoid usage of multiple schema validation in the loop.

✅Correctness verification

The new optimized code was tested for correctness. The results are listed below:

TestStatusDetails
⚙️ Existing Unit Tests🔘None Found
🌀 Generated Regression Tests✅36 PassedSee below
⏪ Replay Tests🔘None Found
🔎 Concolic Coverage Tests🔘None Found
📊 Coverage100.00%

🌀 Generated Regression Tests Details

Click to view details
fromcollectionsimportdefaultdictfromenumimportEnumfromtypingimportAny,Dict# importsimportpytest# used for our unit testsfrompydantic._internalimport_configfrompydantic.errorsimportPydanticInvalidForJsonSchemafrompydantic.json_schemaimportGenerateJsonSchemafrompydantic_coreimportcore_schema,to_jsonable_pythonJsonSchemaValue=Dict[str,Any]frompydantic.json_schemaimportGenerateJsonSchema# Example Enum for TestingclassSomeEnum(Enum):VALUE1='value1'VALUE2='value2'# unit tests@pytest.fixturedefschema_generator():returnGenerateJsonSchema()deftest_single_integer(schema_generator):schema= {'expected': [42]}codeflash_output=schema_generator.literal_schema(schema)deftest_single_string(schema_generator):schema= {'expected': ['hello']}codeflash_output=schema_generator.literal_schema(schema)deftest_single_boolean(schema_generator):schema= {'expected': [True]}codeflash_output=schema_generator.literal_schema(schema)deftest_single_float(schema_generator):schema= {'expected': [3.14]}codeflash_output=schema_generator.literal_schema(schema)deftest_single_none(schema_generator):schema= {'expected': [None]}codeflash_output=schema_generator.literal_schema(schema)deftest_multiple_integers(schema_generator):schema= {'expected': [1,2,3]}codeflash_output=schema_generator.literal_schema(schema)deftest_multiple_strings(schema_generator):schema= {'expected': ['a','b','c']}codeflash_output=schema_generator.literal_schema(schema)deftest_multiple_booleans(schema_generator):schema= {'expected': [True,False]}codeflash_output=schema_generator.literal_schema(schema)deftest_multiple_floats(schema_generator):schema= {'expected': [1.1,2.2,3.3]}codeflash_output=schema_generator.literal_schema(schema)deftest_multiple_nones(schema_generator):schema= {'expected': [None,None]}codeflash_output=schema_generator.literal_schema(schema)deftest_mixed_integers_strings(schema_generator):schema= {'expected': [1,'a']}codeflash_output=schema_generator.literal_schema(schema)deftest_mixed_integers_floats(schema_generator):schema= {'expected': [1,2.2]}codeflash_output=schema_generator.literal_schema(schema)deftest_mixed_booleans_none(schema_generator):schema= {'expected': [True,None]}codeflash_output=schema_generator.literal_schema(schema)deftest_single_enum_value(schema_generator):schema= {'expected': [SomeEnum.VALUE1]}codeflash_output=schema_generator.literal_schema(schema)deftest_multiple_enum_values(schema_generator):schema= {'expected': [SomeEnum.VALUE1,SomeEnum.VALUE2]}codeflash_output=schema_generator.literal_schema(schema)deftest_list_of_lists(schema_generator):schema= {'expected': [[1,2], [3,4]]}codeflash_output=schema_generator.literal_schema(schema)deftest_list_of_dicts(schema_generator):schema= {'expected': [{'key1':'value1'}, {'key2':'value2'}]}codeflash_output=schema_generator.literal_schema(schema)deftest_empty_expected_list(schema_generator):schema= {'expected': []}codeflash_output=schema_generator.literal_schema(schema)deftest_large_number_of_expected_values(schema_generator):schema= {'expected':list(range(1000))}codeflash_output=schema_generator.literal_schema(schema)deftest_large_single_literal_value(schema_generator):schema= {'expected': ['a'*10000]}codeflash_output=schema_generator.literal_schema(schema)deftest_large_number_of_mixed_values(schema_generator):schema= {'expected': [iifi%2==0elsestr(i)foriinrange(1000)]}codeflash_output=schema_generator.literal_schema(schema)deftest_invalid_schema_structure(schema_generator):schema= {'unexpected_key': [1,2,3]}withpytest.raises(KeyError):schema_generator.literal_schema(schema)fromcollectionsimportdefaultdictfromenumimportEnumfromtypingimportAny,Dict# importsimportpytest# used for our unit testsfrompydantic._internalimport_configfrompydantic.errorsimportPydanticInvalidForJsonSchemafrompydantic.json_schemaimportGenerateJsonSchemafrompydantic_coreimportcore_schema,to_jsonable_pythonJsonSchemaValue=Dict[str,Any]frompydantic.json_schemaimportGenerateJsonSchema# unit testsdeftest_single_integer():schema=core_schema.LiteralSchema(expected=[42])generator=GenerateJsonSchema()codeflash_output=generator.literal_schema(schema)deftest_single_string():schema=core_schema.LiteralSchema(expected=['hello'])generator=GenerateJsonSchema()codeflash_output=generator.literal_schema(schema)deftest_single_boolean():schema=core_schema.LiteralSchema(expected=[True])generator=GenerateJsonSchema()codeflash_output=generator.literal_schema(schema)deftest_multiple_integers():schema=core_schema.LiteralSchema(expected=[1,2,3])generator=GenerateJsonSchema()codeflash_output=generator.literal_schema(schema)deftest_multiple_strings():schema=core_schema.LiteralSchema(expected=['a','b','c'])generator=GenerateJsonSchema()codeflash_output=generator.literal_schema(schema)deftest_mixed_types():schema=core_schema.LiteralSchema(expected=[1,'a',True])generator=GenerateJsonSchema()codeflash_output=generator.literal_schema(schema)deftest_empty_expected_list():schema=core_schema.LiteralSchema(expected=[])generator=GenerateJsonSchema()codeflash_output=generator.literal_schema(schema)deftest_none_value():schema=core_schema.LiteralSchema(expected=[None])generator=GenerateJsonSchema()codeflash_output=generator.literal_schema(schema)deftest_list_of_integers():schema=core_schema.LiteralSchema(expected=[[1,2,3]])generator=GenerateJsonSchema()codeflash_output=generator.literal_schema(schema)deftest_list_of_mixed_types():schema=core_schema.LiteralSchema(expected=[[1,'a',True]])generator=GenerateJsonSchema()codeflash_output=generator.literal_schema(schema)deftest_large_number_of_integers():schema=core_schema.LiteralSchema(expected=list(range(1000)))generator=GenerateJsonSchema()codeflash_output=generator.literal_schema(schema)deftest_large_number_of_strings():schema=core_schema.LiteralSchema(expected=[str(i)foriinrange(1000)])generator=GenerateJsonSchema()codeflash_output=generator.literal_schema(schema)deftest_integers_and_floats():schema=core_schema.LiteralSchema(expected=[1,2.0,3])generator=GenerateJsonSchema()codeflash_output=generator.literal_schema(schema)deftest_strings_and_none():schema=core_schema.LiteralSchema(expected=['a',None,'b'])generator=GenerateJsonSchema()codeflash_output=generator.literal_schema(schema)# codeflash_output is used to check that the output of the original code is the same as that of the optimized code.

Optimized withcodeflash.ai

codeflash-aibotand others added3 commitsDecember 3, 2024 01:15
To optimize the code for speed, we can make several improvements.1. **Avoid the Usage of Expensive Operations in Loops**.    - Use set comprehensions directly.    - Avoid usage of multiple schema validation in the loop.2. **Memoization**.    - Simplify frequent type checking by caching results in a dictionary.3. **Efficient Dictionary Access**.    - Replace `defaultdict` where standard dict can be used.    - Avoid recalculating or reassessing the same values multiple times.Here's the optimized version of the program.**Notes**.- The default argument for `DEFAULT_REF_TEMPLATE` was assumed.- `defaultdict` for `_collision_counter` was replaced with a regular dictionary to avoid initializing it with zeros.- Type checking now happens more efficiently. Types of expected values are cached and reassessed only once.- Computed dictionary access and unnecessary usage of intermediate variables were reduced.
@github-actionsgithub-actionsbot added the relnotes-fixUsed for bugfixes. labelJan 23, 2025
@codspeed-hqCodSpeed HQ
Copy link

codspeed-hqbot commentedJan 23, 2025•
edited
Loading

CodSpeed Performance Report

Merging#11321 willnot alter performance

Comparingmisrasaurabh1:codeflash/optimize-GenerateJsonSchema.literal_schema-2024-12-03T01.15.46 (c8e6856) withmain (6a5b640)

Summary

✅ 45 untouched benchmarks

@github-actionsGitHub Actions
Copy link
Contributor

Coverage report

Click to see where and how coverage changed

FileStatementsMissingCoverageCoverage
(new stmts)		Lines missing
  pydantic
  json_schema.py
Project Total 

This report was generated bypython-coverage-comment-action

@ViicosViicos changed the title⚡️ Speed up methodGenerateJsonSchema.literal_schema by 11% (codeflash)SimplifyGenerateJsonSchema.literal_schema() implementationJan 23, 2025
@ViicosViicos merged commit14d14b0 intopydantic:mainJan 23, 2025
53 checks passed
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment
Reviewers

@ViicosViicosViicos approved these changes

Assignees
No one assigned
Labels
relnotes-fixUsed for bugfixes.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

2 participants
@misrasaurabh1@Viicos
[8]ページ先頭
©2009-2025 Movatter.jp