Skip to content

Commit

Permalink
v3 code reduction w/ shared_imports (#168)
Browse files Browse the repository at this point in the history
* Adds typing_imports

* Adds typing_imports for header and parameter

* Updates request body imports

* Adds response_imports

* Adds schema_imports

* Adds security_scheme_imports

* Adds server imports

* Adds operation_imports

* typing_imports -> header_imports

* Sample regen
  • Loading branch information
spacether committed May 31, 2023
1 parent 7876e1a commit 5ca8ce0
Show file tree
Hide file tree
Showing 1,071 changed files with 1,323 additions and 7,947 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -704,6 +704,15 @@ public void processOpts() {

supportingFiles.add(new SupportingFile("exceptions.hbs", packagePath(), "exceptions.py"));

// shared_imports
supportingFiles.add(new SupportingFile("__init__.hbs", packagePath() + File.separator + "shared_imports", "__init__.py"));
supportingFiles.add(new SupportingFile("shared_imports/header_imports.hbs", packagePath() + File.separator + "shared_imports", "header_imports.py"));
supportingFiles.add(new SupportingFile("shared_imports/response_imports.hbs", packagePath() + File.separator + "shared_imports", "response_imports.py"));
supportingFiles.add(new SupportingFile("shared_imports/schema_imports.hbs", packagePath() + File.separator + "shared_imports", "schema_imports.py"));
supportingFiles.add(new SupportingFile("shared_imports/security_scheme_imports.hbs", packagePath() + File.separator + "shared_imports", "security_scheme_imports.py"));
supportingFiles.add(new SupportingFile("shared_imports/server_imports.hbs", packagePath() + File.separator + "shared_imports", "server_imports.py"));
supportingFiles.add(new SupportingFile("shared_imports/operation_imports.hbs", packagePath() + File.separator + "shared_imports", "operation_imports.py"));

if (Boolean.FALSE.equals(excludeTests)) {
supportingFiles.add(new SupportingFile("__init__.hbs", testFolder, "__init__.py"));
supportingFiles.add(new SupportingFile("__init__.hbs", testFolder + File.separator + modelPackage.replace('.', File.separatorChar), "__init__.py"));
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,15 @@
{{> _helper_imports }}
{{jsonPathPiece.camelCase}} = {{refInfo.refModule}}.{{refInfo.refClass}}
{{else}}
{{#if content}}
import typing, typing_extensions

{{/if}}
from {{packageName}} import api_client
from {{packageName}}.shared_imports.header_imports import *
{{#if schema}}

{{#with schema}}
from . import {{jsonPathPiece.snakeCase}}
{{/with}}
{{else}}
{{#if content}}

{{#each content}}
{{#with this}}
{{#with schema}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,15 @@
{{> _helper_imports }}
{{jsonPathPiece.camelCase}} = {{refInfo.refModule}}.{{refInfo.refClass}}
{{else}}
{{#if content}}
import typing, typing_extensions

{{/if}}
from {{packageName}} import api_client

from {{packageName}}.shared_imports.header_imports import *
{{#if schema}}

{{#with schema}}
from . import {{jsonPathPiece.snakeCase}}
{{/with}}
{{else}}
{{#if content}}

{{#each content}}
{{#with this}}
{{#with schema}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@
{{> _helper_imports }}
{{jsonPathPiece.camelCase}} = {{refInfo.refModule}}.{{refInfo.refClass}}
{{else}}
import typing, typing_extensions
from {{packageName}}.shared_imports.header_imports import *

from {{packageName}} import api_client
{{#each content}}
{{#with this}}
{{#with schema}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,38 +10,22 @@
{{> _helper_imports }}
{{jsonPathPiece.camelCase}} = {{refInfo.refModule}}.{{refInfo.refClass}}
{{else}}
import dataclasses
{{#or content headers}}
{{#if headers}}
import datetime
import decimal
import io
{{/if}}
import typing
{{#if headers}}
import uuid
{{/if}}

{{#if headers}}
import frozendict
{{/if}}
import typing_extensions
{{/or}}
import urllib3

from {{packageName}} import api_client
from {{packageName}} import schemas
from {{packageName}}.shared_imports.response_imports import *
{{#if content}}

{{#each content}}
{{#with this.schema}}
from .content.{{../@key.snakeCase}} import {{jsonPathPiece.snakeCase}} as {{../@key.snakeCase}}_{{jsonPathPiece.snakeCase}}
{{/with}}
{{/each}}
{{/if}}
{{#each headers}}
from .headers import {{jsonPathPiece.snakeCase}}
{{/each}}
{{#if headers}}
{{#unless content}}

{{/unless}}
{{#each headers}}
from .headers import {{jsonPathPiece.snakeCase}}
{{/each}}
{{> components/responses/_helper_header_schema_and_def xParams=headers xParamsName="Header" }}
{{/if}}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
{{> _helper_imports }}
{{> components/schemas/_helper_schema_switch_case identifierPieces=(append identifierPieces jsonPathPiece) }}
{{else}}
{{> _helper_imports_schema_types }}
from {{packageName}}.shared_imports.schema_imports import *
{{> components/schemas/_helper_schema_switch_case identifierPieces=(append identifierPieces jsonPathPiece) }}
{{#if imports}}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,7 @@
{{> _helper_imports }}
{{jsonPathPiece.camelCase}} = {{refInfo.refModule}}.{{refInfo.refClass}}
{{else}}
import dataclasses
import typing
import typing_extensions

from {{packageName}} import security_schemes
from {{packageName}}.shared_imports.security_scheme_imports import *

{{#eq type "apiKey"}}
@dataclasses.dataclass
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,7 @@ from {{packageName}}.security import (
{{/gt}}
{{/neq}}
{{/eq}}
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 {{packageName}} import schemas # noqa: F401
from {{packageName}}.shared_imports.operation_imports import *
{{#if imports}}

{{/if}}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
# coding: utf-8
{{> _helper_header }}

import dataclasses
import typing
{{#if server.variables}}
import typing_extensions
{{/if}}
from {{packageName}}.shared_imports.server_imports import *
{{#with server}}

from {{packageName}} import server{{#if variables}}, schemas{{/if}}
{{#if variables}}


Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import typing
import typing_extensions

from {{packageName}} import api_client
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import datetime
import decimal
import io
import typing
import typing_extensions
import uuid

import frozendict

from {{packageName}} import schemas
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import dataclasses
import datetime
import decimal
import io
import typing
import uuid

import frozendict
import typing_extensions
import urllib3

from {{packageName}} import api_client, schemas
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import datetime
import decimal
import io
import re
import typing
import typing_extensions
import uuid

import frozendict

from {{packageName}} import schemas
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import dataclasses
import typing
import typing_extensions

from {{packageName}} import security_schemes
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import dataclasses
import typing
import typing_extensions

from {{packageName}} import server, schemas
Original file line number Diff line number Diff line change
Expand Up @@ -2085,6 +2085,13 @@ src/unit_test_api/security_schemes.py
src/unit_test_api/server.py
src/unit_test_api/servers/__init__.py
src/unit_test_api/servers/server_0.py
src/unit_test_api/shared_imports/__init__.py
src/unit_test_api/shared_imports/header_imports.py
src/unit_test_api/shared_imports/operation_imports.py
src/unit_test_api/shared_imports/response_imports.py
src/unit_test_api/shared_imports/schema_imports.py
src/unit_test_api/shared_imports/security_scheme_imports.py
src/unit_test_api/shared_imports/server_imports.py
test-requirements.txt
test/__init__.py
test/components/__init__.py
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 unit_test_api import schemas # noqa: F401
from unit_test_api.shared_imports.schema_imports import *


class _Not(
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 unit_test_api import schemas # noqa: F401
from unit_test_api.shared_imports.schema_imports import *


class AdditionalpropertiesAllowsASchemaWhichShouldValidate(
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 unit_test_api import schemas # noqa: F401
from unit_test_api.shared_imports.schema_imports import *


class AdditionalpropertiesAreAllowedByDefault(
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 unit_test_api import schemas # noqa: F401
from unit_test_api.shared_imports.schema_imports import *


class AdditionalpropertiesCanExistByItself(
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 unit_test_api import schemas # noqa: F401
from unit_test_api.shared_imports.schema_imports import *


class AdditionalpropertiesShouldNotLookInApplicators(
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 unit_test_api import schemas # noqa: F401
from unit_test_api.shared_imports.schema_imports import *


class Allof(
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 unit_test_api import schemas # noqa: F401
from unit_test_api.shared_imports.schema_imports import *


class AllofCombinedWithAnyofOneof(
Expand Down
Loading

0 comments on commit 5ca8ce0

Please sign in to comment.