Skip to content

oajsg python regen, includes code reduction from common_imports #6

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 our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 2 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ via vscode code counter tool
| -------- | ----- | ---- |
| openapi_generator_python_nextgen | 28 | 2781 |
| openapi_generator_python_prior | 30 | 5075 |
| openapi_json_schema_generator_python | 365 | 9256
| openapi_json_schema_generator_python | 365 | 8737


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

## Generate

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
.gitignore
.gitlab-ci.yml
.openapi-generator-ignore
.travis.yml
README.md
docs/apis/tags/pet_api.md
Expand Down Expand Up @@ -361,10 +362,23 @@ src/openapi_client/security_schemes.py
src/openapi_client/server.py
src/openapi_client/servers/__init__.py
src/openapi_client/servers/server_0.py
src/openapi_client/shared_imports/__init__.py
src/openapi_client/shared_imports/header_imports.py
src/openapi_client/shared_imports/operation_imports.py
src/openapi_client/shared_imports/response_imports.py
src/openapi_client/shared_imports/schema_imports.py
src/openapi_client/shared_imports/security_scheme_imports.py
src/openapi_client/shared_imports/server_imports.py
test-requirements.txt
test/__init__.py
test/components/__init__.py
test/components/schema/__init__.py
test/components/schema/test_api_response.py
test/components/schema/test_category.py
test/components/schema/test_order.py
test/components/schema/test_pet.py
test/components/schema/test_tag.py
test/components/schema/test_user.py
test/test_paths/__init__.py
test/test_paths/__init__.py
test/test_paths/__init__.py
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@
Generated by: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
"""

import typing, typing_extensions
from openapi_client.shared_imports.header_imports import *

from openapi_client import api_client
from .content.application_json import schema as application_json_schema
from .content.application_xml import schema as application_xml_schema

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@
Generated by: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
"""

import typing, typing_extensions
from openapi_client.shared_imports.header_imports import *

from openapi_client import api_client
from .content.application_json import schema as application_json_schema

class UserArray(api_client.RequestBody):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,7 @@
Generated by: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
"""

import datetime # noqa: F401
import decimal # noqa: F401
import io # noqa: F401
import re # noqa: F401
import typing # noqa: F401
import typing_extensions # noqa: F401
import uuid # noqa: F401

import frozendict # noqa: F401

from openapi_client import schemas # noqa: F401
from openapi_client.shared_imports.schema_imports import *


class Schema(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,7 @@
Generated by: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
"""

import datetime # noqa: F401
import decimal # noqa: F401
import io # noqa: F401
import re # noqa: F401
import typing # noqa: F401
import typing_extensions # noqa: F401
import uuid # noqa: F401

import frozendict # noqa: F401

from openapi_client import schemas # noqa: F401
from openapi_client.shared_imports.schema_imports import *


class ApiResponse(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,7 @@
Generated by: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
"""

import datetime # noqa: F401
import decimal # noqa: F401
import io # noqa: F401
import re # noqa: F401
import typing # noqa: F401
import typing_extensions # noqa: F401
import uuid # noqa: F401

import frozendict # noqa: F401

from openapi_client import schemas # noqa: F401
from openapi_client.shared_imports.schema_imports import *


class Category(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,7 @@
Generated by: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
"""

import datetime # noqa: F401
import decimal # noqa: F401
import io # noqa: F401
import re # noqa: F401
import typing # noqa: F401
import typing_extensions # noqa: F401
import uuid # noqa: F401

import frozendict # noqa: F401

from openapi_client import schemas # noqa: F401
from openapi_client.shared_imports.schema_imports import *


class Order(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,7 @@
Generated by: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
"""

import datetime # noqa: F401
import decimal # noqa: F401
import io # noqa: F401
import re # noqa: F401
import typing # noqa: F401
import typing_extensions # noqa: F401
import uuid # noqa: F401

import frozendict # noqa: F401

from openapi_client import schemas # noqa: F401
from openapi_client.shared_imports.schema_imports import *


class Pet(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,7 @@
Generated by: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
"""

import datetime # noqa: F401
import decimal # noqa: F401
import io # noqa: F401
import re # noqa: F401
import typing # noqa: F401
import typing_extensions # noqa: F401
import uuid # noqa: F401

import frozendict # noqa: F401

from openapi_client import schemas # noqa: F401
from openapi_client.shared_imports.schema_imports import *


class Tag(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,7 @@
Generated by: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
"""

import datetime # noqa: F401
import decimal # noqa: F401
import io # noqa: F401
import re # noqa: F401
import typing # noqa: F401
import typing_extensions # noqa: F401
import uuid # noqa: F401

import frozendict # noqa: F401

from openapi_client import schemas # noqa: F401
from openapi_client.shared_imports.schema_imports import *


class User(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,7 @@
Generated by: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
"""

import dataclasses
import typing
import typing_extensions

from openapi_client import security_schemes
from openapi_client.shared_imports.security_scheme_imports import *

@dataclasses.dataclass
class ApiKey(security_schemes.ApiKeySecurityScheme):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,7 @@
Generated by: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
"""

import dataclasses
import typing
import typing_extensions

from openapi_client import security_schemes
from openapi_client.shared_imports.security_scheme_imports import *

@dataclasses.dataclass
class PetstoreAuth(security_schemes.OAuth2SecurityScheme):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,7 @@
"""

from openapi_client import api_client, security_schemes
import datetime # noqa: F401
import decimal # noqa: F401
import io # noqa: F401
import typing # noqa: F401
import typing_extensions # noqa: F401
import uuid # noqa: F401

import frozendict # noqa: F401

from openapi_client import schemas # noqa: F401
from openapi_client.shared_imports.operation_imports import *

from .. import path
from .responses import (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,8 @@
Generated by: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
"""

import dataclasses
import typing
from openapi_client.shared_imports.response_imports import *

import typing_extensions
import urllib3

from openapi_client import api_client
from openapi_client import schemas
from .content.application_xml import schema as application_xml_schema
from .content.application_json import schema as application_json_schema

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,7 @@
Generated by: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
"""

import dataclasses
import urllib3

from openapi_client import api_client
from openapi_client import schemas
from openapi_client.shared_imports.response_imports import *


@dataclasses.dataclass
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,7 @@
"""

from openapi_client import api_client, security_schemes
import datetime # noqa: F401
import decimal # noqa: F401
import io # noqa: F401
import typing # noqa: F401
import typing_extensions # noqa: F401
import uuid # noqa: F401

import frozendict # noqa: F401

from openapi_client import schemas # noqa: F401
from openapi_client.shared_imports.operation_imports import *

from .. import path
from .responses import (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,8 @@
Generated by: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
"""

import dataclasses
import typing
from openapi_client.shared_imports.response_imports import *

import typing_extensions
import urllib3

from openapi_client import api_client
from openapi_client import schemas
from .content.application_xml import schema as application_xml_schema
from .content.application_json import schema as application_json_schema

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,7 @@
Generated by: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
"""

import dataclasses
import urllib3

from openapi_client import api_client
from openapi_client import schemas
from openapi_client.shared_imports.response_imports import *


@dataclasses.dataclass
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,7 @@
Generated by: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
"""

import dataclasses
import urllib3

from openapi_client import api_client
from openapi_client import schemas
from openapi_client.shared_imports.response_imports import *


@dataclasses.dataclass
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,7 @@
Generated by: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
"""

import dataclasses
import urllib3

from openapi_client import api_client
from openapi_client import schemas
from openapi_client.shared_imports.response_imports import *


@dataclasses.dataclass
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,7 @@
"""

from openapi_client import api_client, security_schemes
import datetime # noqa: F401
import decimal # noqa: F401
import io # noqa: F401
import typing # noqa: F401
import typing_extensions # noqa: F401
import uuid # noqa: F401

import frozendict # noqa: F401

from openapi_client import schemas # noqa: F401
from openapi_client.shared_imports.operation_imports import *

from .. import path
from .responses import (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
Generated by: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
"""

from openapi_client import api_client
from openapi_client.shared_imports.header_imports import *

from . import schema

Expand Down
Loading