Skip to content

Commit af1e585

Browse files
spacetherspacether
authored
Merge pull request #6 from openapi-json-schema-tools/oajs_import_code_reduction
oajsg python regen, includes code reduction from common_imports
2 parents df96cbb + 8ef7045 commit af1e585

File tree

132 files changed

+184
-837
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

132 files changed

+184
-837
lines changed

‎README.md

+2-4
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ via vscode code counter tool
2525
| -------- | ----- | ---- |
2626
| openapi_generator_python_nextgen | 28 | 2781 |
2727
| openapi_generator_python_prior | 30 | 5075 |
28-
| openapi_json_schema_generator_python | 365 | 9256
28+
| openapi_json_schema_generator_python | 365 | 8737
2929

3030

3131
### openapi_json_schema_generator_python breakdown
32-
- 4.4k src/openapi_client/paths
32+
- 3.9k src/openapi_client/paths
3333
- ~ 50% of this is in operation.py
3434
- 3.3k 7 files in src/openapi_client
3535
- api_client.py + schemas.py are big
@@ -38,8 +38,6 @@ via vscode code counter tool
3838
Reasons for the openapi json scheme generator difference
3939
- has overload type hints on all endpoints, allows input content type selection
4040
- json paths used to create files so many files made
41-
- object models have `__getitem__` methods for properties
42-
- most of the code comes from paths, can itbe reduced?
4341

4442
## Generate
4543

‎petstore/openapi_json_schema_generator_python/.openapi-generator/FILES

+14
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
.gitignore
22
.gitlab-ci.yml
3+
.openapi-generator-ignore
34
.travis.yml
45
README.md
56
docs/apis/tags/pet_api.md
@@ -361,10 +362,23 @@ src/openapi_client/security_schemes.py
361362
src/openapi_client/server.py
362363
src/openapi_client/servers/__init__.py
363364
src/openapi_client/servers/server_0.py
365+
src/openapi_client/shared_imports/__init__.py
366+
src/openapi_client/shared_imports/header_imports.py
367+
src/openapi_client/shared_imports/operation_imports.py
368+
src/openapi_client/shared_imports/response_imports.py
369+
src/openapi_client/shared_imports/schema_imports.py
370+
src/openapi_client/shared_imports/security_scheme_imports.py
371+
src/openapi_client/shared_imports/server_imports.py
364372
test-requirements.txt
365373
test/__init__.py
366374
test/components/__init__.py
367375
test/components/schema/__init__.py
376+
test/components/schema/test_api_response.py
377+
test/components/schema/test_category.py
378+
test/components/schema/test_order.py
379+
test/components/schema/test_pet.py
380+
test/components/schema/test_tag.py
381+
test/components/schema/test_user.py
368382
test/test_paths/__init__.py
369383
test/test_paths/__init__.py
370384
test/test_paths/__init__.py

‎petstore/openapi_json_schema_generator_python/src/openapi_client/components/request_bodies/request_body_pet/__init__.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@
44
Generated by: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
55
"""
66

7-
import typing, typing_extensions
7+
from openapi_client.shared_imports.header_imports import *
88

9-
from openapi_client import api_client
109
from .content.application_json import schema as application_json_schema
1110
from .content.application_xml import schema as application_xml_schema
1211

‎petstore/openapi_json_schema_generator_python/src/openapi_client/components/request_bodies/request_body_user_array/__init__.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@
44
Generated by: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
55
"""
66

7-
import typing, typing_extensions
7+
from openapi_client.shared_imports.header_imports import *
88

9-
from openapi_client import api_client
109
from .content.application_json import schema as application_json_schema
1110

1211
class UserArray(api_client.RequestBody):

‎petstore/openapi_json_schema_generator_python/src/openapi_client/components/request_bodies/request_body_user_array/content/application_json/schema.py

+1-11
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,7 @@
77
Generated by: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
88
"""
99

10-
import datetime # noqa: F401
11-
import decimal # noqa: F401
12-
import io # noqa: F401
13-
import re # noqa: F401
14-
import typing # noqa: F401
15-
import typing_extensions # noqa: F401
16-
import uuid # noqa: F401
17-
18-
import frozendict # noqa: F401
19-
20-
from openapi_client import schemas # noqa: F401
10+
from openapi_client.shared_imports.schema_imports import *
2111

2212

2313
class Schema(

‎petstore/openapi_json_schema_generator_python/src/openapi_client/components/schema/api_response.py

+1-11
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,7 @@
77
Generated by: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
88
"""
99

10-
import datetime # noqa: F401
11-
import decimal # noqa: F401
12-
import io # noqa: F401
13-
import re # noqa: F401
14-
import typing # noqa: F401
15-
import typing_extensions # noqa: F401
16-
import uuid # noqa: F401
17-
18-
import frozendict # noqa: F401
19-
20-
from openapi_client import schemas # noqa: F401
10+
from openapi_client.shared_imports.schema_imports import *
2111

2212

2313
class ApiResponse(

‎petstore/openapi_json_schema_generator_python/src/openapi_client/components/schema/category.py

+1-11
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,7 @@
77
Generated by: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
88
"""
99

10-
import datetime # noqa: F401
11-
import decimal # noqa: F401
12-
import io # noqa: F401
13-
import re # noqa: F401
14-
import typing # noqa: F401
15-
import typing_extensions # noqa: F401
16-
import uuid # noqa: F401
17-
18-
import frozendict # noqa: F401
19-
20-
from openapi_client import schemas # noqa: F401
10+
from openapi_client.shared_imports.schema_imports import *
2111

2212

2313
class Category(

‎petstore/openapi_json_schema_generator_python/src/openapi_client/components/schema/order.py

+1-11
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,7 @@
77
Generated by: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
88
"""
99

10-
import datetime # noqa: F401
11-
import decimal # noqa: F401
12-
import io # noqa: F401
13-
import re # noqa: F401
14-
import typing # noqa: F401
15-
import typing_extensions # noqa: F401
16-
import uuid # noqa: F401
17-
18-
import frozendict # noqa: F401
19-
20-
from openapi_client import schemas # noqa: F401
10+
from openapi_client.shared_imports.schema_imports import *
2111

2212

2313
class Order(

‎petstore/openapi_json_schema_generator_python/src/openapi_client/components/schema/pet.py

+1-11
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,7 @@
77
Generated by: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
88
"""
99

10-
import datetime # noqa: F401
11-
import decimal # noqa: F401
12-
import io # noqa: F401
13-
import re # noqa: F401
14-
import typing # noqa: F401
15-
import typing_extensions # noqa: F401
16-
import uuid # noqa: F401
17-
18-
import frozendict # noqa: F401
19-
20-
from openapi_client import schemas # noqa: F401
10+
from openapi_client.shared_imports.schema_imports import *
2111

2212

2313
class Pet(

‎petstore/openapi_json_schema_generator_python/src/openapi_client/components/schema/tag.py

+1-11
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,7 @@
77
Generated by: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
88
"""
99

10-
import datetime # noqa: F401
11-
import decimal # noqa: F401
12-
import io # noqa: F401
13-
import re # noqa: F401
14-
import typing # noqa: F401
15-
import typing_extensions # noqa: F401
16-
import uuid # noqa: F401
17-
18-
import frozendict # noqa: F401
19-
20-
from openapi_client import schemas # noqa: F401
10+
from openapi_client.shared_imports.schema_imports import *
2111

2212

2313
class Tag(

‎petstore/openapi_json_schema_generator_python/src/openapi_client/components/schema/user.py

+1-11
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,7 @@
77
Generated by: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
88
"""
99

10-
import datetime # noqa: F401
11-
import decimal # noqa: F401
12-
import io # noqa: F401
13-
import re # noqa: F401
14-
import typing # noqa: F401
15-
import typing_extensions # noqa: F401
16-
import uuid # noqa: F401
17-
18-
import frozendict # noqa: F401
19-
20-
from openapi_client import schemas # noqa: F401
10+
from openapi_client.shared_imports.schema_imports import *
2111

2212

2313
class User(

‎petstore/openapi_json_schema_generator_python/src/openapi_client/components/security_schemes/security_scheme_api_key.py

+1-5
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,7 @@
44
Generated by: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
55
"""
66

7-
import dataclasses
8-
import typing
9-
import typing_extensions
10-
11-
from openapi_client import security_schemes
7+
from openapi_client.shared_imports.security_scheme_imports import *
128

139
@dataclasses.dataclass
1410
class ApiKey(security_schemes.ApiKeySecurityScheme):

‎petstore/openapi_json_schema_generator_python/src/openapi_client/components/security_schemes/security_scheme_petstore_auth.py

+1-5
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,7 @@
44
Generated by: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
55
"""
66

7-
import dataclasses
8-
import typing
9-
import typing_extensions
10-
11-
from openapi_client import security_schemes
7+
from openapi_client.shared_imports.security_scheme_imports import *
128

139
@dataclasses.dataclass
1410
class PetstoreAuth(security_schemes.OAuth2SecurityScheme):

‎petstore/openapi_json_schema_generator_python/src/openapi_client/paths/pet/post/operation.py

+1-10
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,7 @@
55
"""
66

77
from openapi_client import api_client, security_schemes
8-
import datetime # noqa: F401
9-
import decimal # noqa: F401
10-
import io # noqa: F401
11-
import typing # noqa: F401
12-
import typing_extensions # noqa: F401
13-
import uuid # noqa: F401
14-
15-
import frozendict # noqa: F401
16-
17-
from openapi_client import schemas # noqa: F401
8+
from openapi_client.shared_imports.operation_imports import *
189

1910
from .. import path
2011
from .responses import (

‎petstore/openapi_json_schema_generator_python/src/openapi_client/paths/pet/post/responses/response_200/__init__.py

+1-7
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,8 @@
44
Generated by: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
55
"""
66

7-
import dataclasses
8-
import typing
7+
from openapi_client.shared_imports.response_imports import *
98

10-
import typing_extensions
11-
import urllib3
12-
13-
from openapi_client import api_client
14-
from openapi_client import schemas
159
from .content.application_xml import schema as application_xml_schema
1610
from .content.application_json import schema as application_json_schema
1711

‎petstore/openapi_json_schema_generator_python/src/openapi_client/paths/pet/post/responses/response_405/__init__.py

+1-5
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,7 @@
44
Generated by: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
55
"""
66

7-
import dataclasses
8-
import urllib3
9-
10-
from openapi_client import api_client
11-
from openapi_client import schemas
7+
from openapi_client.shared_imports.response_imports import *
128

139

1410
@dataclasses.dataclass

‎petstore/openapi_json_schema_generator_python/src/openapi_client/paths/pet/put/operation.py

+1-10
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,7 @@
55
"""
66

77
from openapi_client import api_client, security_schemes
8-
import datetime # noqa: F401
9-
import decimal # noqa: F401
10-
import io # noqa: F401
11-
import typing # noqa: F401
12-
import typing_extensions # noqa: F401
13-
import uuid # noqa: F401
14-
15-
import frozendict # noqa: F401
16-
17-
from openapi_client import schemas # noqa: F401
8+
from openapi_client.shared_imports.operation_imports import *
189

1910
from .. import path
2011
from .responses import (

‎petstore/openapi_json_schema_generator_python/src/openapi_client/paths/pet/put/responses/response_200/__init__.py

+1-7
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,8 @@
44
Generated by: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
55
"""
66

7-
import dataclasses
8-
import typing
7+
from openapi_client.shared_imports.response_imports import *
98

10-
import typing_extensions
11-
import urllib3
12-
13-
from openapi_client import api_client
14-
from openapi_client import schemas
159
from .content.application_xml import schema as application_xml_schema
1610
from .content.application_json import schema as application_json_schema
1711

‎petstore/openapi_json_schema_generator_python/src/openapi_client/paths/pet/put/responses/response_400/__init__.py

+1-5
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,7 @@
44
Generated by: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
55
"""
66

7-
import dataclasses
8-
import urllib3
9-
10-
from openapi_client import api_client
11-
from openapi_client import schemas
7+
from openapi_client.shared_imports.response_imports import *
128

139

1410
@dataclasses.dataclass

‎petstore/openapi_json_schema_generator_python/src/openapi_client/paths/pet/put/responses/response_404/__init__.py

+1-5
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,7 @@
44
Generated by: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
55
"""
66

7-
import dataclasses
8-
import urllib3
9-
10-
from openapi_client import api_client
11-
from openapi_client import schemas
7+
from openapi_client.shared_imports.response_imports import *
128

139

1410
@dataclasses.dataclass

‎petstore/openapi_json_schema_generator_python/src/openapi_client/paths/pet/put/responses/response_405/__init__.py

+1-5
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,7 @@
44
Generated by: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
55
"""
66

7-
import dataclasses
8-
import urllib3
9-
10-
from openapi_client import api_client
11-
from openapi_client import schemas
7+
from openapi_client.shared_imports.response_imports import *
128

139

1410
@dataclasses.dataclass

‎petstore/openapi_json_schema_generator_python/src/openapi_client/paths/pet_find_by_status/get/operation.py

+1-10
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,7 @@
55
"""
66

77
from openapi_client import api_client, security_schemes
8-
import datetime # noqa: F401
9-
import decimal # noqa: F401
10-
import io # noqa: F401
11-
import typing # noqa: F401
12-
import typing_extensions # noqa: F401
13-
import uuid # noqa: F401
14-
15-
import frozendict # noqa: F401
16-
17-
from openapi_client import schemas # noqa: F401
8+
from openapi_client.shared_imports.operation_imports import *
189

1910
from .. import path
2011
from .responses import (

‎petstore/openapi_json_schema_generator_python/src/openapi_client/paths/pet_find_by_status/get/parameters/parameter_0/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Generated by: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
55
"""
66

7-
from openapi_client import api_client
7+
from openapi_client.shared_imports.header_imports import *
88

99
from . import schema
1010

0 commit comments

Comments
 (0)